Merge pull request #1148 from square/joel/kotlin-2.2

JoelWilcox · web-flow · commit cc06a22d0b01 · 2025-07-16T18:04:45.000-07:00
Upgrade to Kotlin 2.2.0
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.1.21 ]
+        kotlin-version: [ 2.2.0 ]
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kotlin-version: [ 2.1.21 ]
+        kotlin-version: [ 2.2.0 ]
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -172,7 +172,7 @@ jobs:
       # solution.
       fail-fast: false
       matrix:
-        kotlin-version: [ 2.1.21 ]
+        kotlin-version: [ 2.2.0 ]
         agp-version: [ 7.2.0, 7.3.1 ]
 
     steps:
@@ -204,7 +204,7 @@ jobs:
       # solution.
       fail-fast: false
       matrix:
-        kotlin-version: [ 2.1.21 ]
+        kotlin-version: [ 2.2.0 ]
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Added
 
 ### Changed
+- Upgrade Kotlin 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.1.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.0
 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.1.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.0
 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
@@ -59,9 +59,13 @@ abstract class BasePlugin : Plugin<Project> {
 
     target.tasks.withType(KotlinCompile::class.java).configureEach { task ->
       task.compilerOptions {
+        // Disabled for now because of a languageVersion 1.9 warning that cannot be suppressed and
+        // causes nearly all tests to fail. See the following links for context + tracking the fix:
+        // https://kotlinlang.slack.com/archives/C7L3JB43G/p1750705742065189?thread_ts=1750704310.270049&cid=C7L3JB43G
+        // https://youtrack.jetbrains.com/issue/KT-78277/Dont-use-MessageCollector-for-reporting-diagnostics-across-the-compiler
+        // TODO: Re-enable warnings as errors once KT-78277 is resolved
         allWarningsAsErrors.set(
-          target.libs.versions.config.warningsAsErrors.get().toBoolean() ||
-            extension.warningsAsErrors.get(),
+          false
         )
 
         val sourceSetName = task.sourceSetName.getOrElse(
diff --git a/compiler-api/api/compiler-api.api b/compiler-api/api/compiler-api.api
@@ -65,9 +65,10 @@ public final class com/squareup/anvil/compiler/api/ComponentMergingBackend : jav
 }
 
 public abstract interface class com/squareup/anvil/compiler/api/FileWithContent : java/lang/Comparable {
-	public abstract fun compareTo (Lcom/squareup/anvil/compiler/api/FileWithContent;)I
-	public abstract fun component1 ()Ljava/io/File;
-	public abstract fun component2 ()Ljava/lang/String;
+	public fun compareTo (Lcom/squareup/anvil/compiler/api/FileWithContent;)I
+	public synthetic fun compareTo (Ljava/lang/Object;)I
+	public fun component1 ()Ljava/io/File;
+	public fun component2 ()Ljava/lang/String;
 	public abstract fun getContent ()Ljava/lang/String;
 	public abstract fun getFile ()Ljava/io/File;
 }
diff --git a/compiler-api/dependencies/runtimeClasspath.txt b/compiler-api/dependencies/runtimeClasspath.txt
@@ -1,9 +1,8 @@
-org.jetbrains.intellij.deps:trove4j:1.0.20200330
-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.kotlin:kotlin-bom:2.2.0
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.0
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.0
+org.jetbrains.kotlin:kotlin-reflect:2.2.0
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.0
+org.jetbrains.kotlin:kotlin-stdlib:2.2.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0
 org.jetbrains:annotations:13.0
diff --git a/compiler-utils/api/compiler-utils.api b/compiler-utils/api/compiler-utils.api
@@ -58,7 +58,7 @@ public final class com/squareup/anvil/compiler/internal/UtilsKt {
 
 public abstract interface class com/squareup/anvil/compiler/internal/reference/AnnotatedReference {
 	public abstract fun getAnnotations ()Ljava/util/List;
-	public abstract fun isAnnotatedWith (Lorg/jetbrains/kotlin/name/FqName;)Z
+	public fun isAnnotatedWith (Lorg/jetbrains/kotlin/name/FqName;)Z
 }
 
 public final class com/squareup/anvil/compiler/internal/reference/AnnotatedReference$DefaultImpls {
@@ -164,6 +164,7 @@ public abstract interface class com/squareup/anvil/compiler/internal/reference/A
 	public abstract fun getTopLevelPropertyReferences (Lorg/jetbrains/kotlin/psi/KtFile;)Ljava/util/List;
 	public abstract fun resolveClassIdOrNull (Lorg/jetbrains/kotlin/name/ClassId;)Lorg/jetbrains/kotlin/name/FqName;
 	public abstract fun resolveFqNameOrNull (Lorg/jetbrains/kotlin/name/FqName;Lorg/jetbrains/kotlin/incremental/components/LookupLocation;)Lorg/jetbrains/kotlin/descriptors/ClassDescriptor;
+	public static synthetic fun resolveFqNameOrNull$default (Lcom/squareup/anvil/compiler/internal/reference/AnvilModuleDescriptor;Lorg/jetbrains/kotlin/name/FqName;Lorg/jetbrains/kotlin/incremental/components/LookupLocation;ILjava/lang/Object;)Lorg/jetbrains/kotlin/descriptors/ClassDescriptor;
 	public abstract fun resolvePropertyReferenceOrNull (Lorg/jetbrains/kotlin/name/FqName;)Lcom/squareup/anvil/compiler/internal/reference/PropertyReference;
 	public abstract fun resolveTypeAliasFqNameOrNull (Lorg/jetbrains/kotlin/name/FqName;)Lorg/jetbrains/kotlin/descriptors/TypeAliasDescriptor;
 }
@@ -297,9 +298,9 @@ public final class com/squareup/anvil/compiler/internal/reference/ClassReference
 public abstract interface class com/squareup/anvil/compiler/internal/reference/FunctionReference {
 	public abstract fun getFqName ()Lorg/jetbrains/kotlin/name/FqName;
 	public abstract fun getModule ()Lcom/squareup/anvil/compiler/internal/reference/AnvilModuleDescriptor;
-	public abstract fun getName ()Ljava/lang/String;
+	public fun getName ()Ljava/lang/String;
 	public abstract fun getParameters ()Ljava/util/List;
-	public abstract fun returnType ()Lcom/squareup/anvil/compiler/internal/reference/TypeReference;
+	public fun returnType ()Lcom/squareup/anvil/compiler/internal/reference/TypeReference;
 	public abstract fun returnTypeOrNull ()Lcom/squareup/anvil/compiler/internal/reference/TypeReference;
 	public abstract fun visibility ()Lcom/squareup/anvil/compiler/internal/reference/Visibility;
 }
@@ -481,7 +482,7 @@ public abstract interface class com/squareup/anvil/compiler/internal/reference/P
 	public abstract fun getName ()Ljava/lang/String;
 	public abstract fun getSetterAnnotations ()Ljava/util/List;
 	public abstract fun isLateinit ()Z
-	public abstract fun type ()Lcom/squareup/anvil/compiler/internal/reference/TypeReference;
+	public fun type ()Lcom/squareup/anvil/compiler/internal/reference/TypeReference;
 	public abstract fun typeOrNull ()Lcom/squareup/anvil/compiler/internal/reference/TypeReference;
 	public abstract fun visibility ()Lcom/squareup/anvil/compiler/internal/reference/Visibility;
 }
diff --git a/compiler-utils/dependencies/runtimeClasspath.txt b/compiler-utils/dependencies/runtimeClasspath.txt
@@ -3,13 +3,12 @@ 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.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.kotlin:kotlin-bom:2.2.0
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.0
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.0
+org.jetbrains.kotlin:kotlin-reflect:2.2.0
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.0
+org.jetbrains.kotlin:kotlin-stdlib:2.2.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0
 org.jetbrains:annotations:13.0
 org.jspecify:jspecify:1.0.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.11.0
-com.squareup.okio:okio:3.11.0
+com.squareup.okio:okio-jvm:3.15.0
+com.squareup.okio:okio:3.15.0
 com.squareup:javapoet:1.13.0
 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
+dev.zacsweers.kctfork:core:0.8.0
+io.github.classgraph:classgraph:4.8.180
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
@@ -28,15 +28,13 @@ net.ltgt.gradle.incap:incap:0.2
 org.checkerframework:checker-compat-qual:2.5.3
 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.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:2.1.21
+org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:2.2.0
+org.jetbrains.kotlin:kotlin-bom:2.2.0
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.0
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.0
+org.jetbrains.kotlin:kotlin-reflect:2.2.0
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.0
+org.jetbrains.kotlin:kotlin-stdlib:2.2.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0
 org.jetbrains:annotations:13.0
 org.jspecify:jspecify:1.0.0
diff --git a/compiler-utils/src/testFixtures/java/com/squareup/anvil/compiler/internal/testing/AnvilCompilation.kt b/compiler-utils/src/testFixtures/java/com/squareup/anvil/compiler/internal/testing/AnvilCompilation.kt
@@ -284,7 +284,12 @@ public fun compileAnvil(
       kotlinCompilation.apply {
         languageVersion = kotlinLanguageVersion
         apiVersion = kotlinLanguageVersion
-        this.allWarningsAsErrors = allWarningsAsErrors
+        // Disabled for now because of a languageVersion 1.9 warning that cannot be suppressed and
+        // causes nearly all tests to fail. See the following links for context + tracking the fix:
+        // https://kotlinlang.slack.com/archives/C7L3JB43G/p1750705742065189?thread_ts=1750704310.270049&cid=C7L3JB43G
+        // https://youtrack.jetbrains.com/issue/KT-78277/Dont-use-MessageCollector-for-reporting-diagnostics-across-the-compiler
+        // TODO: Re-enable warnings as errors once KT-78277 is resolved
+        this.allWarningsAsErrors = false
         this.messageOutputStream = messageOutputStream
         if (workingDir != null) {
           this.workingDir = workingDir
diff --git a/compiler/dependencies/runtimeClasspath.txt b/compiler/dependencies/runtimeClasspath.txt
@@ -4,13 +4,12 @@ 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.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.kotlin:kotlin-bom:2.2.0
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.0
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.0
+org.jetbrains.kotlin:kotlin-reflect:2.2.0
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.0
+org.jetbrains.kotlin:kotlin-stdlib:2.2.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0
 org.jetbrains:annotations:13.0
 org.jspecify:jspecify:1.0.0
diff --git a/gradle-plugin/dependencies/runtimeClasspath.txt b/gradle-plugin/dependencies/runtimeClasspath.txt
@@ -1,2 +1,2 @@
-org.jetbrains.kotlin:kotlin-stdlib:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.0
 org.jetbrains:annotations:13.0
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -29,10 +29,10 @@ jvm-toolchain = "17"
 jvm-target-library = "8"
 jvm-target-minimal = "11"
 kase = "0.11.1"
-kct = "0.7.1"
+kct = "0.8.0"
 kgx = "0.1.12"
 kotest = "5.9.1"
-kotlin = "2.1.21"
+kotlin = "2.2.0"
 kotlinx-binaryCompatibility = "0.17.0"
 kotlinpoet = "2.2.0"
 ktlint = "1.0.1"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-org.jetbrains.kotlin:kotlin-stdlib:2.1.21`
	`1`	`+org.jetbrains.kotlin:kotlin-stdlib:2.2.0`
`2`	`2`	`org.jetbrains:annotations:13.0`
Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,10 @@ public final class com/squareup/anvil/compiler/api/ComponentMergingBackend : jav`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public abstract interface class com/squareup/anvil/compiler/api/FileWithContent : java/lang/Comparable {`
`68`		`- public abstract fun compareTo (Lcom/squareup/anvil/compiler/api/FileWithContent;)I`
`69`		`- public abstract fun component1 ()Ljava/io/File;`
`70`		`- public abstract fun component2 ()Ljava/lang/String;`
	`68`	`+ public fun compareTo (Lcom/squareup/anvil/compiler/api/FileWithContent;)I`
	`69`	`+ public synthetic fun compareTo (Ljava/lang/Object;)I`
	`70`	`+ public fun component1 ()Ljava/io/File;`
	`71`	`+ public fun component2 ()Ljava/lang/String;`
`71`	`72`	`public abstract fun getContent ()Ljava/lang/String;`
`72`	`73`	`public abstract fun getFile ()Ljava/io/File;`
`73`	`74`	`}`