Merge pull request #51 from amzn/rwo/kotlin2

Upgrade to Kotlin 2.0
amzn · Oct 17, 2024 · 259d4c1 · 259d4c1
2 parents e4fda32 + 839d25c
commit 259d4c1
Show file tree

Hide file tree

Showing 7 changed files with 238 additions and 265 deletions.
diff --git a/...c/src/main/kotlin/software/amazon/lastmile/kotlin/inject/anvil/gradle/LibraryKmpPlugin.kt b/...c/src/main/kotlin/software/amazon/lastmile/kotlin/inject/anvil/gradle/LibraryKmpPlugin.kt
@@ -39,7 +39,9 @@ open class LibraryKmpPlugin : Plugin<Project> {
     private fun Project.enableExpectActualClasses() {
         kotlin.targets.configureEach { target ->
             target.compilations.configureEach { compilation ->
-                compilation.compilerOptions.options.freeCompilerArgs.add("-Xexpect-actual-classes")
+                compilation.compileTaskProvider.configure { task ->
+                    task.compilerOptions.freeCompilerArgs.add("-Xexpect-actual-classes")
+                }
             }
         }
     }
@@ -93,24 +95,21 @@ open class LibraryKmpPlugin : Plugin<Project> {
         uniqueModuleName?.let { moduleName ->
             kotlin.targets.configureEach { target ->
                 target.compilations.configureEach { compilation ->
-                    compilation
-                        .compilerOptions
-                        .options
-                        .let {
-                            when (it) {
-                                is KotlinNativeCompilerOptions -> {
-                                    it.moduleName.set(moduleName)
-                                }
-
-                                is KotlinJvmCompilerOptions -> {
-                                    it.moduleName.set(moduleName)
-                                }
-
-                                is KotlinJsCompilerOptions -> {
-                                    it.moduleName.set(moduleName)
-                                }
+                    compilation.compileTaskProvider.configure {
+                        when (val compilerOptions = it.compilerOptions) {
+                            is KotlinNativeCompilerOptions -> {
+                                compilerOptions.moduleName.set(moduleName)
+                            }
+
+                            is KotlinJvmCompilerOptions -> {
+                                compilerOptions.moduleName.set(moduleName)
+                            }
+
+                            is KotlinJsCompilerOptions -> {
+                                compilerOptions.moduleName.set(moduleName)
                             }
                         }
+                    }
                 }
             }
         }

diff --git a/compiler/build.gradle b/compiler/build.gradle
@@ -32,12 +32,8 @@ dependencies {
     testRuntimeOnly libs.junit.jupiter.launcher
 
     // Added so that the SymbolProcessor is picked up in tests.
-    testImplementation(libs.kotlin.inject.ksp.bugfix) {
-        // TODO: Remove this when upgrading to Kotlin 2.0
-        exclude group: 'com.google.devtools.ksp', module: 'symbol-processing-api'
-    }
+    testImplementation libs.kotlin.inject.ksp
 
     // Bump transitive dependency.
-    // TODO: Enable with KSP2 and Kotlin 2.0 again.
-    // testImplementation libs.ksp
+    testImplementation libs.ksp
 }
diff --git a/compiler/src/test/kotlin/software/amazon/lastmile/kotlin/inject/anvil/Compilation.kt b/compiler/src/test/kotlin/software/amazon/lastmile/kotlin/inject/anvil/Compilation.kt
@@ -8,10 +8,7 @@ import com.tschuchort.compiletesting.JvmCompilationResult
 import com.tschuchort.compiletesting.KotlinCompilation
 import com.tschuchort.compiletesting.SourceFile
 import com.tschuchort.compiletesting.addPreviousResultToClasspath
-import com.tschuchort.compiletesting.kspArgs
-import com.tschuchort.compiletesting.kspIncremental
-import com.tschuchort.compiletesting.kspWithCompilation
-import com.tschuchort.compiletesting.symbolProcessorProviders
+import com.tschuchort.compiletesting.configureKsp
 import org.intellij.lang.annotations.Language
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import org.jetbrains.kotlin.config.JvmTarget
@@ -44,16 +41,25 @@ class Compilation internal constructor(
         processorsConfigured = true
 
         with(kotlinCompilation) {
-            this.symbolProcessorProviders += ServiceLoader.load(
-                SymbolProcessorProvider::class.java,
-                SymbolProcessorProvider::class.java.classLoader,
-            )
-            this.symbolProcessorProviders += symbolProcessorProviders
-            this.kspArgs.putAll(processorOptions)
+            val useKsp2 = false
+
+            if (!useKsp2) {
+                languageVersion = "1.9"
+            }
 
-            // Run KSP embedded directly within this kotlinc invocation
-            kspWithCompilation = true
-            kspIncremental = true
+            configureKsp(useKsp2 = useKsp2) {
+                this.symbolProcessorProviders += ServiceLoader.load(
+                    SymbolProcessorProvider::class.java,
+                    SymbolProcessorProvider::class.java.classLoader,
+                )
+
+                this.symbolProcessorProviders += symbolProcessorProviders
+                this.processorOptions.putAll(processorOptions)
+
+                // Run KSP embedded directly within this kotlinc invocation
+                this.withCompilation = true
+                this.incremental = true
+            }
         }
     }
 

diff --git a/...iler/src/test/kotlin/software/amazon/lastmile/kotlin/inject/anvil/MergeScopeParserTest.kt b/...iler/src/test/kotlin/software/amazon/lastmile/kotlin/inject/anvil/MergeScopeParserTest.kt
@@ -210,7 +210,11 @@ class MergeScopeParserTest {
                 symbolProcessorProviders = setOf(symbolProcessorProvider(block)),
             )
             .compile(*sources) {
-                assertThat(this.exitCode).isEqualTo(exitCode)
+                if (exitCode == OK) {
+                    assertThat(exitCode).isOk()
+                } else {
+                    assertThat(exitCode).isError()
+                }
             }
     }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,22 +1,19 @@
 [versions]
-agp = "8.2.2"
+agp = "8.5.2"
 android-compileSdk = "34"
 android-minSdk = "21"
 assertk = "0.28.1"
 auto-service = "1.1.1"
 auto-service-ksp = "1.2.0"
-detekt = "1.23.6"
-junit-jupiter = "5.10.3"
-kotlin = "1.9.24"
-kotlin-compile-testing = "0.4.1"
+detekt = "1.23.7"
+junit-jupiter = "5.11.0"
+kotlin = "2.0.21"
+kotlin-compile-testing = "0.5.1"
 kotlin-hierarchy = "1.1"
-kotlin-inject = "0.7.1"
-# This is a build with the latest fixes. We need that in the sample app. 0.7.2 depends on
-# Kotlin 2.0, and we can't do the upgrade yet.
-kotlin-inject-bugfix = "0.7.2"
-kotlin-poet = "1.17.0"
-kotlinx-binaryCompatibilityValidator = "0.16.2"
-ksp = "1.9.24-1.0.20"
+kotlin-inject = "0.7.2"
+kotlin-poet = "1.18.1"
+kotlinx-binaryCompatibilityValidator = "0.16.3"
+ksp = "2.0.21-1.0.25"
 ktlint-binary = "1.2.1"
 ktlint-gradle = "12.1.1"
 maven-publish = "0.29.0"
@@ -38,7 +35,6 @@ kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", v
 kotlin-gradle-plugin-api = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlin" }
 kotlin-hierarchy-plugin = { module = "io.github.terrakok:kmp-hierarchy", version.ref = "kotlin-hierarchy" }
 kotlin-inject-ksp = { module = "me.tatarka.inject:kotlin-inject-compiler-ksp", version.ref = "kotlin-inject" }
-kotlin-inject-ksp-bugfix = { module = "me.tatarka.inject:kotlin-inject-compiler-ksp", version.ref = "kotlin-inject-bugfix" }
 kotlin-inject-runtime = { module = "me.tatarka.inject:kotlin-inject-runtime", version.ref = "kotlin-inject" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlinx-binaryCompatibilityValidator = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version.ref = "kotlinx-binaryCompatibilityValidator" }