Update to Kotlin 1.9.22 (#185)

DrewCarlson · web-flow · commit 9c64892cd991 · 2024-01-21T11:12:41.000-08:00
* Update to Kotlin 1.9.22

* ~ cleanup buildscript
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,32 +1,33 @@
 [versions]
-kotlin = "1.9.10"
+kotlin = "1.9.22"
 dokka = "1.9.10"
-agp = "8.1.2"
+agp = "8.2.0"
 coroutines = "1.7.3"
 guava = "31.0.1-android"
 awaitility = "4.2.0"
-atomicfu = "0.22.0"
+atomicfu = "0.23.1"
 binary_compat = "0.13.2"
-kover = "0.7.4"
+kover = "0.7.5"
 slf4j = "2.0.9"
-ksp = "1.9.10-1.0.13"
-kotlinpoet = "1.14.2"
+ksp = "1.9.22-1.0.17"
+kotlinpoet = "1.15.3"
 ax_lifecycle = "2.6.2"
 ax_testing = "2.2.0"
 ax_runner = "1.5.2"
-robolectric = "4.10.3"
+robolectric = "4.11.1"
 turbine = "1.0.0"
-compose_compiler = "1.5.3"
-compose_multiplatform = "1.5.3"
-compose_multiplatform_compiler = "1.5.0"
+compose_compiler = "1.5.8"
+compose_multiplatform = "1.5.11"
+compose_multiplatform_compiler = "1.5.7.1"
+androidxComposeBom = "2023.10.01"
 
 [plugins]
 multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
 binaryCompat = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary_compat" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
-mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.25.3" }
+mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.26.0" }
 composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose_multiplatform" }
 
 [libraries]
diff --git a/mobiuskt-compose/build.gradle.kts b/mobiuskt-compose/build.gradle.kts
@@ -35,18 +35,22 @@ android {
     }
 }
 
