Fix issues when running with KSP2 (#93)

WhosNickDoglio · ZacSweers · web-flow · commit f57d3b671973 · 2025-11-21T23:32:27.000-05:00
Co-authored-by: Zac Sweers &lt;pandanomic@gmail.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,8 +19,8 @@ jobs:
         kotlin-version: [ 1.9.24 ]
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -39,8 +39,8 @@ jobs:
         kotlin-version: [ 1.9.24 ]
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -53,7 +53,7 @@ jobs:
         run: ./gradlew assemble test --no-build-cache --no-daemon --stacktrace -Doverride_kotlin=${{ matrix.kotlin-version }}
 
       - name: Upload Test Results
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
+        uses: actions/upload-artifact@v5
         if: ${{ failure() }}
         with:
           name: test-results-${{ matrix.kotlin-version }}
@@ -64,8 +64,8 @@ jobs:
     timeout-minutes: 25
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -84,7 +84,7 @@ jobs:
         run: ./gradlew.bat assemble test --no-build-cache --no-daemon --stacktrace -Doverride_config-fullTestRun=false -Doverride_config-includeKspTests=false
 
       - name: Upload Test Results
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
+        uses: actions/upload-artifact@v5
         if: ${{ failure() }}
         with:
           name: test-results-windows
@@ -95,8 +95,8 @@ jobs:
     timeout-minutes: 15
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -110,8 +110,8 @@ jobs:
     timeout-minutes: 15
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -128,8 +128,8 @@ jobs:
     timeout-minutes: 15
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -142,7 +142,7 @@ jobs:
         run: ./gradlew -p build-logic/delegate lint --no-build-cache --no-daemon --stacktrace
 
       - name: Upload Lint Results
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
+        uses: actions/upload-artifact@v5
         if: ${{ failure() }}
         with:
           name: lint-results
@@ -153,8 +153,8 @@ jobs:
     timeout-minutes: 15
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -178,8 +178,8 @@ jobs:
         agp-version: [ 7.1.1, 7.2.0, 7.3.1 ]
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -189,7 +189,7 @@ jobs:
         run: ./gradlew :gradle-plugin:assemble :gradle-plugin:test --no-build-cache --no-daemon --stacktrace -Doverride_kotlin=${{ matrix.kotlin-version }} -Doverride_agp=${{ matrix.agp-version }}
 
       - name: Upload Test Results
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
+        uses: actions/upload-artifact@v5
         if: ${{ failure() }}
         with:
           # Use the Kotlin version to prevent overrides.
@@ -209,8 +209,8 @@ jobs:
         kotlin-version: [ 1.9.24 ]
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -226,7 +226,7 @@ jobs:
         run: ./gradlew :delegate:sample:app:assembleDebug --no-build-cache --no-daemon --stacktrace -Doverride_kotlin=${{ matrix.kotlin-version }} -Doverride_config-generateDaggerFactoriesWithAnvil=false
 
       - name: Upload Test Results
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
+        uses: actions/upload-artifact@v5
         if: ${{ failure() }}
         with:
           # Use the Kotlin version to prevent overrides.
@@ -246,8 +246,8 @@ jobs:
           #- 24
           - 29
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -260,7 +260,7 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: AVD cache
-        uses: actions/cache/save@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
+        uses: actions/cache/save@v4
         id: avd-cache
         with:
           path: |
@@ -270,7 +270,7 @@ jobs:
 
       - name: create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32 # v2
+        uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
           arch: x86_64
@@ -286,7 +286,7 @@ jobs:
         run: ./gradlew :annotations:publishToMavenLocal
 
       - name: Instrumentation Tests
-        uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32 # v2
+        uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
           arch: x86_64
@@ -299,19 +299,19 @@ jobs:
           script: ./gradlew connectedCheck --no-build-cache --no-daemon --stacktrace
 
       - name: Upload results
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
+        uses: actions/upload-artifact@v5
         with:
           name: instrumentation-test-results
           path: ./**/build/reports/androidTests/connected/**
 
   gradle-integration-tests:
     name: Gradle integration tests
     runs-on: macos-latest
-    timeout-minutes: 25
+    timeout-minutes: 45
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -324,27 +324,19 @@ jobs:
         run: ./gradlew gradleTest --stacktrace
 
       - name: Upload Test Results
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
+        uses: actions/upload-artifact@v5
         if: ${{ failure() }}
         with:
           name: test-results-gradle-integration
           path: ./**/build/reports/tests/
 
-  gradle-wrapper-validation:
-    name: "Validate the Gradle Wrapper"
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-      - uses: gradle/actions/wrapper-validation@db19848a5fa7950289d3668fb053140cf3028d43 # v3
-
   build-benchmark-project:
     runs-on: ubuntu-latest
     timeout-minutes: 25
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -374,7 +366,6 @@ jobs:
       - kapt-for-dagger-factories
       - instrumentation-tests
       - gradle-integration-tests
-      - gradle-wrapper-validation
       - build-benchmark-project
 
     steps:
diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -13,15 +13,15 @@ jobs:
     timeout-minutes: 25
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@v6
 
       - name: Set version for non-main branch
         if: ${{ github.ref_name != 'main' && !startsWith(github.ref, 'refs/tags/') }}
         run: |
           echo "ORG_GRADLE_PROJECT_VERION_NAME=${{ github.ref_name }}-SNAPSHOT" | sed 's/\//-/g' >> $GITHUB_ENV
 
       - uses: gradle/actions/wrapper-validation@db19848a5fa7950289d3668fb053140cf3028d43 # v3
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,9 +12,9 @@ jobs:
     timeout-minutes: 25
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@v6
       - uses: gradle/actions/wrapper-validation@db19848a5fa7950289d3668fb053140cf3028d43 # v3
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'
diff --git a/compiler-utils/dependencies/runtimeClasspath.txt b/compiler-utils/dependencies/runtimeClasspath.txt
@@ -1,17 +1,17 @@
 com.google.dagger:dagger:2.52
 com.google.devtools.ksp:symbol-processing-api:1.9.24-1.0.20
-com.squareup:kotlinpoet-jvm:1.16.0
-com.squareup:kotlinpoet-ksp:1.16.0
-com.squareup:kotlinpoet:1.16.0
+com.squareup:kotlinpoet-jvm:2.0.0
+com.squareup:kotlinpoet-ksp:2.0.0
+com.squareup:kotlinpoet:2.0.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:1.9.24
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.24
-org.jetbrains.kotlin:kotlin-reflect:1.9.24
+org.jetbrains.kotlin:kotlin-reflect:2.0.10
 org.jetbrains.kotlin:kotlin-script-runtime:1.9.24
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24
-org.jetbrains.kotlin:kotlin-stdlib:1.9.24
+org.jetbrains.kotlin:kotlin-stdlib:2.0.10
 org.jetbrains:annotations:13.0
diff --git a/compiler-utils/src/main/java/com/squareup/anvil/compiler/internal/ksp/KspUtil.kt b/compiler-utils/src/main/java/com/squareup/anvil/compiler/internal/ksp/KspUtil.kt
@@ -329,10 +329,13 @@ public fun KSPropertyDeclaration.toPropertySpec(
 }
 
 public fun KSValueParameter.toParameterSpec(): ParameterSpec {
-  return ParameterSpec.builder(name!!.asString(), type.contextualToTypeName())
-    .addAnnotations(
-      resolvableAnnotations.map { it.toAnnotationSpec() }.asIterable(),
-    )
+  val annotations = resolvableAnnotations.mapNotNull { annotation ->
+    annotation.annotationType.resolve().resolveKSClassDeclaration()?.toClassName()
+  }.asIterable()
+
+  return ParameterSpec.builder(name!!.asString(), type.contextualToTypeName()).apply {
+    annotations.forEach(::addAnnotation)
+  }
     .build()
 }
 
diff --git a/compiler/dependencies/runtimeClasspath.txt b/compiler/dependencies/runtimeClasspath.txt
@@ -1,18 +1,18 @@
 com.google.dagger:dagger:2.52
 com.google.devtools.ksp:symbol-processing-api:1.9.24-1.0.20
-com.squareup:kotlinpoet-jvm:1.16.0
-com.squareup:kotlinpoet-ksp:1.16.0
-com.squareup:kotlinpoet:1.16.0
+com.squareup:kotlinpoet-jvm:2.0.0
+com.squareup:kotlinpoet-ksp:2.0.0
+com.squareup:kotlinpoet:2.0.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:1.9.24
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.24
-org.jetbrains.kotlin:kotlin-reflect:1.9.24
+org.jetbrains.kotlin:kotlin-reflect:2.0.10
 org.jetbrains.kotlin:kotlin-script-runtime:1.9.24
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24
-org.jetbrains.kotlin:kotlin-stdlib:1.9.24
+org.jetbrains.kotlin:kotlin-stdlib:2.0.10
 org.jetbrains:annotations:13.0
diff --git a/compiler/src/main/java/com/squareup/anvil/compiler/KspContributionMerger.kt b/compiler/src/main/java/com/squareup/anvil/compiler/KspContributionMerger.kt
diff --git a/gradle-plugin/src/gradleTest/java/com/squareup/anvil/plugin/LifecycleTest.kt b/gradle-plugin/src/gradleTest/java/com/squareup/anvil/plugin/LifecycleTest.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
