Dependency updates and migration to AGP 9.1 / Gradle 9.4

buildSrc/src/main/kotlin/SetupKotlinCompile.kt

@@ -1,12 +1,13 @@
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 fun Project.setupKotlinCompile() {
-    tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = Config.javaVersion.toString()
-            freeCompilerArgs = listOf(
+    tasks.withType<KotlinCompile>().configureEach {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.fromTarget(Config.javaVersion.toString()))
+            freeCompilerArgs.addAll(
                 "-Xskip-prerelease-check",
                 "-P",
             )

buildSrc/src/main/kotlin/SetupMultiplatform.kt

@@ -1,6 +1,7 @@
 import org.gradle.api.Project
 import org.gradle.api.provider.Provider
 import org.gradle.plugin.use.PluginDependency
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 fun Project.setupMultiplatform(
     vararg buildTargets: BuildTarget,
@@ -30,8 +31,8 @@ fun Project.setupMultiplatform(
         }
 
         setup<BuildTarget.Android>(buildTargets) {
-            android {
-                publishAllLibraryVariants()
+            androidTarget {
+                publishLibraryVariants()
             }
         }
 

buildSrc/src/main/kotlin/SetupTestCoverage.kt

@@ -1,10 +1,17 @@
-import kotlinx.kover.tasks.KoverMergedTask
+import kotlinx.kover.gradle.plugin.dsl.KoverProjectExtension
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
 
 fun Project.setupTestCoverage() {
-    tasks.withType(KoverMergedTask::class.java) {
-        excludes = listOf(
-            "*.BuildConfig",
-        )
+    plugins.withId("org.jetbrains.kotlinx.kover") {
+        extensions.configure<KoverProjectExtension> {
+            reports {
+                filters {
+                    excludes {
+                        classes("*.BuildConfig")
+                    }
+                }
+            }
+        }
     }
 }

config/deps.versions.toml

@@ -1,24 +1,24 @@
 [versions]
-kotlin = "1.9.24"
-coroutines = "1.9.0-RC"
-essenty = "2.1.0"
-androidxTest = "1.6.2"
-androidxJunit = "1.2.1"
-turbine = "1.0.0"
-kotest = "5.4.1"
-kover = "0.5.1"
-kermit = "1.2.2"
-ktLint = "12.1.1"
-dokka = "1.9.20"
+kotlin = "2.3.20"
+coroutines = "1.10.2"
+essenty = "2.5.0"
+androidxTest = "1.7.0"
+androidxJunit = "1.3.0"
+turbine = "1.2.1"
+kotest = "6.1.11"
+kover = "0.9.8"
+kermit = "2.1.0"
+ktLint = "14.2.0"
+dokka = "2.2.0"
 # Android
-android-gradle = "8.5.2"
+android-gradle = "9.1.0"
 
 [libraries]
 # Gradle
 gradle-kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 gradle-android = { group = "com.android.tools.build", name = "gradle", version.ref = "android-gradle" }
 gradle-ktlint = { group = "org.jlleitschuh.gradle", name = "ktlint-gradle", version.ref = "ktLint" }
-gradle-kover = { group = "org.jetbrains.kotlinx", name = "kover", version.ref = "kover" }
+gradle-kover = { group = "org.jetbrains.kotlinx", name = "kover-gradle-plugin", version.ref = "kover" }
 gradle-dokka = { group = "org.jetbrains.dokka", name = "dokka-gradle-plugin", version.ref = "dokka" }
 # Kotlinx
 kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version.ref = "kotlin" }

gradle.properties

@@ -2,3 +2,7 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx4608m -Dfile.encoding=UTF-8
 android.useAndroidX = true
 kotlin.native.binary.memoryModel=experimental
+
+# Temporary support for AGP 9.0
+android.builtInKotlin=false
+android.newDsl=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Sep 10 03:37:05 JST 2023
+#Tue Dec 03 10:00:00 JST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists