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.

Sign up for GitHub

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

Jump to bottom

Fix #4419: Remove TODO Marked Files And Other Alpha Kenya Related Files #5417

Open
wants to merge 21 commits into
base: develop
Choose a base branch
from
Open

Fix #4419: Remove TODO Marked Files And Other Alpha Kenya Related Files #5417

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c743b35
Remove #4419 TODOs
XichengSpencer May 27, 2024
cf295b9
Remove the last file related with AlphaKenya
XichengSpencer Jun 3, 2024
fcb57ef
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
XichengSpencer Jun 18, 2024
caebae1
Deleted Alpha Kenya package, PlatformParameterAlphaKenyaModule.kt, an…
XichengSpencer Jun 30, 2024
0e939f6
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
XichengSpencer Jun 30, 2024
2508f35
Delete more kenyaalpha related in BUILD.bazel,
XichengSpencer Jun 30, 2024
3c5236b
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
XichengSpencer Jul 1, 2024
e4d44c2
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
XichengSpencer Aug 6, 2024
2e63967
Remove EventLoggingConfigurationModule and updated the version code
XichengSpencer Aug 19, 2024
ccba2c4
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
XichengSpencer Aug 19, 2024
d742695
Resolve conflict in test_file_exemptions.textproto
XichengSpencer Aug 19, 2024
a84a3cd
Updated version.bzl and more clean up for EventLoggingConfigurationMo…
XichengSpencer Aug 22, 2024
63a41e4
Remove standard_event_logging_configuration_module in BUILD.bazel tha…
XichengSpencer Aug 22, 2024
6ec532f
More cleanup at EventTypeToHumanReadableNameConverterTest.
XichengSpencer Aug 22, 2024
802dff1
Include javax in BUILD.bazel for EventTypeToHumanReadableNameConverte…
XichengSpencer Aug 27, 2024
fea05c3
Fix syntax error in BUILD.bazel
XichengSpencer Aug 27, 2024
389b68d
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
XichengSpencer Aug 27, 2024
ff8a048
Merge branch 'develop' into #4419
adhiamboperes Sep 2, 2024
e2779bf
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
XichengSpencer Sep 20, 2024
49b57dc
Merge remote-tracking branch 'origin/#4419' into #4419
XichengSpencer Sep 20, 2024
4da3aa1
Remove stard_event_logging_configuration part in BUILD.bazel and fix …
XichengSpencer Sep 24, 2024
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
13 changes: 0 additions & 13 deletions .github/workflows/build_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,19 +426,6 @@ jobs:
run: |
bazel build --compilation_mode=opt -- //:oppia_alpha_kitkat

# Note that caching only works on non-forks.
- 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:
BAZEL_REMOTE_CACHE_URL: ${{ secrets.BAZEL_REMOTE_CACHE_URL }}
run: |
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

- name: Build Oppia alpha Kenya-specific AAB (without caching, or on a fork)
if: ${{ env.ENABLE_CACHING == 'false' || github.event.pull_request.head.repo.full_name != 'oppia/oppia-android' }}
run: |
bazel build --compilation_mode=opt -- //:oppia_alpha_kenya

build_oppia_beta_aab:
name: Build Oppia AAB (beta flavor)
runs-on: ${{ matrix.os }}
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/org/oppia/android/app/application/alpha/AlphaApplicationComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ import org.oppia.android.util.caching.AssetModule
import org.oppia.android.util.caching.CachingModule
import org.oppia.android.util.gcsresource.GcsResourceModule
import org.oppia.android.util.locale.LocaleProdModule
import org.oppia.android.util.logging.EventLoggingConfigurationModule
import org.oppia.android.util.logging.LoggerModule
import org.oppia.android.util.logging.SyncStatusModule
import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
Expand Down Expand Up @@ -97,7 +96,7 @@ import javax.inject.Singleton
SyncStatusModule::class, LogReportingModule::class, NetworkConnectionUtilProdModule::class,
HintsAndSolutionProdModule::class, MetricLogSchedulerModule::class,
PerformanceMetricsConfigurationsModule::class, AlphaBuildFlavorModule::class,
EventLoggingConfigurationModule::class, CpuPerformanceSnapshotterModule::class,
CpuPerformanceSnapshotterModule::class,
PerformanceMetricsAssessorModule::class, ExplorationProgressModule::class,
AuthenticationModule::class,
]
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ kt_android_library(
"//app/src/main/java/org/oppia/android/app/application:application_component",
"//app/src/main/java/org/oppia/android/app/application:common_application_modules",
"//domain/src/main/java/org/oppia/android/domain/auth:auth_module",
"//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module",
"//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module",
"//utility/src/main/java/org/oppia/android/util/networking:prod_module",
],
Expand All @@ -31,7 +30,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
115 changes: 0 additions & 115 deletions .../main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaApplicationComponent.kt
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/java/org/oppia/android/app/application/alphakenya/AlphaKenyaOppiaApplication.kt
View file
Open in desktop
adhiamboperes marked this conversation as resolved.
Show resolved Hide resolved

