Merge pull request #309 from kennethshackleton/kotlin-1.6.20

Kotlin 1.6.20.
bloomberg · Apr 6, 2022 · cdf6b63 · cdf6b63
2 parents d1470d9 + ee914cd
commit cdf6b63
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ApiLib/build.gradle.kts b/ApiLib/build.gradle.kts
@@ -40,7 +40,7 @@ tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
         freeCompilerArgs = freeCompilerArgs + listOf(
             "-Xinline-classes",
-            "-Xopt-in=kotlin.RequiresOptIn"
+            "-opt-in=kotlin.RequiresOptIn"
         )
     }
 }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -105,7 +105,7 @@ subprojects {
     tasks.withType<KotlinCompile> {
         kotlinOptions {
             allWarningsAsErrors = true
-            freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn")
+            freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
             jvmTarget = "11"
         }
     }

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 // TODO Move me.
-val kotlinVersion = "1.6.10"
+val kotlinVersion = "1.6.20"
 
 plugins {
     `kotlin-dsl`

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -39,7 +39,7 @@ enum class Versions(
     JUNIT4("4.13.1", URL("https://github.com/junit-team/junit4")),
     JUNIT5("5.7.2", URL("https://junit.org/junit5/")),
     JUNIT5_PLATFORM("1.7.2", URL("https://junit.org/junit5/")),
-    KOTLIN("1.6.10", URL("https://github.com/JetBrains/kotlin")),
+    KOTLIN("1.6.20", URL("https://github.com/JetBrains/kotlin")),
     KOTLIN_COROUTINES("1.6.0", URL("https://github.com/Kotlin/kotlinx.coroutines")),
     KOTLIN_TEST("1.4.32", URL("https://github.com/JetBrains/kotlin")),
     KOTLINX_KOVER("0.5.0", URL("https://github.com/Kotlin/kotlinx-kover")),