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

Fix part of #2747, #1532, #1640: Remove support for Gradle #5652

Draft
wants to merge 15 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 1 addition & 22 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,7 @@
/testing/src/main/java/org/oppia/android/testing/AssertionHelpers.kt @oppia/android-dev-workflow-reviewers
/testing/src/main/java/org/oppia/android/testing/OppiaTestAnnotations.kt @oppia/android-dev-workflow-reviewers
/testing/src/main/java/org/oppia/android/testing/OppiaTestRule.kt @oppia/android-dev-workflow-reviewers
/testing/src/main/java/org/oppia/android/testing/OppiaTestRunner.kt @oppia/android-dev-workflow-reviewers
/testing/src/*/java/org/oppia/android/testing/data/ @oppia/android-dev-workflow-reviewers
/testing/src/*/java/org/oppia/android/testing/environment/ @oppia/android-dev-workflow-reviewers
/testing/src/*/java/org/oppia/android/testing/junit/ @oppia/android-dev-workflow-reviewers
/testing/src/*/java/org/oppia/android/testing/mockito/ @oppia/android-dev-workflow-reviewers
/testing/src/*/java/org/oppia/android/testing/platformparameter/ @oppia/android-dev-workflow-reviewers
Expand Down Expand Up @@ -277,25 +275,6 @@ WORKSPACE @oppia/android-app-infrastructure-reviewers
/testing/src/test/AndroidManifest.xml @oppia/android-dev-workflow-reviewers
/utility/src/*/AndroidManifest.xml @oppia/android-dev-workflow-reviewers

################################################################################
# Gradle infrastructure #
################################################################################

# Gradle build files.
*.gradle @oppia/android-app-infrastructure-reviewers
gradle.properties @oppia/android-app-infrastructure-reviewers
/gradlew @oppia/android-app-infrastructure-reviewers
/gradlew.bat @oppia/android-app-infrastructure-reviewers
/gradle/ @oppia/android-app-infrastructure-reviewers

# Configuration files only used by Gradle builds.
/app/proguard-rules.pro @oppia/android-app-infrastructure-reviewers
/data/proguard-rules.pro @oppia/android-app-infrastructure-reviewers
/domain/proguard-rules.pro @oppia/android-app-infrastructure-reviewers
/utility/proguard-rules.pro @oppia/android-app-infrastructure-reviewers
*.properties @oppia/android-app-infrastructure-reviewers
/data/src/main/AndroidManifest.xml @oppia/android-app-infrastructure-reviewers

################################################################################
# Sensitive file ownership #
################################################################################
Expand Down Expand Up @@ -323,7 +302,7 @@ gradle.properties @oppia/android-app-infrastructure-reviewers

# Primary app manifest. Eventually, this will be split up so that only the
# sensitive portions require owners approval.
/app/src/main/AndroidManifest.xml @oppia/owners
AndroidManifest.xml @oppia/owners

# Top-level user-facing major/minor versions, and the version codes used to
# ensure users receive the correct build when installing it from Play Store.
Expand Down
161 changes: 0 additions & 161 deletions .github/workflows/main.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/static_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ jobs:
# serving as a cancellation-compliant alternative to if: ${{ always() }} in concurrent workflows.
if: ${{ !cancelled() }}
run: |
bazel run //scripts:accessibility_label_check -- $(pwd) scripts/assets/accessibility_label_exemptions.pb app/src/main/AndroidManifest.xml
bazel run //scripts:accessibility_label_check -- $(pwd) scripts/assets/accessibility_label_exemptions.pb AndroidManifest.xml

- name: KDoc Validation Check
# The expression if: ${{ !cancelled() }} runs a job or step regardless of its success or failure while responding to cancellations,
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
*.iml
.gradle
/local.properties
.idea/*
!.idea/encodings.xml
Expand All @@ -15,9 +14,6 @@ utility/build
/build
/captures
.externalNativeBuild
gradle
gradlew
gradlew.bat
.gitsecret/keys/random_seed
!*.secret
config/oppia-dev-workflow-remote-cache-credentials.json
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# TODO(#1532): Rename file to 'BUILD' post-Gradle.

load("@dagger//:workspace_defs.bzl", "dagger_rules")
load("//:build_flavors.bzl", "AVAILABLE_FLAVORS", "define_oppia_aab_binary_flavor", "transform_android_manifest")
load("//:version.bzl", "MAJOR_VERSION", "MINOR_VERSION", "OPPIA_DEV_KITKAT_VERSION_CODE", "OPPIA_DEV_VERSION_CODE")

# This is exported here since config/ isn't a Bazel package.
exports_files(["config/kitkat_main_dex_class_list.txt"])

# TODO(#1607): Ensure app module libraries don't require directly depending on AndroidManifest.xml.
exports_files(["AndroidManifest.xml"])

# Corresponds to being accessible to all Oppia targets. This should be used for production APIs &
# modules that may be used both in production targets and in tests.
package_group(
Expand Down Expand Up @@ -72,13 +73,12 @@ package_group(
],
)

# TODO(#1640): Move binary manifest to top-level package post-Gradle.
[
transform_android_manifest(
name = "oppia_apk_%s_transformed_manifest" % apk_flavor_metadata["flavor"],
application_relative_qualified_class = ".app.application.dev.DeveloperOppiaApplication",
build_flavor = apk_flavor_metadata["flavor"],
input_file = "//app:src/main/AndroidManifest.xml",
input_file = "AndroidManifest.xml",
major_version = MAJOR_VERSION,
minor_version = MINOR_VERSION,
output_file = "AndroidManifest_transformed_%s.xml" % apk_flavor_metadata["flavor"],
Expand Down
5 changes: 1 addition & 4 deletions app/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# TODO(#1532): Rename file to 'BUILD' post-Gradle.
"""
This library contains the app's core source files and functionality.
Note that:
Expand All @@ -21,8 +20,6 @@ package(default_visibility = [
"//utility:__subpackages__",
])

exports_files(["src/main/AndroidManifest.xml"])

# Corresponds to being accessible to all app layer targets.
package_group(
name = "app_visibility",
Expand Down Expand Up @@ -569,7 +566,7 @@ android_library(
name = "resources",
custom_package = "org.oppia.android.app",
exports_manifest = True,
manifest = "src/main/AndroidManifest.xml",
manifest = "//:AndroidManifest.xml",
resource_files = glob(
["src/main/res/**"],
exclude = DATABINDING_LAYOUTS,
Expand Down
Loading
Loading