Update Kotlin version

2 years ago · 5d67a73f80
19 changed files with 40 additions and 32 deletions
--- 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.10
+kotlin.version=1.7.10
 # __LATEST_COMPOSE_RELEASE_VERSION__
 compose.version=1.2.0-beta02
--- a/examples/codeviewer/gradle.properties
+++ b/examples/codeviewer/gradle.properties
@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.6.10
+kotlin.version=1.7.10
 agp.version=7.0.4
 compose.version=1.2.0-beta02
--- a/examples/falling-balls/gradle.properties
+++ b/examples/falling-balls/gradle.properties
@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.6.10
+kotlin.version=1.7.10
 compose.version=1.2.0-beta02
--- a/examples/imageviewer/gradle.properties
+++ b/examples/imageviewer/gradle.properties
@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.6.10
+kotlin.version=1.7.10
 agp.version=7.0.4
 compose.version=1.2.0-beta02
--- a/examples/intellij-plugin-with-experimental-shared-base/gradle.properties
+++ b/examples/intellij-plugin-with-experimental-shared-base/gradle.properties
@ -1,5 +1,5 @@
 kotlin.stdlib.default.dependency=false
 kotlin.code.style=official
-kotlin.version=1.6.10
+kotlin.version=1.7.10
 compose.version=1.2.0-beta02

--- a/examples/intellij-plugin/gradle.properties
+++ b/examples/intellij-plugin/gradle.properties
@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.6.10
+kotlin.version=1.7.10
 compose.version=1.2.0-beta02
--- 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.6.10
+kotlin.version=1.7.10
 agp.version=7.0.4
 compose.version=1.2.0-beta02
--- 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
+kotlin.version=1.7.10
 compose.version=1.2.0-beta02
--- a/examples/todoapp-lite/gradle.properties
+++ b/examples/todoapp-lite/gradle.properties
@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.6.10
+kotlin.version=1.7.10
 agp.version=7.0.4
 compose.version=1.2.0-beta02
--- a/examples/todoapp/gradle.properties
+++ b/examples/todoapp/gradle.properties
@ -24,5 +24,5 @@ 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
+kotlin.version=1.7.10
 compose.version=1.2.0-beta02
--- a/examples/visual-effects/gradle.properties
+++ b/examples/visual-effects/gradle.properties
@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.6.10
+kotlin.version=1.7.10
 compose.version=1.2.0-beta02
--- a/examples/web-compose-bird/gradle.properties
+++ b/examples/web-compose-bird/gradle.properties
@ -1,4 +1,4 @@
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-kotlin.version=1.6.10
+kotlin.version=1.7.10
 compose.version=1.2.0-beta02
--- a/examples/web-landing/gradle.properties
+++ b/examples/web-landing/gradle.properties
@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.6.10
+kotlin.version=1.7.10
 compose.version=1.2.0-beta02
--- a/examples/web-with-react/gradle.properties
+++ b/examples/web-with-react/gradle.properties
@ -1,3 +1,3 @@
 kotlin.code.style=official
-kotlin.version=1.6.10
+kotlin.version=1.7.10
 compose.version=1.2.0-beta02
--- a/examples/widgets-gallery/gradle.properties
+++ b/examples/widgets-gallery/gradle.properties
@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kotlin.version=1.6.10
+kotlin.version=1.7.10
 compose.version=1.2.0-beta02
 agp.version=7.0.4
--- 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.10
+kotlin.version=1.7.10
 compose.version=1.2.0-beta02
--- 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.10
+kotlin.version=1.7.10
 agp.version=7.0.4
 compose.version=1.2.0-beta02
--- 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.10
+kotlin.version=1.7.10
 compose.version=1.2.0-beta02
--- a/tools/replaceVersion.sh
+++ b/tools/replaceVersion.sh
@ -15,11 +15,18 @@ declare -a folders=(
    "tutorials"
 )

-if [ -z "$@" ]; then
-echo "Specify Compose version. For example: ./replace.sh 1.0.0-rc6"
+if [ -z "$1" ]; then
+echo "Specify Compose version. For example: ./replace.sh 1.2.0-beta02 1.7.10"
 exit 1
 fi
-COMPOSE_VERSION=$@
+
+if [ -z "$2" ]; then
+echo "Specify Kotlin version. For example: ./replace.sh 1.2.0-beta02 1.7.10"
+exit 1
+fi
+
+COMPOSE_VERSION=$1
+KOTLIN_VERSION=$2

 if [[ $OSTYPE == 'darwin'* ]]; then
    SED=gsed
@ -27,25 +34,26 @@ else
    SED=sed
 fi

-replaceCompose() {
+replaceVersion() {
    $SED -i -e "s/$1/$2/g" $3
 }

-replaceComposeInFile() {
+replaceVersionInFile() {
    echo "Replace in $1"
-    replaceCompose '^compose.version=.*' 'compose.version='"$COMPOSE_VERSION"'' $1
-    replaceCompose '^COMPOSE_CORE_VERSION=.*' 'COMPOSE_CORE_VERSION='"$COMPOSE_VERSION"'' $1
-    replaceCompose '^COMPOSE_WEB_VERSION=.*' 'COMPOSE_WEB_VERSION='"$COMPOSE_VERSION"'' $1
-    replaceCompose 'id("org.jetbrains.compose") version ".*"' 'id("org.jetbrains.compose") version "'"$COMPOSE_VERSION"'"' $1
-    replaceCompose '"org.jetbrains.compose:compose-gradle-plugin:.*"' '"org.jetbrains.compose:compose-gradle-plugin:'"$COMPOSE_VERSION"'"' $1
+    replaceVersion '^compose.version=.*' 'compose.version='"$COMPOSE_VERSION"'' $1
+    replaceVersion '^COMPOSE_CORE_VERSION=.*' 'COMPOSE_CORE_VERSION='"$COMPOSE_VERSION"'' $1
+    replaceVersion '^COMPOSE_WEB_VERSION=.*' 'COMPOSE_WEB_VERSION='"$COMPOSE_VERSION"'' $1
+    replaceVersion 'id("org.jetbrains.compose") version ".*"' 'id("org.jetbrains.compose") version "'"$COMPOSE_VERSION"'"' $1
+    replaceVersion '"org.jetbrains.compose:compose-gradle-plugin:.*"' '"org.jetbrains.compose:compose-gradle-plugin:'"$COMPOSE_VERSION"'"' $1
+    replaceVersion '^kotlin.version=.*' 'kotlin.version='"$KOTLIN_VERSION"'' $1
 }

-replaceComposeInFolder() {
-    find $ROOT/$1 -wholename $2 -not -path "**/build**" -not -path "**/.gradle**" | while read file; do replaceComposeInFile "$file"; done
+replaceVersionInFolder() {
+    find $ROOT/$1 -wholename $2 -not -path "**/build**" -not -path "**/.gradle**" | while read file; do replaceVersionInFile "$file"; done
 }

 for folder in "${folders[@]}"
 do
-   replaceComposeInFolder $folder "**gradle.properties"
-   replaceComposeInFolder $folder "**README.md"
+   replaceVersionInFolder $folder "**gradle.properties"
+   replaceVersionInFolder $folder "**README.md"
 done