Skip to content

Commit 48a918c

Browse files
XichengSpenceradhiamboperesBenHenning
authored
Fix #4419: Remove TODO Marked Files And Other Alpha Kenya Related Files (#5417)
<!-- READ ME FIRST: Please fill in the explanation section below and check off every point from the Essential Checklist! --> ## Explanation Fix #4419 Removed application\alphakenya package as Adhiambo suggests. Removed codes in bazel files,test_file_exemptions.textproto that is related with alphakenya Remove AlphaKenya related modules under android/util/logging including KenyaAlphaPlatformParameterModule, EventLoggingModule etc. and corresponding tests and Bazel configs Inlined StandardEventTypeToHumanReadableNameConverterImpl.kt into EventTypeToHumanReadableNameConverter.kt Removed EventLoggingConfigurationModule <!-- - Explain what your PR does. If this PR fixes an existing bug, please include - "Fixes #bugnum:" in the explanation so that GitHub can auto-close the issue - when this PR is merged. --> ## Essential Checklist <!-- Please tick the relevant boxes by putting an "x" in them. --> - [x] The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".) - [x] Any changes to [scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets) files have their rationale included in the PR explanation. - [x] The PR follows the [style guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide). - [x] The PR does not contain any unnecessary code changes from Android Studio ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)). - [x] The PR is made from a branch that's **not** called "develop" and is up-to-date with "develop". - [x] The PR is **assigned** to the appropriate reviewers ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)). ## For UI-specific PRs only <!-- Delete these section if this PR does not include UI-related changes. --> If your PR includes UI-related changes, then: - Add screenshots for portrait/landscape for both a tablet & phone of the before & after UI changes - For the screenshots above, include both English and pseudo-localized (RTL) screenshots (see [RTL guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines)) - Add a video showing the full UX flow with a screen reader enabled (see [accessibility guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide)) - For PRs introducing new UI elements or color changes, both light and dark mode screenshots must be included - Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing --------- Co-authored-by: Adhiambo Peres <[email protected]> Co-authored-by: Ben Henning <[email protected]>
1 parent 55ab73e commit 48a918c

File tree

218 files changed

+288
-3202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+288
-3202
lines changed

.github/workflows/build_tests.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -426,19 +426,6 @@ jobs:
426426
run: |
427427
bazel build --compilation_mode=opt -- //:oppia_alpha_kitkat
428428
429-
# Note that caching only works on non-forks.
430-
- name: Build Oppia alpha Kenya-specific AAB (with caching, non-fork only)
431-
if: ${{ env.ENABLE_CACHING == 'true' && github.event.pull_request.head.repo.full_name == 'oppia/oppia-android' }}
432-
env:
433-
BAZEL_REMOTE_CACHE_URL: ${{ secrets.BAZEL_REMOTE_CACHE_URL }}
434-
run: |
435-
bazel build --compilation_mode=opt --remote_http_cache=$BAZEL_REMOTE_CACHE_URL --google_credentials=./config/oppia-dev-workflow-remote-cache-credentials.json -- //:oppia_alpha_kenya
436-
437-
- name: Build Oppia alpha Kenya-specific AAB (without caching, or on a fork)
438-
if: ${{ env.ENABLE_CACHING == 'false' || github.event.pull_request.head.repo.full_name != 'oppia/oppia-android' }}
439-
run: |
440-
bazel build --compilation_mode=opt -- //:oppia_alpha_kenya
441-
442429
build_oppia_beta_aab:
443430
name: Build Oppia AAB (beta flavor)
444431
runs-on: ${{ matrix.os }}

