From b6e2229c9db0aa411cb743830de63bba2629e7a6 Mon Sep 17 00:00:00 2001 From: kitakkun <48154936+kitakkun@users.noreply.github.com> Date: Fri, 15 Aug 2025 20:37:58 +0900 Subject: [PATCH 1/3] chore: update libraries --- gradle/libs.versions.toml | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 955a4d451..d4bf51916 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] -androidGradlePlugin = "8.11.0" +androidGradlePlugin = "8.11.1" kotlin = "2.2.0" ksp = "2.2.0-2.0.2" -jetbrainsCompose = "1.9.0-beta01" +jetbrainsCompose = "1.9.0-beta03" material3 = "1.9.0-alpha04" kotlinPoet = "2.2.0" @@ -11,50 +11,48 @@ kotlinxSerialization = "1.9.0" kotlinxCollectionsImmutable = "0.4.0" kotlinxDatetime = "0.7.1" -androidxActivityCompose = "1.12.0-alpha04" androidxNavigation3 = "1.0.0-alpha05" +androidxActivityCompose = "1.12.0-alpha06" androidxNavigation3Material = "1.0.0-SNAPSHOT" androidxDatastore = "1.1.7" androidxAppCompat = "1.7.1" -androidxTestCore = "1.6.1" -androidxBrowser = "1.8.0" +androidxTestCore = "1.7.0" +androidxBrowser = "1.9.0" ktor = "3.2.1" -ktorfit = "2.6.2" +ktorfit = "2.6.4" soil = "1.0.0-alpha12" rin = "0.3.0" -metro = "0.5.1" +metro = "0.5.5" -lifecycleCompose = "2.9.1" +lifecycleCompose = "2.9.2" lifecycleViewmodelNavigation3 = "1.0.0-SNAPSHOT" robolectric = "4.15.1" -composeBom = "2025.07.00" +composeBom = "2025.08.00" roborazzi = "1.48.0" -composablePreviewScanner = "0.6.1" +composablePreviewScanner = "0.7.0" junit = "4.13.2" twitterComposeRule = "0.0.26" spotless = "7.2.1" ktlint = "1.7.1" -navigationeventDesktop = "1.0.0-alpha04" - -composeHotReload = "1.0.0-beta04" -coil = "3.2.0" +composeHotReload = "1.0.0-beta05" +coil = "3.3.0" buildkonfig = "0.17.1" -haze = "1.6.9" +haze = "1.6.10" -skie = "0.10.4" +skie = "0.10.5" molecule = "2.1.0" -navigationCompose = "2.9.0-beta04" +navigationCompose = "2.9.0-beta05" aboutLibraries = "12.2.4" @@ -128,6 +126,7 @@ junit = { module = "junit:junit", version.ref = "junit" } navigation3Ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "androidxNavigation3" } navigation3Runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "androidxNavigation3" } navigation3Adaptive = { module = "androidx.compose.material3.adaptive:adaptive-navigation3", version.ref = "androidxNavigation3Material" } +navigationeventDesktop = { group = "androidx.navigationevent", name = "navigationevent-desktop", version.ref = "androidxNavigation3" } lifecycleViewmodelCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleCompose" } lifecycleRuntimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycleCompose" } @@ -135,8 +134,6 @@ lifecycleViewmodelNavigation3 = { module = "androidx.lifecycle:lifecycle-viewmod robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" } -navigationeventDesktop = { group = "androidx.navigationevent", name = "navigationevent-desktop", version.ref = "navigationeventDesktop" } - # coil coil = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" } coilNetwork = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" } From 385d802e1d4d1df78bf9e2a6f02332bf7e124860 Mon Sep 17 00:00:00 2001 From: kitakkun <48154936+kitakkun@users.noreply.github.com> Date: Wed, 20 Aug 2025 00:07:05 +0900 Subject: [PATCH 2/3] fix: adapt DroidKaigiKmpPreviewTester to recent library updates --- core/testing/build.gradle.kts | 2 +- .../testing/previewtester/DroidKaigiKmpPreviewTester.kt | 4 ++-- gradle/libs.versions.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts index 55d18ffe6..c9afc6950 100644 --- a/core/testing/build.gradle.kts +++ b/core/testing/build.gradle.kts @@ -56,7 +56,7 @@ kotlin { implementation(libs.roborazziPreviewScannerSupport) implementation(libs.composablePreviewScannerAndroid) - implementation(libs.composablePreviewScannerJvm) + implementation(libs.composablePreviewScannerCommon) } jvmMain.dependencies { implementation(compose.desktop.currentOs) diff --git a/core/testing/src/androidMain/kotlin/io/github/droidkaigi/confsched/testing/previewtester/DroidKaigiKmpPreviewTester.kt b/core/testing/src/androidMain/kotlin/io/github/droidkaigi/confsched/testing/previewtester/DroidKaigiKmpPreviewTester.kt index d70fb5df9..d394278d8 100644 --- a/core/testing/src/androidMain/kotlin/io/github/droidkaigi/confsched/testing/previewtester/DroidKaigiKmpPreviewTester.kt +++ b/core/testing/src/androidMain/kotlin/io/github/droidkaigi/confsched/testing/previewtester/DroidKaigiKmpPreviewTester.kt @@ -11,8 +11,8 @@ import com.github.takahirom.roborazzi.captureRoboImage import com.github.takahirom.roborazzi.registerRoborazziActivityToRobolectricIfNeeded import org.junit.rules.RuleChain import org.junit.rules.TestWatcher -import sergio.sastre.composable.preview.scanner.jvm.common.CommonComposablePreviewScanner -import sergio.sastre.composable.preview.scanner.jvm.common.CommonPreviewInfo +import sergio.sastre.composable.preview.scanner.common.CommonComposablePreviewScanner +import sergio.sastre.composable.preview.scanner.common.CommonPreviewInfo @Suppress("UNUSED") @OptIn(ExperimentalRoborazziApi::class) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d4bf51916..58bdfd0f1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -119,7 +119,7 @@ roborazziComposeDesktop = { module = "io.github.takahirom.roborazzi:roborazzi-co roborazziComposeIos = { module = "io.github.takahirom.roborazzi:roborazzi-compose-ios", version.ref = "roborazzi" } roborazziPreviewScannerSupport = { module = "io.github.takahirom.roborazzi:roborazzi-compose-preview-scanner-support", version.ref = "roborazzi" } composablePreviewScannerAndroid = { module = "io.github.sergio-sastre.ComposablePreviewScanner:android", version.ref = "composablePreviewScanner" } -composablePreviewScannerJvm = { module = "io.github.sergio-sastre.ComposablePreviewScanner:jvm", version.ref = "composablePreviewScanner" } +composablePreviewScannerCommon = { module = "io.github.sergio-sastre.ComposablePreviewScanner:common", version.ref = "composablePreviewScanner" } junit = { module = "junit:junit", version.ref = "junit" } # navigation3 From e413f7acd83083298320a997afd4f5c9ebcc36b9 Mon Sep 17 00:00:00 2001 From: kitakkun <48154936+kitakkun@users.noreply.github.com> Date: Wed, 20 Aug 2025 00:18:53 +0900 Subject: [PATCH 3/3] chore: bump roborazzi to 1.49.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 58bdfd0f1..fd77c1420 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,7 +34,7 @@ lifecycleViewmodelNavigation3 = "1.0.0-SNAPSHOT" robolectric = "4.15.1" composeBom = "2025.08.00" -roborazzi = "1.48.0" +roborazzi = "1.49.0" composablePreviewScanner = "0.7.0" junit = "4.13.2"