+compose {
+    kotlinCompilerPlugin.set(libs.versions.compose.multiplatform.compiler.get())
+}
+
 kotlin {
     androidTarget()
     jvm {
         jvmToolchain(11)
     }
     js(IR) {
         browser {
-            testTask(Action {
+            testTask {
                 useKarma {
                     useFirefoxHeadless()
                 }
-            })
+            }
         }
     }
     listOf(
diff --git a/mobiuskt-core/build.gradle.kts b/mobiuskt-core/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 apply(plugin = "kotlinx-atomicfu")
 
 android {
-    compileSdk = 33
+    compileSdk = 34
     namespace = "kt.mobius.android"
     defaultConfig {
         minSdk = 21
@@ -37,6 +37,9 @@ android {
 }
 
 kotlin {
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
     androidTarget {
         jvmToolchain(11)
         publishLibraryVariants("release", "debug")
@@ -48,45 +51,31 @@ kotlin {
         binaries.library()
         nodejs()
         browser {
-            testTask(Action {
+            testTask {
                 useKarma {
                     useFirefoxHeadless()
                 }
-            })
-        }
-    }
-
-    val nativeTargets = listOf(
-            iosX64(),
-            iosArm64(),
-            iosSimulatorArm64(),
-            tvosX64(),
-            tvosArm64(),
-            tvosSimulatorArm64(),
-            watchosArm32(),
-            watchosArm64(),
-            watchosSimulatorArm64(),
-            watchosDeviceArm64(),
-            watchosX64(),
-            macosX64(),
-            macosArm64(),
-            linuxX64(),
-            linuxArm64(),
-            mingwX64(),
-    )
-    val darwinTargets = listOf("ios", "tvos", "watchos", "macos")
-    configure(nativeTargets) {
-        compilations.getByName("main") {
-            defaultSourceSet {
-                kotlin.srcDir("src/nativeMain/kotlin")
-
-                if (darwinTargets.any(this@configure.name::startsWith)) {
-                    kotlin.srcDir("src/darwinMain/kotlin")
-                }
             }
         }
     }
 
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+    tvosX64()
+    tvosArm64()
+    tvosSimulatorArm64()
+    watchosArm32()
+    watchosArm64()
+    watchosSimulatorArm64()
+    watchosDeviceArm64()
+    watchosX64()
+    macosX64()
+    macosArm64()
+    linuxX64()
+    linuxArm64()
+    mingwX64()
+
     sourceSets {
         all {
             explicitApi()
@@ -123,15 +112,13 @@ kotlin {
         }
 
         val androidMain by getting {
-            dependsOn(jvmMain)
             dependencies {
                 implementation(libs.androidx.livedata)
                 implementation(libs.androidx.viewmodel)
             }
         }
 
         val androidUnitTest by getting {
-            dependsOn(jvmTest)
             dependencies {
                 implementation(projects.mobiusktTest)
                 implementation(libs.androidx.lifecycleRuntime)
diff --git a/mobiuskt-core/src/androidMain/kotlin/runners/DefaultWorkRunners.android.kt b/mobiuskt-core/src/androidMain/kotlin/runners/DefaultWorkRunners.android.kt
@@ -0,0 +1,28 @@
+package kt.mobius.runners
+
+import kt.mobius.functions.Producer
+import java.util.concurrent.Executors
+import java.util.concurrent.ThreadFactory
+import java.util.concurrent.atomic.AtomicLong
+
+internal actual object DefaultWorkRunners {
+    private val threadFactory = MyThreadFactory()
+
+    actual fun eventWorkRunnerProducer() = Producer {
+        WorkRunners.from(Executors.newSingleThreadExecutor(threadFactory))
+    }
+
+    actual fun effectWorkRunnerProducer() = Producer {
+        WorkRunners.from(Executors.newCachedThreadPool(threadFactory))
+    }
+
+    private class MyThreadFactory : ThreadFactory {
+        private val threadCount = AtomicLong(0)
+
+        override fun newThread(r: java.lang.Runnable): Thread {
+            return Executors.defaultThreadFactory().newThread(r).apply {
+                name = "mobius-thread-${threadCount.incrementAndGet()}"
+            }
+        }
+    }
+}
diff --git a/mobiuskt-core/src/androidMain/kotlin/runners/ExecutorServiceWorkRunner.kt b/mobiuskt-core/src/androidMain/kotlin/runners/ExecutorServiceWorkRunner.kt
@@ -0,0 +1,40 @@
+package kt.mobius.runners
+
+import kotlinx.atomicfu.locks.withLock
+import kt.mobius.MobiusHooks
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.locks.ReentrantLock
+
+/** A [WorkRunner] implementation that is backed by an [ExecutorService]. */
+public class ExecutorServiceWorkRunner(private val service: ExecutorService) : WorkRunner {
+
+    private val logger = MobiusHooks.newLogger("ExecutorServiceWorkRunner")
+    private val lock = ReentrantLock()
+
+    override fun post(runnable: Runnable) {
+        lock.withLock {
+            if (!service.isTerminated && !service.isShutdown) {
+                service.submit(runnable)
+            }
+        }
+    }
+
+    override fun dispose() {
+        try {
+            lock.withLock {
+                val runnables = service.shutdownNow()
+
+                if (runnables.isNotEmpty()) {
+                    logger.warn("Disposing ExecutorServiceWorkRunner with {} outstanding tasks.", runnables.size)
+                }
+            }
+
+            if (!service.awaitTermination(100, TimeUnit.MILLISECONDS)) {
+                logger.error("ExecutorService shutdown timed out; there are still tasks executing")
+            }
+        } catch (e: InterruptedException) {
+            logger.error(e, "Timeout when disposing work runner")
+        }
+    }
+}
diff --git a/mobiuskt-core/src/androidMain/kotlin/runners/Runnable.android.kt b/mobiuskt-core/src/androidMain/kotlin/runners/Runnable.android.kt
@@ -0,0 +1,3 @@
+package kt.mobius.runners
+
+public actual typealias Runnable = java.lang.Runnable
diff --git a/mobiuskt-core/src/androidMain/kotlin/runners/WorkRunners.android.kt b/mobiuskt-core/src/androidMain/kotlin/runners/WorkRunners.android.kt
@@ -0,0 +1,33 @@
+package kt.mobius.runners
+
+
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+
+public actual object WorkRunners {
+
+    @JvmStatic
+    public actual fun immediate(): WorkRunner {
+        return ImmediateWorkRunner()
+    }
+
+    @JvmStatic
+    public fun singleThread(): WorkRunner {
+        return from(Executors.newSingleThreadExecutor())
+    }
+
+    @JvmStatic
+    public fun fixedThreadPool(n: Int): WorkRunner {
+        return from(Executors.newFixedThreadPool(n))
+    }
+
+    @JvmStatic
+    public fun cachedThreadPool(): WorkRunner {
+        return from(Executors.newCachedThreadPool())
+    }
+
+    @JvmStatic
+    public fun from(service: ExecutorService): WorkRunner {
+        return ExecutorServiceWorkRunner(service)
+    }
+}
diff --git a/mobiuskt-core/src/appleMain/kotlin/MobiusDarwin.kt b/mobiuskt-core/src/appleMain/kotlin/MobiusDarwin.kt
diff --git a/mobiuskt-core/src/appleMain/kotlin/runners/DispatchQueueWorkRunner.kt b/mobiuskt-core/src/appleMain/kotlin/runners/DispatchQueueWorkRunner.kt
diff --git a/mobiuskt-coroutines/build.gradle.kts b/mobiuskt-coroutines/build.gradle.kts
@@ -15,38 +15,29 @@ kotlin {
         binaries.executable()
         nodejs()
         browser {
-            testTask(Action {
+            testTask {
                 useKarma {
                     useFirefoxHeadless()
                 }
-            })
-        }
-    }
-    val nativeTargets = listOf(
-        iosX64(),
-        iosArm64(),
-        iosSimulatorArm64(),
-        tvosX64(),
-        tvosArm64(),
-        tvosSimulatorArm64(),
-        watchosArm32(),
-        watchosArm64(),
-        watchosSimulatorArm64(),
-        watchosDeviceArm64(),
-        watchosX64(),
-        macosX64(),
-        macosArm64(),
-        linuxX64(),
-        linuxArm64(),
-        mingwX64(),
-    )
-    configure(nativeTargets) {
-        compilations.getByName("test") {
-            defaultSourceSet {
-                kotlin.srcDir("src/nativeTest/kotlin")
             }
         }
     }
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+    tvosX64()
+    tvosArm64()
+    tvosSimulatorArm64()
+    watchosArm32()
+    watchosArm64()
+    watchosSimulatorArm64()
+    watchosDeviceArm64()
+    watchosX64()
+    macosX64()
+    macosArm64()
+    linuxX64()
+    linuxArm64()
+    mingwX64()
     sourceSets {
         all {
             explicitApi()
diff --git a/mobiuskt-extras/build.gradle.kts b/mobiuskt-extras/build.gradle.kts
@@ -26,11 +26,11 @@ kotlin {
         binaries.library()
         nodejs()
         browser {
-            testTask(Action {
+            testTask {
                 useKarma {
                     useFirefoxHeadless()
                 }
-            })
+            }
         }
     }
 
diff --git a/mobiuskt-test/build.gradle.kts b/mobiuskt-test/build.gradle.kts
@@ -28,11 +28,11 @@ kotlin {
     js(IR) {
         nodejs()
         browser {
-            testTask(Action {
+            testTask {
                 useKarma {
                     useFirefoxHeadless()
                 }
-            })
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -35,18 +35,22 @@ android {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
	`38`	`+compose {`
	`39`	`+ kotlinCompilerPlugin.set(libs.versions.compose.multiplatform.compiler.get())`
	`40`	`+}`
	`41`	`+`
`38`	`42`	`kotlin {`
`39`	`43`	`androidTarget()`
`40`	`44`	`jvm {`
`41`	`45`	`jvmToolchain(11)`
`42`	`46`	`}`
`43`	`47`	`js(IR) {`
`44`	`48`	`browser {`
`45`		`- testTask(Action {`
	`49`	`+ testTask {`
`46`	`50`	`useKarma {`
`47`	`51`	`useFirefoxHeadless()`
`48`	`52`	`}`
`49`		`- })`
	`53`	`+ }`
`50`	`54`	`}`
`51`	`55`	`}`
`52`	`56`	`listOf(`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package kt.mobius.runners`
	`2`	`+`
	`3`	`+public actual typealias Runnable = java.lang.Runnable`
Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,11 @@ kotlin {`
`26`	`26`	`binaries.library()`
`27`	`27`	`nodejs()`
`28`	`28`	`browser {`
`29`		`- testTask(Action {`
	`29`	`+ testTask {`
`30`	`30`	`useKarma {`
`31`	`31`	`useFirefoxHeadless()`
`32`	`32`	`}`
`33`		`- })`
	`33`	`+ }`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,11 @@ kotlin {`
`28`	`28`	`js(IR) {`
`29`	`29`	`nodejs()`
`30`	`30`	`browser {`
`31`		`- testTask(Action {`
	`31`	`+ testTask {`
`32`	`32`	`useKarma {`
`33`	`33`	`useFirefoxHeadless()`
`34`	`34`	`}`
`35`		`- })`
	`35`	`+ }`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`