From 6b724ac2f948ab90a6215cfa99458a51f9de075d Mon Sep 17 00:00:00 2001 From: Ben Henning Date: Sun, 26 May 2024 20:50:20 -0700 Subject: [PATCH] Fix part of #59: Update Dagger structure & version from 2.28.1 to 2.41 (#4931) ## Explanation Fix part of #59 This PR introduces a simplification to Dagger setup throughout the Bazel build graph by defining a single top-level ``dagger_rules()`` invocation rather than introducing up to one per directory. The new approach actually matches Dagger documentation for how it should be setup: https://github.com/google/dagger/blob/f41033cc448eb7bdb83af2356c8802f1208d1824/examples/bazel/BUILD#L20. Semantically, this mainly serves to centralize the exported Dagger dependencies to a single library. Depending on this new top-level ``//:dagger`` library will still enable Dagger annotation processing and code generation for the library depending on it, so it's not expected to result in any significant performance improvements for the build graph. Note that this PR also makes some attempt at removing cases when Dagger isn't needed as a dependency at all (though this will be done in much more significant detail in downstream PRs), and in some cases Dagger was added just for implicitly depending on javax annotations (which can be depended on directly). There are also a number of version upgrades happening in this PR in preparation for upgrading to Kotlin 1.6 (in #4937) since older Dagger has some compatibility issues with newer Kotlin: - Dagger is being upgraded to 2.41 from the current 2.28.1. - The implicit Kotlin stdlib-jdk8 dependency is being bumped from 1.4.10 to 1.5.32 (this could be significant, but note that we are already using the 1.5.0 base Kotlin SDK). Note that this resulted in some additional Proguard exemptions for production builds. These *should* be okay to ignore, but they will be reevaluated in #4937. - Guava is being specially handled to force the Android version of Guava (and specifically 31.0.1 which is needed by the newer version of Dagger). Without this override the JRE version would be used which would cause Desugaring and runtime problems in production builds. - Other dependencies were updated or explicitly listed, as needed, for the Dagger & Guava changes: - com.google.errorprone:error_prone_annotations: 2.9.0 -> 2.11.0 - com.google.guava:failureaccess: 1.0.1 (currently used version) - com.google.j2objc:j2objc-annotations: 1.3 (currently used version) - org.checkerframework:checker-compat-qual: 2.5.5 (currently used version) - org.checkerframework:checker-qual: 3.13.0 -> 3.21.3 It was noticed that the tracking for Guava's third-party license was removed. This is due to Guava now being explicitly depended on rather than being managed by rules_jvm_external. #5397 was filed to track properly including all third-party licenses, not just those from Maven. Addressing that issue will result in Guava's license being included again in production builds. Finally, a ``ExplorationProgressListener`` binding was removed from ``ExplorationProgressModuleTest`` because it was noticed during development that it isn't actually used. ## Essential Checklist - [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 N/A -- build infrastructure-only change. --------- Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com> Co-authored-by: Sean Lip --- BUILD.bazel | 3 + WORKSPACE | 23 +- app/BUILD.bazel | 11 +- .../android/app/activity/route/BUILD.bazel | 5 +- .../oppia/android/app/application/BUILD.bazel | 4 - .../android/app/application/alpha/BUILD.bazel | 7 +- .../app/application/alphakenya/BUILD.bazel | 5 +- .../android/app/application/beta/BUILD.bazel | 5 +- .../android/app/application/dev/BUILD.bazel | 5 +- .../android/app/application/ga/BUILD.bazel | 5 +- .../app/application/testing/BUILD.bazel | 5 +- .../android/app/notice/testing/BUILD.bazel | 3 - .../player/exploration/testing/BUILD.bazel | 3 - .../org/oppia/android/app/shim/BUILD.bazel | 5 - .../oppia/android/app/translation/BUILD.bazel | 12 +- .../app/translation/testing/BUILD.bazel | 9 +- .../android/app/utility/datetime/BUILD.bazel | 4 - .../android/app/utility/lifecycle/BUILD.bazel | 3 - .../android/app/utility/math/BUILD.bazel | 4 - .../learneranalytics/BUILD.bazel | 7 +- .../app/customview/interaction/BUILD.bazel | 5 +- .../oppia/android/app/databinding/BUILD.bazel | 21 +- .../mathexpressionparser/BUILD.bazel | 7 +- .../org/oppia/android/app/notice/BUILD.bazel | 13 +- .../app/player/exploration/BUILD.bazel | 7 +- .../android/app/player/state/BUILD.bazel | 5 +- .../org/oppia/android/app/splash/BUILD.bazel | 5 +- .../oppia/android/app/activity/BUILD.bazel | 5 +- .../android/app/activity/route/BUILD.bazel | 7 +- .../android/app/application/alpha/BUILD.bazel | 5 +- .../android/app/application/beta/BUILD.bazel | 5 +- .../android/app/application/dev/BUILD.bazel | 5 +- .../android/app/application/ga/BUILD.bazel | 5 +- .../app/application/testing/BUILD.bazel | 5 +- .../devoptionsitemviewmodel/BUILD.bazel | 1 + .../android/app/testing/activity/BUILD.bazel | 5 +- .../oppia/android/app/translation/BUILD.bazel | 11 +- .../app/translation/testing/BUILD.bazel | 5 +- .../android/app/utility/math/BUILD.bazel | 5 +- config/proguard/kotlin-proguard-rules.pro | 4 + data/BUILD.bazel | 5 +- .../android/data/backends/gae/BUILD.bazel | 9 +- .../android/data/backends/gae/api/BUILD.bazel | 3 - .../data/backends/gae/model/BUILD.bazel | 3 - .../android/data/persistence/BUILD.bazel | 4 - .../android/data/persistence/BUILD.bazel | 5 +- domain/BUILD.bazel | 7 +- .../org/oppia/android/domain/auth/BUILD.bazel | 9 +- .../oppia/android/domain/classify/BUILD.bazel | 5 +- .../android/domain/classify/rules/BUILD.bazel | 3 - .../algebraicexpressioninput/BUILD.bazel | 6 +- .../rules/continueinteraction/BUILD.bazel | 5 +- .../rules/dragAndDropSortInput/BUILD.bazel | 6 +- .../classify/rules/fractioninput/BUILD.bazel | 6 +- .../rules/imageClickInput/BUILD.bazel | 6 +- .../rules/itemselectioninput/BUILD.bazel | 6 +- .../rules/mathequationinput/BUILD.bazel | 6 +- .../rules/multiplechoiceinput/BUILD.bazel | 6 +- .../rules/numberwithunits/BUILD.bazel | 6 +- .../rules/numericexpressioninput/BUILD.bazel | 6 +- .../classify/rules/numericinput/BUILD.bazel | 6 +- .../classify/rules/ratioinput/BUILD.bazel | 6 +- .../classify/rules/textinput/BUILD.bazel | 6 +- .../android/domain/clipboard/BUILD.bazel | 4 - .../domain/exploration/testing/BUILD.bazel | 5 +- .../domain/feedbackreporting/BUILD.bazel | 5 +- .../oppia/android/domain/locale/BUILD.bazel | 5 - .../android/domain/onboarding/BUILD.bazel | 5 +- .../domain/onboarding/testing/BUILD.bazel | 5 +- .../android/domain/oppialogger/BUILD.bazel | 5 +- .../domain/oppialogger/analytics/BUILD.bazel | 16 +- .../oppialogger/analytics/testing/BUILD.bazel | 5 +- .../domain/oppialogger/exceptions/BUILD.bazel | 5 +- .../oppialogger/logscheduler/BUILD.bazel | 5 +- .../oppialogger/loguploader/BUILD.bazel | 5 +- .../domain/oppialogger/survey/BUILD.bazel | 3 - .../oppia/android/domain/profile/BUILD.bazel | 3 - .../android/domain/spotlight/BUILD.bazel | 3 - .../oppia/android/domain/survey/BUILD.bazel | 3 - .../oppialogger/loguploader/BUILD.bazel | 5 +- .../android/domain/translation/BUILD.bazel | 3 - .../org/oppia/android/domain/auth/BUILD.bazel | 9 +- .../algebraicexpressioninput/BUILD.bazel | 11 +- .../rules/mathequationinput/BUILD.bazel | 11 +- .../rules/numericexpressioninput/BUILD.bazel | 11 +- .../android/domain/clipboard/BUILD.bazel | 5 +- .../android/domain/exploration/BUILD.bazel | 13 +- .../ExplorationProgressModuleTest.kt | 7 - .../lightweightcheckpointing/BUILD.bazel | 5 +- .../domain/exploration/testing/BUILD.bazel | 7 +- .../domain/hintsandsolution/BUILD.bazel | 12 +- .../oppia/android/domain/locale/BUILD.bazel | 13 +- .../android/domain/onboarding/BUILD.bazel | 7 +- .../domain/oppialogger/analytics/BUILD.bazel | 21 +- .../oppialogger/analytics/testing/BUILD.bazel | 5 +- .../oppialogger/loguploader/BUILD.bazel | 7 +- .../oppia/android/domain/question/BUILD.bazel | 7 +- .../oppia/android/domain/survey/BUILD.bazel | 9 +- .../android/domain/translation/BUILD.bazel | 5 +- .../instrumentation/application/BUILD.bazel | 5 +- .../instrumentation/application/BUILD.bazel | 9 +- scripts/assets/maven_dependencies.textproto | 38 +- testing/BUILD.bazel | 6 +- .../oppia/android/testing/data/BUILD.bazel | 4 - .../android/testing/espresso/BUILD.bazel | 4 - .../android/testing/firebase/BUILD.bazel | 5 +- .../oppia/android/testing/logging/BUILD.bazel | 6 +- .../oppia/android/testing/network/BUILD.bazel | 5 +- .../testing/platformparameter/BUILD.bazel | 5 +- .../android/testing/robolectric/BUILD.bazel | 5 +- .../android/testing/threading/BUILD.bazel | 5 +- .../oppia/android/testing/time/BUILD.bazel | 5 +- .../oppia/android/testing/data/BUILD.bazel | 5 +- .../android/testing/firebase/BUILD.bazel | 7 +- .../oppia/android/testing/junit/BUILD.bazel | 9 +- .../oppia/android/testing/logging/BUILD.bazel | 7 +- .../android/testing/networking/BUILD.bazel | 5 +- .../android/testing/robolectric/BUILD.bazel | 5 +- .../android/testing/threading/BUILD.bazel | 11 +- third_party/BUILD.bazel | 15 + third_party/maven_install.json | 373 +++++++++++++++--- third_party/versions.bzl | 21 +- utility/BUILD.bazel | 6 +- .../android/util/accessibility/BUILD.bazel | 7 +- .../oppia/android/util/caching/BUILD.bazel | 8 +- .../android/util/caching/testing/BUILD.bazel | 10 +- .../org/oppia/android/util/data/BUILD.bazel | 5 +- .../android/util/gcsresource/BUILD.bazel | 5 +- .../org/oppia/android/util/locale/BUILD.bazel | 12 +- .../android/util/locale/testing/BUILD.bazel | 6 +- .../oppia/android/util/logging/BUILD.bazel | 11 +- .../android/util/logging/firebase/BUILD.bazel | 9 +- .../logging/performancemetrics/BUILD.bazel | 7 +- .../oppia/android/util/networking/BUILD.bazel | 9 +- .../android/util/parser/html/BUILD.bazel | 5 +- .../android/util/parser/image/BUILD.bazel | 8 +- .../oppia/android/util/profile/BUILD.bazel | 3 - .../org/oppia/android/util/system/BUILD.bazel | 5 +- .../oppia/android/util/threading/BUILD.bazel | 5 +- .../oppia/android/util/caching/BUILD.bazel | 5 +- .../android/util/caching/testing/BUILD.bazel | 7 +- .../org/oppia/android/util/data/BUILD.bazel | 11 +- .../org/oppia/android/util/locale/BUILD.bazel | 17 +- .../android/util/locale/testing/BUILD.bazel | 7 +- .../oppia/android/util/logging/BUILD.bazel | 17 +- .../android/util/logging/firebase/BUILD.bazel | 7 +- .../logging/performancemetrics/BUILD.bazel | 9 +- .../oppia/android/util/networking/BUILD.bazel | 11 +- .../oppia/android/util/profile/BUILD.bazel | 5 +- 149 files changed, 631 insertions(+), 790 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index cbd6507132e..5eb1f397a91 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,5 +1,6 @@ # 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") @@ -137,3 +138,5 @@ package_group( define_oppia_aab_binary_flavor(flavor = flavor) for flavor in AVAILABLE_FLAVORS ] + +dagger_rules() diff --git a/WORKSPACE b/WORKSPACE index 5a61bc78af2..56d95d2c8ad 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -4,7 +4,7 @@ This file lists and imports all external dependencies needed to build Oppia Andr load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_jar") -load("//third_party:versions.bzl", "HTTP_DEPENDENCY_VERSIONS", "get_maven_dependencies") +load("//third_party:versions.bzl", "HTTP_DEPENDENCY_VERSIONS", "MAVEN_REPOSITORIES", "get_maven_dependencies") # Android SDK configuration. For more details, see: # https://docs.bazel.build/versions/master/be/android.html#android_sdk_repository @@ -184,14 +184,25 @@ maven_install( duplicate_version_warning = "error", fail_if_repin_required = True, maven_install_json = "//third_party:maven_install.json", - repositories = DAGGER_REPOSITORIES + [ - "https://maven.fabric.io/public", - "https://maven.google.com", - "https://repo1.maven.org/maven2", - ], + override_targets = { + "com.google.guava:guava": "@//third_party:com_google_guava_guava", + }, + repositories = DAGGER_REPOSITORIES + MAVEN_REPOSITORIES, strict_visibility = True, ) load("@maven//:defs.bzl", "pinned_maven_install") pinned_maven_install() + +http_jar( + name = "guava_android", + sha256 = HTTP_DEPENDENCY_VERSIONS["guava_android"]["sha"], + urls = [ + "{0}/com/google/guava/guava/{1}-android/guava-{1}-android.jar".format( + url_base, + HTTP_DEPENDENCY_VERSIONS["guava_android"]["version"], + ) + for url_base in DAGGER_REPOSITORIES + MAVEN_REPOSITORIES + ], +) diff --git a/app/BUILD.bazel b/app/BUILD.bazel index b2b9ae0ecae..4dcef9d8be5 100644 --- a/app/BUILD.bazel +++ b/app/BUILD.bazel @@ -10,7 +10,6 @@ order to build with Bazel. - All binding adapters must be written in Java. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") load("@tools_android//tools/crashlytics:defs.bzl", "crashlytics_android_library") load("@tools_android//tools/googleservices:defs.bzl", "google_services_xml") @@ -627,7 +626,6 @@ kt_android_library( srcs = LISTENERS, custom_package = "org.oppia.android.app", deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/audio:cellular_audio_dialog_controller", "//model/src/main/proto:arguments_java_proto_lite", "//model/src/main/proto:question_java_proto_lite", @@ -672,7 +670,6 @@ kt_android_library( srcs = ANNOTATIONS, custom_package = "org.oppia.android.app", deps = [ - ":dagger", "//app/src/main/java/org/oppia/android/app/activity:activity_scope", "//app/src/main/java/org/oppia/android/app/fragment:fragment_scope", ], @@ -690,7 +687,6 @@ kt_android_library( ], deps = [ ":annotations", - ":dagger", ":listeners", ":resources", "//app/src/main/java/org/oppia/android/app/shim:intent_factory_shim", @@ -734,7 +730,6 @@ android_library( enable_data_binding = True, manifest = "src/main/DatabindingAdaptersManifest.xml", deps = [ - ":dagger", ":resources", ":view_models", "//app/src/main/java/org/oppia/android/app/translation:app_language_activity_injector_provider", @@ -771,11 +766,11 @@ kt_android_library( visibility = ["//visibility:public"], deps = [ ":binding_adapters", - ":dagger", ":databinding_resources", ":resources", ":view_models", ":views", + "//:dagger", "//app/src/main/java/org/oppia/android/app/activity:activity_intent_factories_shim", "//app/src/main/java/org/oppia/android/app/activity:injectable_auto_localized_app_compat_activity", "//app/src/main/java/org/oppia/android/app/activity:injectable_system_localized_app_compat_activity", @@ -851,9 +846,9 @@ kt_android_library( # keep sorted TEST_DEPS = [ ":app", - ":dagger", ":resources", ":test_deps", + "//:dagger", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", "//app/src/main/java/org/oppia/android/app/application:application_injector_provider", @@ -1023,5 +1018,3 @@ android_library( "//third_party:org_checkerframework_checker-qual", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/activity/route/BUILD.bazel b/app/src/main/java/org/oppia/android/app/activity/route/BUILD.bazel index 4700674d4c2..5b248b75ef9 100644 --- a/app/src/main/java/org/oppia/android/app/activity/route/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/activity/route/BUILD.bazel @@ -2,7 +2,6 @@ Constructs for setting up activity routing support in the Dagger graph. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") # TODO(#59): Define these exported files as separate libraries from top-level targets. @@ -19,11 +18,9 @@ kt_android_library( ], visibility = ["//:oppia_api_visibility"], deps = [ - ":dagger", + "//:dagger", "//model/src/main/proto:arguments_java_proto_lite", "//third_party:androidx_appcompat_appcompat", "//utility/src/main/java/org/oppia/android/util/logging:console_logger", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/application/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/BUILD.bazel index b91f953bfa1..0d857c76241 100644 --- a/app/src/main/java/org/oppia/android/app/application/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/application/BUILD.bazel @@ -5,7 +5,6 @@ Dagger graph. Specific application implementations can be found in subpackages. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -82,7 +81,6 @@ kt_android_library( "ApplicationStartupListenerModule.kt", ], deps = [ - ":dagger", "//app", "//domain/src/main/java/org/oppia/android/domain/oppialogger:startup_listener", ], @@ -134,5 +132,3 @@ android_library( "//utility/src/main/java/org/oppia/android/util/parser/image:repository_glide_module", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel index ce982039b52..65399ed8697 100644 --- a/app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel @@ -2,7 +2,6 @@ This package contains the root application definitions for alpha builds of the app. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -14,7 +13,7 @@ kt_android_library( visibility = ["//:oppia_binary_visibility"], deps = [ ":alpha_build_flavor_module", - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:abstract_application", "//app/src/main/java/org/oppia/android/app/application:application_component", @@ -36,9 +35,7 @@ kt_android_library( "//app/src/test/java/org/oppia/android/app/application/alpha:__pkg__", ], deps = [ - ":dagger", + "//:dagger", "//model/src/main/proto:version_java_proto_lite", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel index ff7623c9481..bf55ea55214 100644 --- a/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel @@ -3,7 +3,6 @@ This package contains the root application definitions for a Kenya user study sp of the app. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -14,7 +13,7 @@ kt_android_library( ], visibility = ["//:oppia_binary_visibility"], deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:abstract_application", "//app/src/main/java/org/oppia/android/app/application:application_component", @@ -26,5 +25,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/networking:prod_module", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/application/beta/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/beta/BUILD.bazel index f8bc14be8ca..2185c8137b9 100644 --- a/app/src/main/java/org/oppia/android/app/application/beta/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/application/beta/BUILD.bazel @@ -2,7 +2,6 @@ This package contains the root application definitions for beta builds of the app. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -17,7 +16,7 @@ kt_android_library( "//app/src/test/java/org/oppia/android/app/application/beta:__pkg__", ], deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:abstract_application", "//app/src/main/java/org/oppia/android/app/application:application_component", @@ -28,5 +27,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/networking:prod_module", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/application/dev/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/dev/BUILD.bazel index 7949a279c20..889eb40580c 100644 --- a/app/src/main/java/org/oppia/android/app/application/dev/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/application/dev/BUILD.bazel @@ -6,7 +6,6 @@ there are specially defined top-level build flavors which will select their corr application configuration. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -21,7 +20,7 @@ kt_android_library( "//app/src/test/java/org/oppia/android/app/application/dev:__pkg__", ], deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:abstract_application", "//app/src/main/java/org/oppia/android/app/application:application_component", @@ -32,5 +31,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/application/ga/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/ga/BUILD.bazel index baa4b12237b..84c3433e38c 100644 --- a/app/src/main/java/org/oppia/android/app/application/ga/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/application/ga/BUILD.bazel @@ -2,7 +2,6 @@ This package contains the root application definitions for general availability builds of the app. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -17,7 +16,7 @@ kt_android_library( "//app/src/test/java/org/oppia/android/app/application/ga:__pkg__", ], deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:abstract_application", "//app/src/main/java/org/oppia/android/app/application:application_component", @@ -28,5 +27,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/networking:prod_module", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/application/testing/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/testing/BUILD.bazel index f55e5d15b86..4ebecb8b338 100644 --- a/app/src/main/java/org/oppia/android/app/application/testing/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/application/testing/BUILD.bazel @@ -3,7 +3,6 @@ This package contains testing utilities that may be needed to set up the root ap testing environments. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -14,9 +13,7 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", + "//:dagger", "//model/src/main/proto:version_java_proto_lite", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/notice/testing/BUILD.bazel b/app/src/main/java/org/oppia/android/app/notice/testing/BUILD.bazel index 00ba0065c2b..248b74fdfa8 100644 --- a/app/src/main/java/org/oppia/android/app/notice/testing/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/notice/testing/BUILD.bazel @@ -2,7 +2,6 @@ Test-only utilities corresponding to app notices. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -69,5 +68,3 @@ kt_android_library( "//app/src/main/java/org/oppia/android/app/testing/activity:test_activity", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/testing/BUILD.bazel b/app/src/main/java/org/oppia/android/app/player/exploration/testing/BUILD.bazel index fafe72ad714..6879af440e7 100644 --- a/app/src/main/java/org/oppia/android/app/player/exploration/testing/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/player/exploration/testing/BUILD.bazel @@ -2,7 +2,6 @@ Test-only utilities corresponding to BottomSheetOptionsMenu. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -17,5 +16,3 @@ kt_android_library( "//app/src/main/java/org/oppia/android/app/testing/activity:test_activity", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/shim/BUILD.bazel b/app/src/main/java/org/oppia/android/app/shim/BUILD.bazel index e316b01485a..88b2ec6e9a1 100644 --- a/app/src/main/java/org/oppia/android/app/shim/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/shim/BUILD.bazel @@ -3,7 +3,6 @@ Temporary shims for providing indirection in the Bazel build graph to unblock mo parts of the app layer. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") IMPL_FILES = [ @@ -59,7 +58,6 @@ kt_android_library( name = "impl", srcs = UPDATED_IMPL_FILES, deps = [ - ":dagger", ":intent_factory_shim", ":view_binding_shim", "//app:databinding_resources", @@ -76,11 +74,8 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":impl", ":intent_factory_shim", ":view_binding_shim", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/translation/BUILD.bazel b/app/src/main/java/org/oppia/android/app/translation/BUILD.bazel index 719d7e1ce26..de38cd46673 100644 --- a/app/src/main/java/org/oppia/android/app/translation/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/translation/BUILD.bazel @@ -2,7 +2,6 @@ UI utilities for for managing languages & locales. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") # Resource shim needed so that AppLanguageResourceHandler can build in both Gradle & Bazel. @@ -26,7 +25,6 @@ kt_android_library( "//testing/src/test/java/org/oppia/android/testing/junit:__pkg__", ], deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/locale:locale_controller", ], ) @@ -42,7 +40,7 @@ kt_android_library( ], deps = [ ":app_language_locale_handler", - ":dagger", + "//:dagger", "//app/src/main/java/org/oppia/android/app/activity:activity_scope", "//domain/src/main/java/org/oppia/android/domain/locale:locale_controller", ], @@ -56,7 +54,6 @@ kt_android_library( visibility = ["//app:app_visibility"], deps = [ ":app_language_locale_handler", - ":dagger", "//app:resources", "//model/src/main/proto:profile_java_proto_lite", "//third_party:androidx_appcompat_appcompat", @@ -74,7 +71,6 @@ kt_android_library( ":activity_language_locale_handler", ":activity_recreator", ":app_language_locale_handler", - ":dagger", "//domain/src/main/java/org/oppia/android/domain/profile:profile_management_controller", "//domain/src/main/java/org/oppia/android/domain/translation:translation_controller", ], @@ -100,7 +96,7 @@ kt_android_library( ], deps = [ ":activity_recreator", - ":dagger", + "//third_party:javax_inject_javax_inject", ], ) @@ -112,8 +108,8 @@ kt_android_library( visibility = ["//:oppia_prod_module_visibility"], deps = [ ":activity_recreator", - ":dagger", ":impl", + "//:dagger", ], ) @@ -174,5 +170,3 @@ kt_android_library( ":app_language_application_injector", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/translation/testing/BUILD.bazel b/app/src/main/java/org/oppia/android/app/translation/testing/BUILD.bazel index 380efd3d894..eb7f84bda27 100644 --- a/app/src/main/java/org/oppia/android/app/translation/testing/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/translation/testing/BUILD.bazel @@ -2,7 +2,6 @@ Testing utilities for languages & locales. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -15,8 +14,8 @@ kt_android_library( "//app:app_testing_visibility", ], deps = [ - ":dagger", "//app/src/main/java/org/oppia/android/app/translation:activity_recreator", + "//third_party:javax_inject_javax_inject", ], ) @@ -28,10 +27,8 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", + ":test_activity_recreator", + "//:dagger", "//app/src/main/java/org/oppia/android/app/translation:activity_recreator", - "//app/src/main/java/org/oppia/android/app/translation/testing:test_activity_recreator", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/utility/datetime/BUILD.bazel b/app/src/main/java/org/oppia/android/app/utility/datetime/BUILD.bazel index c65b5547153..3c21abb2cb0 100644 --- a/app/src/main/java/org/oppia/android/app/utility/datetime/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/utility/datetime/BUILD.bazel @@ -2,7 +2,6 @@ General purposes utilities to manage date and time in user-facing strings. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") # Resource shim needed so that DateTimeUtil can build in both Gradle & Bazel. @@ -23,7 +22,6 @@ kt_android_library( ], visibility = ["//app:__subpackages__"], deps = [ - ":dagger", "//app:resources", "//app/src/main/java/org/oppia/android/app/translation:app_language_resource_handler", "//third_party:javax_inject_javax_inject", @@ -31,5 +29,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/system:oppia_clock", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/utility/lifecycle/BUILD.bazel b/app/src/main/java/org/oppia/android/app/utility/lifecycle/BUILD.bazel index 9e47fd3ff48..67d532a6a9b 100644 --- a/app/src/main/java/org/oppia/android/app/utility/lifecycle/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/utility/lifecycle/BUILD.bazel @@ -2,7 +2,6 @@ Constructs for setting up lifecycle safe timer factory for injection in the Dagger graph. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -18,5 +17,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/threading:annotations", ], ) - -dagger_rules() diff --git a/app/src/main/java/org/oppia/android/app/utility/math/BUILD.bazel b/app/src/main/java/org/oppia/android/app/utility/math/BUILD.bazel index 12d6ae08213..fa068ab78ea 100644 --- a/app/src/main/java/org/oppia/android/app/utility/math/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/utility/math/BUILD.bazel @@ -2,7 +2,6 @@ General purposes utilities corresponding to displaying math expressions & constructs. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") # Resource shim needed so that MathExpressionAccessibilityUtil can build in both Gradle & Bazel. @@ -23,7 +22,6 @@ kt_android_library( ], visibility = ["//app:app_visibility"], deps = [ - ":dagger", "//app:resources", "//app/src/main/java/org/oppia/android/app/translation:app_language_resource_handler", "//model/src/main/proto:languages_java_proto_lite", @@ -31,5 +29,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/math:extensions", ], ) - -dagger_rules() diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel index da61bfc0e69..847369f8d0e 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel @@ -1,4 +1,3 @@ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//app:app_test.bzl", "app_test") load("//app:test_with_resources.bzl", "test_with_resources") @@ -7,7 +6,7 @@ app_test( processed_src = test_with_resources("ProfileAndDeviceIdActivityTest.kt"), test_class = "org.oppia.android.app.administratorcontrols.learneranalytics.ProfileAndDeviceIdActivityTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app:test_deps", "//app/src/main/java/org/oppia/android/app/application:application_component", @@ -40,7 +39,7 @@ app_test( processed_src = test_with_resources("ProfileAndDeviceIdFragmentTest.kt"), test_class = "org.oppia.android.app.administratorcontrols.learneranalytics.ProfileAndDeviceIdFragmentTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app:test_deps", "//app/src/main/java/org/oppia/android/app/application:application_component", @@ -71,5 +70,3 @@ app_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/BUILD.bazel index 16a33d5d0ea..c30d27bb755 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/customview/interaction/BUILD.bazel @@ -2,7 +2,6 @@ Tests for custom interaction views. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//app:app_test.bzl", "app_test") load("//app:test_with_resources.bzl", "test_with_resources") @@ -11,7 +10,7 @@ app_test( processed_src = test_with_resources("MathExpressionInteractionsViewTest.kt"), test_class = "org.oppia.android.app.customview.interaction.MathExpressionInteractionsViewTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -40,5 +39,3 @@ app_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/databinding/BUILD.bazel index b387ee2b7d5..96d6c339ede 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/databinding/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/BUILD.bazel @@ -2,7 +2,6 @@ Tests for UI databinding utilities and adapters. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//app:app_test.bzl", "app_test") load("//app:test_with_resources.bzl", "test_with_resources") @@ -46,7 +45,7 @@ app_test( processed_src = test_with_resources("AppCompatCheckBoxBindingAdaptersTest.kt"), test_class = "org.oppia.android.app.databinding.AppCompatCheckBoxBindingAdaptersTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app:test_deps", "//app/src/main/java/org/oppia/android/app/activity:activity_intent_factories_shim", @@ -82,7 +81,7 @@ app_test( processed_src = test_with_resources("CircularProgressIndicatorAdaptersTest.kt"), test_class = "org.oppia.android.app.databinding.CircularProgressIndicatorAdaptersTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app:test_deps", "//app/src/main/java/org/oppia/android/app/activity:activity_intent_factories_shim", @@ -118,7 +117,7 @@ app_test( processed_src = "DrawableBindingAdaptersTest_updated.kt", test_class = "org.oppia.android.app.databinding.DrawableBindingAdaptersTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app:test_deps", "//app/src/main/java/org/oppia/android/app/activity:activity_intent_factories_shim", @@ -154,7 +153,7 @@ app_test( processed_src = "ImageViewBindingAdaptersTest_updated.kt", test_class = "org.oppia.android.app.databinding.ImageViewBindingAdaptersTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app:test_deps", "//app/src/main/java/org/oppia/android/app/activity:activity_intent_factories_shim", @@ -190,7 +189,7 @@ app_test( processed_src = test_with_resources("MarginBindingAdaptersTest.kt"), test_class = "org.oppia.android.app.databinding.MarginBindingAdaptersTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app:test_deps", "//app/src/main/java/org/oppia/android/app/activity:activity_intent_factories_shim", @@ -226,7 +225,7 @@ app_test( processed_src = test_with_resources("StateAssemblerMarginBindingAdaptersTest.kt"), test_class = "org.oppia.android.app.databinding.StateAssemblerMarginBindingAdaptersTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app:test_deps", "//app/src/main/java/org/oppia/android/app/activity:activity_intent_factories_shim", @@ -262,7 +261,7 @@ app_test( processed_src = test_with_resources("StateAssemblerPaddingBindingAdaptersTest.kt"), test_class = "org.oppia.android.app.databinding.StateAssemblerPaddingBindingAdaptersTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app:test_deps", "//app/src/main/java/org/oppia/android/app/activity:activity_intent_factories_shim", @@ -298,7 +297,7 @@ app_test( processed_src = "TextViewBindingAdaptersTest_updated.kt", test_class = "org.oppia.android.app.databinding.TextViewBindingAdaptersTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app:test_deps", "//app/src/main/java/org/oppia/android/app/activity:activity_intent_factories_shim", @@ -334,7 +333,7 @@ app_test( processed_src = test_with_resources("ViewBindingAdaptersTest.kt"), test_class = "org.oppia.android.app.databinding.ViewBindingAdaptersTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app:test_deps", "//app/src/main/java/org/oppia/android/app/activity:activity_intent_factories_shim", @@ -364,5 +363,3 @@ app_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/BUILD.bazel index 1cf6d50f745..0a49195e96c 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/BUILD.bazel @@ -2,7 +2,6 @@ Tests for the math expression parser developer options UI flows. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//app:app_test.bzl", "app_test") load("//app:test_with_resources.bzl", "test_with_resources") @@ -11,7 +10,7 @@ app_test( processed_src = test_with_resources("MathExpressionParserActivityTest.kt"), test_class = "org.oppia.android.app.devoptions.mathexpressionparser.MathExpressionParserActivityTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -43,7 +42,7 @@ app_test( processed_src = test_with_resources("MathExpressionParserFragmentTest.kt"), test_class = "org.oppia.android.app.devoptions.mathexpressionparser.MathExpressionParserFragmentTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -70,5 +69,3 @@ app_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/notice/BUILD.bazel index 8a43be43344..fae6ecc5a23 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/notice/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/notice/BUILD.bazel @@ -2,7 +2,6 @@ Tests for notices shown in the app. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//app:app_test.bzl", "app_test") load("//app:test_with_resources.bzl", "test_with_resources") @@ -11,7 +10,7 @@ app_test( processed_src = test_with_resources("BetaNoticeDialogFragmentTest.kt"), test_class = "org.oppia.android.app.notice.BetaNoticeDialogFragmentTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -48,7 +47,7 @@ app_test( processed_src = test_with_resources("GeneralAvailabilityUpgradeNoticeDialogFragmentTest.kt"), test_class = "org.oppia.android.app.notice.GeneralAvailabilityUpgradeNoticeDialogFragmentTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -85,7 +84,7 @@ app_test( processed_src = test_with_resources("ForcedAppDeprecationNoticeDialogFragmentTest.kt"), test_class = "org.oppia.android.app.notice.ForcedAppDeprecationNoticeDialogFragmentTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -114,7 +113,7 @@ app_test( processed_src = test_with_resources("OptionalAppDeprecationNoticeDialogFragmentTest.kt"), test_class = "org.oppia.android.app.notice.OptionalAppDeprecationNoticeDialogFragmentTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -143,7 +142,7 @@ app_test( processed_src = test_with_resources("OsDeprecationNoticeDialogFragmentTest.kt"), test_class = "org.oppia.android.app.notice.OsDeprecationNoticeDialogFragmentTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -166,5 +165,3 @@ app_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BUILD.bazel index ce1e1576313..4ba1c3f5b56 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BUILD.bazel @@ -2,7 +2,6 @@ Tests for exploration player. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//app:app_test.bzl", "app_test") load("//app:test_with_resources.bzl", "test_with_resources") @@ -11,7 +10,7 @@ app_test( processed_src = test_with_resources("BottomSheetOptionsMenuTest.kt"), test_class = "org.oppia.android.app.player.exploration.BottomSheetOptionsMenuTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -48,7 +47,7 @@ app_test( processed_src = test_with_resources("ExplorationActivityTest.kt"), test_class = "org.oppia.android.app.player.exploration.ExplorationActivityTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app:test_deps", "//app/src/main/java/org/oppia/android/app/application:application_component", @@ -101,5 +100,3 @@ app_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", ], ) - -dagger_rules() diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel index 8b340d5c065..1264e021c84 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel @@ -2,7 +2,6 @@ Tests for the core state player experience. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//app:app_test.bzl", "app_test") load("//app:test_with_resources.bzl", "test_with_resources") @@ -11,7 +10,7 @@ app_test( processed_src = test_with_resources("StateFragmentTest.kt"), test_class = "org.oppia.android.app.player.state.StateFragmentTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app:test_deps", "//app/src/main/java/org/oppia/android/app/application:application_component", @@ -52,5 +51,3 @@ app_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", ], ) - -dagger_rules() diff --git a/app/src/sharedTest/java/org/oppia/android/app/splash/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/splash/BUILD.bazel index a5c0352eb1e..387ee6650f4 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/splash/BUILD.bazel +++ b/app/src/sharedTest/java/org/oppia/android/app/splash/BUILD.bazel @@ -2,7 +2,6 @@ Tests for the splash/app UI initialization process. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//app:app_test.bzl", "app_test") load("//app:test_with_resources.bzl", "test_with_resources") @@ -11,7 +10,7 @@ app_test( processed_src = test_with_resources("SplashActivityTest.kt"), test_class = "org.oppia.android.app.splash.SplashActivityTest", deps = [ - ":dagger", + "//:dagger", "//app", "//app:test_deps", "//app/src/main/java/org/oppia/android/app/application:application_component", @@ -51,5 +50,3 @@ app_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", ], ) - -dagger_rules() diff --git a/app/src/test/java/org/oppia/android/app/activity/BUILD.bazel b/app/src/test/java/org/oppia/android/app/activity/BUILD.bazel index db0a93ddfc3..48fed80cf67 100644 --- a/app/src/test/java/org/oppia/android/app/activity/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/activity/BUILD.bazel @@ -2,7 +2,6 @@ Tests for general activity routing functionality. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.app.activity.ActivityIntentFactoriesTest", test_manifest = "//app:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/activity:activity_intent_factories_shim", "//app/src/main/java/org/oppia/android/app/application:application_component", @@ -43,5 +42,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/app/src/test/java/org/oppia/android/app/activity/route/BUILD.bazel b/app/src/test/java/org/oppia/android/app/activity/route/BUILD.bazel index cb29f885f98..b10f9b90038 100644 --- a/app/src/test/java/org/oppia/android/app/activity/route/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/activity/route/BUILD.bazel @@ -2,7 +2,6 @@ Tests for general activity routing functionality. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.app.activity.route.ActivityRouterTest", test_manifest = "//app:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/activity:activity_intent_factories_shim", "//app/src/main/java/org/oppia/android/app/application:application_component", @@ -54,7 +53,7 @@ oppia_android_test( test_class = "org.oppia.android.app.activity.route.ActivityRouterModuleTest", test_manifest = "//app:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/activity:activity_intent_factories_shim", "//app/src/main/java/org/oppia/android/app/application:application_component", @@ -86,5 +85,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/app/src/test/java/org/oppia/android/app/application/alpha/BUILD.bazel b/app/src/test/java/org/oppia/android/app/application/alpha/BUILD.bazel index 900715a50e6..e8cc91483e3 100644 --- a/app/src/test/java/org/oppia/android/app/application/alpha/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/application/alpha/BUILD.bazel @@ -2,7 +2,6 @@ Tests for alpha-specific top-level application configurations. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.app.application.alpha.AlphaBuildFlavorModuleTest", test_manifest = "//app:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app/src/main/java/org/oppia/android/app/application/alpha:alpha_build_flavor_module", "//model/src/main/proto:version_java_proto_lite", "//third_party:androidx_test_ext_junit", @@ -22,5 +21,3 @@ oppia_android_test( "//third_party:robolectric_android-all", ], ) - -dagger_rules() diff --git a/app/src/test/java/org/oppia/android/app/application/beta/BUILD.bazel b/app/src/test/java/org/oppia/android/app/application/beta/BUILD.bazel index 4706b193b26..16a2e88e15c 100644 --- a/app/src/test/java/org/oppia/android/app/application/beta/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/application/beta/BUILD.bazel @@ -2,7 +2,6 @@ Tests for beta-specific top-level application configurations. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.app.application.beta.BetaBuildFlavorModuleTest", test_manifest = "//app:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app/src/main/java/org/oppia/android/app/application/beta:beta_application", "//model/src/main/proto:version_java_proto_lite", "//third_party:androidx_test_ext_junit", @@ -22,5 +21,3 @@ oppia_android_test( "//third_party:robolectric_android-all", ], ) - -dagger_rules() diff --git a/app/src/test/java/org/oppia/android/app/application/dev/BUILD.bazel b/app/src/test/java/org/oppia/android/app/application/dev/BUILD.bazel index c6566c6f2a6..47e7ca2b31b 100644 --- a/app/src/test/java/org/oppia/android/app/application/dev/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/application/dev/BUILD.bazel @@ -2,7 +2,6 @@ Tests for developer-specific top-level application configurations. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.app.application.dev.DeveloperBuildFlavorModuleTest", test_manifest = "//app:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app/src/main/java/org/oppia/android/app/application/dev:developer_application", "//model/src/main/proto:version_java_proto_lite", "//third_party:androidx_test_ext_junit", @@ -22,5 +21,3 @@ oppia_android_test( "//third_party:robolectric_android-all", ], ) - -dagger_rules() diff --git a/app/src/test/java/org/oppia/android/app/application/ga/BUILD.bazel b/app/src/test/java/org/oppia/android/app/application/ga/BUILD.bazel index c3ce6168c22..a15268016f6 100644 --- a/app/src/test/java/org/oppia/android/app/application/ga/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/application/ga/BUILD.bazel @@ -2,7 +2,6 @@ Tests for general availability-specific top-level application configurations. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.app.application.ga.GaBuildFlavorModuleTest", test_manifest = "//app:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app/src/main/java/org/oppia/android/app/application/ga:general_availability_application", "//model/src/main/proto:version_java_proto_lite", "//third_party:androidx_test_ext_junit", @@ -22,5 +21,3 @@ oppia_android_test( "//third_party:robolectric_android-all", ], ) - -dagger_rules() diff --git a/app/src/test/java/org/oppia/android/app/application/testing/BUILD.bazel b/app/src/test/java/org/oppia/android/app/application/testing/BUILD.bazel index 2168366aeb4..20c624701ff 100644 --- a/app/src/test/java/org/oppia/android/app/application/testing/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/application/testing/BUILD.bazel @@ -2,7 +2,6 @@ Tests for testing-specific top-level application configurations. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.app.application.testing.TestingBuildFlavorModuleTest", test_manifest = "//app:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app/src/main/java/org/oppia/android/app/application/testing:testing_build_flavor_module", "//model/src/main/proto:version_java_proto_lite", "//third_party:androidx_test_ext_junit", @@ -22,5 +21,3 @@ oppia_android_test( "//third_party:robolectric_android-all", ], ) - -dagger_rules() diff --git a/app/src/test/java/org/oppia/android/app/devoptions/devoptionsitemviewmodel/BUILD.bazel b/app/src/test/java/org/oppia/android/app/devoptions/devoptionsitemviewmodel/BUILD.bazel index 55d5000dbd8..c2648795ecd 100644 --- a/app/src/test/java/org/oppia/android/app/devoptions/devoptionsitemviewmodel/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/devoptions/devoptionsitemviewmodel/BUILD.bazel @@ -11,6 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.app.devoptions.devoptionsitemviewmodel.DeveloperOptionsTestParsersViewModelTest", test_manifest = "//app:test_manifest", deps = [ + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", diff --git a/app/src/test/java/org/oppia/android/app/testing/activity/BUILD.bazel b/app/src/test/java/org/oppia/android/app/testing/activity/BUILD.bazel index 26313703901..6ee76e3e337 100644 --- a/app/src/test/java/org/oppia/android/app/testing/activity/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/testing/activity/BUILD.bazel @@ -2,7 +2,6 @@ Tests for generic activity & fragment test utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.app.testing.activity.TestActivityTest", test_manifest = "//app:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -46,5 +45,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", ], ) - -dagger_rules() diff --git a/app/src/test/java/org/oppia/android/app/translation/BUILD.bazel b/app/src/test/java/org/oppia/android/app/translation/BUILD.bazel index d28b6c7c34f..faddd51f273 100644 --- a/app/src/test/java/org/oppia/android/app/translation/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/translation/BUILD.bazel @@ -2,7 +2,6 @@ Tests for language & locale UI utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.app.translation.AppLanguageLocaleHandlerTest", test_manifest = "//app:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app/src/main/java/org/oppia/android/app/translation:app_language_locale_handler", "//config/src/java/org/oppia/android/config:all_languages_config", "//domain", @@ -49,7 +48,7 @@ oppia_android_test( test_class = "org.oppia.android.app.translation.ActivityLanguageLocaleHandlerTest", test_manifest = "//app:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -97,7 +96,7 @@ oppia_android_test( test_class = "org.oppia.android.app.translation.AppLanguageResourceHandlerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -147,7 +146,7 @@ oppia_android_test( test_class = "org.oppia.android.app.translation.AppLanguageWatcherMixinTest", test_manifest = "//app:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -186,5 +185,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/system:prod_module", ], ) - -dagger_rules() diff --git a/app/src/test/java/org/oppia/android/app/translation/testing/BUILD.bazel b/app/src/test/java/org/oppia/android/app/translation/testing/BUILD.bazel index 71bad81a590..96f5bedbacb 100644 --- a/app/src/test/java/org/oppia/android/app/translation/testing/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/translation/testing/BUILD.bazel @@ -2,7 +2,6 @@ Tests for language & locale UI testing utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.app.translation.testing.TestActivityRecreatorTest", test_manifest = "//app:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app/src/main/java/org/oppia/android/app/translation/testing:test_activity_recreator", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -25,5 +24,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/data:data_providers", ], ) - -dagger_rules() diff --git a/app/src/test/java/org/oppia/android/app/utility/math/BUILD.bazel b/app/src/test/java/org/oppia/android/app/utility/math/BUILD.bazel index 0678f0fb9bd..672944d46ec 100644 --- a/app/src/test/java/org/oppia/android/app/utility/math/BUILD.bazel +++ b/app/src/test/java/org/oppia/android/app/utility/math/BUILD.bazel @@ -2,7 +2,6 @@ Tests for UI-specific math utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.app.utility.math.MathExpressionAccessibilityUtilTest", test_manifest = "//app:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -51,5 +50,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", ], ) - -dagger_rules() diff --git a/config/proguard/kotlin-proguard-rules.pro b/config/proguard/kotlin-proguard-rules.pro index 0ed1a7d6a17..3503b267482 100644 --- a/config/proguard/kotlin-proguard-rules.pro +++ b/config/proguard/kotlin-proguard-rules.pro @@ -23,3 +23,7 @@ -dontwarn sun.misc.SignalHandler -dontwarn sun.misc.Signal -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement + +# TODO(#4120): Reevaluate if these exemptions are needed long-term. +-dontwarn kotlin.text.Regex$splitToSequence* +-dontwarn kotlin.time.jdk8.DurationConversionsJDK8Kt diff --git a/data/BUILD.bazel b/data/BUILD.bazel index 96b31650478..9e61d1f5786 100644 --- a/data/BUILD.bazel +++ b/data/BUILD.bazel @@ -3,7 +3,6 @@ This library provides data to the rest of the application. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//data:data_test.bzl", "data_test") filegroup( @@ -14,7 +13,7 @@ filegroup( # keep sorted TEST_DEPS = [ - ":dagger", + "//:dagger", "//data/src/main/java/org/oppia/android/data/backends/gae:network_config_prod_module", "//data/src/main/java/org/oppia/android/data/backends/gae:oppia_retrofit", "//data/src/main/java/org/oppia/android/data/backends/gae:prod_module", @@ -58,5 +57,3 @@ MIGRATED_TESTS = [ filtered_tests = MIGRATED_TESTS, deps = TEST_DEPS, ) for test_file_path in glob(["src/test/java/org/oppia/android/data/**/*Test.kt"])] - -dagger_rules() diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/BUILD.bazel b/data/src/main/java/org/oppia/android/data/backends/gae/BUILD.bazel index 22bc9933435..ed01ed8eae1 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/BUILD.bazel +++ b/data/src/main/java/org/oppia/android/data/backends/gae/BUILD.bazel @@ -3,7 +3,6 @@ Library for providing top-level HTTP networking support for Oppia's App Engine backend. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -20,8 +19,8 @@ kt_android_library( ], deps = [ ":constants", - ":dagger", ":network_config_annotations", + "//:dagger", "//model/src/main/proto:arguments_java_proto_lite", "//model/src/main/proto:event_logger_java_proto_lite", "//third_party:com_squareup_okhttp3_okhttp", @@ -40,8 +39,8 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":network_config_annotations", + "//:dagger", ], ) @@ -82,14 +81,12 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":network_config_annotations", ":network_interceptors", ":oppia_retrofit", + "//:dagger", "//data/src/main/java/org/oppia/android/data/backends/gae/api", "//third_party:com_google_guava_guava", "//third_party:com_squareup_retrofit2_converter-moshi", ], ) - -dagger_rules() diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/BUILD.bazel b/data/src/main/java/org/oppia/android/data/backends/gae/api/BUILD.bazel index 4dd54d21272..d7088cf7935 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/BUILD.bazel +++ b/data/src/main/java/org/oppia/android/data/backends/gae/api/BUILD.bazel @@ -3,7 +3,6 @@ Library for providing a network API interface with Oppia's App Engine backend. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -26,5 +25,3 @@ kt_android_library( "//third_party:com_squareup_retrofit2_retrofit", ], ) - -dagger_rules() diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/BUILD.bazel b/data/src/main/java/org/oppia/android/data/backends/gae/model/BUILD.bazel index 5923a1c1233..485e0124e60 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/BUILD.bazel +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/BUILD.bazel @@ -3,7 +3,6 @@ Library for providing model definitions for Oppia's App Engine backend endpoints. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -54,5 +53,3 @@ kt_android_library( "//third_party:moshi", ], ) - -dagger_rules() diff --git a/data/src/main/java/org/oppia/android/data/persistence/BUILD.bazel b/data/src/main/java/org/oppia/android/data/persistence/BUILD.bazel index 2137ddc1f86..8d4b3a4f783 100644 --- a/data/src/main/java/org/oppia/android/data/persistence/BUILD.bazel +++ b/data/src/main/java/org/oppia/android/data/persistence/BUILD.bazel @@ -2,7 +2,6 @@ This package provides persistence to the rest of the application. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -11,7 +10,6 @@ kt_android_library( custom_package = "org.oppia.android.data.persistence", visibility = ["//:oppia_api_visibility"], deps = [ - ":dagger", "//model/src/main/proto:profile_java_proto_lite", "//third_party:androidx_annotation_annotation", "//utility/src/main/java/org/oppia/android/util/data:async_data_subscription_manager", @@ -21,5 +19,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/profile:directory_management_util", ], ) - -dagger_rules() diff --git a/data/src/test/java/org/oppia/android/data/persistence/BUILD.bazel b/data/src/test/java/org/oppia/android/data/persistence/BUILD.bazel index 9a0686181ab..8412556066a 100644 --- a/data/src/test/java/org/oppia/android/data/persistence/BUILD.bazel +++ b/data/src/test/java/org/oppia/android/data/persistence/BUILD.bazel @@ -2,7 +2,6 @@ Tests for infrastructure that provides data persistence support for the rest of the app. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.data.persistence.PersistentCacheStoreTest", test_manifest = "//data:test_manifest", deps = [ - ":dagger", + "//:dagger", "//data/src/main/java/org/oppia/android/data/persistence:cache_store", "//model/src/main/proto:test_models", "//testing", @@ -28,5 +27,3 @@ oppia_android_test( "//third_party:robolectric_android-all", ], ) - -dagger_rules() diff --git a/domain/BUILD.bazel b/domain/BUILD.bazel index ebc2daa97ab..bf096edd4cf 100755 --- a/domain/BUILD.bazel +++ b/domain/BUILD.bazel @@ -3,7 +3,6 @@ This library contains the frontend controller and business service logic for the application. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") load("//domain:domain_assets.bzl", "generate_assets_list_from_text_protos") load("//domain:domain_test.bzl", "domain_test") @@ -117,7 +116,7 @@ kt_android_library( manifest = "src/main/AndroidManifest.xml", visibility = ["//visibility:public"], deps = [ - ":dagger", + "//:dagger", "//data/src/main/java/org/oppia/android/data/backends/gae/api", "//data/src/main/java/org/oppia/android/data/persistence:cache_store", "//domain/src/main/java/org/oppia/android/domain/classify:answer_classification_controller", @@ -172,9 +171,9 @@ kt_android_library( # keep sorted TEST_DEPS = [ - ":dagger", ":domain", ":interaction_object_test_builder", + "//:dagger", "//app:crashlytics", "//app:crashlytics_deps", "//app:firestore_deps", @@ -261,5 +260,3 @@ MIGRATED_TESTS = [ filtered_tests = MIGRATED_TESTS, deps = TEST_DEPS, ) for test_file_path in glob(["src/test/java/org/oppia/android/domain/**/*Test.kt"])] - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/auth/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/auth/BUILD.bazel index d00f97bfb90..37503b05060 100644 --- a/domain/src/main/java/org/oppia/android/domain/auth/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/auth/BUILD.bazel @@ -2,7 +2,6 @@ Library for providing authentication with Firebase functionality. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -43,8 +42,8 @@ kt_android_library( visibility = ["//:oppia_prod_module_visibility"], deps = [ ":authentication_controller", - ":dagger", ":firebase_auth_wrapper_impl", + "//:dagger", ], ) @@ -55,8 +54,8 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":firebase_auth_instance_wrapper_impl", + "//:dagger", ], ) @@ -67,9 +66,7 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":firebase_auth_wrapper", + "//:dagger", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/BUILD.bazel index 7c523f15e2f..30be62200c9 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/BUILD.bazel @@ -2,7 +2,6 @@ Domain components for answer classification. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -75,9 +74,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":generic_interaction_classifier", ":interaction_classifier", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify/rules:rule_classifier_provider", "//domain/src/main/java/org/oppia/android/domain/onboarding:exploration_meta_data_retriever", "//third_party:javax_inject_javax_inject", @@ -96,5 +95,3 @@ kt_android_library( "//model/src/main/proto:translation_java_proto_lite", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/rules/BUILD.bazel index f581741e245..c9a0c8ed31e 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/BUILD.bazel @@ -2,7 +2,6 @@ Rule classifier providers for classify domain components. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -34,5 +33,3 @@ kt_android_library( "//third_party:javax_inject_javax_inject", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel index c59365719f5..9f24847da82 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel @@ -2,7 +2,6 @@ Classifiers for the 'AlgebraicExpressionInput' interaction. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -14,7 +13,6 @@ kt_android_library( ], visibility = ["//domain:domain_testing_visibility"], deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/classify:classification_context", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:generic_rule_classifier", @@ -38,10 +36,8 @@ kt_android_library( visibility = ["//:oppia_prod_module_visibility"], deps = [ ":algebraic_expression_input_providers", - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:rule_classifier_provider", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction/BUILD.bazel index 5cf7d3227c8..479424f099e 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction/BUILD.bazel @@ -2,7 +2,6 @@ Classifiers for the 'Continue' interaction. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -12,10 +11,8 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:rule_classifier_provider", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/BUILD.bazel index 5dadd526a23..d1ad2995f17 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/BUILD.bazel @@ -2,7 +2,6 @@ Classifiers for the 'DragAndDropSortInput' interaction. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -14,7 +13,6 @@ kt_android_library( "DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProvider.kt", ], deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/classify:classification_context", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:generic_rule_classifier", @@ -33,11 +31,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":drag_and_drop_sort_input_providers", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:rule_classifier_provider", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/BUILD.bazel index 5da32a18e7c..87b0f38ec3e 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/BUILD.bazel @@ -2,7 +2,6 @@ Classifiers for the 'FractionInput' interaction. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -20,7 +19,6 @@ kt_android_library( "FractionInputIsLessThanRuleClassifierProvider.kt", ], deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/classify:classification_context", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:generic_rule_classifier", @@ -39,11 +37,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":fraction_input_providers", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:rule_classifier_provider", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/BUILD.bazel index eb216ecc013..691670a9741 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/BUILD.bazel @@ -2,7 +2,6 @@ Classifiers for the 'ImageClickInput' interaction. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -11,7 +10,6 @@ kt_android_library( "ImageClickInputIsInRegionRuleClassifierProvider.kt", ], deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/classify:classification_context", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:generic_rule_classifier", @@ -30,11 +28,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":image_click_input_providers", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:rule_classifier_provider", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/BUILD.bazel index b1ae3ef0a1f..6b4752ca5e1 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/BUILD.bazel @@ -2,7 +2,6 @@ Classifiers for the 'ItemSelectionInput' interaction. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -14,7 +13,6 @@ kt_android_library( "ItemSelectionInputIsProperSubsetOfRuleClassifierProvider.kt", ], deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/classify:classification_context", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:generic_rule_classifier", @@ -33,11 +31,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":item_selection_input_providers", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:rule_classifier_provider", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/mathequationinput/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/rules/mathequationinput/BUILD.bazel index 0a70ea19348..3dcf2a57cdb 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/mathequationinput/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/mathequationinput/BUILD.bazel @@ -2,7 +2,6 @@ Classifiers for the 'MathEquationInput' interaction. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -14,7 +13,6 @@ kt_android_library( ], visibility = ["//domain:domain_testing_visibility"], deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/classify:classification_context", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:generic_rule_classifier", @@ -37,11 +35,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":math_equation_input_providers", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:rule_classifier_provider", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/BUILD.bazel index 19a34a097ca..ccbe9213512 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/BUILD.bazel @@ -2,7 +2,6 @@ Classifiers for the 'MultipleChoiceInput' interaction. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -11,7 +10,6 @@ kt_android_library( "MultipleChoiceInputEqualsRuleClassifierProvider.kt", ], deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/classify:classification_context", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:generic_rule_classifier", @@ -30,11 +28,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":multiple_choice_input_providers", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:rule_classifier_provider", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/BUILD.bazel index 1954b42da92..eb4b0b00110 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/BUILD.bazel @@ -2,7 +2,6 @@ Classifiers for the 'NumberWithUnits' interaction. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -12,7 +11,6 @@ kt_android_library( "NumberWithUnitsIsEquivalentToRuleClassifierProvider.kt", ], deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/classify:classification_context", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:generic_rule_classifier", @@ -31,11 +29,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":number_with_units_providers", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:rule_classifier_provider", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericexpressioninput/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericexpressioninput/BUILD.bazel index 5a11936c237..ded61c2a1dd 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericexpressioninput/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericexpressioninput/BUILD.bazel @@ -2,7 +2,6 @@ Classifiers for the 'NumericExpressionInput' interaction. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -14,7 +13,6 @@ kt_android_library( ], visibility = ["//domain:domain_testing_visibility"], deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/classify:classification_context", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:generic_rule_classifier", @@ -37,11 +35,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":numeric_expression_input_providers", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:rule_classifier_provider", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/BUILD.bazel index 2d8f8e7136e..a25efd74a6d 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/BUILD.bazel @@ -2,7 +2,6 @@ Classifiers for the 'NumericInput' interaction. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -17,7 +16,6 @@ kt_android_library( "NumericInputIsWithinToleranceRuleClassifierProvider.kt", ], deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/classify:classification_context", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:generic_rule_classifier", @@ -36,11 +34,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":numeric_input_providers", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:rule_classifier_provider", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/BUILD.bazel index 6fb01de8afb..be367bfdc7f 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/BUILD.bazel @@ -2,7 +2,6 @@ Classifiers for the 'RatioInput' interaction. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -14,7 +13,6 @@ kt_android_library( "RatioInputIsEquivalentRuleClassifierProvider.kt", ], deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/classify:classification_context", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:generic_rule_classifier", @@ -33,11 +31,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":ratio_input_providers", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:rule_classifier_provider", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/BUILD.bazel index 4a8a59451fa..763bffacd05 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/BUILD.bazel @@ -2,7 +2,6 @@ Classifiers for the 'TextInput' interaction. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -14,7 +13,6 @@ kt_android_library( "TextInputStartsWithRuleClassifierProvider.kt", ], deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/classify:classification_context", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:generic_rule_classifier", @@ -37,11 +35,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":text_input_providers", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:rule_classifier", "//domain/src/main/java/org/oppia/android/domain/classify/rules:rule_classifier_provider", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/clipboard/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/clipboard/BUILD.bazel index 9b485b17b05..4285df8c762 100644 --- a/domain/src/main/java/org/oppia/android/domain/clipboard/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/clipboard/BUILD.bazel @@ -3,7 +3,6 @@ Domain services & definitions corresponding to managing the system clipboard whe text. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -13,10 +12,7 @@ kt_android_library( ], visibility = ["//:oppia_api_visibility"], deps = [ - ":dagger", "//utility/src/main/java/org/oppia/android/util/data:data_provider", "//utility/src/main/java/org/oppia/android/util/data:data_providers", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/testing/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/exploration/testing/BUILD.bazel index aa24abd30f7..f2299ed6cd9 100644 --- a/domain/src/main/java/org/oppia/android/domain/exploration/testing/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/exploration/testing/BUILD.bazel @@ -2,7 +2,6 @@ Test-only utilities for exploration management & loading domain components. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -25,9 +24,7 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", ":fake_exploration_retriever", + "//:dagger", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/feedbackreporting/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/feedbackreporting/BUILD.bazel index ee80b564682..3a142430a7f 100644 --- a/domain/src/main/java/org/oppia/android/domain/feedbackreporting/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/feedbackreporting/BUILD.bazel @@ -2,7 +2,6 @@ Domain services & definitions corresponding to user feedback reporting. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -12,8 +11,8 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", ":report_schema_version", + "//:dagger", ], ) @@ -27,5 +26,3 @@ kt_android_library( "//third_party:javax_inject_javax_inject", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/locale/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/locale/BUILD.bazel index bfa81c3fcb7..5db57463f86 100644 --- a/domain/src/main/java/org/oppia/android/domain/locale/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/locale/BUILD.bazel @@ -2,7 +2,6 @@ Domain definitions for managing languages & locales. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -13,7 +12,6 @@ kt_android_library( visibility = ["//:oppia_api_visibility"], deps = [ ":content_locale_impl", - ":dagger", ":language_config_retriever", "//domain/src/main/java/org/oppia/android/domain/oppialogger:oppia_logger", "//model/src/main/proto:languages_java_proto_lite", @@ -49,7 +47,6 @@ kt_android_library( "//domain:domain_testing_visibility", ], deps = [ - ":dagger", "//model/src/main/proto:languages_java_proto_lite", "//utility/src/main/java/org/oppia/android/util/caching:annotations", "//utility/src/main/java/org/oppia/android/util/caching:asset_repository", @@ -83,5 +80,3 @@ kt_android_library( ":locale_application_injector", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/onboarding/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/onboarding/BUILD.bazel index bf578eb1067..293ffa8f4fc 100644 --- a/domain/src/main/java/org/oppia/android/domain/onboarding/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/onboarding/BUILD.bazel @@ -2,7 +2,6 @@ Utilities for onboarding domain components. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -34,9 +33,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":exploration_meta_data_retriever", ":impl", + "//:dagger", ], ) @@ -79,5 +78,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/extensions:context_extensions", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/onboarding/testing/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/onboarding/testing/BUILD.bazel index 540172f4f86..be23c119989 100644 --- a/domain/src/main/java/org/oppia/android/domain/onboarding/testing/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/onboarding/testing/BUILD.bazel @@ -2,7 +2,6 @@ Test-only utilities for onboarding domain components. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -13,8 +12,8 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", ":fake_exploration_meta_data_retriever", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/onboarding:exploration_meta_data_retriever", ], ) @@ -31,5 +30,3 @@ kt_android_library( "//third_party:javax_inject_javax_inject", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/oppialogger/BUILD.bazel index 9126d713ce0..6180098f779 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/BUILD.bazel @@ -2,7 +2,6 @@ Package for providing logging support. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -66,9 +65,7 @@ kt_android_library( ], deps = [ ":application_id_seed", - ":dagger", + "//:dagger", "//utility/src/main/java/org/oppia/android/util/system:oppia_clock", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel index 5f49e2b7a58..dcfae35e1ce 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel @@ -2,7 +2,6 @@ Library for providing logging analytics to the Oppia android app. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -23,7 +22,7 @@ kt_android_library( ], visibility = ["//domain/src/main/java/org/oppia/android/domain/oppialogger:__subpackages__"], deps = [ - ":dagger", + "//:dagger", "//data/src/main/java/org/oppia/android/data/backends/gae:network_interceptors", "//data/src/main/java/org/oppia/android/data/persistence:cache_store", "//domain/src/main/java/org/oppia/android/domain/oppialogger:prod_module", @@ -46,7 +45,6 @@ kt_android_library( ], visibility = ["//domain/src/main/java/org/oppia/android/domain/oppialogger:__subpackages__"], deps = [ - ":dagger", "//data/src/main/java/org/oppia/android/data/persistence:cache_store", "//domain/src/main/java/org/oppia/android/domain/oppialogger:prod_module", "//model/src/main/proto:performance_metrics_event_logger_java_proto_lite", @@ -66,7 +64,6 @@ kt_android_library( ], visibility = ["//:oppia_api_visibility"], deps = [ - ":dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger:logging_identifier_controller", "//domain/src/main/java/org/oppia/android/domain/oppialogger:oppia_logger", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:controller", @@ -82,7 +79,6 @@ kt_android_library( ], visibility = ["//:oppia_api_visibility"], deps = [ - ":dagger", ":performance_metrics_controller", "//domain/src/main/java/org/oppia/android/domain/oppialogger:logging_identifier_controller", "//domain/src/main/java/org/oppia/android/domain/oppialogger:oppia_logger", @@ -125,7 +121,6 @@ kt_android_library( deps = [ ":application_lifecycle_listener", ":cpu_performance_snapshotter", - ":dagger", ":learner_analytics_inactivity_limit_millis", ":performance_metrics_controller", "//domain/src/main/java/org/oppia/android/domain/oppialogger:logging_identifier_controller", @@ -147,8 +142,8 @@ kt_android_library( visibility = ["//:oppia_prod_module_visibility"], deps = [ ":application_lifecycle_observer", - ":dagger", ":learner_analytics_inactivity_limit_millis", + "//:dagger", "//domain", ], ) @@ -161,7 +156,6 @@ kt_android_library( visibility = ["//:oppia_testing_visibility"], deps = [ ":cpu_performance_logging_time_period_millis", - ":dagger", ":learner_analytics_inactivity_limit_millis", ":performance_metrics_controller", "//domain/src/main/java/org/oppia/android/domain/oppialogger:logging_identifier_controller", @@ -184,8 +178,8 @@ kt_android_library( visibility = ["//:oppia_prod_module_visibility"], deps = [ ":cpu_performance_snapshotter", - ":dagger", ":learner_analytics_inactivity_limit_millis", + "//:dagger", ], ) @@ -204,7 +198,7 @@ kt_android_library( ], visibility = ["//:oppia_api_visibility"], deps = [ - ":dagger", + "//:dagger", "//data/src/main/java/org/oppia/android/data/persistence:cache_store", "//domain/src/main/java/org/oppia/android/domain/auth:authentication_controller", "//domain/src/main/java/org/oppia/android/domain/oppialogger:prod_module", @@ -217,5 +211,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/system:oppia_clock", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/testing/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/testing/BUILD.bazel index a92a8aa723a..1f5645eed60 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/testing/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/testing/BUILD.bazel @@ -2,7 +2,6 @@ Package for testing utilities for log uploading functionality. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -13,10 +12,8 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", + "//third_party:javax_inject_javax_inject", "//utility/src/main/java/org/oppia/android/util/logging:log_uploader", "//utility/src/main/java/org/oppia/android/util/logging:metric_log_scheduler", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/BUILD.bazel index 3d479108604..d0805571dbd 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/BUILD.bazel @@ -2,7 +2,6 @@ Package for providing logging support for exceptions. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -30,8 +29,8 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":startup_listener", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger:startup_listener", ], ) @@ -48,5 +47,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/logging:console_logger", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/logscheduler/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/oppialogger/logscheduler/BUILD.bazel index 8b62f56b4ac..2f8c93f1c40 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/logscheduler/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/logscheduler/BUILD.bazel @@ -2,7 +2,6 @@ Library for providing log scheduling functionality to the Oppia android app. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -54,11 +53,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":performance_metrics_log_scheduler", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger:startup_listener", "//utility/src/main/java/org/oppia/android/util/logging:metric_log_scheduler", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel index 58f18019799..2348e0caead 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel @@ -2,7 +2,6 @@ Library for providing log uploading functionality to the Oppia android app. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -67,10 +66,8 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":initializer", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger:startup_listener", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/survey/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/oppialogger/survey/BUILD.bazel index 1568c5914b9..dca0f23dfa2 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/survey/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/survey/BUILD.bazel @@ -2,7 +2,6 @@ Library for providing logging functionality in a survey. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -16,5 +15,3 @@ kt_android_library( "//third_party:javax_inject_javax_inject", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/profile/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/profile/BUILD.bazel index 559ed5175d5..23a3ba5f821 100644 --- a/domain/src/main/java/org/oppia/android/domain/profile/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/profile/BUILD.bazel @@ -2,7 +2,6 @@ Domain definitions and controllers for managing profiles. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -29,5 +28,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/system:oppia_clock", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/spotlight/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/spotlight/BUILD.bazel index e9c1bb9fcc3..a472d8e814d 100644 --- a/domain/src/main/java/org/oppia/android/domain/spotlight/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/spotlight/BUILD.bazel @@ -2,7 +2,6 @@ Domain definitions and controllers for managing spotlights. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -21,5 +20,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/data:data_providers", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/survey/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/survey/BUILD.bazel index 7e6da66527e..92c999a4a8b 100644 --- a/domain/src/main/java/org/oppia/android/domain/survey/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/survey/BUILD.bazel @@ -2,7 +2,6 @@ Library for providing survey functionality in the app. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -60,5 +59,3 @@ kt_android_library( "//model/src/main/proto:survey_java_proto_lite", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/testing/oppialogger/loguploader/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/testing/oppialogger/loguploader/BUILD.bazel index 8b7fcd64eca..241c5879b68 100644 --- a/domain/src/main/java/org/oppia/android/domain/testing/oppialogger/loguploader/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/testing/oppialogger/loguploader/BUILD.bazel @@ -2,7 +2,6 @@ Package for testing utilities for log uploading functionality. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -13,9 +12,7 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", + "//third_party:javax_inject_javax_inject", "//utility/src/main/java/org/oppia/android/util/logging:log_uploader", ], ) - -dagger_rules() diff --git a/domain/src/main/java/org/oppia/android/domain/translation/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/translation/BUILD.bazel index a66c9c7a081..53cc31e391c 100644 --- a/domain/src/main/java/org/oppia/android/domain/translation/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/translation/BUILD.bazel @@ -2,7 +2,6 @@ Domain definitions for managing translations. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -26,5 +25,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/locale:oppia_locale", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/auth/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/auth/BUILD.bazel index 7b549aa2c45..fecc92c1cb3 100644 --- a/domain/src/test/java/org/oppia/android/domain/auth/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/auth/BUILD.bazel @@ -2,7 +2,6 @@ Tests for libraries providing authentication with Firebase functionality. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.auth.AuthenticationControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/auth:auth_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//testing", @@ -35,7 +34,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.auth.AuthenticationModuleTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/auth:auth_module", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -57,7 +56,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.auth.FirebaseAuthWrapperImplTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/auth:auth_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//testing", @@ -72,5 +71,3 @@ oppia_android_test( "//third_party:robolectric_android-all", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel index 786cd962d4d..60ea68740a9 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel @@ -2,7 +2,6 @@ Tests for algebraic expression input classifiers. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.classify.rules.algebraicexpressioninput.AlgebraicExpressionInputIsEquivalentToRuleClassifierProviderTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput:algebraic_expression_input_providers", "//model/src/main/proto:interaction_object_java_proto_lite", @@ -38,7 +37,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.classify.rules.algebraicexpressioninput.AlgebraicExpressionInputMatchesExactlyWithRuleClassifierProviderTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput:algebraic_expression_input_providers", "//model/src/main/proto:interaction_object_java_proto_lite", @@ -64,7 +63,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.classify.rules.algebraicexpressioninput.AlgebraicExpressionInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput:algebraic_expression_input_providers", "//model/src/main/proto:interaction_object_java_proto_lite", @@ -90,7 +89,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.classify.rules.algebraicexpressioninput.AlgebraicExpressionInputModuleTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput:algebraic_expression_input_rule_module", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -105,5 +104,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/logging:prod_module", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/BUILD.bazel index 88686b47484..8170eefb44e 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/BUILD.bazel @@ -2,7 +2,6 @@ Tests for math equation input classifiers. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.classify.rules.mathequationinput.MathEquationInputIsEquivalentToRuleClassifierProviderTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify/rules/mathequationinput:math_equation_input_providers", "//model/src/main/proto:interaction_object_java_proto_lite", @@ -38,7 +37,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.classify.rules.mathequationinput.MathEquationInputMatchesExactlyWithRuleClassifierProviderTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify/rules/mathequationinput:math_equation_input_providers", "//model/src/main/proto:interaction_object_java_proto_lite", @@ -64,7 +63,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.classify.rules.mathequationinput.MathEquationInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify/rules/mathequationinput:math_equation_input_providers", "//model/src/main/proto:interaction_object_java_proto_lite", @@ -90,7 +89,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.classify.rules.mathequationinput.MathEquationInputModuleTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify/rules/mathequationinput:math_equation_input_rule_module", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -105,5 +104,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/logging:prod_module", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/numericexpressioninput/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/classify/rules/numericexpressioninput/BUILD.bazel index 7755b5ca94a..aebbea64f41 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/numericexpressioninput/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/numericexpressioninput/BUILD.bazel @@ -2,7 +2,6 @@ Tests for numeric expression input classifiers. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExpressionInputIsEquivalentToRuleClassifierProviderTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify/rules/numericexpressioninput:numeric_expression_input_providers", "//model/src/main/proto:interaction_object_java_proto_lite", @@ -38,7 +37,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExpressionInputMatchesExactlyWithRuleClassifierProviderTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify/rules/numericexpressioninput:numeric_expression_input_providers", "//model/src/main/proto:interaction_object_java_proto_lite", @@ -64,7 +63,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExpressionInputMatchesUpToTrivialManipulationsRuleClassifierProviderTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify/rules/numericexpressioninput:numeric_expression_input_providers", "//model/src/main/proto:interaction_object_java_proto_lite", @@ -90,7 +89,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExpressionInputModuleTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify/rules/numericexpressioninput:numeric_expression_input_rule_module", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -105,5 +104,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/logging:prod_module", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/clipboard/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/clipboard/BUILD.bazel index 6d6534cf9bf..2a9d2c82b26 100644 --- a/domain/src/test/java/org/oppia/android/domain/clipboard/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/clipboard/BUILD.bazel @@ -2,7 +2,6 @@ Tests for clipboard management domain services & definitions. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.clipboard.ClipboardControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/clipboard:clipboard_controller", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//testing", @@ -32,5 +31,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/exploration/BUILD.bazel index 5eb52cf2749..c292a5d8c1f 100644 --- a/domain/src/test/java/org/oppia/android/domain/exploration/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/exploration/BUILD.bazel @@ -2,7 +2,6 @@ Tests for lightweight exploration player domain components. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.exploration.ExplorationDataControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify:interactions_module", "//domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput:algebraic_expression_input_rule_module", @@ -56,7 +55,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.exploration.ExplorationProgressControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//config/src/java/org/oppia/android/config:all_languages_config", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify:interactions_module", @@ -103,7 +102,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.exploration.ExplorationStorageModuleTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/oppialogger:prod_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", @@ -131,7 +130,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.exploration.ExplorationActiveTimeControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify:interactions_module", "//domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput:algebraic_expression_input_rule_module", @@ -177,7 +176,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.exploration.ExplorationProgressModuleTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify:interactions_module", "//domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput:algebraic_expression_input_rule_module", @@ -215,5 +214,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressModuleTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressModuleTest.kt index cf7eef40556..eea2f6708ee 100644 --- a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressModuleTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressModuleTest.kt @@ -10,7 +10,6 @@ import dagger.BindsInstance import dagger.Component import dagger.Module import dagger.Provides -import dagger.multibindings.IntoSet import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -63,12 +62,6 @@ class ExplorationProgressModuleTest { interface TestModule { @Binds fun provideContext(application: Application): Context - - @Binds - @IntoSet - fun bindExplorationProgressListener( - activeTimeController: ExplorationActiveTimeController - ): ExplorationProgressListener } @Module diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/BUILD.bazel index af942107187..49c83ca1450 100644 --- a/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/BUILD.bazel @@ -2,7 +2,6 @@ Tests for lightweight checkpointing domain components. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.exploration.lightweightcheckpointing.ExplorationCheckpointControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:interactions_module", "//domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput:algebraic_expression_input_rule_module", "//domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction:continue_module", @@ -47,5 +46,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/system:prod_module", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/testing/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/exploration/testing/BUILD.bazel index 23bed07b229..858cfe267a1 100644 --- a/domain/src/test/java/org/oppia/android/domain/exploration/testing/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/exploration/testing/BUILD.bazel @@ -2,7 +2,6 @@ Tests for test-only exploration domain utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.exploration.testing.ExplorationStorageTestModuleTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/exploration/testing:fake_exploration_retriever", "//domain/src/main/java/org/oppia/android/domain/exploration/testing:test_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", @@ -40,7 +39,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.exploration.testing.FakeExplorationRetrieverTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/exploration/testing:fake_exploration_retriever", "//testing", @@ -58,5 +57,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/logging:prod_module", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/hintsandsolution/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/hintsandsolution/BUILD.bazel index 1dc2c093e59..9ed11d7c15d 100644 --- a/domain/src/test/java/org/oppia/android/domain/hintsandsolution/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/hintsandsolution/BUILD.bazel @@ -2,7 +2,6 @@ Tests for hints and solution domain components. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,6 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.hintsandsolution.HelpIndexExtensionsTest", test_manifest = "//domain:test_manifest", deps = [ + "//:dagger", "//testing", "//third_party:androidx_test_ext_junit", "//third_party:com_google_truth_truth", @@ -28,7 +28,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.hintsandsolution.HintHandlerDebugImplTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/exploration/testing:test_module", "//testing", @@ -54,7 +54,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.hintsandsolution.HintHandlerProdImplTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/exploration/testing:test_module", "//testing", @@ -80,7 +80,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.hintsandsolution.HintsAndSolutionDebugModuleTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -100,7 +100,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.hintsandsolution.HintsAndSolutionProdModuleTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -112,5 +112,3 @@ oppia_android_test( "//third_party:robolectric_android-all", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/locale/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/locale/BUILD.bazel index b631b4f16e3..7b02bf08e9c 100644 --- a/domain/src/test/java/org/oppia/android/domain/locale/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/locale/BUILD.bazel @@ -2,7 +2,6 @@ Tests for language & locale domain components. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.locale.ContentLocaleImplTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//config/src/java/org/oppia/android/config:all_languages_config", "//domain/src/main/java/org/oppia/android/domain/locale:content_locale_impl", "//model/src/main/proto:languages_java_proto_lite", @@ -32,7 +31,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.locale.LanguageConfigRetrieverTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//config/src/java/org/oppia/android/config:all_languages_config", "//domain/src/main/java/org/oppia/android/domain/locale:language_config_retriever", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -57,7 +56,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.locale.LanguageConfigRetrieverProductionTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//config/src/java/org/oppia/android/config:production_languages_config", "//domain/src/main/java/org/oppia/android/domain/locale:language_config_retriever", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -82,7 +81,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.locale.LanguageConfigRetrieverWithoutAssetsTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//config/src/java/org/oppia/android/config:all_languages_config", "//domain/src/main/java/org/oppia/android/domain/locale:language_config_retriever", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -104,7 +103,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.locale.LocaleControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//config/src/java/org/oppia/android/config:all_languages_config", "//domain/src/main/java/org/oppia/android/domain/locale:locale_controller", "//domain/src/main/java/org/oppia/android/domain/oppialogger:prod_module", @@ -129,5 +128,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/system:prod_module", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/onboarding/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/onboarding/BUILD.bazel index 7014081371a..16993f30a2c 100644 --- a/domain/src/test/java/org/oppia/android/domain/onboarding/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/onboarding/BUILD.bazel @@ -2,7 +2,6 @@ Tests for domain components pertaining to onboarding the user to the app. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.onboarding.AppStartupStateControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/onboarding:retriever_prod_module", "//domain/src/main/java/org/oppia/android/domain/onboarding:state_controller", @@ -43,7 +42,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.onboarding.DeprecationControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/onboarding:deprecation_controller", "//domain/src/main/java/org/oppia/android/domain/onboarding:retriever_prod_module", @@ -66,5 +65,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/system:prod_module", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel index 1cacb701329..8db519ab7ed 100644 --- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel @@ -2,7 +2,6 @@ Tests for app analytics logging support. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.oppialogger.analytics.AnalyticsControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger:prod_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//testing", @@ -44,7 +43,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.oppialogger.analytics.ApplicationLifecycleModuleTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:cpu_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//testing", @@ -73,7 +72,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.oppialogger.analytics.ApplicationLifecycleObserverTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:cpu_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//testing", @@ -106,7 +105,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterModuleTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:cpu_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//testing", @@ -135,7 +134,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:cpu_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//testing", @@ -165,7 +164,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.oppialogger.analytics.LearnerAnalyticsLoggerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/classify:interactions_module", "//domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput:algebraic_expression_input_rule_module", "//domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction:continue_module", @@ -209,7 +208,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.oppialogger.analytics.PerformanceMetricsControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:cpu_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/logscheduler:metric_log_scheduler_module", @@ -240,7 +239,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.oppialogger.analytics.PerformanceMetricsLoggerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:cpu_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//testing", @@ -270,7 +269,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.oppialogger.analytics.SurveyEventsLoggerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/survey:survey_events_logger", "//testing", @@ -292,5 +291,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/testing/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/testing/BUILD.bazel index 0d317321c64..533770e2c80 100644 --- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/testing/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/testing/BUILD.bazel @@ -2,7 +2,6 @@ Tests for test-only app analytics logging support components. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.oppialogger.analytics.testing.FakeLogSchedulerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:cpu_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/testing:fake_log_scheduler", @@ -37,5 +36,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:prod_module", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel index da6cd042dea..a6e4f4d9620 100644 --- a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel @@ -2,7 +2,6 @@ Tests for app-wide log uploading functionality. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.oppialogger.loguploader.LogReportWorkManagerInitializerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:cpu_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", @@ -46,7 +45,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader:worker", @@ -73,5 +72,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:network_connection_debug_util", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/question/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/question/BUILD.bazel index 3989ef637a4..db85b223c11 100644 --- a/domain/src/test/java/org/oppia/android/domain/question/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/question/BUILD.bazel @@ -2,7 +2,6 @@ Tests for lightweight exploration player domain components. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.question.QuestionAssessmentProgressControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//config/src/java/org/oppia/android/config:all_languages_config", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify:interactions_module", @@ -58,7 +57,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.question.QuestionTrainingControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify:interactions_module", "//domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput:algebraic_expression_input_rule_module", @@ -94,5 +93,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/system:prod_module", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/survey/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/survey/BUILD.bazel index d2d4394ce79..a3fbfdef517 100644 --- a/domain/src/test/java/org/oppia/android/domain/survey/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/survey/BUILD.bazel @@ -2,7 +2,6 @@ Tests for survey domain components. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.survey.SurveyGatingControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger:prod_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//domain/src/main/java/org/oppia/android/domain/survey:gating_controller", @@ -40,7 +39,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.survey.SurveyControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger:prod_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//domain/src/main/java/org/oppia/android/domain/survey:survey_controller", @@ -67,7 +66,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.survey.SurveyProgressControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger:prod_module", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//domain/src/main/java/org/oppia/android/domain/survey:survey_controller", @@ -87,5 +86,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/domain/src/test/java/org/oppia/android/domain/translation/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/translation/BUILD.bazel index 1336cab8f7a..8c5617bb171 100644 --- a/domain/src/test/java/org/oppia/android/domain/translation/BUILD.bazel +++ b/domain/src/test/java/org/oppia/android/domain/translation/BUILD.bazel @@ -2,7 +2,6 @@ Tests for domain components pertaining to managing translations. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.domain.translation.TranslationControllerTest", test_manifest = "//domain:test_manifest", deps = [ - ":dagger", + "//:dagger", "//config/src/java/org/oppia/android/config:all_languages_config", "//domain/src/main/java/org/oppia/android/domain/locale:locale_controller", "//domain/src/main/java/org/oppia/android/domain/oppialogger:prod_module", @@ -38,5 +37,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/system:prod_module", ], ) - -dagger_rules() diff --git a/instrumentation/src/java/org/oppia/android/instrumentation/application/BUILD.bazel b/instrumentation/src/java/org/oppia/android/instrumentation/application/BUILD.bazel index 5e9c6382d77..7bbf3e45552 100644 --- a/instrumentation/src/java/org/oppia/android/instrumentation/application/BUILD.bazel +++ b/instrumentation/src/java/org/oppia/android/instrumentation/application/BUILD.bazel @@ -2,7 +2,6 @@ This library contains the test application and modules used to build the test app for end-to-end tests. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -17,7 +16,7 @@ kt_android_library( ], visibility = ["//:oppia_e2e_testing_visibility"], deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:abstract_application", "//app/src/main/java/org/oppia/android/app/application:application_component", @@ -32,5 +31,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/instrumentation/src/javatests/org/oppia/android/instrumentation/application/BUILD.bazel b/instrumentation/src/javatests/org/oppia/android/instrumentation/application/BUILD.bazel index 43b0a009e54..56bcf6097bf 100644 --- a/instrumentation/src/javatests/org/oppia/android/instrumentation/application/BUILD.bazel +++ b/instrumentation/src/javatests/org/oppia/android/instrumentation/application/BUILD.bazel @@ -2,7 +2,6 @@ This library contains the Robolectric tests for the e2e test modules. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.instrumentation.application.EndToEndTestGcsResourceModuleTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//instrumentation/src/java/org/oppia/android/instrumentation/application:oppia_test_application", "//third_party:androidx_test_ext_junit", "//third_party:androidx_test_runner", @@ -29,7 +28,7 @@ oppia_android_test( test_class = "org.oppia.android.instrumentation.application.EndToEndTestImageParsingModuleTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//instrumentation/src/java/org/oppia/android/instrumentation/application:oppia_test_application", "//third_party:androidx_test_ext_junit", "//third_party:androidx_test_runner", @@ -46,7 +45,7 @@ oppia_android_test( test_class = "org.oppia.android.instrumentation.application.EndToEndTestNetworkConfigModuleTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//instrumentation/src/java/org/oppia/android/instrumentation/application:oppia_test_application", "//third_party:androidx_test_ext_junit", "//third_party:androidx_test_runner", @@ -55,5 +54,3 @@ oppia_android_test( "//third_party:robolectric_android-all", ], ) - -dagger_rules() diff --git a/scripts/assets/maven_dependencies.textproto b/scripts/assets/maven_dependencies.textproto index 156750ab011..6498f36a747 100644 --- a/scripts/assets/maven_dependencies.textproto +++ b/scripts/assets/maven_dependencies.textproto @@ -1010,8 +1010,8 @@ maven_dependency { } } maven_dependency { - artifact_name: "com.google.dagger:dagger:2.28.1" - artifact_version: "2.28.1" + artifact_name: "com.google.dagger:dagger:2.41" + artifact_version: "2.41" license { license_name: "Apache 2.0" original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt" @@ -1021,8 +1021,8 @@ maven_dependency { } } maven_dependency { - artifact_name: "com.google.errorprone:error_prone_annotations:2.9.0" - artifact_version: "2.9.0" + artifact_name: "com.google.errorprone:error_prone_annotations:2.11.0" + artifact_version: "2.11.0" license { license_name: "Apache 2.0" original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt" @@ -1294,16 +1294,6 @@ maven_dependency { } } } -maven_dependency { - artifact_name: "com.google.guava:guava:30.1.1-android" - artifact_version: "30.1.1-android" - license { - license_name: "The Apache Software License, Version 2.0" - scrapable_link { - url: "https://www.apache.org/licenses/LICENSE-2.0.txt" - } - } -} maven_dependency { artifact_name: "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" artifact_version: "9999.0-empty-to-avoid-conflict-with-guava" @@ -1603,8 +1593,8 @@ maven_dependency { } } maven_dependency { - artifact_name: "org.checkerframework:checker-qual:3.13.0" - artifact_version: "3.13.0" + artifact_name: "org.checkerframework:checker-qual:3.21.3" + artifact_version: "3.21.3" license { license_name: "The MIT License" original_link: "https://opensource.org/licenses/MIT" @@ -1636,8 +1626,8 @@ maven_dependency { } } maven_dependency { - artifact_name: "org.jetbrains.kotlin:kotlin-stdlib:1.5.0" - artifact_version: "1.5.0" + artifact_name: "org.jetbrains.kotlin:kotlin-stdlib:1.5.32" + artifact_version: "1.5.32" license { license_name: "The Apache License, Version 2.0" original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt" @@ -1647,8 +1637,8 @@ maven_dependency { } } maven_dependency { - artifact_name: "org.jetbrains.kotlin:kotlin-stdlib-common:1.5.0" - artifact_version: "1.5.0" + artifact_name: "org.jetbrains.kotlin:kotlin-stdlib-common:1.5.32" + artifact_version: "1.5.32" license { license_name: "The Apache License, Version 2.0" original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt" @@ -1658,8 +1648,8 @@ maven_dependency { } } maven_dependency { - artifact_name: "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10" - artifact_version: "1.4.10" + artifact_name: "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.32" + artifact_version: "1.5.32" license { license_name: "The Apache License, Version 2.0" original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt" @@ -1669,8 +1659,8 @@ maven_dependency { } } maven_dependency { - artifact_name: "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10" - artifact_version: "1.4.10" + artifact_name: "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32" + artifact_version: "1.5.32" license { license_name: "The Apache License, Version 2.0" original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt" diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel index 6a166ef498e..f24555b5e38 100644 --- a/testing/BUILD.bazel +++ b/testing/BUILD.bazel @@ -3,7 +3,6 @@ This library contains fake objects used for testing as well as tests for these objects. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") load("//testing:testing_test.bzl", "testing_test") @@ -33,7 +32,6 @@ kt_android_library( manifest = "src/main/AndroidManifest.xml", visibility = ["//visibility:public"], deps = [ - ":dagger", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify:interactions_module", "//domain/src/main/java/org/oppia/android/domain/profile:profile_management_controller", @@ -76,8 +74,8 @@ kt_android_library( # keep sorted TEST_DEPS = [ ":assertion_helpers", - ":dagger", ":testing", + "//:dagger", "//data/src/main/java/org/oppia/android/data/backends/gae:network_config_prod_module", "//domain", "//domain/src/main/java/org/oppia/android/domain/classify:interactions_module", @@ -162,5 +160,3 @@ filegroup( srcs = ["src/test/AndroidManifest.xml"], visibility = ["//:oppia_testing_visibility"], ) - -dagger_rules() diff --git a/testing/src/main/java/org/oppia/android/testing/data/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/data/BUILD.bazel index 67f93f5d11b..23574d297fa 100644 --- a/testing/src/main/java/org/oppia/android/testing/data/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/data/BUILD.bazel @@ -3,7 +3,6 @@ Package for common test utilities corresponding to data processing & data providers. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -29,7 +28,6 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", "//testing/src/main/java/org/oppia/android/testing/data:async_result_subject", "//testing/src/main/java/org/oppia/android/testing/mockito", "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers", @@ -39,5 +37,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/data:data_providers", ], ) - -dagger_rules() diff --git a/testing/src/main/java/org/oppia/android/testing/espresso/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/espresso/BUILD.bazel index 95f138cd1c3..31f17410282 100644 --- a/testing/src/main/java/org/oppia/android/testing/espresso/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/espresso/BUILD.bazel @@ -3,7 +3,6 @@ Package for common Espresso matchers & other test utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -14,7 +13,6 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers", "//third_party:androidx_test_espresso_espresso-core", ], @@ -69,5 +67,3 @@ kt_android_library( "//third_party:com_google_android_material_material", ], ) - -dagger_rules() diff --git a/testing/src/main/java/org/oppia/android/testing/firebase/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/firebase/BUILD.bazel index 78b9c0ffb82..bf9882c63b3 100644 --- a/testing/src/main/java/org/oppia/android/testing/firebase/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/firebase/BUILD.bazel @@ -2,7 +2,6 @@ Package for test-only Firebase utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -14,9 +13,7 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/auth:firebase_auth_wrapper", ], ) - -dagger_rules() diff --git a/testing/src/main/java/org/oppia/android/testing/logging/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/logging/BUILD.bazel index 328f36948d5..01b0bded674 100644 --- a/testing/src/main/java/org/oppia/android/testing/logging/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/logging/BUILD.bazel @@ -2,7 +2,6 @@ Test utilities for broad logging functionality. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -27,7 +26,6 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", "//utility/src/main/java/org/oppia/android/util/logging:sync_status_manager", "//utility/src/main/java/org/oppia/android/util/logging:sync_status_manager_impl", ], @@ -41,10 +39,8 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", ":test_sync_status_manager", + "//:dagger", "//utility/src/main/java/org/oppia/android/util/logging:sync_status_manager", ], ) - -dagger_rules() diff --git a/testing/src/main/java/org/oppia/android/testing/network/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/network/BUILD.bazel index fdf6a36523f..8d9f2088328 100644 --- a/testing/src/main/java/org/oppia/android/testing/network/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/network/BUILD.bazel @@ -3,7 +3,6 @@ Library for providing test-only HTTP mocks for the app's networking layer. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -51,11 +50,9 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", + "//:dagger", "//data/src/main/java/org/oppia/android/data/backends/gae:oppia_retrofit", "//data/src/main/java/org/oppia/android/data/backends/gae:prod_module", "//third_party:com_squareup_retrofit2_retrofit-mock", ], ) - -dagger_rules() diff --git a/testing/src/main/java/org/oppia/android/testing/platformparameter/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/platformparameter/BUILD.bazel index 2ef5618b8fc..3428020d28d 100644 --- a/testing/src/main/java/org/oppia/android/testing/platformparameter/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/platformparameter/BUILD.bazel @@ -3,7 +3,6 @@ Package for test-specific platform parameter utilities and helpers. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -30,11 +29,9 @@ kt_android_library( "//:oppia_testing_visibility", ], deps = [ - ":dagger", ":test_constants", + "//:dagger", "//utility", "//utility/src/main/java/org/oppia/android/util/extensions:context_extensions", ], ) - -dagger_rules() diff --git a/testing/src/main/java/org/oppia/android/testing/robolectric/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/robolectric/BUILD.bazel index 15870e33871..a9a9b0a3143 100644 --- a/testing/src/main/java/org/oppia/android/testing/robolectric/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/robolectric/BUILD.bazel @@ -3,7 +3,6 @@ Package for Robolectric-specific utilities and configurations. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -26,8 +25,8 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", ":is_on_robolectric", + "//:dagger", ], ) @@ -73,5 +72,3 @@ kt_android_library( "//third_party:org_robolectric_robolectric", ], ) - -dagger_rules() diff --git a/testing/src/main/java/org/oppia/android/testing/threading/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/threading/BUILD.bazel index 2b084f0de00..6877cfa3e4c 100644 --- a/testing/src/main/java/org/oppia/android/testing/threading/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/threading/BUILD.bazel @@ -4,7 +4,6 @@ Package for test-only threading utilities, including classes to coordinate cross in a way that can improve test reliability, correctness, and performance. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -105,11 +104,9 @@ kt_android_library( visibility = ["//:oppia_testing_visibility"], deps = [ ":annotations", - ":dagger", ":espresso_impl", ":robolectric_impl", + "//:dagger", "//utility/src/main/java/org/oppia/android/util/threading:annotations", ], ) - -dagger_rules() diff --git a/testing/src/main/java/org/oppia/android/testing/time/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/time/BUILD.bazel index 0c0958f1f93..a4d62682fe5 100644 --- a/testing/src/main/java/org/oppia/android/testing/time/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/time/BUILD.bazel @@ -4,7 +4,6 @@ Package for test-only utilities for coordinating time, particularly in simulated environments (i.e. Robolectric). """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -41,9 +40,7 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", ":fake_oppia_clock", + "//:dagger", ], ) - -dagger_rules() diff --git a/testing/src/test/java/org/oppia/android/testing/data/BUILD.bazel b/testing/src/test/java/org/oppia/android/testing/data/BUILD.bazel index 2152aed1832..f56cf1bf1b9 100644 --- a/testing/src/test/java/org/oppia/android/testing/data/BUILD.bazel +++ b/testing/src/test/java/org/oppia/android/testing/data/BUILD.bazel @@ -3,7 +3,6 @@ Tests for data processing test utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -13,7 +12,7 @@ oppia_android_test( test_class = "org.oppia.android.testing.data.DataProviderTestMonitorTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/locale:locale_controller", "//domain/src/main/java/org/oppia/android/domain/translation:translation_controller", "//model/src/main/proto:languages_java_proto_lite", @@ -34,5 +33,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/testing/src/test/java/org/oppia/android/testing/firebase/BUILD.bazel b/testing/src/test/java/org/oppia/android/testing/firebase/BUILD.bazel index c6d5f002b6d..6eeeb67df1b 100644 --- a/testing/src/test/java/org/oppia/android/testing/firebase/BUILD.bazel +++ b/testing/src/test/java/org/oppia/android/testing/firebase/BUILD.bazel @@ -2,7 +2,6 @@ Tests for test-only Firebase utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.testing.firebase.FakeFirebaseAuthWrapperImplTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -32,7 +31,7 @@ oppia_android_test( test_class = "org.oppia.android.testing.firebase.TestAuthenticationModuleTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -44,5 +43,3 @@ oppia_android_test( "//third_party:robolectric_android-all", ], ) - -dagger_rules() diff --git a/testing/src/test/java/org/oppia/android/testing/junit/BUILD.bazel b/testing/src/test/java/org/oppia/android/testing/junit/BUILD.bazel index 1b4bcc4dc08..69c6c6cbdca 100644 --- a/testing/src/test/java/org/oppia/android/testing/junit/BUILD.bazel +++ b/testing/src/test/java/org/oppia/android/testing/junit/BUILD.bazel @@ -2,7 +2,6 @@ Tests for generic activity & fragment test utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.testing.junit.InitializeDefaultLocaleRuleCustomContextTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -67,7 +66,7 @@ oppia_android_test( test_class = "org.oppia.android.testing.junit.InitializeDefaultLocaleRuleOmissionTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -121,7 +120,7 @@ oppia_android_test( test_class = "org.oppia.android.testing.junit.InitializeDefaultLocaleRuleTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//app", "//app/src/main/java/org/oppia/android/app/application:application_component", "//app/src/main/java/org/oppia/android/app/application:application_injector", @@ -168,5 +167,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module", ], ) - -dagger_rules() diff --git a/testing/src/test/java/org/oppia/android/testing/logging/BUILD.bazel b/testing/src/test/java/org/oppia/android/testing/logging/BUILD.bazel index 740f52ae5f9..27b564b46fa 100644 --- a/testing/src/test/java/org/oppia/android/testing/logging/BUILD.bazel +++ b/testing/src/test/java/org/oppia/android/testing/logging/BUILD.bazel @@ -2,7 +2,6 @@ Tests for broad logging functionality test utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.testing.logging.TestSyncStatusManagerTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor", "//testing/src/main/java/org/oppia/android/testing/junit:oppia_parameterized_test_runner", @@ -39,7 +38,7 @@ oppia_android_test( test_class = "org.oppia.android.testing.logging.SyncStatusTestModuleTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor", "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module", @@ -58,5 +57,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/testing/src/test/java/org/oppia/android/testing/networking/BUILD.bazel b/testing/src/test/java/org/oppia/android/testing/networking/BUILD.bazel index 99403b6dee1..f4e43827563 100644 --- a/testing/src/test/java/org/oppia/android/testing/networking/BUILD.bazel +++ b/testing/src/test/java/org/oppia/android/testing/networking/BUILD.bazel @@ -2,7 +2,6 @@ Tests for networking-specific test utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.testing.networking.NetworkConnectionTestUtilTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing/src/main/java/org/oppia/android/testing/networking:network_connection_test_util", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/time:test_module", @@ -26,5 +25,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:prod_module", ], ) - -dagger_rules() diff --git a/testing/src/test/java/org/oppia/android/testing/robolectric/BUILD.bazel b/testing/src/test/java/org/oppia/android/testing/robolectric/BUILD.bazel index 144e4f00c59..a569473150f 100644 --- a/testing/src/test/java/org/oppia/android/testing/robolectric/BUILD.bazel +++ b/testing/src/test/java/org/oppia/android/testing/robolectric/BUILD.bazel @@ -2,7 +2,6 @@ Tests for Robolectric-specific utilities and configurations. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.testing.robolectric.ShadowBidiFormatterTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing/src/main/java/org/oppia/android/testing/robolectric:shadow_bidi_formatter", "//third_party:androidx_core_core", "//third_party:androidx_test_ext_junit", @@ -22,5 +21,3 @@ oppia_android_test( "//third_party:robolectric_android-all", ], ) - -dagger_rules() diff --git a/testing/src/test/java/org/oppia/android/testing/threading/BUILD.bazel b/testing/src/test/java/org/oppia/android/testing/threading/BUILD.bazel index 08c073d5e32..2c962fd3cd2 100644 --- a/testing/src/test/java/org/oppia/android/testing/threading/BUILD.bazel +++ b/testing/src/test/java/org/oppia/android/testing/threading/BUILD.bazel @@ -3,7 +3,6 @@ Tests for threading-specific test utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") load("//:oppia_android_test.bzl", "oppia_android_test") @@ -26,7 +25,7 @@ oppia_android_test( test_class = "org.oppia.android.testing.threading.CoroutineExecutorServiceTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/threading:coroutine_executor_service", @@ -43,8 +42,8 @@ oppia_android_test( test_class = "org.oppia.android.testing.threading.TestCoroutineDispatcherEspressoImplTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", ":test_coroutine_dispatcher_test_base", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/threading:test_module", "//third_party:robolectric_android-all", @@ -59,8 +58,8 @@ oppia_android_test( test_class = "org.oppia.android.testing.threading.TestCoroutineDispatcherRobolectricImplTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", ":test_coroutine_dispatcher_test_base", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/threading:test_module", "//third_party:robolectric_android-all", @@ -75,12 +74,10 @@ oppia_android_test( test_class = "org.oppia.android.testing.threading.TestCoroutineDispatcherTest", test_manifest = "//testing:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/threading:test_module", "//third_party:robolectric_android-all", "//utility", ], ) - -dagger_rules() diff --git a/third_party/BUILD.bazel b/third_party/BUILD.bazel index 803a3fc85fe..d3b80abccd6 100644 --- a/third_party/BUILD.bazel +++ b/third_party/BUILD.bazel @@ -82,6 +82,21 @@ android_library( ], ) +# Creates an alias for Guava Android to support maven_install's override of Guava. This ensures that +# Guava-Android is always used in builds, even if dependencies request a newer version of Guava-JRE. +android_library( + name = "com_google_guava_guava", + visibility = ["//visibility:public"], + exports = [ + "//third_party:com_google_errorprone_error_prone_annotations", + "//third_party:com_google_guava_failureaccess", + "//third_party:com_google_j2objc_j2objc-annotations", + "//third_party:org_checkerframework_checker-compat-qual", + "//third_party:org_checkerframework_checker-qual", + "@guava_android//jar", + ], +) + # Define a separate target for the Glide annotation processor compiler. Unfortunately, this library # can't encapsulate all of Glide (i.e. by exporting the main Glide dependency) since that includes # Android assets which java_library targets do not export. diff --git a/third_party/maven_install.json b/third_party/maven_install.json index 6ff77b7d640..396db58c5e9 100644 --- a/third_party/maven_install.json +++ b/third_party/maven_install.json @@ -1,19 +1,18 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -28532950, - "__RESOLVED_ARTIFACTS_HASH": -1835137249, + "__INPUT_ARTIFACTS_HASH": 2017630185, + "__RESOLVED_ARTIFACTS_HASH": -1490224642, "conflict_resolution": { "androidx.constraintlayout:constraintlayout:1.1.3": "androidx.constraintlayout:constraintlayout:2.0.1", "androidx.core:core:1.0.1": "androidx.core:core:1.3.1", "androidx.recyclerview:recyclerview:1.0.0": "androidx.recyclerview:recyclerview:1.1.0", "androidx.test:core:1.0.0": "androidx.test:core:1.4.0", "com.google.firebase:firebase-common:19.3.0": "com.google.firebase:firebase-common:20.1.1", - "com.google.guava:guava:28.1-android": "com.google.guava:guava:30.1.1-android", "com.google.protobuf:protobuf-javalite:3.17.3": "com.google.protobuf:protobuf-javalite:3.19.2", "com.google.truth:truth:0.43": "com.google.truth:truth:1.1.3", "junit:junit:4.12": "junit:junit:4.13.2", "org.jetbrains.kotlin:kotlin-reflect:1.3.41": "org.jetbrains.kotlin:kotlin-reflect:1.5.0", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72": "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10", + "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72": "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32", "org.mockito:mockito-core:2.19.0": "org.mockito:mockito-core:3.9.0" }, "artifacts": { @@ -763,33 +762,39 @@ }, "com.google.dagger:dagger": { "shasums": { - "jar": "c2a09540677b6ffeeb5911c5d8e69738718004e875a10c176e84ed8c997739a7" + "jar": "bb0600d2dd9669cbd5a2e40e7d3fbc4692f57fb7d59509d26b380398e20f5739" }, - "version": "2.28.1" + "version": "2.41" }, "com.google.dagger:dagger-compiler": { "shasums": { - "jar": "379d4fce6d11234c3814aca1676aa34f5dd0f0ec5155c44de2d5e49cacee573c" + "jar": "b53edab184655a0de6bacfb9551849de7b6bf0c688a4771321b4cf6f548ac80e" }, - "version": "2.28.1" + "version": "2.41" }, "com.google.dagger:dagger-producers": { "shasums": { - "jar": "7c44499d5717cf6fdc3d026e5440c6bac9cabc98226d28715ca0eda90e68f7b2" + "jar": "8fe89dc042654fdf38a5be19bfe7f1d61a512225495a9379d52e5c28bc3f4521" }, - "version": "2.28.1" + "version": "2.41" }, "com.google.dagger:dagger-spi": { "shasums": { - "jar": "aae2a23d0bce8bae6d6c0e302b048c389d0f2354adc14fd80366c2913e3c5f07" + "jar": "960d8a3ea526e53f4a47e025bce84c714cdec9b84d29fc29d348bbb58406d8ea" }, - "version": "2.28.1" + "version": "2.41" + }, + "com.google.devtools.ksp:symbol-processing-api": { + "shasums": { + "jar": "bf4a6875af46917174b087d03840456685e115954d926ce88fd04b9d2f254df3" + }, + "version": "1.5.30-1.0.0" }, "com.google.errorprone:error_prone_annotations": { "shasums": { - "jar": "f947bdc33ae27a6b4aa44799e6c21e1944797bd0010ba43eb82d11446e163694" + "jar": "721cb91842b46fa056847d104d5225c8b8e1e8b62263b993051e1e5a0137b7ec" }, - "version": "2.9.0" + "version": "2.11.0" }, "com.google.errorprone:javac-shaded": { "shasums": { @@ -955,9 +960,9 @@ }, "com.google.guava:guava": { "shasums": { - "jar": "355f79352f8c252f2bdaa06c687c4836a38016caccfc4c28d16ae77ecfdffa2f" + "jar": "d5be94d65e87bd219fb3193ad1517baa55a3b88fc91d21cf735826ab5af087b9" }, - "version": "30.1.1-android" + "version": "31.0.1-jre" }, "com.google.guava:listenablefuture": { "shasums": { @@ -1075,9 +1080,9 @@ }, "com.squareup:javapoet": { "shasums": { - "jar": "9cbf2107be499ec6e95afd36b58e3ca122a24166cdd375732e51267d64058e90" + "jar": "4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291" }, - "version": "1.11.1" + "version": "1.13.0" }, "com.squareup:javawriter": { "shasums": { @@ -1175,12 +1180,6 @@ }, "version": "1.3.2" }, - "javax.annotation:jsr250-api": { - "shasums": { - "jar": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f" - }, - "version": "1.0" - }, "javax.inject:javax.inject": { "shasums": { "jar": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff" @@ -1243,9 +1242,9 @@ }, "org.checkerframework:checker-qual": { "shasums": { - "jar": "3ea0dcd73b4d6cb2fb34bd7ed4dad6db327a01ebad7db05eb7894076b3d64491" + "jar": "63d474e16948b0a5aabd12c18bdc3d6f47ac2efc4c7ee08da76dba4658138f95" }, - "version": "3.13.0" + "version": "3.21.3" }, "org.codehaus.mojo:animal-sniffer-annotations": { "shasums": { @@ -1309,27 +1308,27 @@ }, "org.jetbrains.kotlin:kotlin-stdlib": { "shasums": { - "jar": "52283996fe4067cd7330288b96ae67ecd463614dc741172c54d9d349ab6a9cd7" + "jar": "452d205f54a1f08673de273cb3d0148fbf9cd95275e5b0068fa1b001f48aee0a" }, - "version": "1.5.0" + "version": "1.5.32" }, "org.jetbrains.kotlin:kotlin-stdlib-common": { "shasums": { - "jar": "c14ce6720a487b5e238f1b0c30ac3ad73e45b90a40731ca0b1cfddec1a37682f" + "jar": "dc2fb23e280a39c9abde2cbf4c1567b66840f1f1ece6c7bb78d58d38076b5def" }, - "version": "1.5.0" + "version": "1.5.32" }, "org.jetbrains.kotlin:kotlin-stdlib-jdk7": { "shasums": { - "jar": "f9566380c08722c780ce33ceee23e98ddf765ca98fabd3e2fabae7975c8d232b" + "jar": "bc954cd528b97cc25b8110686bda8af95cfcdb0dba0f3f68d0bb7c2d30d2c504" }, - "version": "1.4.10" + "version": "1.5.32" }, "org.jetbrains.kotlin:kotlin-stdlib-jdk8": { "shasums": { - "jar": "39b7a9442d7a3865e0f4a732c56c1d5da0e11ffb3bb82a461d32deb0c0ca7673" + "jar": "fe6837926a93a36f76550631d552dcf98046d96888a4ffd0c939e33296a3d9e5" }, - "version": "1.4.10" + "version": "1.5.32" }, "org.jetbrains.kotlin:kotlin-test": { "shasums": { @@ -1387,9 +1386,9 @@ }, "org.jetbrains.kotlinx:kotlinx-metadata-jvm": { "shasums": { - "jar": "9753bb39efef35957c5c15df9a3cb769aabf2cdfa74b47afcb7760e5146be3b5" + "jar": "fdaf7ba158465f6b6e9ce5762e0300fd681a976fbfeb5ed50fa5a2b26868cec8" }, - "version": "0.1.0" + "version": "0.3.0" }, "org.jetbrains:annotations": { "shasums": { @@ -2074,11 +2073,11 @@ "com.google.guava:failureaccess", "com.google.guava:guava", "com.squareup:javapoet", - "javax.annotation:jsr250-api", "javax.inject:javax.inject", "net.ltgt.gradle.incap:incap", "org.checkerframework:checker-compat-qual", "org.jetbrains.kotlin:kotlin-stdlib", + "org.jetbrains.kotlin:kotlin-stdlib-jdk8", "org.jetbrains.kotlinx:kotlinx-metadata-jvm" ], "com.google.dagger:dagger-producers": [ @@ -2092,10 +2091,16 @@ "com.google.code.findbugs:jsr305", "com.google.dagger:dagger", "com.google.dagger:dagger-producers", + "com.google.devtools.ksp:symbol-processing-api", "com.google.guava:failureaccess", "com.google.guava:guava", "com.squareup:javapoet", - "javax.inject:javax.inject" + "javax.inject:javax.inject", + "org.jetbrains.kotlin:kotlin-stdlib", + "org.jetbrains.kotlin:kotlin-stdlib-jdk8" + ], + "com.google.devtools.ksp:symbol-processing-api": [ + "org.jetbrains.kotlin:kotlin-stdlib-jdk8" ], "com.google.firebase:firebase-analytics:aar": [ "com.google.android.gms:play-services-measurement-api:aar", @@ -2261,7 +2266,7 @@ "com.google.guava:failureaccess", "com.google.guava:listenablefuture", "com.google.j2objc:j2objc-annotations", - "org.checkerframework:checker-compat-qual" + "org.checkerframework:checker-qual" ], "com.google.protobuf:protobuf-java-util": [ "com.google.code.gson:gson", @@ -2672,6 +2677,7 @@ ], "com.google.dagger:dagger": [ "dagger", + "dagger.assisted", "dagger.internal", "dagger.multibindings" ], @@ -2681,14 +2687,12 @@ "dagger.internal.codegen.binding", "dagger.internal.codegen.bindinggraphvalidation", "dagger.internal.codegen.compileroption", + "dagger.internal.codegen.componentgenerator", "dagger.internal.codegen.javapoet", "dagger.internal.codegen.kotlin", "dagger.internal.codegen.langmodel", - "dagger.internal.codegen.statistics", "dagger.internal.codegen.validation", - "dagger.internal.codegen.writing", - "dagger.model", - "dagger.shaded.auto.common" + "dagger.internal.codegen.writing" ], "com.google.dagger:dagger-producers": [ "dagger.producers", @@ -2698,9 +2702,24 @@ ], "com.google.dagger:dagger-spi": [ "dagger.internal.codegen.extension", + "dagger.internal.codegen.xprocessing", "dagger.model", - "dagger.shaded.auto.common", - "dagger.spi" + "dagger.spi", + "dagger.spi.model", + "dagger.spi.shaded.androidx.room.compiler.processing", + "dagger.spi.shaded.androidx.room.compiler.processing.compat", + "dagger.spi.shaded.androidx.room.compiler.processing.javac", + "dagger.spi.shaded.androidx.room.compiler.processing.javac.kotlin", + "dagger.spi.shaded.androidx.room.compiler.processing.ksp", + "dagger.spi.shaded.androidx.room.compiler.processing.ksp.synthetic", + "dagger.spi.shaded.androidx.room.compiler.processing.util", + "dagger.spi.shaded.auto.common" + ], + "com.google.devtools.ksp:symbol-processing-api": [ + "com.google.devtools.ksp", + "com.google.devtools.ksp.processing", + "com.google.devtools.ksp.symbol", + "com.google.devtools.ksp.visitor" ], "com.google.errorprone:error_prone_annotations": [ "com.google.errorprone.annotations", @@ -2975,10 +2994,6 @@ "javax.annotation.security", "javax.annotation.sql" ], - "javax.annotation:jsr250-api": [ - "javax.annotation", - "javax.annotation.security" - ], "javax.inject:javax.inject": [ "javax.inject" ], @@ -3283,6 +3298,7 @@ "org.checkerframework.checker.initialization.qual", "org.checkerframework.checker.interning.qual", "org.checkerframework.checker.lock.qual", + "org.checkerframework.checker.mustcall.qual", "org.checkerframework.checker.nullness.qual", "org.checkerframework.checker.optional.qual", "org.checkerframework.checker.propkey.qual", @@ -4186,6 +4202,7 @@ ], "org.jetbrains.kotlin:kotlin-stdlib-jdk7": [ "kotlin.internal.jdk7", + "kotlin.io.path", "kotlin.jdk7" ], "org.jetbrains.kotlin:kotlin-stdlib-jdk8": [ @@ -4607,6 +4624,7 @@ "com.google.dagger:dagger-compiler", "com.google.dagger:dagger-producers", "com.google.dagger:dagger-spi", + "com.google.devtools.ksp:symbol-processing-api", "com.google.errorprone:error_prone_annotations", "com.google.errorprone:javac-shaded", "com.google.firebase:firebase-analytics:aar", @@ -4672,7 +4690,6 @@ "io.xlate:yaml-json", "jakarta.json:jakarta.json-api", "javax.annotation:javax.annotation-api", - "javax.annotation:jsr250-api", "javax.inject:javax.inject", "junit:junit", "net.bytebuddy:byte-buddy", @@ -4859,6 +4876,259 @@ "com.google.dagger:dagger-compiler", "com.google.dagger:dagger-producers", "com.google.dagger:dagger-spi", + "com.google.devtools.ksp:symbol-processing-api", + "com.google.errorprone:error_prone_annotations", + "com.google.errorprone:javac-shaded", + "com.google.firebase:firebase-analytics:aar", + "com.google.firebase:firebase-annotations", + "com.google.firebase:firebase-appcheck-debug:aar", + "com.google.firebase:firebase-appcheck-interop:aar", + "com.google.firebase:firebase-appcheck-playintegrity:aar", + "com.google.firebase:firebase-appcheck:aar", + "com.google.firebase:firebase-auth-interop:aar", + "com.google.firebase:firebase-auth-ktx:aar", + "com.google.firebase:firebase-auth:aar", + "com.google.firebase:firebase-common-ktx:aar", + "com.google.firebase:firebase-common:aar", + "com.google.firebase:firebase-components:aar", + "com.google.firebase:firebase-crashlytics:aar", + "com.google.firebase:firebase-database-collection:aar", + "com.google.firebase:firebase-encoders-json:aar", + "com.google.firebase:firebase-firestore-ktx:aar", + "com.google.firebase:firebase-firestore:aar", + "com.google.firebase:firebase-iid-interop:aar", + "com.google.firebase:firebase-iid:aar", + "com.google.firebase:firebase-installations-interop:aar", + "com.google.firebase:firebase-installations:aar", + "com.google.firebase:firebase-measurement-connector:aar", + "com.google.firebase:protolite-well-known-types:aar", + "com.google.gms:google-services", + "com.google.googlejavaformat:google-java-format", + "com.google.guava:failureaccess", + "com.google.guava:guava", + "com.google.guava:listenablefuture", + "com.google.j2objc:j2objc-annotations", + "com.google.protobuf:protobuf-java", + "com.google.protobuf:protobuf-java-util", + "com.google.protobuf:protobuf-javalite", + "com.google.truth.extensions:truth-liteproto-extension", + "com.google.truth:truth", + "com.googlecode.juniversalchardet:juniversalchardet", + "com.ibm.icu:icu4j", + "com.squareup.moshi:moshi", + "com.squareup.moshi:moshi-kotlin", + "com.squareup.moshi:moshi-kotlin-codegen", + "com.squareup.okhttp3:mockwebserver", + "com.squareup.okhttp3:okhttp", + "com.squareup.okhttp:okhttp", + "com.squareup.okio:okio", + "com.squareup.retrofit2:converter-moshi", + "com.squareup.retrofit2:retrofit", + "com.squareup.retrofit2:retrofit-mock", + "com.squareup:javapoet", + "com.squareup:javawriter", + "com.squareup:kotlinpoet", + "commons-codec:commons-codec", + "commons-io:commons-io", + "io.fabric.sdk.android:fabric:aar", + "io.grpc:grpc-android:aar", + "io.grpc:grpc-api", + "io.grpc:grpc-context", + "io.grpc:grpc-core", + "io.grpc:grpc-okhttp", + "io.grpc:grpc-protobuf-lite", + "io.grpc:grpc-stub", + "io.perfmark:perfmark-api", + "io.xlate:yaml-json", + "jakarta.json:jakarta.json-api", + "javax.annotation:javax.annotation-api", + "javax.inject:javax.inject", + "junit:junit", + "net.bytebuddy:byte-buddy", + "net.bytebuddy:byte-buddy-agent", + "net.ltgt.gradle.incap:incap", + "net.sf.kxml:kxml2", + "nl.dionsegijn:konfetti:aar", + "org.antlr:antlr4", + "org.bouncycastle:bcprov-jdk15on", + "org.checkerframework:checker-compat-qual", + "org.checkerframework:checker-qual", + "org.codehaus.mojo:animal-sniffer-annotations", + "org.eclipse.parsson:parsson", + "org.hamcrest:hamcrest-core", + "org.hamcrest:hamcrest-integration", + "org.hamcrest:hamcrest-library", + "org.jetbrains.intellij.deps:trove4j", + "org.jetbrains.kotlin:kotlin-compiler-embeddable", + "org.jetbrains.kotlin:kotlin-daemon-embeddable", + "org.jetbrains.kotlin:kotlin-reflect", + "org.jetbrains.kotlin:kotlin-script-runtime", + "org.jetbrains.kotlin:kotlin-stdlib", + "org.jetbrains.kotlin:kotlin-stdlib-common", + "org.jetbrains.kotlin:kotlin-stdlib-jdk7", + "org.jetbrains.kotlin:kotlin-stdlib-jdk8", + "org.jetbrains.kotlin:kotlin-test", + "org.jetbrains.kotlin:kotlin-test-annotations-common", + "org.jetbrains.kotlin:kotlin-test-common", + "org.jetbrains.kotlin:kotlin-test-junit", + "org.jetbrains.kotlinx:kotlinx-coroutines-android", + "org.jetbrains.kotlinx:kotlinx-coroutines-core", + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", + "org.jetbrains.kotlinx:kotlinx-coroutines-debug", + "org.jetbrains.kotlinx:kotlinx-coroutines-test", + "org.jetbrains.kotlinx:kotlinx-metadata-jvm", + "org.jetbrains:annotations", + "org.mockito.kotlin:mockito-kotlin", + "org.mockito:mockito-core", + "org.objenesis:objenesis", + "org.ow2.asm:asm", + "org.ow2.asm:asm-analysis", + "org.ow2.asm:asm-commons", + "org.ow2.asm:asm-tree", + "org.ow2.asm:asm-util", + "org.robolectric:annotations", + "org.robolectric:junit", + "org.robolectric:pluginapi", + "org.robolectric:plugins-maven-dependency-resolver", + "org.robolectric:resources", + "org.robolectric:robolectric", + "org.robolectric:sandbox", + "org.robolectric:shadowapi", + "org.robolectric:shadows-framework", + "org.robolectric:utils", + "org.robolectric:utils-reflector", + "org.snakeyaml:snakeyaml-engine" + ], + "https://oss.sonatype.org/content/repositories/snapshots/": [ + "android.arch.core:common", + "android.arch.core:core-testing:aar", + "android.arch.core:runtime:aar", + "androidx.activity:activity:aar", + "androidx.annotation:annotation", + "androidx.annotation:annotation-experimental:aar", + "androidx.appcompat:appcompat-resources:aar", + "androidx.appcompat:appcompat:aar", + "androidx.arch.core:core-common", + "androidx.arch.core:core-runtime:aar", + "androidx.arch.core:core-testing:aar", + "androidx.cardview:cardview:aar", + "androidx.collection:collection", + "androidx.constraintlayout:constraintlayout-solver", + "androidx.constraintlayout:constraintlayout:aar", + "androidx.coordinatorlayout:coordinatorlayout:aar", + "androidx.core:core-ktx:aar", + "androidx.core:core:aar", + "androidx.cursoradapter:cursoradapter:aar", + "androidx.customview:customview:aar", + "androidx.databinding:databinding-adapters:aar", + "androidx.databinding:databinding-common", + "androidx.databinding:databinding-compiler", + "androidx.databinding:databinding-compiler-common", + "androidx.databinding:databinding-runtime:aar", + "androidx.documentfile:documentfile:aar", + "androidx.drawerlayout:drawerlayout:aar", + "androidx.dynamicanimation:dynamicanimation:aar", + "androidx.exifinterface:exifinterface:aar", + "androidx.fragment:fragment:aar", + "androidx.interpolator:interpolator:aar", + "androidx.legacy:legacy-support-core-utils:aar", + "androidx.lifecycle:lifecycle-common", + "androidx.lifecycle:lifecycle-extensions:aar", + "androidx.lifecycle:lifecycle-livedata-core-ktx:aar", + "androidx.lifecycle:lifecycle-livedata-core:aar", + "androidx.lifecycle:lifecycle-livedata-ktx:aar", + "androidx.lifecycle:lifecycle-livedata:aar", + "androidx.lifecycle:lifecycle-process:aar", + "androidx.lifecycle:lifecycle-runtime:aar", + "androidx.lifecycle:lifecycle-service:aar", + "androidx.lifecycle:lifecycle-viewmodel-ktx:aar", + "androidx.lifecycle:lifecycle-viewmodel-savedstate:aar", + "androidx.lifecycle:lifecycle-viewmodel:aar", + "androidx.loader:loader:aar", + "androidx.localbroadcastmanager:localbroadcastmanager:aar", + "androidx.multidex:multidex-instrumentation:aar", + "androidx.multidex:multidex:aar", + "androidx.navigation:navigation-common-ktx:aar", + "androidx.navigation:navigation-common:aar", + "androidx.navigation:navigation-fragment-ktx:aar", + "androidx.navigation:navigation-fragment:aar", + "androidx.navigation:navigation-runtime-ktx:aar", + "androidx.navigation:navigation-runtime:aar", + "androidx.navigation:navigation-ui-ktx:aar", + "androidx.navigation:navigation-ui:aar", + "androidx.print:print:aar", + "androidx.recyclerview:recyclerview:aar", + "androidx.room:room-common", + "androidx.room:room-runtime:aar", + "androidx.savedstate:savedstate:aar", + "androidx.sqlite:sqlite-framework:aar", + "androidx.sqlite:sqlite:aar", + "androidx.test.espresso:espresso-accessibility:aar", + "androidx.test.espresso:espresso-contrib:aar", + "androidx.test.espresso:espresso-core:aar", + "androidx.test.espresso:espresso-idling-resource:aar", + "androidx.test.espresso:espresso-intents:aar", + "androidx.test.ext:junit:aar", + "androidx.test.ext:truth:aar", + "androidx.test.uiautomator:uiautomator:aar", + "androidx.test:core:aar", + "androidx.test:monitor:aar", + "androidx.test:rules:aar", + "androidx.test:runner:aar", + "androidx.transition:transition:aar", + "androidx.vectordrawable:vectordrawable-animated:aar", + "androidx.vectordrawable:vectordrawable:aar", + "androidx.versionedparcelable:versionedparcelable:aar", + "androidx.viewpager2:viewpager2:aar", + "androidx.viewpager:viewpager:aar", + "androidx.work:work-runtime-ktx:aar", + "androidx.work:work-runtime:aar", + "androidx.work:work-testing:aar", + "com.almworks.sqlite4java:sqlite4java", + "com.android.databinding:baseLibrary", + "com.android.support:support-annotations", + "com.android.tools.build.jetifier:jetifier-core", + "com.android.tools.build:aapt2-proto", + "com.android.tools:annotations", + "com.crashlytics.sdk.android:answers:aar", + "com.crashlytics.sdk.android:beta:aar", + "com.crashlytics.sdk.android:crashlytics-core:aar", + "com.crashlytics.sdk.android:crashlytics:aar", + "com.github.bumptech.glide:annotations", + "com.github.bumptech.glide:compiler", + "com.github.bumptech.glide:disklrucache", + "com.github.bumptech.glide:gifdecoder:aar", + "com.github.bumptech.glide:glide:aar", + "com.github.bumptech.glide:mocks:aar", + "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework", + "com.google.android.datatransport:transport-api:aar", + "com.google.android.datatransport:transport-backend-cct:aar", + "com.google.android.datatransport:transport-runtime:aar", + "com.google.android.flexbox:flexbox:aar", + "com.google.android.gms:play-services-ads-identifier:aar", + "com.google.android.gms:play-services-base:aar", + "com.google.android.gms:play-services-basement:aar", + "com.google.android.gms:play-services-measurement-api:aar", + "com.google.android.gms:play-services-measurement-base:aar", + "com.google.android.gms:play-services-measurement-impl:aar", + "com.google.android.gms:play-services-measurement-sdk-api:aar", + "com.google.android.gms:play-services-measurement-sdk:aar", + "com.google.android.gms:play-services-measurement:aar", + "com.google.android.gms:play-services-stats:aar", + "com.google.android.gms:play-services-tasks:aar", + "com.google.android.gms:strict-version-matcher-plugin", + "com.google.android.material:material:aar", + "com.google.android.play:integrity:aar", + "com.google.android:annotations", + "com.google.auto.service:auto-service-annotations", + "com.google.auto.value:auto-value-annotations", + "com.google.code.findbugs:jsr305", + "com.google.code.gson:gson", + "com.google.dagger:dagger", + "com.google.dagger:dagger-compiler", + "com.google.dagger:dagger-producers", + "com.google.dagger:dagger-spi", + "com.google.devtools.ksp:symbol-processing-api", "com.google.errorprone:error_prone_annotations", "com.google.errorprone:javac-shaded", "com.google.firebase:firebase-analytics:aar", @@ -4924,7 +5194,6 @@ "io.xlate:yaml-json", "jakarta.json:jakarta.json-api", "javax.annotation:javax.annotation-api", - "javax.annotation:jsr250-api", "javax.inject:javax.inject", "junit:junit", "net.bytebuddy:byte-buddy", @@ -5111,6 +5380,7 @@ "com.google.dagger:dagger-compiler", "com.google.dagger:dagger-producers", "com.google.dagger:dagger-spi", + "com.google.devtools.ksp:symbol-processing-api", "com.google.errorprone:error_prone_annotations", "com.google.errorprone:javac-shaded", "com.google.firebase:firebase-analytics:aar", @@ -5176,7 +5446,6 @@ "io.xlate:yaml-json", "jakarta.json:jakarta.json-api", "javax.annotation:javax.annotation-api", - "javax.annotation:jsr250-api", "javax.inject:javax.inject", "junit:junit", "net.bytebuddy:byte-buddy", diff --git a/third_party/versions.bzl b/third_party/versions.bzl index af797590404..e113a395247 100644 --- a/third_party/versions.bzl +++ b/third_party/versions.bzl @@ -55,6 +55,7 @@ MAVEN_PRODUCTION_DEPENDENCY_VERSIONS = { "com.google.android.flexbox:flexbox": "3.0.0", "com.google.android.material:material": "1.3.0", "com.google.auto.value:auto-value-annotations": "1.8.1", + "com.google.errorprone:error_prone_annotations": "2.11.0", "com.google.firebase:firebase-analytics": "17.5.0", "com.google.firebase:firebase-appcheck": "16.0.0", "com.google.firebase:firebase-appcheck-debug": "16.0.0", @@ -64,7 +65,8 @@ MAVEN_PRODUCTION_DEPENDENCY_VERSIONS = { "com.google.firebase:firebase-crashlytics": "17.1.1", "com.google.firebase:firebase-firestore-ktx": "24.2.1", "com.google.gms:google-services": "4.3.3", - "com.google.guava:guava": "28.1-android", + "com.google.guava:failureaccess": "1.0.1", + "com.google.j2objc:j2objc-annotations": "1.3", "com.google.protobuf:protobuf-javalite": "3.17.3", "com.squareup.moshi:moshi-kotlin": "1.11.0", "com.squareup.moshi:moshi-kotlin-codegen": "1.11.0", @@ -75,7 +77,8 @@ MAVEN_PRODUCTION_DEPENDENCY_VERSIONS = { "javax.annotation:javax.annotation-api:jar": "1.3.2", "javax.inject:javax.inject": "1", "nl.dionsegijn:konfetti": "1.2.5", - "org.checkerframework:checker-qual": "3.13.0", + "org.checkerframework:checker-compat-qual": "2.5.5", + "org.checkerframework:checker-qual": "3.21.3", "org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar": "1.3.72", "org.jetbrains.kotlinx:kotlinx-coroutines-android": "1.4.1", "org.jetbrains.kotlinx:kotlinx-coroutines-core": "1.4.3", @@ -126,8 +129,12 @@ HTTP_DEPENDENCY_VERSIONS = { "version": "1.8.0", }, "dagger": { - "sha": "9e69ab2f9a47e0f74e71fe49098bea908c528aa02fa0c5995334447b310d0cdd", - "version": "2.28.1", + "sha": "5c2b22e88e52110178afebda100755f31f5dd505c317be0bfb4f7ad88a88db86", + "version": "2.41", + }, + "guava_android": { + "sha": "9425a423a4cb9d9db0356300722d9bd8e634cf539f29d97bb84f457cccd16eb8", + "version": "31.0.1", }, "protobuf_tools": { "sha": "efcb0b9004200fce79de23be796072a055105273905a5a441dbb5a979d724d20", @@ -155,6 +162,12 @@ HTTP_DEPENDENCY_VERSIONS = { }, } +MAVEN_REPOSITORIES = [ + "https://maven.fabric.io/public", + "https://maven.google.com", + "https://repo1.maven.org/maven2", +] + def get_maven_dependencies(): """ Returns a list of maven dependencies to install to fulfill third-party dependencies. diff --git a/utility/BUILD.bazel b/utility/BUILD.bazel index b69cab715d7..81b8cd3d39d 100644 --- a/utility/BUILD.bazel +++ b/utility/BUILD.bazel @@ -3,7 +3,6 @@ This library contains utilities that all other modules, minus model, depend on. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") load("//utility:utility_test.bzl", "utility_test") @@ -65,7 +64,6 @@ kt_android_library( ), visibility = ["//visibility:public"], deps = [ - ":dagger", ":resources", "//app:crashlytics", "//app:crashlytics_deps", @@ -103,9 +101,9 @@ filegroup( # keep sorted TEST_DEPS = [ - ":dagger", ":test_resources", ":utility", + "//:dagger", "//app:crashlytics", "//app:crashlytics_deps", "//app:firestore_deps", @@ -162,5 +160,3 @@ MIGRATED_TESTS = [ filtered_tests = MIGRATED_TESTS, deps = TEST_DEPS, ) for test_file_path in glob(["src/test/java/org/oppia/android/util/**/*Test.kt"])] - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/accessibility/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/accessibility/BUILD.bazel index 334c946e4a9..33f4143f887 100644 --- a/utility/src/main/java/org/oppia/android/util/accessibility/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/accessibility/BUILD.bazel @@ -2,7 +2,6 @@ General purposes utilities for Android accessibility checking. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -44,8 +43,8 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":impl", + "//:dagger", ], ) @@ -57,9 +56,7 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", ":testing", + "//:dagger", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/caching/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/caching/BUILD.bazel index 28d5943b78d..1a9ed34db7b 100644 --- a/utility/src/main/java/org/oppia/android/util/caching/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/caching/BUILD.bazel @@ -2,7 +2,6 @@ Utilities corresponding to caching. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -39,7 +38,6 @@ kt_android_library( ], deps = [ ":asset_repository", - ":dagger", "//third_party:com_google_protobuf_protobuf-javalite", "//utility/src/main/java/org/oppia/android/util/logging:console_logger", ], @@ -54,8 +52,8 @@ kt_android_library( deps = [ ":annotations", ":asset_repository", - ":dagger", ":topic_list_to_cache", + "//:dagger", ], ) @@ -66,8 +64,8 @@ kt_android_library( ], visibility = ["//:oppia_api_visibility"], deps = [ - ":dagger", ":impl", + "//:dagger", ], ) @@ -81,5 +79,3 @@ kt_android_library( "//third_party:javax_inject_javax_inject", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/caching/testing/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/caching/testing/BUILD.bazel index cf17e2459dc..524a5c7e53a 100644 --- a/utility/src/main/java/org/oppia/android/util/caching/testing/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/caching/testing/BUILD.bazel @@ -2,7 +2,6 @@ Testing utilities corresponding asset caching utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -13,7 +12,7 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", + "//:dagger", "//utility/src/main/java/org/oppia/android/util/caching:annotations", "//utility/src/main/java/org/oppia/android/util/caching:topic_list_to_cache", ], @@ -27,8 +26,8 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", ":test_asset_repository", + "//:dagger", ], ) @@ -40,7 +39,6 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", "//third_party:com_google_protobuf_protobuf-javalite", "//utility/src/main/java/org/oppia/android/util/caching:asset_repository", "//utility/src/main/java/org/oppia/android/util/caching:impl", @@ -55,9 +53,7 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", + "//third_party:javax_inject_javax_inject", "//utility/src/main/java/org/oppia/android/util/caching:asset_repository", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/data/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/data/BUILD.bazel index fa19e2b393e..46290b3b89c 100644 --- a/utility/src/main/java/org/oppia/android/util/data/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/data/BUILD.bazel @@ -2,7 +2,6 @@ Utilities corresponding to data. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -48,8 +47,8 @@ kt_android_library( deps = [ ":async_data_subscription_manager", ":async_result", - ":dagger", ":data_provider", + "//:dagger", "//third_party:androidx_lifecycle_lifecycle-livedata-core", "//third_party:javax_inject_javax_inject", "//third_party:org_jetbrains_kotlinx_kotlinx-coroutines-core", @@ -70,5 +69,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/threading:annotations", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/gcsresource/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/gcsresource/BUILD.bazel index a08e5bee6f6..40b791ffc55 100644 --- a/utility/src/main/java/org/oppia/android/util/gcsresource/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/gcsresource/BUILD.bazel @@ -2,7 +2,6 @@ Utilities for interacting with GCS backend resources. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -24,8 +23,6 @@ kt_android_library( visibility = ["//:oppia_prod_module_visibility"], deps = [ ":annotations", - ":dagger", + "//:dagger", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/locale/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/locale/BUILD.bazel index 9635257d80e..5c4edcc7288 100644 --- a/utility/src/main/java/org/oppia/android/util/locale/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/locale/BUILD.bazel @@ -2,7 +2,6 @@ Generic utilities for managing languages & locales. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -12,8 +11,8 @@ kt_android_library( ], visibility = ["//:oppia_api_visibility"], deps = [ - ":dagger", ":oppia_locale", + "//third_party:javax_inject_javax_inject", ], ) @@ -56,10 +55,10 @@ kt_android_library( ], deps = [ ":android_locale_factory", - ":dagger", ":oppia_bidi_formatter", ":oppia_locale", "//third_party:androidx_core_core", + "//third_party:javax_inject_javax_inject", "//utility/src/main/java/org/oppia/android/util/data:data_providers", "//utility/src/main/java/org/oppia/android/util/system:oppia_clock", ], @@ -75,7 +74,8 @@ kt_android_library( ], deps = [ ":android_locale_profile", - ":dagger", + "//:dagger", + "//third_party:javax_inject_javax_inject", "//third_party:org_jetbrains_kotlinx_kotlinx-coroutines-core", "//utility/src/main/java/org/oppia/android/util/threading:annotations", ], @@ -98,10 +98,8 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":impl", ":oppia_locale", + "//:dagger", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/locale/testing/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/locale/testing/BUILD.bazel index 15136e7c69e..fa840ff6152 100644 --- a/utility/src/main/java/org/oppia/android/util/locale/testing/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/locale/testing/BUILD.bazel @@ -2,7 +2,6 @@ Testing utilities for language & locale general utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -13,7 +12,6 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", "//utility/src/main/java/org/oppia/android/util/locale:impl", "//utility/src/main/java/org/oppia/android/util/locale:oppia_bidi_formatter", ], @@ -27,10 +25,8 @@ kt_android_library( ], visibility = ["//:oppia_testing_visibility"], deps = [ - ":dagger", ":test_oppia_bidi_formatter", + "//:dagger", "//utility/src/main/java/org/oppia/android/util/locale:impl", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel index e0bb6856702..8a05f5c64cd 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel @@ -2,7 +2,6 @@ General purpose utilities for logging. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -24,8 +23,8 @@ kt_android_library( visibility = ["//:oppia_api_visibility"], deps = [ ":annotations", - ":dagger", ":log_level", + "//:dagger", "//model/src/main/proto:event_logger_java_proto_lite", "//third_party:javax_inject_javax_inject", "//third_party:org_jetbrains_kotlinx_kotlinx-coroutines-core", @@ -130,9 +129,9 @@ kt_android_library( visibility = ["//:oppia_prod_module_visibility"], deps = [ ":annotations", - ":dagger", ":log_level", ":sync_status_manager_impl", + "//:dagger", "//third_party:javax_inject_javax_inject", ], ) @@ -145,8 +144,8 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":event_type_to_human_readable_name_converter", + "//:dagger", ], ) @@ -158,8 +157,8 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":event_type_to_human_readable_name_converter", + "//:dagger", ], ) @@ -213,5 +212,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/networking:network_connection_util", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/logging/firebase/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/logging/firebase/BUILD.bazel index 91e936b66a8..b0d26ebc6c7 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/firebase/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/logging/firebase/BUILD.bazel @@ -2,7 +2,6 @@ Logging utility implementations backed by Firebase. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -46,11 +45,11 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":debug_module", ":firebase_exception_logger", ":firestore_logger_impl", ":prod_impl", + "//:dagger", "//third_party:com_google_firebase_firebase-analytics", "//third_party:com_google_firebase_firebase-crashlytics", "//third_party:javax_inject_javax_inject", @@ -82,10 +81,10 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":debug_event_logger", ":debug_firestore_logger_impl", ":firebase_exception_logger", + "//:dagger", ], ) @@ -150,9 +149,7 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":firestore_wrapper", + "//:dagger", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/logging/performancemetrics/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/logging/performancemetrics/BUILD.bazel index ff353d105be..f2b674020e6 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/performancemetrics/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/logging/performancemetrics/BUILD.bazel @@ -2,7 +2,6 @@ General purpose utilities for performance metrics logging. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -34,8 +33,8 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":performance_metrics_assessor_impl", + "//:dagger", "//model/src/main/proto:performance_metrics_event_logger_java_proto_lite", "//third_party:javax_inject_javax_inject", ], @@ -64,11 +63,9 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", + "//:dagger", "//model/src/main/proto:performance_metrics_event_logger_java_proto_lite", "//third_party:javax_inject_javax_inject", "//utility/src/main/java/org/oppia/android/util/system:oppia_clock", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/networking/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/networking/BUILD.bazel index 9d2801a3001..382ebf75f64 100644 --- a/utility/src/main/java/org/oppia/android/util/networking/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/networking/BUILD.bazel @@ -2,7 +2,6 @@ Package for networking utilities """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -64,8 +63,8 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":prod_impl", + "//:dagger", ], ) @@ -76,8 +75,8 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":debug_impl", + "//:dagger", ], ) @@ -90,9 +89,7 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":network_connection_debug_util", + "//:dagger", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/parser/html/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/parser/html/BUILD.bazel index 47dab3398be..adb9af41640 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/html/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/parser/html/BUILD.bazel @@ -2,7 +2,6 @@ General-purpose utilities for parsing & rendering HTML within the app. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -105,10 +104,8 @@ kt_android_library( ], deps = [ ":custom_html_content_handler", - ":dagger", ":exploration_html_parser_entity_type", ":tag_handlers", + "//:dagger", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/parser/image/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/parser/image/BUILD.bazel index bdc56d21a08..e88fe61795f 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/image/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/parser/image/BUILD.bazel @@ -2,7 +2,6 @@ General-purpose utilities for image loading and processing. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -60,9 +59,9 @@ kt_android_library( "//:oppia_prod_module_visibility", ], deps = [ - ":dagger", ":glide_image_loader", ":image_loader", + "//:dagger", ], ) @@ -112,8 +111,8 @@ kt_android_library( "//:oppia_testing_visibility", ], deps = [ - ":dagger", ":image_parsing_annonations", + "//:dagger", "//third_party:javax_inject_javax_inject", ], ) @@ -149,6 +148,7 @@ kt_android_library( deps = [ ":image_asset_fetcher", ":repository_model_loader", + "//:dagger", "//third_party:glide_compiler", "//utility/src/main/java/org/oppia/android/util/caching:annotations", "//utility/src/main/java/org/oppia/android/util/caching:asset_repository", @@ -222,5 +222,3 @@ kt_android_library( "//utility/src/main/java/org/oppia/android/util/parser/svg:block_picture_drawable", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/profile/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/profile/BUILD.bazel index 84dc1073a62..1d98a6aa872 100644 --- a/utility/src/main/java/org/oppia/android/util/profile/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/profile/BUILD.bazel @@ -2,7 +2,6 @@ General purposes utilities to manage directories. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -26,5 +25,3 @@ kt_android_library( "//third_party:javax_inject_javax_inject", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/system/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/system/BUILD.bazel index 76e15d8f17d..6b423da811c 100644 --- a/utility/src/main/java/org/oppia/android/util/system/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/system/BUILD.bazel @@ -2,7 +2,6 @@ Utilities corresponding to system utilities such as the system clock. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -31,8 +30,8 @@ kt_android_library( ], visibility = ["//:oppia_prod_module_visibility"], deps = [ - ":dagger", ":oppia_clock_impl", + "//:dagger", ], ) @@ -57,5 +56,3 @@ kt_android_library( ":oppia_clock_injector", ], ) - -dagger_rules() diff --git a/utility/src/main/java/org/oppia/android/util/threading/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/threading/BUILD.bazel index bb5b44721bc..19d3ea5ad0c 100644 --- a/utility/src/main/java/org/oppia/android/util/threading/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/threading/BUILD.bazel @@ -2,7 +2,6 @@ General purpose utilities for multi-threading and concurrency. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") kt_android_library( @@ -52,10 +51,8 @@ kt_android_library( visibility = ["//:oppia_prod_module_visibility"], deps = [ ":annotations", - ":dagger", + "//:dagger", "//third_party:javax_inject_javax_inject", "//third_party:org_jetbrains_kotlinx_kotlinx-coroutines-android", ], ) - -dagger_rules() diff --git a/utility/src/test/java/org/oppia/android/util/caching/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/caching/BUILD.bazel index cadafded7a4..e733344f2d0 100644 --- a/utility/src/test/java/org/oppia/android/util/caching/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/caching/BUILD.bazel @@ -2,7 +2,6 @@ Tests for caching utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.util.caching.AssetModuleTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/threading:test_module", "//testing/src/main/java/org/oppia/android/testing/time:test_module", @@ -27,5 +26,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/logging:prod_module", ], ) - -dagger_rules() diff --git a/utility/src/test/java/org/oppia/android/util/caching/testing/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/caching/testing/BUILD.bazel index f9cf0e1a190..013c0b633ec 100644 --- a/utility/src/test/java/org/oppia/android/util/caching/testing/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/caching/testing/BUILD.bazel @@ -2,7 +2,6 @@ Tests for testing utilities corresponding asset caching utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.util.caching.testing.AssetTestNoOpModuleTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//third_party:androidx_test_ext_junit", "//third_party:com_google_truth_truth", "//third_party:junit_junit", @@ -30,7 +29,7 @@ oppia_android_test( test_class = "org.oppia.android.util.caching.testing.TestNoOpAssetRepositoryTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//model/src/main/proto:test_models", "//testing", "//third_party:androidx_test_ext_junit", @@ -43,5 +42,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/caching/testing:asset_test_no_op_module", ], ) - -dagger_rules() diff --git a/utility/src/test/java/org/oppia/android/util/data/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/data/BUILD.bazel index b2890356c40..1b11bf47e94 100644 --- a/utility/src/test/java/org/oppia/android/util/data/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/data/BUILD.bazel @@ -2,7 +2,6 @@ Tests for lightweight exploration player domain components. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.util.data.AsyncDataSubscriptionManagerTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/threading:test_module", @@ -31,7 +30,7 @@ oppia_android_test( test_class = "org.oppia.android.util.data.AsyncResultTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/threading:test_module", @@ -51,7 +50,7 @@ oppia_android_test( test_class = "org.oppia.android.util.data.DataProvidersTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/data:async_result_subject", "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor", @@ -72,7 +71,7 @@ oppia_android_test( test_class = "org.oppia.android.util.data.InMemoryBlockingCacheTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/threading:test_module", @@ -83,5 +82,3 @@ oppia_android_test( "//third_party:robolectric_android-all", ], ) - -dagger_rules() diff --git a/utility/src/test/java/org/oppia/android/util/locale/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/locale/BUILD.bazel index d1bc33a3988..ba3f39fbc63 100644 --- a/utility/src/test/java/org/oppia/android/util/locale/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/locale/BUILD.bazel @@ -2,7 +2,6 @@ Tests for language & locale utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.util.locale.AndroidLocaleFactoryTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/threading:test_module", @@ -34,7 +33,7 @@ oppia_android_test( test_class = "org.oppia.android.util.locale.AndroidLocaleProfileTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing/src/main/java/org/oppia/android/testing/time:test_module", "//third_party:androidx_test_ext_junit", "//third_party:com_google_truth_truth", @@ -53,7 +52,7 @@ oppia_android_test( test_class = "org.oppia.android.util.locale.LocaleProdModuleTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing/src/main/java/org/oppia/android/testing/time:test_module", "//third_party:androidx_test_ext_junit", "//third_party:com_google_truth_truth", @@ -71,7 +70,7 @@ oppia_android_test( test_class = "org.oppia.android.util.locale.DisplayLocaleImplTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//model/src/main/proto:languages_java_proto_lite", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -97,7 +96,7 @@ oppia_android_test( test_class = "org.oppia.android.util.locale.MachineLocaleImplTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing/src/main/java/org/oppia/android/testing/time:test_module", "//third_party:androidx_test_ext_junit", "//third_party:com_google_truth_truth", @@ -115,7 +114,7 @@ oppia_android_test( test_class = "org.oppia.android.util.locale.OppiaBidiFormatterImplTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing/src/main/java/org/oppia/android/testing/robolectric:shadow_bidi_formatter", "//third_party:androidx_test_ext_junit", "//third_party:com_google_truth_truth", @@ -134,7 +133,7 @@ oppia_android_test( test_class = "org.oppia.android.util.locale.OppiaLocaleContextExtensionsTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//model/src/main/proto:languages_java_proto_lite", "//third_party:androidx_test_ext_junit", "//third_party:com_google_truth_extensions_truth-liteproto-extension", @@ -144,5 +143,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/locale:oppia_locale", ], ) - -dagger_rules() diff --git a/utility/src/test/java/org/oppia/android/util/locale/testing/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/locale/testing/BUILD.bazel index e8457492b52..7d91ef52f46 100644 --- a/utility/src/test/java/org/oppia/android/util/locale/testing/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/locale/testing/BUILD.bazel @@ -2,7 +2,6 @@ Tests for testing utilities for language & locale general utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.util.locale.testing.LocaleTestModuleTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing/src/main/java/org/oppia/android/testing/time:test_module", "//third_party:androidx_test_ext_junit", "//third_party:com_google_truth_truth", @@ -30,7 +29,7 @@ oppia_android_test( test_class = "org.oppia.android.util.locale.testing.TestOppiaBidiFormatterTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:shadow_bidi_formatter", "//third_party:androidx_test_ext_junit", @@ -42,5 +41,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/locale/testing:test_oppia_bidi_formatter", ], ) - -dagger_rules() diff --git a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel index 15aa68e6b79..03e0fdc9689 100644 --- a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel @@ -2,7 +2,6 @@ Tests for logging utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") load("//:oppia_android_test.bzl", "oppia_android_test") @@ -30,7 +29,7 @@ oppia_android_test( test_class = "org.oppia.android.util.logging.EventBundleCreatorTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/junit:oppia_parameterized_test_runner", "//testing/src/main/java/org/oppia/android/testing/junit:parameterized_robolectric_test_runner", @@ -51,7 +50,7 @@ oppia_android_test( test_class = "org.oppia.android.util.logging.EventLoggingConfigurationModuleTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//third_party:androidx_test_ext_junit", "//third_party:androidx_test_ext_truth", @@ -69,7 +68,7 @@ oppia_android_test( test_class = "org.oppia.android.util.logging.KenyaAlphaEventBundleCreatorTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//third_party:androidx_test_ext_junit", "//third_party:androidx_test_ext_truth", @@ -88,7 +87,7 @@ oppia_android_test( test_class = "org.oppia.android.util.logging.KenyaAlphaEventLoggingConfigurationModuleTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//third_party:androidx_test_ext_junit", "//third_party:androidx_test_ext_truth", @@ -106,7 +105,7 @@ oppia_android_test( test_class = "org.oppia.android.util.logging.StandardEventTypeToHumanReadableNameConverterImplTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//third_party:androidx_test_ext_junit", "//third_party:com_google_truth_truth", @@ -123,8 +122,8 @@ oppia_android_test( test_class = "org.oppia.android.util.logging.SyncStatusManagerImplTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", ":sync_status_manager_test_base", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -147,8 +146,8 @@ oppia_android_test( test_class = "org.oppia.android.util.logging.ConsoleLoggerTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", ":sync_status_manager_test_base", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor", "//testing/src/main/java/org/oppia/android/testing/junit:oppia_parameterized_test_runner", @@ -170,5 +169,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/utility/src/test/java/org/oppia/android/util/logging/firebase/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/logging/firebase/BUILD.bazel index 3ae5970b336..8980bedd68c 100644 --- a/utility/src/test/java/org/oppia/android/util/logging/firebase/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/logging/firebase/BUILD.bazel @@ -2,7 +2,6 @@ Tests for logging utility implementations backed by Firebase. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.util.logging.firebase.LogReportingModuleTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/threading:test_module", @@ -36,7 +35,7 @@ oppia_android_test( test_class = "org.oppia.android.util.logging.firebase.DebugFirestoreEventLoggerImplTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/threading:test_module", @@ -53,5 +52,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/utility/src/test/java/org/oppia/android/util/logging/performancemetrics/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/logging/performancemetrics/BUILD.bazel index 9719a59c057..58eb7dfd8a0 100644 --- a/utility/src/test/java/org/oppia/android/util/logging/performancemetrics/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/logging/performancemetrics/BUILD.bazel @@ -2,7 +2,6 @@ Tests for general-purpose utilities for performance metrics logging. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.util.logging.performancemetrics.PerformanceMetricsAssessorImplTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/junit:oppia_parameterized_test_runner", "//testing/src/main/java/org/oppia/android/testing/junit:parameterized_robolectric_test_runner", @@ -40,7 +39,7 @@ oppia_android_test( test_class = "org.oppia.android.util.logging.performancemetrics.PerformanceMetricsAssessorModuleTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/threading:test_module", @@ -63,7 +62,7 @@ oppia_android_test( test_class = "org.oppia.android.util.logging.performancemetrics.PerformanceMetricsConfigurationsModuleTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/threading:test_module", @@ -77,5 +76,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/logging/performancemetrics:performance_metrics_configurations_module", ], ) - -dagger_rules() diff --git a/utility/src/test/java/org/oppia/android/util/networking/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/networking/BUILD.bazel index 6d2c1dc4bf8..c76aa778976 100644 --- a/utility/src/test/java/org/oppia/android/util/networking/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/networking/BUILD.bazel @@ -2,7 +2,6 @@ Tests for networking-specific utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.util.networking.NetworkConnectionUtilProdModuleTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing/src/main/java/org/oppia/android/testing/networking:network_connection_test_util", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/time:test_module", @@ -34,7 +33,7 @@ oppia_android_test( test_class = "org.oppia.android.util.networking.NetworkConnectionUtilProdImplTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing/src/main/java/org/oppia/android/testing/networking:network_connection_test_util", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/time:test_module", @@ -56,7 +55,7 @@ oppia_android_test( test_class = "org.oppia.android.util.networking.NetworkConnectionUtilDebugModuleTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing/src/main/java/org/oppia/android/testing/networking:network_connection_test_util", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/time:test_module", @@ -78,7 +77,7 @@ oppia_android_test( test_class = "org.oppia.android.util.networking.NetworkConnectionUtilDebugImplTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing/src/main/java/org/oppia/android/testing/networking:network_connection_test_util", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", "//testing/src/main/java/org/oppia/android/testing/time:test_module", @@ -92,5 +91,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/networking:debug_module", ], ) - -dagger_rules() diff --git a/utility/src/test/java/org/oppia/android/util/profile/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/profile/BUILD.bazel index 83e10b86f43..4ee39e3515c 100644 --- a/utility/src/test/java/org/oppia/android/util/profile/BUILD.bazel +++ b/utility/src/test/java/org/oppia/android/util/profile/BUILD.bazel @@ -2,7 +2,6 @@ Tests for profile utilities. """ -load("@dagger//:workspace_defs.bzl", "dagger_rules") load("//:oppia_android_test.bzl", "oppia_android_test") oppia_android_test( @@ -12,7 +11,7 @@ oppia_android_test( test_class = "org.oppia.android.util.profile.ProfileNameValidatorTest", test_manifest = "//utility:test_manifest", deps = [ - ":dagger", + "//:dagger", "//testing/src/main/java/org/oppia/android/testing/junit:oppia_parameterized_test_runner", "//testing/src/main/java/org/oppia/android/testing/junit:parameterized_robolectric_test_runner", "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", @@ -28,5 +27,3 @@ oppia_android_test( "//utility/src/main/java/org/oppia/android/util/profile:profile_name_validator", ], ) - -dagger_rules()