Merge pull request #707 from icerockdev/update-samples

Update samples
icerockdev · May 17, 2024 · 61b3e46 · 61b3e46
2 parents 0b1b6cc + 5f301d3
commit 61b3e46
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/samples/cm-resources-sample/gradle/libs.versions.toml b/samples/cm-resources-sample/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 
 kotlin = "1.9.23"
-compose = "1.6.2"
+compose = "1.6.10-rc01"
 agp = "8.3.1"
 androidx-activityCompose = "1.8.2"
 androidx-uiTest = "1.6.4"

diff --git a/samples/compose-resources-gallery/local-check.sh b/samples/compose-resources-gallery/local-check.sh
@@ -14,7 +14,7 @@ log "compose-resources-gallery android success"
 ./gradlew clean jvmJar
 log "compose-resources-gallery jvm success"
 
-./gradlew clean jsBrowserDistribution
+./gradlew clean jsBrowserDistribution --rerun-tasks
 log "compose-resources-gallery js success"
 
 if ! command -v xcodebuild &> /dev/null

diff --git a/samples/kotlin-2-sample/androidApp/build.gradle.kts b/samples/kotlin-2-sample/androidApp/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -16,9 +17,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

diff --git a/samples/kotlin-2-sample/gradle/libs.versions.toml b/samples/kotlin-2-sample/gradle/libs.versions.toml
@@ -1,10 +1,9 @@
 [versions]
-agp = "8.4.0-alpha13"
-kotlin = "2.0.0-Beta5"
-compose = "1.5.4"
-compose-compiler = "1.5.11-dev-k2.0.0-Beta5-b5a216d0ac6"
-compose-material3 = "1.1.2"
-androidx-activityCompose = "1.8.2"
+agp = "8.4.0"
+kotlin = "2.0.0-RC3"
+compose = "1.6.7"
+compose-material3 = "1.2.1"
+androidx-activityCompose = "1.9.0"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -21,3 +20,4 @@ androidLibrary = { id = "com.android.library", version.ref = "agp" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/samples/resources-gallery/local-check.sh b/samples/resources-gallery/local-check.sh
@@ -14,7 +14,7 @@ log "resources-gallery android success"
 ./gradlew clean jvmJar
 log "resources-gallery jvm success"
 
-./gradlew clean jsBrowserDistribution
+./gradlew clean jsBrowserDistribution --rerun-tasks
 log "resources-gallery js success"
 
 if ! command -v xcodebuild &> /dev/null