From 972fa4b6c0433287e418fbd030c2dbf65ca58498 Mon Sep 17 00:00:00 2001 From: Konstantin Kolchurin Date: Thu, 16 May 2024 12:37:33 +0700 Subject: [PATCH 1/4] migrate on new compose compiler settings, update kotlin on rc3 --- samples/kotlin-2-sample/androidApp/build.gradle.kts | 4 +--- samples/kotlin-2-sample/gradle/libs.versions.toml | 12 ++++++------ samples/kotlin-2-sample/shared/build.gradle.kts | 1 + 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/samples/kotlin-2-sample/androidApp/build.gradle.kts b/samples/kotlin-2-sample/androidApp/build.gradle.kts index 1885bec4..021a2d33 100644 --- 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 index da5110b0..d72c2482 100644 --- 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" } \ No newline at end of file diff --git a/samples/kotlin-2-sample/shared/build.gradle.kts b/samples/kotlin-2-sample/shared/build.gradle.kts index 8e70cd1d..5c8c0b42 100644 --- a/samples/kotlin-2-sample/shared/build.gradle.kts +++ b/samples/kotlin-2-sample/shared/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.androidLibrary) + alias(libs.plugins.compose.compiler) apply false id("dev.icerock.mobile.multiplatform-resources") } From d78111309bb443f8e92ef2925f9b13a41e92985a Mon Sep 17 00:00:00 2001 From: Konstantin Kolchurin Date: Thu, 16 May 2024 13:04:31 +0700 Subject: [PATCH 2/4] update compose multiplatform with fix of crash on ios --- samples/cm-resources-sample/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/cm-resources-sample/gradle/libs.versions.toml b/samples/cm-resources-sample/gradle/libs.versions.toml index 0667bef7..128f41b7 100644 --- 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" From 6a6c974e662824d13645e104aa6c24f2165c4db4 Mon Sep 17 00:00:00 2001 From: Konstantin Kolchurin Date: Thu, 16 May 2024 13:06:32 +0700 Subject: [PATCH 3/4] #707 remove useless plugin --- samples/kotlin-2-sample/shared/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/samples/kotlin-2-sample/shared/build.gradle.kts b/samples/kotlin-2-sample/shared/build.gradle.kts index 5c8c0b42..8e70cd1d 100644 --- a/samples/kotlin-2-sample/shared/build.gradle.kts +++ b/samples/kotlin-2-sample/shared/build.gradle.kts @@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.androidLibrary) - alias(libs.plugins.compose.compiler) apply false id("dev.icerock.mobile.multiplatform-resources") } From 5f301d3c3da5226152b0db6904878316bce713b9 Mon Sep 17 00:00:00 2001 From: Konstantin Kolchurin Date: Thu, 16 May 2024 20:07:58 +0700 Subject: [PATCH 4/4] #707 add rerun-tasks for problem tasks --- samples/compose-resources-gallery/local-check.sh | 2 +- samples/resources-gallery/local-check.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/compose-resources-gallery/local-check.sh b/samples/compose-resources-gallery/local-check.sh index 55587a35..7c3a3412 100755 --- 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/resources-gallery/local-check.sh b/samples/resources-gallery/local-check.sh index 2e9edf64..9cc9a4fa 100755 --- 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