Kotlin 2.0.0-RC2

drewhamilton · Apr 29, 2024 · 6a085c1 · 6a085c1
1 parent da0a56c
commit 6a085c1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/build-support/src/main/java/dev/drewhamilton/poko/build/PokoBuildPlugin.kt b/build-support/src/main/java/dev/drewhamilton/poko/build/PokoBuildPlugin.kt
@@ -8,8 +8,8 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.AppliedPlugin
 import org.gradle.kotlin.dsl.buildConfigField
-import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
 import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtensionConfig
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 private val Project.pokoGroupId get() = property("PUBLISH_GROUP") as String
 private val Project.pokoVersion get() = property("PUBLISH_VERSION") as String
@@ -31,8 +31,8 @@ class PokoBuildPlugin : Plugin<Project> {
     }
 
     private fun commonKotlinConfiguration(project: Project) {
-        project.tasks.withType(KotlinCompile::class.java).configureEach {
-            kotlinOptions.freeCompilerArgs += "-progressive"
+        project.tasks.withType(KotlinCompilationTask::class.java).configureEach {
+            compilerOptions.freeCompilerArgs.add("-progressive")
         }
     }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 
 androidx-compose-runtime = "1.6.6"
-kotlin = "2.0.0-RC1"
+kotlin = "2.0.0-RC2"
 kotlinCompileTesting = "1.5.1"
 kotlinCompileTestingFork = "0.5.0-alpha07"
 # https://github.com/google/ksp/releases:

diff --git a/sample/compose/build.gradle.kts b/sample/compose/build.gradle.kts
@@ -20,11 +20,6 @@ if (jvmToolchainLanguageVersion != null) {
     }
 }
 
-composeCompiler {
-    // https://youtrack.jetbrains.com/issue/KT-67216
-    suppressKotlinVersionCompatibilityCheck = libs.versions.kotlin
-}
-
 android {
     namespace = "dev.drewhamilton.poko.sample.compose"
     compileSdk = 33