app/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,6 @@ TEST_DEPS = [
939939
"//utility/src/main/java/org/oppia/android/util/accessibility:test_module",
940940
"//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
941941
"//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module",
942-
"//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module",
943942
"//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module",
944943
"//utility/src/main/java/org/oppia/android/util/math:math_expression_parser",
945944
"//utility/src/main/java/org/oppia/android/util/networking:debug_module",

app/src/main/java/org/oppia/android/app/application/alpha/AlphaApplicationComponent.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import org.oppia.android.util.caching.AssetModule
4949
import org.oppia.android.util.caching.CachingModule
5050
import org.oppia.android.util.gcsresource.GcsResourceModule
5151
import org.oppia.android.util.locale.LocaleProdModule
52-
import org.oppia.android.util.logging.EventLoggingConfigurationModule
5352
import org.oppia.android.util.logging.LoggerModule
5453
import org.oppia.android.util.logging.SyncStatusModule
5554
import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
@@ -97,7 +96,7 @@ import javax.inject.Singleton
9796
SyncStatusModule::class, LogReportingModule::class, NetworkConnectionUtilProdModule::class,
9897
HintsAndSolutionProdModule::class, MetricLogSchedulerModule::class,
9998
PerformanceMetricsConfigurationsModule::class, AlphaBuildFlavorModule::class,
100-
EventLoggingConfigurationModule::class, CpuPerformanceSnapshotterModule::class,
99+
CpuPerformanceSnapshotterModule::class,
101100
PerformanceMetricsAssessorModule::class, ExplorationProgressModule::class,
102101
AuthenticationModule::class,
103102
]

app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ kt_android_library(
1919
"//app/src/main/java/org/oppia/android/app/application:application_component",
2020
"//app/src/main/java/org/oppia/android/app/application:common_application_modules",
2121
"//domain/src/main/java/org/oppia/android/domain/auth:auth_module",
22-
"//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module",
2322
"//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module",
2423
"//utility/src/main/java/org/oppia/android/util/networking:prod_module",
2524
],
@@ -31,7 +30,6 @@ kt_android_library(
3130
"AlphaBuildFlavorModule.kt",
3231
],
3332
visibility = [
34-
"//app/src/main/java/org/oppia/android/app/application/alphakenya:__pkg__",
3533
"//app/src/test/java/org/oppia/android/app/application/alpha:__pkg__",
3634
],
3735
deps = [

app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt

Lines changed: 0 additions & 115 deletions
This file was deleted.

app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaOppiaApplication.kt

Lines changed: 0 additions & 9 deletions
This file was deleted.

app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel

Lines changed: 0 additions & 27 deletions
This file was deleted.

app/src/main/java/org/oppia/android/app/application/beta/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ kt_android_library(
2222
"//app/src/main/java/org/oppia/android/app/application:application_component",
2323
"//app/src/main/java/org/oppia/android/app/application:common_application_modules",
2424
"//domain/src/main/java/org/oppia/android/domain/auth:auth_module",
25-
"//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module",
2625
"//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module",
2726
"//utility/src/main/java/org/oppia/android/util/networking:prod_module",
2827
],

app/src/main/java/org/oppia/android/app/application/beta/BetaApplicationComponent.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import org.oppia.android.util.caching.AssetModule
4949
import org.oppia.android.util.caching.CachingModule
5050
import org.oppia.android.util.gcsresource.GcsResourceModule
5151
import org.oppia.android.util.locale.LocaleProdModule
52-
import org.oppia.android.util.logging.EventLoggingConfigurationModule
5352
import org.oppia.android.util.logging.LoggerModule
5453
import org.oppia.android.util.logging.SyncStatusModule
5554
import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
@@ -97,7 +96,7 @@ import javax.inject.Singleton
9796
SyncStatusModule::class, LogReportingModule::class, NetworkConnectionUtilProdModule::class,
9897
HintsAndSolutionProdModule::class, MetricLogSchedulerModule::class,
9998
PerformanceMetricsConfigurationsModule::class, BetaBuildFlavorModule::class,
100-
EventLoggingConfigurationModule::class, ActivityRouterModule::class,
99+
ActivityRouterModule::class,
101100
CpuPerformanceSnapshotterModule::class, PerformanceMetricsAssessorModule::class,
102101
ExplorationProgressModule::class, AuthenticationModule::class,
103102
]

app/src/main/java/org/oppia/android/app/application/dev/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ kt_android_library(
2626
"//app/src/main/java/org/oppia/android/app/application:application_component",
2727
"//app/src/main/java/org/oppia/android/app/application:common_application_modules",
2828
"//domain/src/main/java/org/oppia/android/domain/auth:auth_module",
29-
"//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module",
3029
"//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module",
3130
"//utility/src/main/java/org/oppia/android/util/networking:debug_module",
3231
],

0 commit comments

Comments
 (0)