Skip to content
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

[3.x] Update Android dependencies for the project #87588

Merged
merged 1 commit into from
Jan 29, 2024

Conversation

m4gr3d
Copy link
Contributor

@m4gr3d m4gr3d commented Jan 25, 2024

Manual cherry-pick from #87346, #83515, #84674 and #86383 to the 3.x branch.

  • Update Java version from 11 to 17
    • Introduce an editor setting to allow users the ability to specify the path to the Java SDK used for the Android gradle build. At build time, a gradle task validates the java version and prints out an error if it doesn't match the target version
Screenshot 2023-12-21 at 3 25 47 AM
  • Update Android gradle plugin version from 7.2.1 to 8.2.0
  • Update gradle version from 7.4.2 to 8.2
  • Update target SDK from 33 to 34
  • Update build tools version from 33.0.2 to 34.0.0
  • Update kotlin version from 1.7.0 to 1.9.20
  • Update Android fragment version from 1.3.6 to 1.6.2
  • Update AndroidX window version from 1.0.0 to 1.2.0
  • Update Nexus plugin version from 1.1.0 to 1.3.0

Fixes #87072 for the 3.x branch

Notes:

- Update Java version from 11 to 17
- Update Android gradle plugin version from 7.2.1 to 8.2.0
- Update gradle version from 7.4.2 to 8.2
- Update target SDK from 33 to 34
- Update build tools version from 33.0.2 to 34.0.0
- Update kotlin version from 1.7.0 to 1.9.20
- Update Android fragment version from 1.3.6 to 1.6.2
- Update AndroidX window version from 1.0.0 to 1.2.0
- Update Nexus plugin version from 1.1.0 to 1.3.0
@m4gr3d m4gr3d force-pushed the update_android_dependencies_3x branch from a945bf3 to eba77be Compare January 25, 2024 21:58
@lawnjelly
Copy link
Member

Looks fine to me but I am far from Android expert. 👍
Still draft so expecting more work on it, will leave for Akien to do his own review.

@m4gr3d m4gr3d marked this pull request as ready for review January 29, 2024 02:48
@m4gr3d m4gr3d requested review from a team as code owners January 29, 2024 02:48
@m4gr3d
Copy link
Contributor Author

m4gr3d commented Jan 29, 2024

I performed a similar round of testing as for #86383, and didn't uncover any regressions.
Additional testing is welcomed, but from my point of view, this looks good to go!

Copy link
Member

@lawnjelly lawnjelly left a comment

Choose a reason for hiding this comment

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

Leaving @akien-mga to do final check.

Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

Looks great!

@akien-mga akien-mga merged commit d1b6b6f into godotengine:3.x Jan 29, 2024
13 checks passed
@m4gr3d m4gr3d deleted the update_android_dependencies_3x branch January 29, 2024 22:31
@akien-mga
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants