Skip to content

AGP 9.0 migration#2719

Open
HrBDev wants to merge 6 commits into
celzero:mainfrom
HrBDev:main
Open

AGP 9.0 migration#2719
HrBDev wants to merge 6 commits into
celzero:mainfrom
HrBDev:main

Conversation

@HrBDev

@HrBDev HrBDev commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

No description provided.

@ignoramous

Copy link
Copy Markdown
Collaborator

Hi. Thanks. Glad to see you contributing again.

Does F-Droid now support AGP 9 (ref)? Believe their build servers are one reason we're stuck with AGP 8.x, or may be we can split the build steps to use AGP 8 or 9 depending on the variant?

@HrBDev

HrBDev commented Jun 19, 2026

Copy link
Copy Markdown
Contributor Author

Thanks
I believe the AGP issue has been resolved for some time already.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR migrates the Android build to the AGP 9.x / newer Gradle toolchain, updating wrapper scripts, centralizing dependency repositories, and modernizing module build configuration (variant API + Kotlin compiler options).

Changes:

  • Introduces dependencyResolutionManagement in settings.gradle and removes common repos from allprojects.
  • Updates Gradle wrapper (scripts + gradle-wrapper.properties) to a newer Gradle distribution.
  • Bumps AGP/Kotlin and multiple Android library dependency versions; migrates ABI versionCode logic to the androidComponents API.

Reviewed changes

Copilot reviewed 5 out of 7 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
settings.gradle Adds centralized repository management via dependencyResolutionManagement.
gradlew.bat Updates Windows Gradle wrapper script logic/behavior.
gradlew Updates POSIX Gradle wrapper script template.
gradle/wrapper/gradle-wrapper.properties Updates Gradle distribution URL and wrapper settings.
build.gradle Bumps AGP/Kotlin tooling; adjusts repository configuration; updates clean task.
app/build.gradle Migrates variant/output versionCode logic; updates Kotlin compiler configuration and dependencies.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread settings.gradle
include ':app',':tun2socks'

dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
Comment thread app/build.gradle
Comment on lines 5 to 8
plugins {
id 'com.android.application'
id 'com.google.devtools.ksp'
id 'kotlin-android'
}
Comment thread gradlew.bat
Comment on lines +50 to +54
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail
"%COMSPEC%" /c exit 1
Comment thread gradlew.bat
Comment on lines +64 to +68
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail
"%COMSPEC%" /c exit 1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants