Kotlin 1.9.10 -> 1.9.24 (gdg-berlin-android#302)

sielukm · Jul 4, 2024 · cc21044 · cc21044
2 parents 35b1ac5 + 88513d9
commit cc21044
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 20 deletions.
diff --git a/zeapp/badge/build.gradle.kts b/zeapp/badge/build.gradle.kts
@@ -1,12 +1,16 @@
 plugins {
-    kotlin("multiplatform")
+    alias(libs.plugins.kotlin.multiplatform)
     id("com.android.library")
 }
 
 @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     targetHierarchy.default()
 
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+
     androidTarget {
         compilations.all {
             kotlinOptions {
@@ -26,28 +30,16 @@ kotlin {
         os.startsWith("Mac OS") ->
             jvm("mac") {
                 withJavaEnabled
-
-                jvmToolchain {
-                    languageVersion.set(JavaLanguageVersion.of(17))
-                }
             }
 
         os.startsWith("Linux") ->
             jvm("linux") {
                 withJavaEnabled
-
-                jvmToolchain {
-                    languageVersion.set(JavaLanguageVersion.of(17))
-                }
             }
 
         os.startsWith("Windows") ->
             jvm("windows") {
                 withJavaEnabled
-
-                jvmToolchain {
-                    languageVersion.set(JavaLanguageVersion.of(17))
-                }
             }
 
         else -> throw StopActionException("Your operating system is not supported at this time: '${os}'.")

diff --git a/zeapp/benchmark/build.gradle.kts b/zeapp/benchmark/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.test")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.android.test)
     alias(libs.plugins.baselineprofile)
 }
 

diff --git a/zeapp/build.gradle.kts b/zeapp/build.gradle.kts
@@ -2,15 +2,15 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.android.test) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.kotlin.kapt) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.detekt.gradle) apply false
     alias(libs.plugins.dagger.hilt) apply false
     alias(libs.plugins.license.report.gradle) apply false
     alias(libs.plugins.aboutlibraries.gradle) apply false
-    alias(libs.plugins.kotlin.multiplatform) apply false
-    alias(libs.plugins.android.test) apply false
 }
 
 tasks.register("clean", Delete::class) {

diff --git a/zeapp/gradle.properties b/zeapp/gradle.properties
@@ -32,3 +32,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 roborazzi.test.compare=true
 roborazzi.test.verify=true
 roborazzi.test.record=false
+
diff --git a/zeapp/gradle/libs.versions.toml b/zeapp/gradle/libs.versions.toml
@@ -2,9 +2,10 @@
 
 [versions]
 android-gradle-plugin = "8.3.2"
+android-gradle-test-plugin = "8.0.2"
 androidx-activity = "1.9.0"
 androidx-compose-bom = "2024.06.00"
-androidx-compose-compiler = "1.5.3"
+androidx-compose-compiler = "1.5.14"
 androidx-core = "1.13.1"
 androidx-datastore = "1.1.1"
 androidx-lifecycle = "2.8.3"
@@ -16,7 +17,7 @@ coil = "2.6.0"
 dagger-hilt = "2.51.1"
 detekt-gradle = "1.23.1"
 jSerialComm = "2.10.3"
-kotlin = "1.9.10"
+kotlin = "1.9.24"
 kotlinx-coroutines-core = "1.8.1"
 kotlinxSerializationJson = "1.6.3"
 ktlint-gradle = "11.6.1"
@@ -50,6 +51,7 @@ compose-ui-manifest = "1.6.8"
 [plugins]
 android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
 android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
+android-test = { id = "com.android.test", version.ref = "android-gradle-test-plugin" }
 baselineprofile = { id = "androidx.baselineprofile", version.ref = "benchmark" }
 dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger-hilt" }
 detekt-gradle = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt-gradle" }
@@ -59,7 +61,6 @@ ktlint-gradle = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint-gr
 license-report-gradle = { id = "com.jaredsburrows.license", version.ref = "license-report-gradle" }
 aboutlibraries-gradle = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlibraries" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-android-test = { id = "com.android.test", version.ref = "android-test" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "jetbrains-compose" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }