Merge pull request #1144 from square/joel/kotlin-2.1

JoelWilcox · web-flow · commit 52c1e565c8f8 · 2025-07-01T20:08:04.000-07:00
Upgrade Kotlin to 2.1.21
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kotlin-version: [ 2.0.21 ]
+        kotlin-version: [ 2.1.21 ]
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kotlin-version: [ 2.0.21 ]
+        kotlin-version: [ 2.1.21 ]
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -172,7 +172,7 @@ jobs:
       # solution.
       fail-fast: false
       matrix:
-        kotlin-version: [ 2.0.21 ]
+        kotlin-version: [ 2.1.21 ]
         agp-version: [ 7.2.0, 7.3.1 ]
 
     steps:
@@ -204,7 +204,7 @@ jobs:
       # solution.
       fail-fast: false
       matrix:
-        kotlin-version: [ 2.0.21 ]
+        kotlin-version: [ 2.1.21 ]
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -27,7 +27,7 @@ jobs:
           java-version: '17'
           check-latest: true
 
-      - name: Publish Release 1.9
+      - name: Publish Release
         run: ./gradlew clean publish --no-build-cache --no-daemon --stacktrace
         env:
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_CENTRAL_USERNAME }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
           java-version: '17'
           check-latest: true
 
-      - name: Publish Release 1.9
+      - name: Publish Release
         run: ./gradlew clean publish --no-build-cache --no-daemon --stacktrace --no-parallel
         env:
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_CENTRAL_USERNAME }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@
 ### Added
 
 ### Changed
+- Upgrade Kotlin to `2.1.21`
+- Upgrade kotlin-metadata to `2.1.21`. This will remain in sync with the Kotlin version for all future releases.
+- Upgrade KotlinPoet to `2.2.0`
 
 ### Deprecated
 
diff --git a/annotations-optional/dependencies/runtimeClasspath.txt b/annotations-optional/dependencies/runtimeClasspath.txt
@@ -1,3 +1,3 @@
 javax.inject:javax.inject:1
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlin:kotlin-stdlib:2.1.21
 org.jetbrains:annotations:13.0
diff --git a/annotations/dependencies/runtimeClasspath.txt b/annotations/dependencies/runtimeClasspath.txt
@@ -1,2 +1,2 @@
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlin:kotlin-stdlib:2.1.21
 org.jetbrains:annotations:13.0
diff --git a/build-logic/conventions/src/main/kotlin/com/squareup/anvil/conventions/BasePlugin.kt b/build-logic/conventions/src/main/kotlin/com/squareup/anvil/conventions/BasePlugin.kt
@@ -92,8 +92,6 @@ abstract class BasePlugin : Plugin<Project> {
           freeCompilerArgs.add("-Xexplicit-api=strict")
         }
 
-        languageVersion.set(KotlinVersion.KOTLIN_2_0)
-
         jvmTarget.set(JvmTarget.fromInt(target.jvmTargetInt()))
       }
     }
diff --git a/build-logic/conventions/src/main/kotlin/com/squareup/anvil/conventions/PublishConventionPlugin.kt b/build-logic/conventions/src/main/kotlin/com/squareup/anvil/conventions/PublishConventionPlugin.kt
@@ -10,7 +10,6 @@ import com.squareup.anvil.conventions.utils.libs
 import com.vanniktech.maven.publish.JavadocJar.Dokka
 import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
