google · copybara-service · Jun 10, 2026
diff --git a/.github/actions/artifact-android-local-tests/action.yml b/.github/actions/artifact-android-local-tests/action.yml
@@ -12,21 +12,28 @@ runs:
         path: |
           ~/.gradle/caches
           ~/.gradle/wrapper
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        key: ${{ runner.os }}-gradle-java-${{ env.USE_JAVA_VERSION_FOR_GRADLE }}-kotlin-${{ env.USE_KOTLIN_VERSION }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
         restore-keys: |
+          ${{ runner.os }}-gradle-java-${{ env.USE_JAVA_VERSION_FOR_GRADLE }}-kotlin-${{ env.USE_KOTLIN_VERSION }}-
+          ${{ runner.os }}-gradle-java-${{ env.USE_JAVA_VERSION_FOR_GRADLE }}-
           ${{ runner.os }}-gradle-
     - name: 'Download local snapshot for tests'
       uses: actions/download-artifact@v4
       with:
         name: local-snapshot
         path: ~/.m2/repository/com/google/dagger
-    - name: 'Install Java ${{ env.USE_JAVA_VERSION_FOR_GRADLE }}'
+    - name: 'Install Java ${{ env.USE_JAVA_VERSION_FOR_GRADLE }} (Target)'
       uses: actions/setup-java@v4
       with:
         distribution: '${{ env.USE_JAVA_DISTRIBUTION }}'
         java-version: '${{ env.USE_JAVA_VERSION_FOR_GRADLE }}'
-    - name: 'Gradle Android local tests (AGP ${{ env.USE_AGP_VERSION }})'
-      run: ./util/run-local-gradle-android-tests.sh "${{ env.USE_AGP_VERSION }}"
+    - name: 'Install Java 21 (Gradle Boot JDK)'
+      uses: actions/setup-java@v4
+      with:
+        distribution: '${{ env.USE_JAVA_DISTRIBUTION }}'
+        java-version: '21'
+    - name: 'Gradle Android local tests (AGP ${{ env.USE_AGP_VERSION }}, Java ${{ env.USE_JAVA_VERSION_FOR_GRADLE }}, Kotlin ${{ env.USE_KOTLIN_VERSION }})'
+      run: ./util/run-local-gradle-android-tests.sh "${{ env.USE_AGP_VERSION }}" "${{ env.USE_JAVA_VERSION_FOR_GRADLE }}" "${{ env.USE_KOTLIN_VERSION }}" "${{ env.USE_KSP_VERSION }}"
       shell: bash
     - name: 'Upload test reports (AGP ${{ env.USE_AGP_VERSION }})'
       if: ${{ always() }}

diff --git a/.github/actions/artifact-java-local-tests/action.yml b/.github/actions/artifact-java-local-tests/action.yml
@@ -12,14 +12,16 @@ runs:
         path: |
           ~/.gradle/caches
           ~/.gradle/wrapper
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        key: ${{ runner.os }}-gradle-java-${{ env.USE_JAVA_VERSION_FOR_GRADLE }}-kotlin-${{ env.USE_KOTLIN_VERSION }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
         restore-keys: |
+          ${{ runner.os }}-gradle-java-${{ env.USE_JAVA_VERSION_FOR_GRADLE }}-kotlin-${{ env.USE_KOTLIN_VERSION }}-
+          ${{ runner.os }}-gradle-java-${{ env.USE_JAVA_VERSION_FOR_GRADLE }}-
           ${{ runner.os }}-gradle-
     - name: 'Download local snapshot for tests'
       uses: actions/download-artifact@v4
       with:
         name: local-snapshot
         path: ~/.m2/repository/com/google/dagger
-    - name: 'Gradle Java local tests'
-      run: ./util/run-local-gradle-tests.sh
+    - name: 'Gradle Java local tests (Java ${{ env.USE_JAVA_VERSION_FOR_GRADLE }}, Kotlin ${{ env.USE_KOTLIN_VERSION }})'
+      run: ./util/run-local-gradle-tests.sh "${{ env.USE_JAVA_VERSION_FOR_GRADLE }}" "${{ env.USE_KOTLIN_VERSION }}" "${{ env.USE_KSP_VERSION }}"
       shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,13 +61,27 @@
       - uses: actions/checkout@v4
       - uses: ./.github/actions/artifact-verification-tests
   artifact-java-local-tests:
-    name: 'Artifact Java local tests'
+    name: 'Artifact Java local tests (Java ${{ matrix.java }}, Kotlin ${{ matrix.kotlin }})'
     needs: bazel-build
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - java: '11'
+            kotlin: '2.3.21'
+            ksp: '2.3.7'
+          - java: '21'
+            kotlin: '2.3.21'
+            ksp: '2.3.7'
+    env:
+      USE_JAVA_VERSION_FOR_GRADLE: ${{ matrix.java }}
+      USE_KOTLIN_VERSION: ${{ matrix.kotlin }}
+      USE_KSP_VERSION: ${{ matrix.ksp }}
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/artifact-java-local-tests
  test-gradle-plugin:
    name: 'Test Hilt Gradle plugin'
    needs: bazel-build
    runs-on: ubuntu-latest
@@ -75,13 +89,30 @@
       - uses: actions/checkout@v4
       - uses: ./.github/actions/test-gradle-plugin
   artifact-android-local-tests:
-    name: 'Artifact Android local tests'
+    name: 'Artifact Android local tests (AGP ${{ matrix.agp }}, Java ${{ matrix.java }}, Kotlin ${{ matrix.kotlin }})'
     needs: bazel-build
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - agp: '9.0.0'
+            java: '11'
+            kotlin: '2.3.21'
+            ksp: '2.3.7'
+          - agp: '9.0.0'
+            java: '21'
+            kotlin: '2.3.21'
+            ksp: '2.3.7'
+    env:
+      USE_AGP_VERSION: ${{ matrix.agp }}
+      USE_JAVA_VERSION_FOR_GRADLE: ${{ matrix.java }}
+      USE_KOTLIN_VERSION: ${{ matrix.kotlin }}
+      USE_KSP_VERSION: ${{ matrix.ksp }}
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/artifact-android-local-tests
  artifact-android-emulator-legacy-api-tests:
    name: 'Artifact Android emulator tests (API ${{ matrix.api-level }})'
    # We only run this on master push (essentially a postsubmit) since these
    # can take a while to run

diff --git a/javatests/artifacts/dagger-android-ksp/app/build.gradle b/javatests/artifacts/dagger-android-ksp/app/build.gradle
@@ -30,10 +30,6 @@ android {
         versionName "1.0"
     }
     namespace "dagger.android.ksp"
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
     testOptions {
         unitTests.includeAndroidResources = true
     }
@@ -48,9 +44,6 @@ android {
     }
 }
 
-kotlin {
-    jvmToolchain(17)
-}
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'

diff --git a/javatests/artifacts/dagger-android-ksp/build.gradle b/javatests/artifacts/dagger-android-ksp/build.gradle
@@ -16,13 +16,15 @@
 
 buildscript {
     ext {
-        agp_version = System.getenv('AGP_VERSION')
-        kotlin_version = "2.3.21"
-        ksp_version = "2.3.7"
+        agp_version = project.findProperty("agpVersion") ?: System.getenv('AGP_VERSION')
+        kotlin_version = project.findProperty("kotlinVersion") ?: "2.3.21"
+        ksp_version = project.findProperty("kspVersion") ?: "2.3.7"
+        java_version = project.findProperty("javaVersion") ?: "11"
     }
     repositories {
         google()
         mavenCentral()
+        gradlePluginPortal()
         mavenLocal()
     }
     dependencies {
@@ -42,4 +44,21 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
+}
+
+subprojects {
+    plugins.withType(com.android.build.gradle.BasePlugin).configureEach {
+        project.android {
+            compileOptions {
+                sourceCompatibility JavaVersion.toVersion(project.findProperty("javaVersion") ?: "11")
+                targetCompatibility JavaVersion.toVersion(project.findProperty("javaVersion") ?: "11")
+            }
+        }
+    }
+
+    plugins.withType(org.jetbrains.kotlin.gradle.plugin.KotlinBasePluginWrapper).configureEach {
+        kotlin {
+            jvmToolchain((project.findProperty("javaVersion") ?: "11").toInteger())
+        }
+    }
 }
diff --git a/javatests/artifacts/dagger-android/simple/app/build.gradle b/javatests/artifacts/dagger-android/simple/app/build.gradle
@@ -28,10 +28,6 @@ android {
         versionName "1.0"
     }
     namespace "dagger.android.simple"
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
     testOptions {
         unitTests.includeAndroidResources = true
     }

diff --git a/javatests/artifacts/dagger-android/simple/build.gradle b/javatests/artifacts/dagger-android/simple/build.gradle
@@ -16,7 +16,8 @@
 
 buildscript {
     ext {
-        agp_version = System.getenv('AGP_VERSION')
+        agp_version = project.findProperty("agpVersion") ?: System.getenv('AGP_VERSION')
+        java_version = project.findProperty("javaVersion") ?: "11"
     }
     repositories {
         google()
@@ -47,3 +48,14 @@ allprojects {
         }
     }
 }
+
+subprojects {
+    plugins.withType(com.android.build.gradle.BasePlugin).configureEach {
+        project.android {
+            compileOptions {
+                sourceCompatibility JavaVersion.toVersion(project.findProperty("javaVersion") ?: "11")
+                targetCompatibility JavaVersion.toVersion(project.findProperty("javaVersion") ?: "11")
+            }
+        }
+    }
+}
diff --git a/javatests/artifacts/dagger-ksp/build.gradle b/javatests/artifacts/dagger-ksp/build.gradle
@@ -17,8 +17,9 @@
 buildscript {
   ext {
     dagger_version = "LOCAL-SNAPSHOT"
-    kotlin_version = "2.3.21"
-    ksp_version = "2.3.7"
+    kotlin_version = project.findProperty("kotlinVersion") ?: "2.3.21"
+    ksp_version = project.findProperty("kspVersion") ?: "2.3.7"
+    java_version = project.findProperty("javaVersion") ?: "11"
     junit_version = "4.13"
     truth_version = "1.0.1"
   }
@@ -48,3 +49,13 @@ allprojects {
     }
   }
 }
+
+subprojects {
+  plugins.withType(JavaPlugin) {
+    java {
+      toolchain {
+        languageVersion = JavaLanguageVersion.of(java_version.toInteger())
+      }
+    }
+  }
+}
diff --git a/javatests/artifacts/dagger-ksp/kotlin-app/build.gradle b/javatests/artifacts/dagger-ksp/kotlin-app/build.gradle
@@ -20,12 +20,6 @@ plugins {
     id 'com.google.devtools.ksp'
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}
-
 dependencies {
   implementation project(path: ':kotlin-app:kotlin-library')
 

diff --git a/javatests/artifacts/dagger-ksp/kotlin-app/kotlin-library/build.gradle b/javatests/artifacts/dagger-ksp/kotlin-app/kotlin-library/build.gradle
@@ -21,7 +21,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(java_version.toInteger()))
     }
 }
 

