Repository navigation
ADFA-6400: Prepare the build scripts for Gradle 9 - #2271
Open
Daniel-ADFA wants to merge 2 commits into
Open
Daniel-ADFA wants to merge 2 commits into
Daniel-ADFA wants to merge 2 commits into
Conversation
Changes that Gradle 9.6.1 and AGP 9.3.1 need, made so they also work on
the current Gradle 8.14.4 and AGP 8.8.2:
- settings.gradle.kts no longer includes :compose-preview, whose
directory went away when it moved into a plugin. Gradle 9 refuses to
configure a project without a directory.
- SigningKeyUtils runs the key download through providers.exec;
Project.exec is gone in Gradle 9.
- AndroidModuleConf sets lint and packaging through properties. AGP 9's
CommonExtension has no lint {} or packaging {} blocks.
- gradle-wrapper.zip is built from Gradle's public Wrapper task instead
of IDEWrapperGenerator and GradleVersionResolver, a copy of Gradle's
wrapper task built on internals that changed in Gradle 9. The zip has
the same jar and properties as before; gradlew is Gradle's current
script, which runs the wrapper jar with -jar.
There was a problem hiding this comment.
Claude Code Review
This repository is configured for manual code reviews. Comment @claude review for a one-time review, or @claude review always to subscribe this PR to a review on every future push.
Tip: disable this comment in your organization's Code Review settings.
Daniel-ADFA
changed the base branch from
stage
to
feat/ADFA-6400-build-toolchain
November 16, 2026 19:11
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
ADFA-6400
First step of moving CoGo's own build to Gradle 9.6.1 and AGP 9.3.1. These are the build-script changes Gradle 9 and AGP 9 need, made so they also work on today's Gradle 8.14.4 and AGP 8.8.2. The version bump comes in a follow-up PR.
settings.gradle.ktsdrops:compose-preview, whose directory went away when it moved into a plugin. Gradle 9 refuses to configure it.SigningKeyUtilsusesproviders.exec;Project.execis gone in Gradle 9.AndroidModuleConfsetslintandpackagingthrough properties; AGP 9'sCommonExtensionhas nolint {}orpackaging {}blocks.gradle-wrapper.zipis built with Gradle's publicWrappertask.IDEWrapperGeneratorandGradleVersionResolver(a copy of Gradle's wrapper task on internals that changed in Gradle 9) are deleted. The zip keeps the same jar and properties;gradlewis Gradle's current script, which runs the jar with-jar.Review by commit: the first is a Spotless reformat of
GradleWrapperGeneratorTask.ktonly.Tested:
:app:assembleV8DebugandspotlessCheckpass, and the APK carriesassets/data/common/gradle-wrapper.zip; the zippedgradlewstarts Gradle 9.6.1. With Gradle 9.6.1 and AGP 9.3.1 switched in locally, build-logic compiles. Not run: the signing-key download, which needs CI secrets.