-
Notifications
You must be signed in to change notification settings - Fork 612
Fix part of #2747, #1532: Remove support for Gradle #5652
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
Conversation
This removes the actual Gradle build infrastructure and CI workflows. It also updates some TODO references to no longer reference Gradle (as there are additional blockers for that work) and updates CODEOWNERS and .gitignore accordingly. Some unnecesary files have also been removed.
This aligns with Bazel best practices and is preferred over the suffix (which was only needed due to Gradle having some issues with files named 'BUILD'.
Bazel is now the only platform that these tests can run on. Note that no tests were Gradle-specific.
It is only used for checking if a test is running in Bazel, and all tests are now. One Gradle-specific test has been removed.
This is only used when running tests with Gradle. We may eventually need to reintroduce someting like this for Espresso support in the future, but it's not yet clear if that's the case.
APK & AAB differences analysisNote that this is a summarized snapshot. See the CI artifacts for detailed differences. DevExpand to see flavor specificsUniversal APKAPK file size: 19 MiB (old), 19 MiB (new), 20 bytes (Removed) APK download size (estimated): 17 MiB (old), 17 MiB (new), 33 bytes (Removed) Method count: 260219 (old), 260219 (new), 0 (No change) Features: 2 (old), 2 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 6818 (old), 6818 (new), 0 (No change)
Lesson assets: 111 (old), 111 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 18 MiB (old), 18 MiB (new), 16 bytes (Removed) Configuration hdpiAPK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change) Configuration ldpiAPK file size: 49 KiB (old), 49 KiB (new), 0 bytes (No change) Configuration mdpiAPK file size: 45 KiB (old), 45 KiB (new), 0 bytes (No change) Configuration tvdpiAPK file size: 86 KiB (old), 86 KiB (new), 0 bytes (No change) Configuration xhdpiAPK file size: 57 KiB (old), 57 KiB (new), 0 bytes (No change) Configuration xxhdpiAPK file size: 63 KiB (old), 63 KiB (new), 0 bytes (No change) Configuration xxxhdpiAPK file size: 63 KiB (old), 63 KiB (new), 0 bytes (No change) AlphaExpand to see flavor specificsUniversal APKAPK file size: 11 MiB (old), 11 MiB (new), 16 bytes (Removed) APK download size (estimated): 10 MiB (old), 10 MiB (new), 11 bytes (Added) Method count: 116287 (old), 116287 (new), 0 (No change) Features: 2 (old), 2 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 5786 (old), 5786 (new), 0 (No change)
Lesson assets: 111 (old), 111 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 11 MiB (old), 11 MiB (new), 16 bytes (Removed) Configuration hdpiAPK file size: 43 KiB (old), 43 KiB (new), 0 bytes (No change) Configuration ldpiAPK file size: 44 KiB (old), 44 KiB (new), 0 bytes (No change) Configuration mdpiAPK file size: 38 KiB (old), 38 KiB (new), 0 bytes (No change) Configuration tvdpiAPK file size: 73 KiB (old), 73 KiB (new), 0 bytes (No change) Configuration xhdpiAPK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change) Configuration xxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) Configuration xxxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) BetaExpand to see flavor specificsUniversal APKAPK file size: 11 MiB (old), 11 MiB (new), 20 bytes (Removed) APK download size (estimated): 10 MiB (old), 10 MiB (new), 32 bytes (Removed) Method count: 116293 (old), 116293 (new), 0 (No change) Features: 2 (old), 2 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 5786 (old), 5786 (new), 0 (No change)
Lesson assets: 111 (old), 111 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 11 MiB (old), 11 MiB (new), 16 bytes (Removed) Configuration hdpiAPK file size: 43 KiB (old), 43 KiB (new), 0 bytes (No change) Configuration ldpiAPK file size: 44 KiB (old), 44 KiB (new), 0 bytes (No change) Configuration mdpiAPK file size: 38 KiB (old), 38 KiB (new), 0 bytes (No change) Configuration tvdpiAPK file size: 73 KiB (old), 73 KiB (new), 0 bytes (No change) Configuration xhdpiAPK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change) Configuration xxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) Configuration xxxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) GaExpand to see flavor specificsUniversal APKAPK file size: 11 MiB (old), 11 MiB (new), 20 bytes (Removed) APK download size (estimated): 10 MiB (old), 10 MiB (new), 63 bytes (Added) Method count: 116293 (old), 116293 (new), 0 (No change) Features: 2 (old), 2 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 5786 (old), 5786 (new), 0 (No change)
Lesson assets: 111 (old), 111 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 11 MiB (old), 11 MiB (new), 20 bytes (Removed) Configuration hdpiAPK file size: 43 KiB (old), 43 KiB (new), 0 bytes (No change) Configuration ldpiAPK file size: 44 KiB (old), 44 KiB (new), 0 bytes (No change) Configuration mdpiAPK file size: 38 KiB (old), 38 KiB (new), 0 bytes (No change) Configuration tvdpiAPK file size: 73 KiB (old), 73 KiB (new), 0 bytes (No change) Configuration xhdpiAPK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change) Configuration xxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) Configuration xxxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) |
Once modularization work is completed, this will be the only Android manifest in the codebase. Since it contains high-level definitions of the app structure, it makes sense to exist at the top level.
APK & AAB differences analysisNote that this is a summarized snapshot. See the CI artifacts for detailed differences. DevExpand to see flavor specificsUniversal APKAPK file size: 19 MiB (old), 19 MiB (new), 124 bytes (Added) APK download size (estimated): 17 MiB (old), 17 MiB (new), 1103 bytes (Added) Method count: 260219 (old), 260219 (new), 0 (No change) Features: 2 (old), 2 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 6818 (old), 6818 (new), 0 (No change)
Lesson assets: 111 (old), 111 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 18 MiB (old), 18 MiB (new), 124 bytes (Added) Configuration hdpiAPK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change) Configuration ldpiAPK file size: 49 KiB (old), 49 KiB (new), 0 bytes (No change) Configuration mdpiAPK file size: 45 KiB (old), 45 KiB (new), 0 bytes (No change) Configuration tvdpiAPK file size: 86 KiB (old), 86 KiB (new), 0 bytes (No change) Configuration xhdpiAPK file size: 57 KiB (old), 57 KiB (new), 0 bytes (No change) Configuration xxhdpiAPK file size: 63 KiB (old), 63 KiB (new), 0 bytes (No change) Configuration xxxhdpiAPK file size: 63 KiB (old), 63 KiB (new), 0 bytes (No change) AlphaExpand to see flavor specificsUniversal APKAPK file size: 11 MiB (old), 11 MiB (new), 20 bytes (Removed) APK download size (estimated): 10 MiB (old), 10 MiB (new), 81 bytes (Added) Method count: 116287 (old), 116287 (new), 0 (No change) Features: 2 (old), 2 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 5786 (old), 5786 (new), 0 (No change)
Lesson assets: 111 (old), 111 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 11 MiB (old), 11 MiB (new), 16 bytes (Removed) Configuration hdpiAPK file size: 43 KiB (old), 43 KiB (new), 0 bytes (No change) Configuration ldpiAPK file size: 44 KiB (old), 44 KiB (new), 0 bytes (No change) Configuration mdpiAPK file size: 38 KiB (old), 38 KiB (new), 0 bytes (No change) Configuration tvdpiAPK file size: 73 KiB (old), 73 KiB (new), 0 bytes (No change) Configuration xhdpiAPK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change) Configuration xxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) Configuration xxxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) BetaExpand to see flavor specificsUniversal APKAPK file size: 11 MiB (old), 11 MiB (new), 20 bytes (Removed) APK download size (estimated): 10 MiB (old), 10 MiB (new), 149 bytes (Removed) Method count: 116293 (old), 116293 (new), 0 (No change) Features: 2 (old), 2 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 5786 (old), 5786 (new), 0 (No change)
Lesson assets: 111 (old), 111 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 11 MiB (old), 11 MiB (new), 16 bytes (Removed) Configuration hdpiAPK file size: 43 KiB (old), 43 KiB (new), 0 bytes (No change) Configuration ldpiAPK file size: 44 KiB (old), 44 KiB (new), 0 bytes (No change) Configuration mdpiAPK file size: 38 KiB (old), 38 KiB (new), 0 bytes (No change) Configuration tvdpiAPK file size: 73 KiB (old), 73 KiB (new), 0 bytes (No change) Configuration xhdpiAPK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change) Configuration xxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) Configuration xxxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) GaExpand to see flavor specificsUniversal APKAPK file size: 11 MiB (old), 11 MiB (new), 24 bytes (Removed) APK download size (estimated): 10 MiB (old), 10 MiB (new), 139 bytes (Added) Method count: 116293 (old), 116293 (new), 0 (No change) Features: 2 (old), 2 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 5786 (old), 5786 (new), 0 (No change)
Lesson assets: 111 (old), 111 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 11 MiB (old), 11 MiB (new), 20 bytes (Removed) Configuration hdpiAPK file size: 43 KiB (old), 43 KiB (new), 0 bytes (No change) Configuration ldpiAPK file size: 44 KiB (old), 44 KiB (new), 0 bytes (No change) Configuration mdpiAPK file size: 38 KiB (old), 38 KiB (new), 0 bytes (No change) Configuration tvdpiAPK file size: 73 KiB (old), 73 KiB (new), 0 bytes (No change) Configuration xhdpiAPK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change) Configuration xxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) Configuration xxxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) |
Specifically, this: - Adds/removes CODEOWNER changes per file updates. - Fixes two validation checks (which was confirmed). - Removes redundant tests now that Gradle support has been removed.
It seems cleaner to retain the explicit extension in the long-term.
BenHenning
left a comment
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.
Self-reviewed all changes.
...redTest/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragmentTest.kt
Show resolved
Hide resolved
Coverage ReportResultsNumber of files assessed: 58 Failing coverage
Passing coverageFiles with passing code coverage
Exempted coverageFiles exempted from coverage
|
APK & AAB differences analysisNote that this is a summarized snapshot. See the CI artifacts for detailed differences. DevExpand to see flavor specificsUniversal APKAPK file size: 19 MiB (old), 19 MiB (new), 100 bytes (Removed) APK download size (estimated): 17 MiB (old), 17 MiB (new), 266 bytes (Removed) Method count: 260263 (old), 260263 (new), 0 (No change) Features: 2 (old), 2 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 6820 (old), 6820 (new), 0 (No change)
Lesson assets: 111 (old), 111 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 18 MiB (old), 18 MiB (new), 100 bytes (Removed) Configuration hdpiAPK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change) Configuration ldpiAPK file size: 49 KiB (old), 49 KiB (new), 0 bytes (No change) Configuration mdpiAPK file size: 45 KiB (old), 45 KiB (new), 0 bytes (No change) Configuration tvdpiAPK file size: 86 KiB (old), 86 KiB (new), 0 bytes (No change) Configuration xhdpiAPK file size: 57 KiB (old), 57 KiB (new), 0 bytes (No change) Configuration xxhdpiAPK file size: 63 KiB (old), 63 KiB (new), 0 bytes (No change) Configuration xxxhdpiAPK file size: 63 KiB (old), 63 KiB (new), 0 bytes (No change) AlphaExpand to see flavor specificsUniversal APKAPK file size: 11 MiB (old), 11 MiB (new), 20 bytes (Removed) APK download size (estimated): 10 MiB (old), 10 MiB (new), 74 bytes (Removed) Method count: 115793 (old), 115793 (new), 0 (No change) Features: 2 (old), 2 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 5788 (old), 5788 (new), 0 (No change)
Lesson assets: 111 (old), 111 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 11 MiB (old), 11 MiB (new), 16 bytes (Removed) Configuration hdpiAPK file size: 43 KiB (old), 43 KiB (new), 0 bytes (No change) Configuration ldpiAPK file size: 44 KiB (old), 44 KiB (new), 0 bytes (No change) Configuration mdpiAPK file size: 38 KiB (old), 38 KiB (new), 0 bytes (No change) Configuration tvdpiAPK file size: 73 KiB (old), 73 KiB (new), 0 bytes (No change) Configuration xhdpiAPK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change) Configuration xxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) Configuration xxxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) BetaExpand to see flavor specificsUniversal APKAPK file size: 11 MiB (old), 11 MiB (new), 20 bytes (Removed) APK download size (estimated): 10 MiB (old), 10 MiB (new), 102 bytes (Removed) Method count: 115799 (old), 115799 (new), 0 (No change) Features: 2 (old), 2 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 5788 (old), 5788 (new), 0 (No change)
Lesson assets: 111 (old), 111 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 10 MiB (old), 10 MiB (new), 20 bytes (Removed) Configuration hdpiAPK file size: 43 KiB (old), 43 KiB (new), 0 bytes (No change) Configuration ldpiAPK file size: 44 KiB (old), 44 KiB (new), 0 bytes (No change) Configuration mdpiAPK file size: 38 KiB (old), 38 KiB (new), 0 bytes (No change) Configuration tvdpiAPK file size: 73 KiB (old), 73 KiB (new), 0 bytes (No change) Configuration xhdpiAPK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change) Configuration xxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) Configuration xxxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) GaExpand to see flavor specificsUniversal APKAPK file size: 11 MiB (old), 11 MiB (new), 8 bytes (Removed) APK download size (estimated): 10 MiB (old), 10 MiB (new), 178 bytes (Removed) Method count: 115799 (old), 115799 (new), 0 (No change) Features: 2 (old), 2 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 5788 (old), 5788 (new), 0 (No change)
Lesson assets: 111 (old), 111 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 10 MiB (old), 10 MiB (new), 12 bytes (Removed) Configuration hdpiAPK file size: 43 KiB (old), 43 KiB (new), 0 bytes (No change) Configuration ldpiAPK file size: 44 KiB (old), 44 KiB (new), 0 bytes (No change) Configuration mdpiAPK file size: 38 KiB (old), 38 KiB (new), 0 bytes (No change) Configuration tvdpiAPK file size: 73 KiB (old), 73 KiB (new), 0 bytes (No change) Configuration xhdpiAPK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change) Configuration xxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) Configuration xxxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change) |
|
TODO: Consider removing references to 'module' as well since that's Gradle specific in most uses and may add confusion. |
|
Hi @BenHenning, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue. |
|
PTAL for codeowners @seanlip and @adhiamboperes. PTAL specifically for infrastructure, documentation, and lint changes @manas-yu. @adhiamboperes and @manas-yu you are probably both broadly interested in all of the changes here since they are so far-reaching. /cc @subhajitxyz as well for FYI. |
seanlip
left a comment
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.
Thanks @BenHenning! LGTM for codeowners, left 2 comments.
APK & AAB differences analysisNote that this is a summarized snapshot. See the CI artifacts for detailed differences. DevExpand to see flavor specificsUniversal APKAPK file size: 19 MiB (old), 19 MiB (new), 31 KiB (Removed) APK download size (estimated): 18 MiB (old), 18 MiB (new), 30 KiB (Removed) Method count: 265429 (old), 264883 (new), 546 (Removed) Features: 1 (old), 1 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 7085 (old), 7075 (new), 10 (Removed)
Lesson assets: 113 (old), 113 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 19 MiB (old), 19 MiB (new), 31 KiB (Removed)
Configuration hdpiAPK file size: 50 KiB (old), 50 KiB (new), 32 bytes (Removed) Configuration ldpiAPK file size: 49 KiB (old), 49 KiB (new), 40 bytes (Removed) Configuration mdpiAPK file size: 46 KiB (old), 46 KiB (new), 32 bytes (Removed) Configuration tvdpiAPK file size: 86 KiB (old), 86 KiB (new), 56 bytes (Removed) Configuration xhdpiAPK file size: 57 KiB (old), 57 KiB (new), 40 bytes (Removed) Configuration xxhdpiAPK file size: 63 KiB (old), 63 KiB (new), 32 bytes (Removed) Configuration xxxhdpiAPK file size: 64 KiB (old), 64 KiB (new), 32 bytes (Removed) AlphaExpand to see flavor specificsUniversal APKAPK file size: 11 MiB (old), 11 MiB (new), 66 KiB (Removed) APK download size (estimated): 10 MiB (old), 10 MiB (new), 59 KiB (Removed) Method count: 119982 (old), 119128 (new), 854 (Removed) Features: 1 (old), 1 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 6040 (old), 6030 (new), 10 (Removed)
Lesson assets: 114 (old), 114 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 11 MiB (old), 11 MiB (new), 66 KiB (Removed)
Configuration hdpiAPK file size: 43 KiB (old), 43 KiB (new), 24 bytes (Removed) Configuration ldpiAPK file size: 45 KiB (old), 45 KiB (new), 40 bytes (Removed) Configuration mdpiAPK file size: 38 KiB (old), 38 KiB (new), 24 bytes (Removed) Configuration tvdpiAPK file size: 73 KiB (old), 73 KiB (new), 40 bytes (Removed) Configuration xhdpiAPK file size: 50 KiB (old), 50 KiB (new), 32 bytes (Removed) Configuration xxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 24 bytes (Removed) Configuration xxxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 24 bytes (Removed) BetaExpand to see flavor specificsUniversal APKAPK file size: 11 MiB (old), 11 MiB (new), 66 KiB (Removed) APK download size (estimated): 10 MiB (old), 10 MiB (new), 61 KiB (Removed) Method count: 119988 (old), 119134 (new), 854 (Removed) Features: 1 (old), 1 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 6040 (old), 6030 (new), 10 (Removed)
Lesson assets: 114 (old), 114 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 11 MiB (old), 11 MiB (new), 66 KiB (Removed)
Configuration hdpiAPK file size: 43 KiB (old), 43 KiB (new), 24 bytes (Removed) Configuration ldpiAPK file size: 45 KiB (old), 45 KiB (new), 40 bytes (Removed) Configuration mdpiAPK file size: 38 KiB (old), 38 KiB (new), 24 bytes (Removed) Configuration tvdpiAPK file size: 73 KiB (old), 73 KiB (new), 40 bytes (Removed) Configuration xhdpiAPK file size: 50 KiB (old), 50 KiB (new), 32 bytes (Removed) Configuration xxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 24 bytes (Removed) Configuration xxxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 24 bytes (Removed) GaExpand to see flavor specificsUniversal APKAPK file size: 11 MiB (old), 11 MiB (new), 66 KiB (Removed) APK download size (estimated): 10 MiB (old), 10 MiB (new), 62 KiB (Removed) Method count: 119988 (old), 119134 (new), 854 (Removed) Features: 1 (old), 1 (new), 0 (No change) Permissions: 6 (old), 6 (new), 0 (No change) Resources: 6040 (old), 6030 (new), 10 (Removed)
Lesson assets: 114 (old), 114 (new), 0 (No change) AAB differencesExpand to see AAB specificsSupported configurations:
Base APKAPK file size: 11 MiB (old), 11 MiB (new), 66 KiB (Removed)
Configuration hdpiAPK file size: 43 KiB (old), 43 KiB (new), 24 bytes (Removed) Configuration ldpiAPK file size: 45 KiB (old), 45 KiB (new), 40 bytes (Removed) Configuration mdpiAPK file size: 38 KiB (old), 38 KiB (new), 24 bytes (Removed) Configuration tvdpiAPK file size: 73 KiB (old), 73 KiB (new), 40 bytes (Removed) Configuration xhdpiAPK file size: 50 KiB (old), 50 KiB (new), 32 bytes (Removed) Configuration xxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 24 bytes (Removed) Configuration xxxhdpiAPK file size: 55 KiB (old), 55 KiB (new), 24 bytes (Removed) |
adhiamboperes
left a comment
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.
Apologies for the dely @BenHenning. I should be able to complete this review later in the day. Things are however looking very meticulous.
|
Hi @BenHenning, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue. |
adhiamboperes
left a comment
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.
Finished reviewing this @BenHenning, nothing blocking. Generally LGTM.
Apologies for the delay!
scripts/src/javatests/org/oppia/android/scripts/regex/RegexPatternValidationCheckTest.kt
Show resolved
Hide resolved
|
Hi @BenHenning, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to merge this PR once the CI checks pass and you're happy with it. Thanks! |
Conflicts: wiki/Installing-Oppia-Android.md
|
I think I can address both of your comments @seanlip and @adhiamboperes, thanks for the reviews! Note that I didn't change anything from your comments @adhiamboperes (see my replies). Please let me know if there is something you'd like me to change--I'm happy to consider that for a follow-up PR as needed. |
BenHenning
left a comment
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.
Checked merge commit & earlier reviewer address commit.
|
This should be good to merge once CI is passing. Hopefully it won't take too many re-runs. |
Coverage ReportResultsNumber of files assessed: 68 Passing coverageFiles with passing code coverage
Exempted coverageFiles exempted from coverage
|
Explanation
Fixes part of #2747
Fixes #1532
This PR is doing a lot to address the vast majority of #2747--removing support for Gradle. It doesn't address everything, however--some items will need to be addressed in future PRs (largely new cleanup opportunities that are unlocked with the removal of Gradle). However, it does remove the entirety of Gradle definition infrastructure.
This PR specifically:
.gradlefiles,settings.gradle, thegradlewwrappers, and thegradle/wrapperdirectory). As a side benefit, this removes some of the last binary files from the codebase. :)config/proguard/), some manifest files, and some Robolectric-specific definitions.main.ymlworkflow (which was disabled in Fix part of #2747: Disable Gradle in CI #5629). This is entirely a Gradle-specific workflow, so there's nothing that needs to be moved over as all of what's being tested is covered more efficiently and thoroughly in other specific workflow files..gitignoreper the Gradle file removals (fewer files/directories need to be ignored).StateFragmentTestandExplorationActivityTesthas been kept but had its removal TODO removed. This is because the code seems to have changed (or the original problem misunderstood). These waits seem actually necessary due to relying on real image loading, so the fix is more complex than simply "migrate to Bazel & move off of Gradle." There's real test infrastructure work needed to fix these tests properly, and it doesn't seem sufficiently important to prioritize (though note it did seem possible to remove the waits outright inExplorationActivityTestwithout issue). The longer-term infrastructure work is tracked in Allow tests to orchestrate Glide to test image loading in testing environments #1523.LoadLessonProtosFromAssetshas been made default true (since it can't ever be false with Gradle removed). See the note below on removing JSON assets for the work to fully clean this up.OppiaTestRunneras it was only used for Gradle builds to help it set up state correctly for orchestrated tests (i.e. Espresso). We may need to reintroduce something like this in the future, but for now there's no value in keeping an unused class.RepositoryFileand test removals inRepositoryFileTestnow that Gradle build directories no longer need to be filtered.TestEnvironmentConfigwas removed since there's no longer a need to test which environment tests are currently running in.OppiaTestRunner).ApiMockLoaderwas simplified now that test config artifacts are in a single location during testing time.InitializeDefaultLocaleRulecan now have nearly all of its reflection removed since it can be directly built to reference the classes that it's interacting with (which wasn't possible in the Gradle world, see the TODO in that class). Some new tests were added, as well, which brings its test coverage to 100%.TransformAndroidManifestwas updated to support adding top-level comments in manifest files (which are TODOs for [Feature Request]: Update Android lint script to support a single top-level manifest #6010 to move or remove manifest files--see below). Tests were also added to test the new functionality.Note also that this work opens up more things that still need to be, or can now be, addressed, including:
robolectric.propertiesfiles, though I'm not entirely certain at this point which SDK version is used in Bazel tests for Robolectric (other than it being tied to Robolectric version and that we pull in all supported SDKs so that tests can selectively opt into specific SDKs for testing).genrules can now be removed to improve symbol analysis in Android Studio (and general build system complexity). See Remove genrules once Gradle has been removed #1617.AndroidManifest.xmlfrom the app directory to the top-level directory to address Move binary manifest to top-level package post-Gradle [Blocked: #6010] #1640. Unfortunately this can't be done as part of this PR (as previously attempted) due to [Feature Request]: Update Android lint script to support a single top-level manifest #6010 and required changes to the Android Lint script. Note that the addressing of [Feature Request]: Update Android lint script to support a single top-level manifest #6010 also allows other manifests to potentially be removed and, hopefully, a reduction of manifests to the bare minimum (the top-level plus any asset-holding libraries--at least for now).Essential Checklist
For UI-specific PRs only
There are no known UI effects from removing Gradle support, but build infrastructure is complex and this is not a no-op change. It's expected that the Bazel builds are relatively the same as before, however (see the APK & AAB differences analysis), so there shouldn't be an UI or UX changes as a result of this work.