diff --git a/app-ios-shared/src/iosTest/kotlin/io/github/droidkaigi/confsched/shared/IosComposeKaigiTest.kt b/app-ios-shared/src/iosTest/kotlin/io/github/droidkaigi/confsched/shared/IosComposeKaigiTest.kt index 2d77927ef..978e8e390 100644 --- a/app-ios-shared/src/iosTest/kotlin/io/github/droidkaigi/confsched/shared/IosComposeKaigiTest.kt +++ b/app-ios-shared/src/iosTest/kotlin/io/github/droidkaigi/confsched/shared/IosComposeKaigiTest.kt @@ -62,8 +62,7 @@ class IosComposeKaigiTest { ) } } - // We are investigating error about Json format -// onRoot().captureRoboImage(this, filePath = "ios_compose_launch.png") + onRoot().captureRoboImage(this, filePath = "ios_compose_launch.png") } } } diff --git a/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/DroidKaigiKmpPreviewTester.kt b/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/DroidKaigiKmpPreviewTester.kt index 492460c82..8daef9a74 100644 --- a/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/DroidKaigiKmpPreviewTester.kt +++ b/core/testing/src/main/java/io/github/droidkaigi/confsched/testing/DroidKaigiKmpPreviewTester.kt @@ -4,11 +4,12 @@ import com.github.takahirom.roborazzi.ComposePreviewTester import com.github.takahirom.roborazzi.captureRoboImage import sergio.sastre.composable.preview.scanner.core.preview.ComposablePreview import sergio.sastre.composable.preview.scanner.jvm.JvmAnnotationScanner +import sergio.sastre.composable.preview.scanner.jvm.JvmAnnotationScanner.DesktopPreviewInfo class DroidKaigiKmpPreviewTester : ComposePreviewTester { - override fun previews(vararg packages: String): List> { + override fun previews(): List> { return JvmAnnotationScanner("org.jetbrains.compose.ui.tooling.preview.Preview") - .scanPackageTrees(*packages) + .scanPackageTrees(*options().scanOptions.packages.toTypedArray()) .getPreviews() } diff --git a/gradle.properties b/gradle.properties index a58e8a647..58cc0f14a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,10 +28,6 @@ kotlin.incremental.native=true # kotlin debug #kotlin.compiler.execution.strategy=in-process -# skie -# Skie doesn't support Kotlin 2.0.10-RC2 yet -skie.kgpVersion=2.0.0 - # roborazzi roborazzi.test.record=true roborazzi.record.namingStrategy=testClassAndMethod diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cf5be9467..74b2d3652 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ androidGradlePlugin = "8.5.1" # For updating Kotlin and Compose Compiler version, see: # https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#jetpack-compose-and-compose-multiplatform-release-cycles # https://developer.android.com/jetpack/androidx/releases/compose-kotlin?#pre-release_kotlin_compatibility -kotlin = "2.0.10-RC2" +kotlin = "2.0.10" androidxCore = "1.13.1" androidDesugarJdkLibs = "2.0.4" @@ -27,8 +27,8 @@ koin = "3.4.3" ktlint = "0.49.1" kotlinxSerialization = "1.7.1" ktor = "2.3.10" -roborazzi = "1.23.0" -ksp = "2.0.10-RC2-1.0.24" +roborazzi = "1.26.0" +ksp = "2.0.10-1.0.24" firebaseBom = "33.1.2" multiplatformFirebase = "1.8.1" kermit = "1.2.2" @@ -43,7 +43,7 @@ lottie = "6.1.0" molecule = "1.4.2" kover = "0.7.6" androidxLifecycleProcess = "2.8.4" -skie = "0.8.3" +skie = "0.8.4" composablePreviewScanner = "0.1.3" coil = "3.0.0-alpha06"