Merge pull request #1152 from square/joel/kotlin-2.2.10

JoelWilcox · web-flow · commit ba3f4cd7ae09 · 2025-09-03T11:31:10.000-07:00
Upgrade to Kotlin 2.2.10
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.2.0 ]
+        kotlin-version: [ 2.2.10 ]
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kotlin-version: [ 2.2.0 ]
+        kotlin-version: [ 2.2.10 ]
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -172,7 +172,7 @@ jobs:
       # solution.
       fail-fast: false
       matrix:
-        kotlin-version: [ 2.2.0 ]
+        kotlin-version: [ 2.2.10 ]
         agp-version: [ 7.2.0, 7.3.1 ]
 
     steps:
@@ -204,7 +204,7 @@ jobs:
       # solution.
       fail-fast: false
       matrix:
-        kotlin-version: [ 2.2.0 ]
+        kotlin-version: [ 2.2.10 ]
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,8 +5,10 @@
 ### Added
 
 ### Changed
+- Upgrade Kotlin to `2.2.10`
 
 ### Deprecated
+- `AndroidVariantFilter.androidVariant` is now nullable and deprecated. We're no longer guaranteed that the variant will be available when creating the filter, and the base type is slated to be removed in a future release of AGP.
 
 ### Removed
 
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.2.0
+org.jetbrains.kotlin:kotlin-stdlib:2.2.10
 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.2.0
+org.jetbrains.kotlin:kotlin-stdlib:2.2.10
 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
@@ -13,7 +13,6 @@ import org.gradle.api.tasks.testing.Test
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.plugin.KotlinBasePluginWrapper
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
diff --git a/compiler-api/dependencies/runtimeClasspath.txt b/compiler-api/dependencies/runtimeClasspath.txt
@@ -1,8 +1,8 @@
-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.kotlin:kotlin-bom:2.2.10
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.10
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.10
+org.jetbrains.kotlin:kotlin-reflect:2.2.10
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.10
+org.jetbrains.kotlin:kotlin-stdlib:2.2.10
 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
@@ -3,12 +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.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.kotlin:kotlin-bom:2.2.10
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.10
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.10
+org.jetbrains.kotlin:kotlin-reflect:2.2.10
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.10
+org.jetbrains.kotlin:kotlin-stdlib:2.2.10
 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
@@ -29,12 +29,12 @@ org.checkerframework:checker-compat-qual:2.5.3
 org.checkerframework:checker-qual:3.42.0
 org.hamcrest:hamcrest-core:1.3
 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.kotlin:kotlin-bom:2.2.10
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.10
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.10
+org.jetbrains.kotlin:kotlin-reflect:2.2.10
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.10
+org.jetbrains.kotlin:kotlin-stdlib:2.2.10
 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/dependencies/runtimeClasspath.txt b/compiler/dependencies/runtimeClasspath.txt
@@ -4,12 +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.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.kotlin:kotlin-bom:2.2.10
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.10
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.10
+org.jetbrains.kotlin:kotlin-reflect:2.2.10
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.10
+org.jetbrains.kotlin:kotlin-stdlib:2.2.10
 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.2.0
+org.jetbrains.kotlin:kotlin-stdlib:2.2.10
 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
@@ -34,6 +34,7 @@ import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.File
+import java.util.Locale.getDefault
 import java.util.concurrent.ConcurrentHashMap
 
 @Suppress("DEPRECATION")
@@ -486,20 +487,31 @@ internal class Variant private constructor(
       val project = kotlinCompilation.target.project
       val extension = project.extensions.getByType(AnvilExtension::class.java)
       val androidVariant = (kotlinCompilation as? KotlinJvmAndroidCompilation)?.androidVariant
+      val isAndroidCompilation = kotlinCompilation is KotlinJvmAndroidCompilation
 
-      val androidSourceSets = if (androidVariant != null) {
+      val androidSourceSets = if (isAndroidCompilation) {
         val sourceSetsByName = project.extensions.getByType(BaseExtension::class.java)
           .sourceSets
           .associateBy { it.name }
 
-        androidVariant.sourceSets.mapNotNull { sourceSetsByName[it.name] }
+        if (androidVariant != null) {
+          androidVariant.sourceSets.mapNotNull { sourceSetsByName[it.name] }
+        } else {
+          kotlinCompilation.kotlinSourceSets.mapNotNull { sourceSet ->
+            // Source sets get prefixed with Android and we just want the base version
+            val sourceSetName = sourceSet.name.removePrefix("android").replaceFirstChar {
+              it.lowercase(getDefault())
+            }
+            sourceSetsByName[sourceSetName]
+          }
+        }
       } else {
         null
       }
 
       val commonFilter = CommonFilter(kotlinCompilation.name, extension)
-      val variantFilter = if (androidVariant != null) {
-        AndroidVariantFilter(commonFilter, androidVariant)
+      val variantFilter = if (isAndroidCompilation) {
+        AndroidVariantFilter(commonFilter, kotlinCompilation.androidVariant)
       } else {
         JvmVariantFilter(commonFilter)
       }
@@ -544,11 +556,15 @@ internal fun KotlinCompilation<*>.sourceSetName() =
     // are concatenated differently than in the KGP and Java source sets.
     // In KGP and Java, we get `debugAndroidTest`, but in AGP we get `androidTestDebug`.
     // The KAPT configuration names are derived from the AGP name.
-    is KotlinJvmAndroidCompilation ->
-      comp.androidVariant.sourceSets
+    is KotlinJvmAndroidCompilation -> {
+      comp.androidVariant?.sourceSets
         // For ['debug', 'androidTest', 'debugAndroidTest'], the last name is always the one we want.
-        .last()
-        .name
+        ?.last()
+        ?.name
+        ?: comp.kotlinSourceSets.last().name.removePrefix("android").replaceFirstChar {
+          it.lowercase(getDefault())
+        }
+    }
     is KotlinJvmCompilation -> comp.name
     else -> name
   }
diff --git a/gradle-plugin/src/main/java/com/squareup/anvil/plugin/VariantFilter.kt b/gradle-plugin/src/main/java/com/squareup/anvil/plugin/VariantFilter.kt
@@ -115,5 +115,8 @@ public class JvmVariantFilter internal constructor(
 public class AndroidVariantFilter internal constructor(
   commonFilter: CommonFilter,
   @Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
-  public val androidVariant: BaseVariantDeprecated,
+  @Deprecated(
+    message = "This field will be removed in a future release. The base type (and ability to access it when creating variant filters) is being removed in a future release of KGP+AGP. See AGP's [AndroidComponentsExtension.onVariants] API for a potential replacement.",
+  )
+  public val androidVariant: BaseVariantDeprecated?,
 ) : VariantFilter by commonFilter
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ kase = "0.11.1"
 kct = "0.8.0"
 kgx = "0.1.12"
 kotest = "5.9.1"
-kotlin = "2.2.0"
+kotlin = "2.2.10"
 kotlinx-binaryCompatibility = "0.17.0"
 kotlinpoet = "2.2.0"
 ktlint = "1.0.1"
@@ -76,6 +76,7 @@ androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-
 androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" }
 
 agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
+agp-api = { module = "com.android.tools.build:gradle-api", version.ref = "agp" }
 
 auto-service-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoService" }
 auto-service-processor = { module = "com.google.auto.service:auto-service", version.ref = "autoService" }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-org.jetbrains.kotlin:kotlin-stdlib:2.2.0`
	`1`	`+org.jetbrains.kotlin:kotlin-stdlib:2.2.10`
`2`	`2`	`org.jetbrains:annotations:13.0`