From 15f8b0bbd374c5dc69a4d4729ef19231e60f581d Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 29 Apr 2022 16:33:55 +0400 Subject: [PATCH] Revert Kotlin to 1.6.10 Version of Kotlin should be compatible with Compose that is set in gradle.properties --- components/gradle.properties | 2 +- examples/notepad/gradle.properties | 2 +- examples/todoapp/gradle.properties | 3 ++- experimental/examples/falling-balls-mpp/gradle.properties | 2 +- templates/desktop-template/gradle.properties | 2 +- templates/multiplatform-template/gradle.properties | 2 +- templates/web-template/gradle.properties | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/components/gradle.properties b/components/gradle.properties index e55148b388..8fb205f495 100644 --- a/components/gradle.properties +++ b/components/gradle.properties @@ -3,6 +3,6 @@ android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official # __KOTLIN_COMPOSE_VERSION__ -kotlin.version=1.6.21 +kotlin.version=1.6.10 # __LATEST_COMPOSE_RELEASE_VERSION__ compose.version=1.1.0 diff --git a/examples/notepad/gradle.properties b/examples/notepad/gradle.properties index 5679ab5bab..654c3e3d5f 100644 --- a/examples/notepad/gradle.properties +++ b/examples/notepad/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official kotlin.version=1.6.10 -compose.version=1.1.0 +compose.version=1.1.0 \ No newline at end of file diff --git a/examples/todoapp/gradle.properties b/examples/todoapp/gradle.properties index 0f00b05d73..b8b81092a6 100755 --- a/examples/todoapp/gradle.properties +++ b/examples/todoapp/gradle.properties @@ -23,5 +23,6 @@ org.gradle.parallel=true org.gradle.caching=true kotlin.native.disableCompilerDaemon=true +#todo remove -Pkotlin.version=1.6.20 from Xcode project, when stable version on Compose with Koltin 1.6.20 or later released kotlin.version=1.6.10 -compose.version=1.1.0 +compose.version=1.1.0 \ No newline at end of file diff --git a/experimental/examples/falling-balls-mpp/gradle.properties b/experimental/examples/falling-balls-mpp/gradle.properties index a5320812b8..d0c69fe7c3 100644 --- a/experimental/examples/falling-balls-mpp/gradle.properties +++ b/experimental/examples/falling-balls-mpp/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx3g compose.version=1.2.0-alpha01-dev620 -kotlin.version=1.6.21 +kotlin.version=1.6.10 kotlin.code.style=official kotlin.native.cacheKind=none kotlin.native.useEmbeddableCompilerJar=true diff --git a/templates/desktop-template/gradle.properties b/templates/desktop-template/gradle.properties index 9ee6382dcb..5679ab5bab 100644 --- a/templates/desktop-template/gradle.properties +++ b/templates/desktop-template/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official -kotlin.version=1.6.21 +kotlin.version=1.6.10 compose.version=1.1.0 diff --git a/templates/multiplatform-template/gradle.properties b/templates/multiplatform-template/gradle.properties index 975ce54deb..c0554eeeca 100644 --- a/templates/multiplatform-template/gradle.properties +++ b/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.6.21 +kotlin.version=1.6.10 agp.version=7.0.4 compose.version=1.1.0 diff --git a/templates/web-template/gradle.properties b/templates/web-template/gradle.properties index 9ee6382dcb..5679ab5bab 100644 --- a/templates/web-template/gradle.properties +++ b/templates/web-template/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official -kotlin.version=1.6.21 +kotlin.version=1.6.10 compose.version=1.1.0