-import com.vanniktech.maven.publish.SonatypeHost
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.publish.maven.MavenPublication
@@ -38,7 +37,7 @@ open class PublishConventionPlugin : Plugin<Project> {
     @Suppress("UnstableApiUsage")
     mavenPublishing.pomFromGradleProperties()
     mavenPublishing.signAllPublications()
-    mavenPublishing.publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
+    mavenPublishing.publishToMavenCentral(automaticRelease = true)
 
     target.plugins.withId("org.jetbrains.kotlin.jvm") {
       when {
diff --git a/compiler-api/dependencies/runtimeClasspath.txt b/compiler-api/dependencies/runtimeClasspath.txt
@@ -1,9 +1,9 @@
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
-org.jetbrains.kotlin:kotlin-bom:2.0.21
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.21
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.21
-org.jetbrains.kotlin:kotlin-reflect:2.0.21
-org.jetbrains.kotlin:kotlin-script-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4
+org.jetbrains.kotlin:kotlin-bom:2.1.21
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.1.21
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.1.21
+org.jetbrains.kotlin:kotlin-reflect:2.1.21
+org.jetbrains.kotlin:kotlin-script-runtime:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib:2.1.21
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0
 org.jetbrains:annotations:13.0
diff --git a/compiler-utils/dependencies/runtimeClasspath.txt b/compiler-utils/dependencies/runtimeClasspath.txt
@@ -1,14 +1,14 @@
 com.google.dagger:dagger:2.52
-com.squareup:kotlinpoet-jvm:2.0.0
-com.squareup:kotlinpoet:2.0.0
+com.squareup:kotlinpoet-jvm:2.2.0
+com.squareup:kotlinpoet:2.2.0
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
-org.jetbrains.kotlin:kotlin-bom:2.0.21
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.21
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.21
-org.jetbrains.kotlin:kotlin-reflect:2.0.21
-org.jetbrains.kotlin:kotlin-script-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4
+org.jetbrains.kotlin:kotlin-bom:2.1.21
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.1.21
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.1.21
+org.jetbrains.kotlin:kotlin-reflect:2.1.21
+org.jetbrains.kotlin:kotlin-script-runtime:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib:2.1.21
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0
 org.jetbrains:annotations:13.0
diff --git a/compiler-utils/dependencies/testFixturesRuntimeClasspath.txt b/compiler-utils/dependencies/testFixturesRuntimeClasspath.txt
@@ -13,13 +13,13 @@ com.google.guava:failureaccess:1.0.2
 com.google.guava:guava:33.2.1-android
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.truth:truth:1.4.4
-com.squareup.okio:okio-jvm:3.9.0
-com.squareup.okio:okio:3.9.0
+com.squareup.okio:okio-jvm:3.11.0
+com.squareup.okio:okio:3.11.0
 com.squareup:javapoet:1.13.0
-com.squareup:kotlinpoet-jvm:2.0.0
-com.squareup:kotlinpoet:2.0.0
-dev.zacsweers.kctfork:core:0.5.1
-io.github.classgraph:classgraph:4.8.174
+com.squareup:kotlinpoet-jvm:2.2.0
+com.squareup:kotlinpoet:2.2.0
+dev.zacsweers.kctfork:core:0.7.1
+io.github.classgraph:classgraph:4.8.179
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
@@ -29,17 +29,17 @@ org.checkerframework:checker-compat-qual:2.5.5
 org.checkerframework:checker-qual:3.42.0
 org.hamcrest:hamcrest-core:1.3
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
-org.jetbrains.kotlin:kotlin-annotation-processing-compiler:2.0.0
-org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:2.0.0
-org.jetbrains.kotlin:kotlin-bom:2.0.21
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.21
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.21
-org.jetbrains.kotlin:kotlin-reflect:2.0.21
-org.jetbrains.kotlin:kotlin-script-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4
+org.jetbrains.kotlin:kotlin-annotation-processing-compiler:2.1.10
+org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:2.1.10
+org.jetbrains.kotlin:kotlin-bom:2.1.21
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.1.21
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.1.21
+org.jetbrains.kotlin:kotlin-reflect:2.1.21
+org.jetbrains.kotlin:kotlin-script-runtime:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib:2.1.21
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0
 org.jetbrains:annotations:13.0
 org.jspecify:jspecify:0.3.0
 org.ow2.asm:asm:9.7
diff --git a/compiler/dependencies/runtimeClasspath.txt b/compiler/dependencies/runtimeClasspath.txt
@@ -1,15 +1,15 @@
 com.google.dagger:dagger:2.52
-com.squareup:kotlinpoet-jvm:2.0.0
-com.squareup:kotlinpoet:2.0.0
+com.squareup:kotlinpoet-jvm:2.2.0
+com.squareup:kotlinpoet:2.2.0
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
-org.jetbrains.kotlin:kotlin-bom:2.0.21
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.21
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.21
-org.jetbrains.kotlin:kotlin-reflect:2.0.21
-org.jetbrains.kotlin:kotlin-script-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4
+org.jetbrains.kotlin:kotlin-bom:2.1.21
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.1.21
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.1.21
+org.jetbrains.kotlin:kotlin-reflect:2.1.21
+org.jetbrains.kotlin:kotlin-script-runtime:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib:2.1.21
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0
 org.jetbrains:annotations:13.0
diff --git a/compiler/src/main/java/com/squareup/anvil/compiler/IrContributionMerger.kt b/compiler/src/main/java/com/squareup/anvil/compiler/IrContributionMerger.kt
@@ -31,10 +31,10 @@ import org.jetbrains.kotlin.ir.types.classFqName
 import org.jetbrains.kotlin.ir.types.classOrFail
 import org.jetbrains.kotlin.ir.types.classOrNull
 import org.jetbrains.kotlin.ir.types.starProjectedType
-import org.jetbrains.kotlin.ir.types.superTypes
 import org.jetbrains.kotlin.ir.types.typeWith
 import org.jetbrains.kotlin.ir.util.defaultType
 import org.jetbrains.kotlin.ir.util.functions
+import org.jetbrains.kotlin.ir.util.superTypes
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -389,9 +389,9 @@ internal class IrContributionMerger(
       typeArguments = emptyList(),
     )
       .apply {
-        putValueArgument(
+        arguments.add(
           index = 0,
-          valueArgument = irVararg(
+          element = irVararg(
             elementType = pluginContext.irBuiltIns.kClassClass.starProjectedType,
             values = contributedModules
               .map {
@@ -408,9 +408,9 @@ internal class IrContributionMerger(
             .mapNotNull { it.argumentOrNull(name)?.argumentExpression as? IrVararg }
             .ifEmpty { return }
 
-          putValueArgument(
+          arguments.add(
             index = 1,
-            valueArgument = irVararg(
+            element = irVararg(
               elementType = varargArguments[0].varargElementType,
               // These are always IrExpression instances too
               values = varargArguments.flatMap { it.elements }
diff --git a/compiler/src/main/java/com/squareup/anvil/compiler/codegen/reference/AnnotationArgumentReferenceIr.kt b/compiler/src/main/java/com/squareup/anvil/compiler/codegen/reference/AnnotationArgumentReferenceIr.kt
@@ -28,7 +28,7 @@ internal class AnnotationArgumentReferenceIr(
   // support primitives later on.
   @OptIn(UnsafeDuringIrConstructionAPI::class)
   private fun findValue(): Any {
-    (argumentExpression as? IrConst<*>)?.let {
+    (argumentExpression as? IrConst)?.let {
       return it.value as Any
     }
 
diff --git a/compiler/src/test/java/com/squareup/anvil/compiler/dagger/InjectConstructorFactoryGeneratorTest.kt b/compiler/src/test/java/com/squareup/anvil/compiler/dagger/InjectConstructorFactoryGeneratorTest.kt
@@ -1107,7 +1107,7 @@ public class InjectClass_Factory(
         .invoke(null)
       assertThat(newInstance).isNotNull()
 
-      val getInstance = (factoryInstance as Factory<*>).get()
+      val getInstance = (factoryInstance as Factory<*>).get()!!
 
       assertThat(getInstance.getPropertyValue("name")).isEqualTo(name)
       assertThat(getInstance.getPropertyValue("middle1")).isEqualTo(middle1)
@@ -1163,7 +1163,7 @@ public class InjectClass_Factory(
         .invoke(null)
       assertThat(newInstance).isNotNull()
 
-      val getInstance = (factoryInstance as Factory<*>).get()
+      val getInstance = (factoryInstance as Factory<*>).get()!!
 
       assertThat(getInstance.getPropertyValue("base1")).isEqualTo(base1)
       assertThat(getInstance.getPropertyValue("base2")).isEqualTo(base2)
@@ -1233,7 +1233,7 @@ public class InjectClass_Factory(
         .invoke(null)
       assertThat(newInstance).isNotNull()
 
-      val getInstance = (factoryInstance as Factory<*>).get()
+      val getInstance = (factoryInstance as Factory<*>).get()!!
 
       assertThat(getInstance.getPropertyValue("name")).isEqualTo(name)
       assertThat(getInstance.getPropertyValue("base1")).isEqualTo(base1)
@@ -1320,7 +1320,7 @@ public class InjectClass_Factory(
         .invoke(null)
       assertThat(newInstance).isNotNull()
 
-      val getInstance = (factoryInstance as Factory<*>).get()
+      val getInstance = (factoryInstance as Factory<*>).get()!!
 
       assertThat(getInstance.getPropertyValue("name")).isEqualTo(name)
       assertThat(getInstance.getPropertyValue("middle1")).isEqualTo(middle1)
@@ -1433,7 +1433,7 @@ public class InjectClass_Factory(
 
       val newInstance = staticMethods.single { it.name == "newInstance" }
         .invoke(null, "a")
-      val getInstance = (factoryInstance as Factory<*>).get()
+      val getInstance = (factoryInstance as Factory<*>).get()!!
 
       assertThat(newInstance).isNotNull()
       assertThat(getInstance).isNotNull()
@@ -1695,7 +1695,7 @@ public final class MyClass_Factory implements Factory<MyClass> {
       assertThat(factoryInstance::class.java).isEqualTo(factoryClass)
 
       val newInstance = staticMethods.single { it.name == "newInstance" }.invoke(null)
-      val getInstance = (factoryInstance as Factory<*>).get()
+      val getInstance = (factoryInstance as Factory<*>).get()!!
 
       assertThat(newInstance).isNotNull()
       assertThat(getInstance).isNotNull()
diff --git a/gradle-plugin/dependencies/runtimeClasspath.txt b/gradle-plugin/dependencies/runtimeClasspath.txt
@@ -1,2 +1,2 @@
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlin:kotlin-stdlib:2.1.21
 org.jetbrains:annotations:13.0
diff --git a/gradle-plugin/src/main/java/com/squareup/anvil/plugin/AnvilPlugin.kt b/gradle-plugin/src/main/java/com/squareup/anvil/plugin/AnvilPlugin.kt
@@ -156,9 +156,7 @@ internal open class AnvilPlugin : KotlinCompilerPluginSupportPlugin {
   ): Provider<List<SubpluginOption>> {
     kotlinCompilation.compileTaskProvider.configure { action ->
       action.compilerOptions.let {
-        @Suppress("DEPRECATION")
-        val useK2 = it.useK2.get()
-        if (useK2 || it.languageVersion.getOrElse(KOTLIN_1_9) >= KOTLIN_2_0) {
+        if (it.languageVersion.getOrElse(KOTLIN_1_9) >= KOTLIN_2_0) {
           kotlinCompilation.project.logger
             .warn(
               "NOTE: Anvil is currently incompatible with the K2 compiler and the language " +
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -29,12 +29,12 @@ jvm-toolchain = "17"
 jvm-target-library = "8"
 jvm-target-minimal = "11"
 kase = "0.11.1"
-kct = "0.5.1"
+kct = "0.7.1"
 kgx = "0.1.12"
 kotest = "5.9.1"
-kotlin = "2.0.21"
+kotlin = "2.1.21"
 kotlinx-binaryCompatibility = "0.17.0"
-kotlinpoet = "2.0.0"
+kotlinpoet = "2.2.0"
 ktlint = "1.0.1"
 ktlintPlugin = "12.1.2"
 mavenPublish = "0.33.0"
@@ -117,7 +117,7 @@ kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable",
 kotlin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
 kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-gradlePluginApi = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlin" }
-kotlin-metadata = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.9.0"
+kotlin-metadata = { module = "org.jetbrains.kotlin:kotlin-metadata-jvm", version.ref = "kotlin" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-org.jetbrains.kotlin:kotlin-stdlib:2.0.21`
	`1`	`+org.jetbrains.kotlin:kotlin-stdlib:2.1.21`
`2`	`2`	`org.jetbrains:annotations:13.0`
Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,6 @@ abstract class BasePlugin : Plugin<Project> {`
`92`	`92`	`freeCompilerArgs.add("-Xexplicit-api=strict")`
`93`	`93`	`}`
`94`	`94`
`95`		`- languageVersion.set(KotlinVersion.KOTLIN_2_0)`
`96`		`-`
`97`	`95`	`jvmTarget.set(JvmTarget.fromInt(target.jvmTargetInt()))`
`98`	`96`	`}`
`99`	`97`	`}`