From e989d25a3c4987b7ddd3e119962b5bb7f29beaa1 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Sun, 20 Feb 2022 12:24:24 +0100 Subject: [PATCH] mucking about with updating kotlin 1.6.20 --- buildSrc/build.gradle.kts | 2 ++ buildSrc/src/main/kotlin/dev/adamko/kafkatorio/common.kt | 2 +- .../kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts | 1 + gradle/libs.versions.toml | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 2d4696c..91135ae 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -11,6 +11,7 @@ plugins { object Versions { const val jvmTarget = "11" const val kotlinTarget = "1.6" +// const val kotlin = "1.6.20-M1" const val kotlin = "1.6.10" const val gradleNodePlugin = "3.2.0" @@ -66,6 +67,7 @@ tasks.withType().configureEach { } kotlinOptions.freeCompilerArgs += listOf( +// "-Xcontext-receivers", "-opt-in=kotlin.RequiresOptIn", "-opt-in=kotlin.ExperimentalStdlibApi", "-opt-in=kotlin.time.ExperimentalTime", diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/common.kt b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/common.kt index 11e6b2b..63aa77a 100644 --- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/common.kt +++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/common.kt @@ -18,7 +18,7 @@ object Versions { const val node = "14.19.0" - const val kotlinWrappers = "0.0.1-pre.294-kotlin-1.6.10" + const val kotlinWrappers = "0.0.1-pre.300-kotlin-1.6.10" const val junit = "5.8.2" const val kotest = "5.1.0" const val mockk = "1.12.1" diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts index 342a119..4228ba7 100644 --- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts +++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts @@ -43,6 +43,7 @@ tasks.withType().configureEach { } kotlinOptions.freeCompilerArgs += listOf( +// "-Xcontext-receivers", "-opt-in=kotlin.RequiresOptIn", "-opt-in=kotlin.ExperimentalStdlibApi", "-opt-in=kotlin.time.ExperimentalTime", diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bd0d438..1295f7c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,6 +6,7 @@ ## compilation ## jvm = "11" +#kotlin = "1.6.20-M1" kotlin = "1.6.10" ## libs ##