diff --git a/javatests/artifacts/dagger/build.gradle b/javatests/artifacts/dagger/build.gradle
@@ -17,8 +17,9 @@
 buildscript {
   ext {
     dagger_version = "LOCAL-SNAPSHOT"
-    kotlin_version = "2.3.21"
-    ksp_version = "2.3.7"
+    kotlin_version = project.findProperty("kotlinVersion") ?: "2.3.21"
+    ksp_version = project.findProperty("kspVersion") ?: "2.3.7"
+    java_version = project.findProperty("javaVersion") ?: "11"
     junit_version = "4.13"
     truth_version = "1.0.1"
   }
@@ -40,3 +41,15 @@ allprojects {
     }
   }
 }
+
+subprojects {
+  if (name != 'build-tests') {
+    plugins.withType(JavaPlugin) {
+      java {
+        toolchain {
+          languageVersion = JavaLanguageVersion.of(java_version.toInteger())
+        }
+      }
+    }
+  }
+}
diff --git a/javatests/artifacts/dagger/java-app/build.gradle b/javatests/artifacts/dagger/java-app/build.gradle
@@ -19,12 +19,6 @@ plugins {
   id 'application'
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}
-
 dependencies {
   implementation "com.google.dagger:dagger:$dagger_version"
   annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"

diff --git a/javatests/artifacts/dagger/kotlin-app/build.gradle b/javatests/artifacts/dagger/kotlin-app/build.gradle
@@ -20,12 +20,6 @@ plugins {
     id 'org.jetbrains.kotlin.kapt' version "$kotlin_version"
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}
-
 dependencies {
   implementation project(path: ':kotlin-app:kotlin-library')
 

diff --git a/javatests/artifacts/dagger/kotlin-app/kotlin-library/build.gradle b/javatests/artifacts/dagger/kotlin-app/kotlin-library/build.gradle
@@ -21,7 +21,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(java_version.toInteger()))
     }
 }
 

