Reenable AGP 9 in HiltGradlePlugin. #5084
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NEW: Upgraded AGP from 9.0.0-beta05 to 9.0.0.
*** Original change description ***
This required a number of changes:
* Updated Gradle 8.14.3 -> 9.2.0
* Updated shadow plugin from com.github.johnrengelman.shadow:8.1.1 to 'com.gradleup.shadow:9.2.2' (old artifact doesn't support Gradle 9).
* Updated HiltGradlePlugin to 9.0.0-beta05:
* Migrated BaseExtension to AndroidComponentsExtension
* Migrated BaseVariant to Component
* Migrated variant.javaCompileOutput.classpath to variant.compileClasspath
* Migrated variant.javaCompileOutput.destinationDirectory to variant.artifacts.use(HiltCopyTask).toGet()
* Migrated variant.javaCompileOutput.options.bootstrapClasspath with androidExtension.sdkComponents.bootClasspath
* Migrated variant.javaCompileOutput.options.compilerArgumentProviders with variant.javaCompilation.annotationProcessor.argumentProviders
project.buildDir = ... to project.layout.buildDirectory.set(...)
* Updated HiltGradlePlugin tests to use AGP 9.0.0-beta05:
* Migrate to builtin kotlin
* removed 'kotlin-android'
* replaced 'kotlin-kapt' with 'legacy-kapt'
* Migrated javatests/artifacts/hilt-android/simple/app/build.gradle to kts and replace GradleVersion with custom AgpVersion. The GradleVersion does not work with APG versions like 9.0.0-beta02, so I had to do this with custom parsing.
* removed android.kotlinOptions (removed in AGP 9)
* removed android.useAndroidX=true (default in AGP 9)
* added android.disallowKotlinSourceSets=false (workaround for google/ksp#2729)
***
RELNOTES=The next Dagger release will require AGP 9 when using the HiltGradlePlugin. This requirement is due to certain fixes only being available in AGP 9.
PiperOrigin-RevId: 857185342
copybara-service
bot
force-pushed
the
test_857185342
branch
from
c64b452 to
3d3aab7
Compare
Goooler
reviewed
Jan 17, 2026
Goooler
reviewed
Jan 17, 2026
Goooler
reviewed
Jan 17, 2026
Goooler
reviewed
Jan 17, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reenable AGP 9 in HiltGradlePlugin.
NEW: Upgraded AGP from 9.0.0-beta05 to 9.0.0.
*** Original change description ***
This required a number of changes:
project.buildDir = ... to project.layout.buildDirectory.set(...)
RELNOTES=The next Dagger release will require AGP 9 when using the HiltGradlePlugin. This requirement is due to certain fixes only being available in AGP 9.