Skip to content

Miscellaneous cleanup for the Android codebase#36798

Merged
akien-mga merged 1 commit into
godotengine:masterfrom
m4gr3d:android_codebase_misc_cleanup
Mar 5, 2020
Merged

Miscellaneous cleanup for the Android codebase#36798
akien-mga merged 1 commit into
godotengine:masterfrom
m4gr3d:android_codebase_misc_cleanup

Conversation

@m4gr3d

@m4gr3d m4gr3d commented Mar 4, 2020

Copy link
Copy Markdown
Contributor

Miscellaneous cleanup for the Android codebase:

  • update gradle plugins versions
  • add formatting rules for AndroidManifest and gradle build files
  • cleanup java_godot_lib_jni

Note: logic was mostly moved around and no new logic/functionality was added.

@m4gr3d m4gr3d requested review from a team and akien-mga March 4, 2020 17:23
@m4gr3d m4gr3d added this to the 4.0 milestone Mar 4, 2020
@m4gr3d m4gr3d added cherrypick:3.x Considered for cherry-picking into a future 3.x release platform:android labels Mar 4, 2020
- update gradle plugins versions
- add formatting rules for AndroidManifest and gradle build files
- cleanup java_godot_lib_jni

Note: logic was mostly moved around and no new logic/functionality was added.
@m4gr3d m4gr3d force-pushed the android_codebase_misc_cleanup branch from e1a30ff to b38283a Compare March 4, 2020 20:16
@akien-mga akien-mga merged commit fbaa55a into godotengine:master Mar 5, 2020
@akien-mga

Copy link
Copy Markdown
Member

Thanks!

@m4gr3d m4gr3d deleted the android_codebase_misc_cleanup branch March 5, 2020 15:56
@m4gr3d

m4gr3d commented Mar 5, 2020

Copy link
Copy Markdown
Contributor Author

@akien-mga Should I provide a separate version of this PR against the 3.2 branch?

@akien-mga

Copy link
Copy Markdown
Member

No the cherrypick:3.2 already means that I'll cherrypick this for the 3.2 branch when I come to it.

@akien-mga

Copy link
Copy Markdown
Member

Actually this can't be cherry-picked easily for 3.2 currently. Maybe I missed an intermediate PR that should also be cherry-picked? Otherwise I guess a dedicated PR for 3.2 would make sense indeed.

@m4gr3d

m4gr3d commented Mar 25, 2020

Copy link
Copy Markdown
Contributor Author

Actually this can't be cherry-picked easily for 3.2 currently. Maybe I missed an intermediate PR that should also be cherry-picked? Otherwise I guess a dedicated PR for 3.2 would make sense indeed.

@akien-mga I've added PR #37300 as a dedicated PR for 3.2.

@akien-mga akien-mga added topic:buildsystem and removed cherrypick:3.x Considered for cherry-picking into a future 3.x release labels Mar 25, 2020
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.

2 participants