-
-
Notifications
You must be signed in to change notification settings - Fork 21.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upgrade Android Gradle to version 7.2 #53610
Conversation
@madmiraal Thanks for the upgrade! This version of the Android gradle plugin may deprecate the enableResourceOptimizations flag which would reintroduce #50623. Could you check that it's not the case. @akien-mga FYI, we may need to deprecate the legacy build system for release builds in the near future, as I'm uncertain how we would avoid #50623 if the |
@madmiraal FYI, you can see the deprecation warning when compiling the Godot Android templates with the current version (4.2.1) of the Android gradle plugin:
|
I've confirmed that upgrading the AGP to 7.0.2 does not reintroduce #50623.
Despite the warning message stating that "It will be removed in version 7.0 of the Android Gradle plugin.", the deprecation "has been reverted to being softly enforced": https://issuetracker.google.com/issues/184666005#comment4. It's still something that will ultimately need to be addressed. I suggest we open a separate issue for it. |
@madmiraal Thanks for checking! The PR is missing the update to the @akien-mga FYI, as the ci config may need to be updated as well. |
Oops! That will also explain why the CI test passed. Somehow that got missed when I recreated this commit after creating #53609. 😕
This is why I created #53609 (and updated the documentation: godotengine/godot-docs#5312 and godotengine/godot-docs#5315). |
0143e6b
to
59dcc01
Compare
Updated the I've also reconfirmed that the PR still does not reintroduce #50623. Note: The warning has also been updated to say that
|
@@ -1,5 +1,5 @@ | |||
ext.versions = [ | |||
androidGradlePlugin: '4.2.2', | |||
androidGradlePlugin: '7.0.3', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The javaVersion
property below should be updated as well to JavaVersion.VERSION_11
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. I've used the simple 11
format[1] to keep it tidy and consistent with the other entries.
Sounds good! There is one more missing update (added a comment) and it should be good to go! |
59dcc01
to
95b1275
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great, thanks!
Thanks! |
Cherry-picked for 3.4. |
Upgrades Android Gradle build tools to the current stable version: 7.2, the Android Gradle plug-in to the current stable version 7.0.3, and the supported Java version to 11.
The upgrade was done using
./gradlew wrapper --gradle-version 7.2 --distribution-type bin
. This ensures that the gradle wrapper (gradle-wrapper.jar
) and the gradle wrapper scripts (gradlew
andgradlew.bat
) are upgraded too. Furthermore, using--distribution-type bin
(the default) ensures that only the binaries are installed instead of the source and documentation, which has being done since #31919 for no good reason I could identify.Includes updating the
.gitattributes
file to ensure that the Windows onlygradlew.bat
file's line endings are not changed by git fromCRLF
toLF
.Can be cherry-picked for 3.x.
The Android Gradle plug-in 7.0 is dependent on JDK 11, so #53609 is required for passing CI.