From 6cc2c1b4e44d823d8848d1124e9e1c54fb5dcb9d Mon Sep 17 00:00:00 2001 From: Isaac Udy Date: Mon, 29 Jun 2026 11:31:35 +1200 Subject: [PATCH 1/2] Upgrade to Kotlin 2.4.0 + Compose MP 1.11.1; bump deps and submodules - Kotlin 2.3.21 -> 2.4.0 (KSP stays 2.3.9, verified compatible) - Compose Multiplatform 1.10.3 -> 1.11.1, androidx-lifecycle 2.9.6 -> 2.10.0 - coroutines 1.11.0, kotlinx-io 0.9.1, koin 4.2.2, ktor 3.5.1, logback 1.5.37, androidx-core 1.19.0 - Gradle wrapper 9.5.0 -> 9.6.1; regenerate wasm yarn.lock for Compose 1.11.1 - Advance embedded-enro and embedded-udytils submodules to matching upgrades Verified: all platforms (Android/desktop/wasmJs/iOS) + server compile, web bundle builds, Paparazzi snapshots pass. Co-Authored-By: Claude Opus 4.8 --- embedded-enro | 2 +- embedded-udytils | 2 +- gradle/libs.versions.toml | 18 +++++++++--------- gradle/wrapper/gradle-wrapper.properties | 2 +- kotlin-js-store/wasm/yarn.lock | 5 +++++ 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/embedded-enro b/embedded-enro index f779740..36abec3 160000 --- a/embedded-enro +++ b/embedded-enro @@ -1 +1 @@ -Subproject commit f77974036ceaeea55625da3dc31dc1a6392320ea +Subproject commit 36abec35b7a6f4bf03474050336389545e563907 diff --git a/embedded-udytils b/embedded-udytils index 82b1c7f..e3401fb 160000 --- a/embedded-udytils +++ b/embedded-udytils @@ -1 +1 @@ -Subproject commit 82b1c7f0f7f2b8e98dd03f553a2f9c37f91d645f +Subproject commit e3401fbe873e503d16c725057d56e308d6dea94a diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e1281f8..de5f53d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,19 +5,19 @@ android-minSdk = "24" android-targetSdk = "36" androidx-activity = "1.13.0" androidx-appcompat = "1.7.1" -androidx-core = "1.18.0" -androidx-lifecycle = "2.9.6" -composeMultiplatform = "1.10.3" -kotlin = "2.3.21" -kotlinx-coroutines = "1.10.2" +androidx-core = "1.19.0" +androidx-lifecycle = "2.10.0" +composeMultiplatform = "1.11.1" +kotlin = "2.4.0" +kotlinx-coroutines = "1.11.0" kotlinx-serialization = "1.11.0" kotlinx-datetime = "0.8.0" -kotlinx-io = "0.9.0" +kotlinx-io = "0.9.1" kotlinx-browser = "0.5.0" -koin = "4.2.1" +koin = "4.2.2" ksp = "2.3.9" -ktor = "3.5.0" -logback = "1.5.33" +ktor = "3.5.1" +logback = "1.5.37" konsist = "0.17.3" paparazzi = "2.0.0-alpha05" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1a70468..a351597 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/kotlin-js-store/wasm/yarn.lock b/kotlin-js-store/wasm/yarn.lock index d3b9b64..0302322 100644 --- a/kotlin-js-store/wasm/yarn.lock +++ b/kotlin-js-store/wasm/yarn.lock @@ -11,3 +11,8 @@ ws@8.18.3: version "8.18.3" resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472" integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg== + +ws@8.20.1: + version "8.20.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.20.1.tgz#91a9ae2b312ccf98e0a85ec499b48cef45ab0ddb" + integrity sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w== From 3d0d79feb8979291b82d92b960cddb24fb0ef461 Mon Sep 17 00:00:00 2001 From: Isaac Udy Date: Mon, 29 Jun 2026 13:09:09 +1200 Subject: [PATCH 2/2] Advance embedded-enro to the Kotlin 2.4 CI fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Picks up the @PublishedApi fix (NavigationDirection.MetadataKey) and the macos-26 CI runner from isaac-udy/Enro#221 — now green on both Linux and macOS/iOS jobs. Co-Authored-By: Claude Opus 4.8 --- embedded-enro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embedded-enro b/embedded-enro index 36abec3..da2cac3 160000 --- a/embedded-enro +++ b/embedded-enro @@ -1 +1 @@ -Subproject commit 36abec35b7a6f4bf03474050336389545e563907 +Subproject commit da2cac34412c41c73867baa5b2f5ec462a05a5bc