This file was deleted.

27 changes: 0 additions & 27 deletions app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion app/src/main/java/org/oppia/android/app/application/beta/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ kt_android_library(
"//app/src/main/java/org/oppia/android/app/application:application_component",
"//app/src/main/java/org/oppia/android/app/application:common_application_modules",
"//domain/src/main/java/org/oppia/android/domain/auth:auth_module",
"//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module",
"//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module",
"//utility/src/main/java/org/oppia/android/util/networking:prod_module",
],
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/org/oppia/android/app/application/beta/BetaApplicationComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ import org.oppia.android.util.caching.AssetModule
import org.oppia.android.util.caching.CachingModule
import org.oppia.android.util.gcsresource.GcsResourceModule
import org.oppia.android.util.locale.LocaleProdModule
import org.oppia.android.util.logging.EventLoggingConfigurationModule
import org.oppia.android.util.logging.LoggerModule
import org.oppia.android.util.logging.SyncStatusModule
import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
Expand Down Expand Up @@ -97,7 +96,7 @@ import javax.inject.Singleton
SyncStatusModule::class, LogReportingModule::class, NetworkConnectionUtilProdModule::class,
HintsAndSolutionProdModule::class, MetricLogSchedulerModule::class,
PerformanceMetricsConfigurationsModule::class, BetaBuildFlavorModule::class,
EventLoggingConfigurationModule::class, ActivityRouterModule::class,
ActivityRouterModule::class,
CpuPerformanceSnapshotterModule::class, PerformanceMetricsAssessorModule::class,
ExplorationProgressModule::class, AuthenticationModule::class,
]
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/org/oppia/android/app/application/dev/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ kt_android_library(
"//app/src/main/java/org/oppia/android/app/application:application_component",
"//app/src/main/java/org/oppia/android/app/application:common_application_modules",
"//domain/src/main/java/org/oppia/android/domain/auth:auth_module",
"//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module",
"//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module",
"//utility/src/main/java/org/oppia/android/util/networking:debug_module",
],
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/org/oppia/android/app/application/dev/DeveloperApplicationComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ import org.oppia.android.util.caching.AssetModule
import org.oppia.android.util.caching.CachingModule
import org.oppia.android.util.gcsresource.GcsResourceModule
import org.oppia.android.util.locale.LocaleProdModule
import org.oppia.android.util.logging.EventLoggingConfigurationModule
import org.oppia.android.util.logging.LoggerModule
import org.oppia.android.util.logging.SyncStatusModule
import org.oppia.android.util.logging.firebase.DebugLogReportingModule
Expand Down Expand Up @@ -99,7 +98,7 @@ import javax.inject.Singleton
NetworkConnectionDebugUtilModule::class, LoggingIdentifierModule::class,
SyncStatusModule::class, MetricLogSchedulerModule::class,
PerformanceMetricsAssessorModule::class, PerformanceMetricsConfigurationsModule::class,
DeveloperBuildFlavorModule::class, EventLoggingConfigurationModule::class,
DeveloperBuildFlavorModule::class,
CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class,
AuthenticationModule::class,
]
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/org/oppia/android/app/application/ga/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ kt_android_library(
"//app/src/main/java/org/oppia/android/app/application:application_component",
"//app/src/main/java/org/oppia/android/app/application:common_application_modules",
"//domain/src/main/java/org/oppia/android/domain/auth:auth_module",
"//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module",
"//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module",
"//utility/src/main/java/org/oppia/android/util/networking:prod_module",
],
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/org/oppia/android/app/application/ga/GaApplicationComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ import org.oppia.android.util.caching.AssetModule
import org.oppia.android.util.caching.CachingModule
import org.oppia.android.util.gcsresource.GcsResourceModule
import org.oppia.android.util.locale.LocaleProdModule
import org.oppia.android.util.logging.EventLoggingConfigurationModule
import org.oppia.android.util.logging.LoggerModule
import org.oppia.android.util.logging.SyncStatusModule
import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
Expand Down Expand Up @@ -97,7 +96,7 @@ import javax.inject.Singleton
SyncStatusModule::class, LogReportingModule::class, NetworkConnectionUtilProdModule::class,
HintsAndSolutionProdModule::class, MetricLogSchedulerModule::class,
PerformanceMetricsConfigurationsModule::class, GaBuildFlavorModule::class,
EventLoggingConfigurationModule::class, ActivityRouterModule::class,
ActivityRouterModule::class,
CpuPerformanceSnapshotterModule::class, PerformanceMetricsAssessorModule::class,
ExplorationProgressModule::class, AuthenticationModule::class,
]
Expand Down
3 changes: 1 addition & 2 deletions ...est/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ import org.oppia.android.util.caching.testing.CachingTestModule
import org.oppia.android.util.gcsresource.GcsResourceModule
import org.oppia.android.util.locale.LocaleProdModule
import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName
import org.oppia.android.util.logging.EventLoggingConfigurationModule
import org.oppia.android.util.logging.LoggerModule
import org.oppia.android.util.logging.SyncStatusModule
import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
Expand Down Expand Up @@ -928,7 +927,7 @@ class AdministratorControlsActivityTest {
MathEquationInputModule::class, SplitScreenInteractionModule::class,
LoggingIdentifierModule::class, ApplicationLifecycleModule::class,
SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class,
EventLoggingConfigurationModule::class, ActivityRouterModule::class,
ActivityRouterModule::class,
CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class,
TestAuthenticationModule::class
]
Expand Down
3 changes: 1 addition & 2 deletions ...est/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ import org.oppia.android.util.caching.AssetModule
import org.oppia.android.util.caching.testing.CachingTestModule
import org.oppia.android.util.gcsresource.GcsResourceModule
import org.oppia.android.util.locale.LocaleProdModule
import org.oppia.android.util.logging.EventLoggingConfigurationModule
import org.oppia.android.util.logging.LoggerModule
import org.oppia.android.util.logging.SyncStatusModule
import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
Expand Down Expand Up @@ -616,7 +615,7 @@ class AdministratorControlsFragmentTest {
MathEquationInputModule::class, SplitScreenInteractionModule::class,
LoggingIdentifierModule::class, ApplicationLifecycleModule::class,
SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class,
EventLoggingConfigurationModule::class, ActivityRouterModule::class,
ActivityRouterModule::class,
CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class,
TestAuthenticationModule::class
]
Expand Down
3 changes: 1 addition & 2 deletions ...src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ import org.oppia.android.util.extensions.getVersionName
import org.oppia.android.util.gcsresource.GcsResourceModule
import org.oppia.android.util.locale.LocaleProdModule
import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.extractCurrentAppScreenName
import org.oppia.android.util.logging.EventLoggingConfigurationModule
import org.oppia.android.util.logging.LoggerModule
import org.oppia.android.util.logging.SyncStatusModule
import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
Expand Down Expand Up @@ -307,7 +306,7 @@ class AppVersionActivityTest {
MathEquationInputModule::class, SplitScreenInteractionModule::class,
LoggingIdentifierModule::class, ApplicationLifecycleModule::class,
SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class,
EventLoggingConfigurationModule::class, ActivityRouterModule::class,
ActivityRouterModule::class,
CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class,
TestAuthenticationModule::class
]
Expand Down
Loading
Loading