From e1412d47b8b3a9a416522c515ca8cce5cf1bbb3b Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sun, 2 Oct 2022 13:14:16 +0100 Subject: [PATCH 1/2] Upgrade Kotlin to stable 1.7.20 in GitHub workflow --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 3667d432e..be177cf6e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: java-version: [ 11, 17, 18 ] # test LTS versions, and the newest - kotlin-version: [ 1.5.31, 1.6.21, 1.7.20-RC ] + kotlin-version: [ 1.5.31, 1.6.21, 1.7.20 ] kotlin-ir-enabled: [ true, false ] fail-fast: false # in case one JDK fails, we still want to see results from others timeout-minutes: 30 From ae13ff0f651b774f8b1204266222b6979f901598 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sun, 2 Oct 2022 13:19:42 +0100 Subject: [PATCH 2/2] Update references to kotlin 1.7.10 --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/buildsrc/config/Deps.kt | 2 +- gradle.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 4b8fac6e7..72842767d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } // set the versions of Gradle plugins that the subprojects will use here -val kotlinPluginVersion: String = "1.7.10" +val kotlinPluginVersion: String = "1.7.20" val androidGradle = "7.2.1" val kotlinxKover = "0.5.1" diff --git a/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt b/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt index 200aa2123..f1f690a04 100644 --- a/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt +++ b/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt @@ -11,7 +11,7 @@ object Deps { const val androidTools = "7.2.1" const val dokka = "1.7.10" - const val kotlinDefault = "1.7.10" + const val kotlinDefault = "1.7.20" const val coroutines = "1.6.4" const val slfj = "1.7.36" const val logback = "1.2.10" diff --git a/gradle.properties b/gradle.properties index 833525446..1cb95aebe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.welcome=never org.gradle.jvmargs=-XX:MaxMetaspaceSize=768m kotlin.mpp.stability.nowarn=true localrepo=build/maven-local-repo -kotlin.version=1.7.10 +kotlin.version=1.7.20 android.useAndroidX=true # version of Java that will be used to build the project javaToolchainMainVersion=11