Merge pull request #85 from AniTrend/develop

Develop ➡️ Master

.github/workflows/android-dependency-updates.yaml

@@ -12,16 +12,16 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: 11
         distribution: 'adopt'
     - name: Gradle check for updates
       run: ./gradlew dependencyUpdates --stacktrace
     - name: Upload dependency updates report
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: dependency-report
         path: build/dependencyUpdates/report.json

.github/workflows/android-spotless.yml

@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '11'
         distribution: 'adopt'

.github/workflows/android-test.yml

@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '11'
         distribution: 'adopt'

.github/workflows/gradle-dokka.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '11'
         distribution: 'adopt'
@@ -23,7 +23,7 @@ jobs:
       run: ./gradlew dokkaHtmlMultiModule
 
     - name: Deploy 🚀
-      uses: JamesIves/[email protected].5
+      uses: JamesIves/github-pages-deploy-action@v4.4.1
       with:
         branch: docs # The branch the action should deploy to.
         folder: dokka-docs # The folder the action should deploy.

.github/workflows/release-builder.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Fetch tags
         run: git fetch --tags --force
       - uses: ericcornelissen/git-tag-annotation-action@v2

build.gradle.kts

@@ -15,8 +15,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath(co.anitrend.arch.buildSrc.Libraries.Android.Tools.buildGradle)
-        classpath(co.anitrend.arch.buildSrc.Libraries.JetBrains.Kotlin.Gradle.plugin)
+        classpath(libs.android.gradle.plugin)
+        classpath(libs.jetbrains.kotlin.gradle)
     }
 }
 

buildSrc/build.gradle.kts

@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
 plugins {
     `kotlin-dsl`
     `maven-publish`
+    `version-catalog`
 }
 
 repositories {
@@ -27,27 +28,27 @@ tasks.withType(KotlinJvmCompile::class) {
     }
 }
 
-val buildToolsVersion = "7.2.1"
-val kotlinVersion = "1.7.20"
-val dokkaVersion = "1.6.21"
-val manesVersion = "0.42.0"
-val spotlessVersion = "6.11.0"
+fun Project.library(alias: String) =
+    extensions.getByType<VersionCatalogsExtension>()
+        .named("libs")
+        .findLibrary(alias)
+        .get()
 
 dependencies {
     /* Depend on the android gradle plugin, since we want to access it in our plugin */
-    implementation("com.android.tools.build:gradle:$buildToolsVersion")
+    implementation(library("android-gradle-plugin"))
 
     /* Depend on the kotlin plugin, since we want to access it in our plugin */
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+    implementation(library("jetbrains-kotlin-gradle"))
 
     /* Depend on the dokka plugin, since we want to access it in our plugin */
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion")
+    implementation(library("jetbrains-dokka-gradle"))
 
     /** Dependency management */
-    implementation("com.github.ben-manes:gradle-versions-plugin:$manesVersion")
+    implementation(library("gradle-versions"))
 
     /** Spotless */
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion")
+    implementation(library("spotless-gradle"))
 
     /* Depend on the default Gradle API's since we want to build a custom plugin */
     implementation(gradleApi())

buildSrc/settings.gradle.kts

@@ -0,0 +1,9 @@
+@file:Suppress("UnstableApiUsage")
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

buildSrc/src/main/java/co/anitrend/arch/buildSrc/common/Configuration.kt

@@ -13,8 +13,8 @@ object Configuration {
 
     private const val channel = "alpha"
 
-    const val compileSdk = 32
-    const val targetSdk = 32
+    const val compileSdk = 33
+    const val targetSdk = 33
     const val minSdk = 21
 
     /**
@@ -34,4 +34,4 @@ object Configuration {
         "$major.$minor.$patch-$channel$${revision.toVersion()}"
     else
         "$major.$minor.$patch"
-}
+}

buildSrc/src/main/java/co/anitrend/arch/buildSrc/plugin/components/AndroidConfiguration.kt

@@ -5,8 +5,8 @@ import co.anitrend.arch.buildSrc.plugin.extensions.baseExtension
 import co.anitrend.arch.buildSrc.plugin.extensions.libraryExtension
 import co.anitrend.arch.buildSrc.plugin.extensions.isDomainModule
 import co.anitrend.arch.buildSrc.plugin.extensions.isThemeModule
+import co.anitrend.arch.buildSrc.plugin.extensions.version
 import co.anitrend.arch.buildSrc.common.Configuration
-import co.anitrend.arch.buildSrc.common.Versions
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
@@ -30,7 +30,7 @@ internal fun Project.configureSpotless(): Unit = spotlessExtension().run {
             "**/test/**/*.kt",
             "bin/**/*.kt"
         )
-        ktlint(Versions.ktlint).userData(
+        ktlint(version("ktlint").toString()).userData(
             mapOf("android" to "true")
         )
         licenseHeaderFile(rootProject.file("spotless/copyright.kt"))

buildSrc/src/main/java/co/anitrend/arch/buildSrc/plugin/extensions/ProjectExtensions.kt

@@ -5,10 +5,15 @@ import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.LibraryExtension
 import com.diffplug.gradle.spotless.SpotlessExtension
 import org.gradle.api.Project
+import org.gradle.api.artifacts.MinimalExternalModuleDependency
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.artifacts.VersionConstraint
 import org.gradle.api.internal.plugins.DefaultArtifactPublicationSet
 import org.gradle.api.plugins.BasePlugin
 import org.gradle.api.plugins.ExtraPropertiesExtension
 import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.provider.Provider
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.reporting.ReportingExtension
 import org.gradle.api.tasks.SourceSetContainer
@@ -45,6 +50,20 @@ fun Project.isThemeModule() =
 fun Project.isUiModule() =
     name == Modules.Support.Ui.id
 
+fun Project.versionCatalog(): VersionCatalog =
+    versionCatalogExtension()
+        .named("libs")
+
+fun Project.library(alias: String): Provider<MinimalExternalModuleDependency> =
+    versionCatalog()
+        .findLibrary(alias)
+        .get()
+
+fun Project.version(alias: String): VersionConstraint =
+    versionCatalog()
+        .findVersion(alias)
+        .get()
+
 internal fun Project.baseExtension() =
     extensions.getByType<BaseExtension>()
 
@@ -81,6 +100,9 @@ internal fun Project.publishingExtension() =
 internal fun Project.spotlessExtension() =
     extensions.getByType<SpotlessExtension>()
 
+internal fun Project.versionCatalogExtension() =
+    extensions.getByType<VersionCatalogsExtension>()
+
 internal fun Project.containsBasePlugin(): Boolean {
     return project.plugins.toList().any { plugin ->
         plugin is BasePlugin