Update to latest Androidx lifecycle maven coordinates

DrewCarlson · May 26, 2024 · 244432c · 244432c
1 parent 7132bba
commit 244432c
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 27 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 kotlin = "2.0.0"
 dokka = "1.9.20"
-agp = "8.2.0"
+agp = "8.2.2"
 coroutines = "1.8.1"
 guava = "31.0.1-android"
 awaitility = "4.2.1"
@@ -45,9 +45,9 @@ kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
 kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinpoet" }
 compileTesting = { module = "dev.zacsweers.kctfork:core", version.ref = "compileTesting" }
 compileTesting-ksp = { module = "dev.zacsweers.kctfork:ksp", version.ref = "compileTesting" }
-androidx-livedata = { module = "androidx.lifecycle:lifecycle-livedata", version.ref = "ax_lifecycle" }
+androidx-livedata = { module = "androidx.lifecycle:lifecycle-livedata-core-ktx", version.ref = "ax_lifecycle" }
 androidx-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "ax_lifecycle" }
-androidx-lifecycleRuntime = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "ax_lifecycle" }
+androidx-lifecycleRuntime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "ax_lifecycle" }
 androidx-coreTesting = { module = "androidx.arch.core:core-testing", version.ref = "ax_testing" }
 androidx-test-runner = { module = "androidx.test:runner", version.ref = "ax_runner" }
 robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }

diff --git a/mobiuskt-codegen-api/build.gradle.kts b/mobiuskt-codegen-api/build.gradle.kts
@@ -1,5 +1,6 @@
 @file:OptIn(ExperimentalWasmDsl::class)
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
@@ -10,7 +11,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 
     iosX64()
     iosArm64()
@@ -25,7 +26,11 @@ kotlin {
     linuxX64()
     linuxArm64()
     mingwX64()
-    jvm()
+    jvm {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
+        }
+    }
     js(IR) {
         nodejs()
         browser()

diff --git a/mobiuskt-compose/build.gradle.kts b/mobiuskt-compose/build.gradle.kts
@@ -1,5 +1,6 @@
 @file:OptIn(ExperimentalWasmDsl::class)
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
@@ -30,22 +31,19 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 
     androidTarget {
         publishAllLibraryVariants()
     }
-    jvm()
+    jvm {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
+        }
+    }
     js(IR) {
         browser {
             testTask {

diff --git a/mobiuskt-core/build.gradle.kts b/mobiuskt-core/build.gradle.kts
@@ -1,5 +1,6 @@
 @file:OptIn(ExperimentalWasmDsl::class)
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
@@ -33,22 +34,21 @@ android {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
         }
     }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
     compilerOptions {
         freeCompilerArgs.add("-Xexpect-actual-classes")
     }
     androidTarget {
         publishLibraryVariants("release", "debug")
     }
-    jvm()
+    jvm {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
+        }
+    }
     js(IR) {
         binaries.library()
         nodejs()

diff --git a/mobiuskt-coroutines/build.gradle.kts b/mobiuskt-coroutines/build.gradle.kts
@@ -1,5 +1,6 @@
 @file:OptIn(ExperimentalWasmDsl::class)
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
@@ -12,8 +13,12 @@ plugins {
 apply(plugin = "kotlinx-atomicfu")
 
 kotlin {
-    jvmToolchain(11)
-    jvm()
+    jvmToolchain(17)
+    jvm {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
+        }
+    }
     js(IR) {
         binaries.executable()
         nodejs()

diff --git a/mobiuskt-extras/build.gradle.kts b/mobiuskt-extras/build.gradle.kts
@@ -1,5 +1,6 @@
 @file:OptIn(ExperimentalWasmDsl::class)
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
@@ -10,7 +11,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
     iosX64()
     iosArm64()
     iosSimulatorArm64()
@@ -24,7 +25,11 @@ kotlin {
     linuxX64()
     linuxArm64()
     mingwX64()
-    jvm()
+    jvm {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
+        }
+    }
     js(IR) {
         binaries.library()
         nodejs()

diff --git a/mobiuskt-test/build.gradle.kts b/mobiuskt-test/build.gradle.kts
@@ -1,5 +1,6 @@
 @file:OptIn(ExperimentalWasmDsl::class)
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
@@ -10,7 +11,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 
     iosX64()
     iosArm64()
@@ -28,7 +29,11 @@ kotlin {
     linuxX64()
     linuxArm64()
     mingwX64()
-    jvm()
+    jvm {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
+        }
+    }
     js(IR) {
         nodejs()
         browser {