diff --git a/javatests/artifacts/dagger/transitive-annotation-app/build.gradle b/javatests/artifacts/dagger/transitive-annotation-app/build.gradle
@@ -19,12 +19,6 @@ plugins {
   id 'application'
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}
-
 dependencies {
   implementation project(":transitive-annotation-app:library1")
   implementation "com.google.dagger:dagger:$dagger_version"

diff --git a/javatests/artifacts/dagger/transitive-annotation-app/library1/build.gradle b/javatests/artifacts/dagger/transitive-annotation-app/library1/build.gradle
@@ -19,12 +19,6 @@ plugins {
   id 'java-library'
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}
-
 dependencies {
   implementation project(":transitive-annotation-app:library2")
   implementation "com.google.dagger:dagger:$dagger_version"

diff --git a/javatests/artifacts/dagger/transitive-annotation-app/library2/build.gradle b/javatests/artifacts/dagger/transitive-annotation-app/library2/build.gradle
@@ -18,9 +18,3 @@ plugins {
   id 'java'
   id 'java-library'
 }
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}
diff --git a/javatests/artifacts/dagger/transitive-annotation-kotlin-app/build.gradle b/javatests/artifacts/dagger/transitive-annotation-kotlin-app/build.gradle
@@ -20,12 +20,6 @@ plugins {
   id 'org.jetbrains.kotlin.kapt' version "$kotlin_version"
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}
-
 kapt {
   correctErrorTypes = true
 }

diff --git a/javatests/artifacts/dagger/transitive-annotation-kotlin-app/library1/build.gradle b/javatests/artifacts/dagger/transitive-annotation-kotlin-app/library1/build.gradle
@@ -20,12 +20,6 @@ plugins {
   id 'org.jetbrains.kotlin.kapt'
 }
 
-java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(11))
-  }
-}
-
 kapt {
   correctErrorTypes = true
 }

diff --git a/javatests/artifacts/dagger/transitive-annotation-kotlin-app/library2/build.gradle b/javatests/artifacts/dagger/transitive-annotation-kotlin-app/library2/build.gradle
@@ -23,9 +23,3 @@ plugins {
 kapt {
   correctErrorTypes = true
 }
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}
diff --git a/javatests/artifacts/hilt-android/simple/app-java-only/build.gradle b/javatests/artifacts/hilt-android/simple/app-java-only/build.gradle
@@ -29,10 +29,6 @@ android {
         versionName "1.0"
     }
     namespace "dagger.hilt.android.simple"
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
     testOptions {
         unitTests.includeAndroidResources = true
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ plugins { @@
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(11))
+            languageVersion.set(JavaLanguageVersion.of(java_version.toInteger()))
         }
     }
@@ Expand Down @@