From 9ac23ae93e9110ea0a84228b3eeb44bac54d444f Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 15 Mar 2024 11:39:40 +0100 Subject: [PATCH] Compose 1.6.1 examples (#4480) --- ci/compose-uber-jar/gradle.properties | 2 +- ci/templates/desktop-template/gradle.properties | 4 ++-- ci/templates/html-library-template/gradle.properties | 4 ++-- ci/templates/multiplatform-template/gradle.properties | 4 ++-- examples/chat/gradle.properties | 4 ++-- examples/cocoapods-ios-example/gradle.properties | 4 ++-- examples/codeviewer/gradle.properties | 4 ++-- examples/graphics-2d/gradle.properties | 4 ++-- examples/html/compose-bird/gradle.properties | 4 ++-- examples/html/compose-in-js/gradle.properties | 4 ++-- examples/html/landing/gradle.properties | 4 ++-- examples/html/with-react/gradle.properties | 4 ++-- examples/imageviewer/gradle.properties | 4 ++-- examples/intellij-plugin/gradle.properties | 4 ++-- examples/interop/ios-compose-in-swiftui/gradle.properties | 4 ++-- examples/interop/ios-compose-in-uikit/gradle.properties | 4 ++-- examples/interop/ios-swiftui-in-compose/gradle.properties | 4 ++-- examples/interop/ios-uikit-in-compose/gradle.properties | 4 ++-- examples/issues/gradle.properties | 4 ++-- examples/notepad/gradle.properties | 4 ++-- examples/todoapp-lite/gradle.properties | 4 ++-- examples/widgets-gallery/gradle.properties | 4 ++-- tutorials/HTML/Getting_Started/README.md | 4 ++-- 23 files changed, 45 insertions(+), 45 deletions(-) diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index 38875d51ea..cdc94ed41c 100644 --- a/ci/compose-uber-jar/gradle.properties +++ b/ci/compose-uber-jar/gradle.properties @@ -1,2 +1,2 @@ -compose.version=1.6.0 +compose.version=1.6.1 kotlin.code.style=official diff --git a/ci/templates/desktop-template/gradle.properties b/ci/templates/desktop-template/gradle.properties index 98aed13c99..f03b950a01 100644 --- a/ci/templates/desktop-template/gradle.properties +++ b/ci/templates/desktop-template/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official -kotlin.version=1.9.22 -compose.version=1.6.0 +kotlin.version=1.9.23 +compose.version=1.6.1 diff --git a/ci/templates/html-library-template/gradle.properties b/ci/templates/html-library-template/gradle.properties index 98aed13c99..f03b950a01 100644 --- a/ci/templates/html-library-template/gradle.properties +++ b/ci/templates/html-library-template/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official -kotlin.version=1.9.22 -compose.version=1.6.0 +kotlin.version=1.9.23 +compose.version=1.6.1 diff --git a/ci/templates/multiplatform-template/gradle.properties b/ci/templates/multiplatform-template/gradle.properties index 1672037284..7143191425 100644 --- a/ci/templates/multiplatform-template/gradle.properties +++ b/ci/templates/multiplatform-template/gradle.properties @@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official -kotlin.version=1.9.22 +kotlin.version=1.9.23 agp.version=8.0.2 -compose.version=1.6.0 +compose.version=1.6.1 diff --git a/examples/chat/gradle.properties b/examples/chat/gradle.properties index 6c87d8788d..f920bc439e 100644 --- a/examples/chat/gradle.properties +++ b/examples/chat/gradle.properties @@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.22 +kotlin.version=1.9.23 agp.version=8.0.2 -compose.version=1.6.0 +compose.version=1.6.1 diff --git a/examples/cocoapods-ios-example/gradle.properties b/examples/cocoapods-ios-example/gradle.properties index 81c8543bad..20a375a447 100644 --- a/examples/cocoapods-ios-example/gradle.properties +++ b/examples/cocoapods-ios-example/gradle.properties @@ -20,6 +20,6 @@ android.minSdk=24 #Compose #Versions -kotlin.version=1.9.22 +kotlin.version=1.9.23 agp.version=8.0.2 -compose.version=1.6.0 \ No newline at end of file +compose.version=1.6.1 \ No newline at end of file diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties index 6c87d8788d..f920bc439e 100644 --- a/examples/codeviewer/gradle.properties +++ b/examples/codeviewer/gradle.properties @@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.22 +kotlin.version=1.9.23 agp.version=8.0.2 -compose.version=1.6.0 +compose.version=1.6.1 diff --git a/examples/graphics-2d/gradle.properties b/examples/graphics-2d/gradle.properties index 160ad041b9..599ff1425d 100644 --- a/examples/graphics-2d/gradle.properties +++ b/examples/graphics-2d/gradle.properties @@ -10,9 +10,9 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.22 +kotlin.version=1.9.23 agp.version=8.0.2 -compose.version=1.6.0 +compose.version=1.6.1 # TODO: remove when switching to 1.9.10. See: https://youtrack.jetbrains.com/issue/KT-60852 # usage: ./gradlew :jsApp:jsBrowserRun -Pworkaround.kotlin.js.kt60852=true diff --git a/examples/html/compose-bird/gradle.properties b/examples/html/compose-bird/gradle.properties index 52bac29b80..51d931d9b5 100644 --- a/examples/html/compose-bird/gradle.properties +++ b/examples/html/compose-bird/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -kotlin.version=1.9.22 -compose.version=1.6.0 +kotlin.version=1.9.23 +compose.version=1.6.1 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/html/compose-in-js/gradle.properties b/examples/html/compose-in-js/gradle.properties index b370a30cf3..c3260ce4a2 100644 --- a/examples/html/compose-in-js/gradle.properties +++ b/examples/html/compose-in-js/gradle.properties @@ -1,6 +1,6 @@ kotlin.code.style=official kotlin.js.webpack.major.version=4 -kotlin.version=1.9.22 -compose.version=1.6.0 +kotlin.version=1.9.23 +compose.version=1.6.1 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/html/landing/gradle.properties b/examples/html/landing/gradle.properties index 52bac29b80..51d931d9b5 100644 --- a/examples/html/landing/gradle.properties +++ b/examples/html/landing/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -kotlin.version=1.9.22 -compose.version=1.6.0 +kotlin.version=1.9.23 +compose.version=1.6.1 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/html/with-react/gradle.properties b/examples/html/with-react/gradle.properties index 52bac29b80..51d931d9b5 100644 --- a/examples/html/with-react/gradle.properties +++ b/examples/html/with-react/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -kotlin.version=1.9.22 -compose.version=1.6.0 +kotlin.version=1.9.23 +compose.version=1.6.1 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties index 2ca49d5478..fa0afb3636 100644 --- a/examples/imageviewer/gradle.properties +++ b/examples/imageviewer/gradle.properties @@ -6,6 +6,6 @@ org.gradle.configuration-cache=true org.gradle.caching=true org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.macos.enabled=true -kotlin.version=1.9.22 +kotlin.version=1.9.23 agp.version=8.0.2 -compose.version=1.6.0 +compose.version=1.6.1 diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties index 52bac29b80..51d931d9b5 100644 --- a/examples/intellij-plugin/gradle.properties +++ b/examples/intellij-plugin/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -kotlin.version=1.9.22 -compose.version=1.6.0 +kotlin.version=1.9.23 +compose.version=1.6.1 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/interop/ios-compose-in-swiftui/gradle.properties b/examples/interop/ios-compose-in-swiftui/gradle.properties index 4f122f8b6e..dfa3f36959 100644 --- a/examples/interop/ios-compose-in-swiftui/gradle.properties +++ b/examples/interop/ios-compose-in-swiftui/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official xcodeproj=./iosApp org.gradle.jvmargs=-Xmx3g -kotlin.version=1.9.22 -compose.version=1.6.0 +kotlin.version=1.9.23 +compose.version=1.6.1 diff --git a/examples/interop/ios-compose-in-uikit/gradle.properties b/examples/interop/ios-compose-in-uikit/gradle.properties index e0ebafa997..9079d09dd0 100644 --- a/examples/interop/ios-compose-in-uikit/gradle.properties +++ b/examples/interop/ios-compose-in-uikit/gradle.properties @@ -3,5 +3,5 @@ xcodeproj=./iosApp org.gradle.jvmargs=-Xmx3g # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.22 -compose.version=1.6.0 +kotlin.version=1.9.23 +compose.version=1.6.1 diff --git a/examples/interop/ios-swiftui-in-compose/gradle.properties b/examples/interop/ios-swiftui-in-compose/gradle.properties index e0ebafa997..9079d09dd0 100644 --- a/examples/interop/ios-swiftui-in-compose/gradle.properties +++ b/examples/interop/ios-swiftui-in-compose/gradle.properties @@ -3,5 +3,5 @@ xcodeproj=./iosApp org.gradle.jvmargs=-Xmx3g # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.22 -compose.version=1.6.0 +kotlin.version=1.9.23 +compose.version=1.6.1 diff --git a/examples/interop/ios-uikit-in-compose/gradle.properties b/examples/interop/ios-uikit-in-compose/gradle.properties index e0ebafa997..9079d09dd0 100644 --- a/examples/interop/ios-uikit-in-compose/gradle.properties +++ b/examples/interop/ios-uikit-in-compose/gradle.properties @@ -3,5 +3,5 @@ xcodeproj=./iosApp org.gradle.jvmargs=-Xmx3g # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.22 -compose.version=1.6.0 +kotlin.version=1.9.23 +compose.version=1.6.1 diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties index d4a549a70b..6d43fda82c 100644 --- a/examples/issues/gradle.properties +++ b/examples/issues/gradle.properties @@ -19,6 +19,6 @@ kotlin.code.style=official android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -kotlin.version=1.9.22 +kotlin.version=1.9.23 agp.version=8.0.2 -compose.version=1.6.0 +compose.version=1.6.1 diff --git a/examples/notepad/gradle.properties b/examples/notepad/gradle.properties index 5227c1f440..4f539b5d97 100644 --- a/examples/notepad/gradle.properties +++ b/examples/notepad/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official -kotlin.version=1.9.22 -compose.version=1.6.0 +kotlin.version=1.9.23 +compose.version=1.6.1 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties index 6c87d8788d..f920bc439e 100755 --- a/examples/todoapp-lite/gradle.properties +++ b/examples/todoapp-lite/gradle.properties @@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.22 +kotlin.version=1.9.23 agp.version=8.0.2 -compose.version=1.6.0 +compose.version=1.6.1 diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties index 8170c07ca7..ad5da73d84 100644 --- a/examples/widgets-gallery/gradle.properties +++ b/examples/widgets-gallery/gradle.properties @@ -10,7 +10,7 @@ kotlin.native.useEmbeddableCompilerJar=true kotlin.mpp.androidSourceSetLayoutVersion=2 # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.9.22 +kotlin.version=1.9.23 agp.version=8.0.2 # Replace this with release version when it comes out -compose.version=1.6.0 +compose.version=1.6.1 diff --git a/tutorials/HTML/Getting_Started/README.md b/tutorials/HTML/Getting_Started/README.md index 43487576e8..53b5b536a6 100644 --- a/tutorials/HTML/Getting_Started/README.md +++ b/tutorials/HTML/Getting_Started/README.md @@ -36,8 +36,8 @@ pluginManagement { ``` kotlin // Add compose gradle plugin plugins { - kotlin("multiplatform") version "1.9.22" - id("org.jetbrains.compose") version "1.6.0" + kotlin("multiplatform") version "1.9.23" + id("org.jetbrains.compose") version "1.6.1" } // Add maven repositories