Merge pull request #940 from SimonMarquis/patch-1

Upgrade Kotlin to stable 1.7.20 in GitHub workflow
mockk · Oct 8, 2022 · 5116633 · 5116633
2 parents ddf677e + ae13ff0
commit 5116633
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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

diff --git 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
@@ -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
@@ -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