Skip to content

Commit

Permalink
Remove #4419 TODOs
Browse files Browse the repository at this point in the history
Remove application\alphakenya package
Remove codes in bazel files,test_file_exemptions.textproto that is related with alphakenya
Remove AlphaKenya related modules and corresponding tests
  • Loading branch information
XichengSpencer committed May 27, 2024
1 parent a0deeea commit c743b35
Show file tree
Hide file tree
Showing 15 changed files with 2 additions and 2,333 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ jobs:
run: |
bazel build --compilation_mode=opt -- //:oppia_alpha_kitkat
# Note that caching only works on non-forks.
# Note that caching only works on non-forks. 4419: should remove this?
- name: Build Oppia alpha Kenya-specific AAB (with caching, non-fork only)
if: ${{ env.ENABLE_CACHING == 'true' && github.event.pull_request.head.repo.full_name == 'oppia/oppia-android' }}
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ kt_android_library(
"AlphaBuildFlavorModule.kt",
],
visibility = [
"//app/src/main/java/org/oppia/android/app/application/alphakenya:__pkg__",
"//app/src/test/java/org/oppia/android/app/application/alpha:__pkg__",
],
deps = [
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

18 changes: 1 addition & 17 deletions build_flavors.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Macros & definitions corresponding to Oppia binary build flavors.
"""

load("//:oppia_android_application.bzl", "declare_deployable_application", "oppia_android_application")
load("//:version.bzl", "MAJOR_VERSION", "MINOR_VERSION", "OPPIA_ALPHA_KENYA_VERSION_CODE", "OPPIA_ALPHA_KITKAT_VERSION_CODE", "OPPIA_ALPHA_VERSION_CODE", "OPPIA_BETA_VERSION_CODE", "OPPIA_DEV_KITKAT_VERSION_CODE", "OPPIA_DEV_VERSION_CODE", "OPPIA_GA_VERSION_CODE")
load("//:version.bzl", "MAJOR_VERSION", "MINOR_VERSION", "OPPIA_ALPHA_KITKAT_VERSION_CODE", "OPPIA_ALPHA_VERSION_CODE", "OPPIA_BETA_VERSION_CODE", "OPPIA_DEV_KITKAT_VERSION_CODE", "OPPIA_DEV_VERSION_CODE", "OPPIA_GA_VERSION_CODE")

# Defines the list of flavors available to build the Oppia app in. Note to developers: this list
# should be ordered by the development pipeline (i.e. features go through dev first, then other
Expand All @@ -13,7 +13,6 @@ AVAILABLE_FLAVORS = [
"dev_kitkat",
"alpha",
"alpha_kitkat",
"alpha_kenya",
"beta",
"ga",
]
Expand Down Expand Up @@ -41,7 +40,6 @@ _PRODUCTION_PROGUARD_SPECS = [
]

# Note to developers: keys of this dict should follow the order of AVAILABLE_FLAVORS.
# TODO(#4419): Remove the Kenya-specific alpha flavor.
_FLAVOR_METADATA = {
"dev": {
"manifest": "//app:src/main/AndroidManifest.xml",
Expand Down Expand Up @@ -101,20 +99,6 @@ _FLAVOR_METADATA = {
"version_code": OPPIA_ALPHA_KITKAT_VERSION_CODE,
"application_class": ".app.application.alpha.AlphaOppiaApplication",
},
"alpha_kenya": {
"manifest": "//app:src/main/AndroidManifest.xml",
"min_sdk_version": 21,
"target_sdk_version": 33,
"multidex": "native",
"proguard_specs": _PRODUCTION_PROGUARD_SPECS,
"production_release": True,
"deps": [
"//app/src/main/java/org/oppia/android/app/application/alphakenya:alpha_kenya_application",
"//config/src/java/org/oppia/android/config:all_languages_config",
],
"version_code": OPPIA_ALPHA_KENYA_VERSION_CODE,
"application_class": ".app.application.alphakenya.AlphaKenyaOppiaApplication",
},
"beta": {
"manifest": "//app:src/main/AndroidManifest.xml",
"min_sdk_version": 21,
Expand Down
Loading

0 comments on commit c743b35

Please sign in to comment.