k2

rsocket · May 6, 2024 · b551064 · b551064
1 parent 3127558
commit b551064
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ syntax: glob
 !/.idea/codeStyles
 *.iml
 
+.kotlin
 .gradle
 classes
 build/

diff --git a/build-logic/src/main/kotlin/rsocketbuild.multiplatform-base.gradle.kts b/build-logic/src/main/kotlin/rsocketbuild.multiplatform-base.gradle.kts
@@ -36,6 +36,13 @@ kotlin {
         // allWarningsAsErrors.set(true)
         progressiveMode.set(true)
         freeCompilerArgs.add("-Xrender-internal-diagnostic-names")
+        optIn.addAll(
+            // TODO: drop Transport annotations
+            OptIns.TransportApi,
+            OptIns.RSocketTransportApi,
+
+            OptIns.ExperimentalSubclassOptIn
+        )
     }
 
     sourceSets.configureEach {
@@ -55,8 +62,10 @@ kotlin {
 
     targets.withType<KotlinJvmTarget>().configureEach {
         compilations.configureEach {
-            compilerOptions.configure {
-                freeCompilerArgs.add("-Xjvm-default=all")
+            compileTaskProvider.configure {
+                compilerOptions {
+                    freeCompilerArgs.add("-Xjvm-default=all")
+                }
             }
         }
     }

diff --git a/build-logic/src/main/kotlin/rsocketbuild/OptIns.kt b/build-logic/src/main/kotlin/rsocketbuild/OptIns.kt
@@ -18,6 +18,7 @@ package rsocketbuild
 
 @Suppress("ConstPropertyName")
 object OptIns {
+    const val ExperimentalSubclassOptIn = "kotlin.ExperimentalSubclassOptIn"
     const val ExperimentalStdlibApi = "kotlin.ExperimentalStdlibApi"
     const val ExperimentalCoroutinesApi = "kotlinx.coroutines.ExperimentalCoroutinesApi"
     const val DelicateCoroutinesApi = "kotlinx.coroutines.DelicateCoroutinesApi"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.22"
+kotlin = "2.0.0-RC1"
 
 kotlinx-atomicfu = "0.23.2"
 kotlinx-coroutines = "1.8.0"