diff --git a/WORKSPACE b/WORKSPACE index 56d95d2c8ad..f3658f7c92c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -30,15 +30,12 @@ http_archive( urls = ["https://github.com/bazelbuild/rules_kotlin/releases/download/%s/rules_kotlin_release.tgz" % HTTP_DEPENDENCY_VERSIONS["rules_kotlin"]["version"]], ) -# TODO(#1535): Remove once rules_kotlin is released because these lines become unnecessary -load("@io_bazel_rules_kotlin//kotlin:dependencies.bzl", "kt_download_local_dev_dependencies") - -kt_download_local_dev_dependencies() - -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains") +load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories") kotlin_repositories() +load("@io_bazel_rules_kotlin//kotlin:core.bzl", "kt_register_toolchains") + kt_register_toolchains() # The proto_compiler and proto_java_toolchain bindings load the protos rules needed for the model diff --git a/app/BUILD.bazel b/app/BUILD.bazel index 4dcef9d8be5..9cc7ada4641 100644 --- a/app/BUILD.bazel +++ b/app/BUILD.bazel @@ -10,7 +10,7 @@ order to build with Bazel. - All binding adapters must be written in Java. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") load("@tools_android//tools/crashlytics:defs.bzl", "crashlytics_android_library") load("@tools_android//tools/googleservices:defs.bzl", "google_services_xml") load("//app:app_test.bzl", "app_test") diff --git a/app/src/main/java/org/oppia/android/app/activity/BUILD.bazel b/app/src/main/java/org/oppia/android/app/activity/BUILD.bazel index 3a91a9ad7c2..6deef27629c 100644 --- a/app/src/main/java/org/oppia/android/app/activity/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/activity/BUILD.bazel @@ -2,7 +2,7 @@ Constructs for setting up activities for injection in the Dagger graph. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") # TODO(#59): Define these exported files as separate libraries from top-level targets. exports_files([ 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 5b248b75ef9..20065008968 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,7 @@ Constructs for setting up activity routing support in the Dagger graph. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") # TODO(#59): Define these exported files as separate libraries from top-level targets. exports_files([ 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 0d857c76241..064c317d50c 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,7 @@ Dagger graph. Specific application implementations can be found in subpackages. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "abstract_application", 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 65399ed8697..d83972809b7 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,7 @@ This package contains the root application definitions for alpha builds of the app. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "alpha_application", 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 bf55ea55214..33f82ca7469 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,7 @@ This package contains the root application definitions for a Kenya user study sp of the app. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "alpha_kenya_application", 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 2185c8137b9..e615e151ac2 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,7 @@ This package contains the root application definitions for beta builds of the app. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "beta_application", 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 889eb40580c..76e56e3bab1 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,7 @@ there are specially defined top-level build flavors which will select their corr application configuration. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "developer_application", 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 84c3433e38c..da232f782d2 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,7 @@ This package contains the root application definitions for general availability builds of the app. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "general_availability_application", 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 4ebecb8b338..84c36d77c85 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,7 @@ This package contains testing utilities that may be needed to set up the root ap testing environments. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "testing_build_flavor_module", diff --git a/app/src/main/java/org/oppia/android/app/fragment/BUILD.bazel b/app/src/main/java/org/oppia/android/app/fragment/BUILD.bazel index 208f0313858..bce950a36e2 100644 --- a/app/src/main/java/org/oppia/android/app/fragment/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/fragment/BUILD.bazel @@ -2,7 +2,7 @@ Constructs for setting up fragments for injection in the Dagger graph. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") # TODO(#59): Define these exported files as separate libraries from top-level targets. exports_files([ 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 248b74fdfa8..68cdc7a25b6 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,7 @@ Test-only utilities corresponding to app notices. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "beta_notice_dialog_frgment_test_activity", 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 6879af440e7..553af67894b 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,7 @@ Test-only utilities corresponding to BottomSheetOptionsMenu. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "bottom_sheet_options_menu_test_activity", 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 88b2ec6e9a1..4957b2ceda9 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,7 @@ Temporary shims for providing indirection in the Bazel build graph to unblock mo parts of the app layer. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") IMPL_FILES = [ "IntentFactoryShimImpl.kt", diff --git a/app/src/main/java/org/oppia/android/app/spotlight/BUILD.bazel b/app/src/main/java/org/oppia/android/app/spotlight/BUILD.bazel index 3114c4f118c..f0f3d0a2840 100644 --- a/app/src/main/java/org/oppia/android/app/spotlight/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/spotlight/BUILD.bazel @@ -2,7 +2,7 @@ Constructs for setting up spotlights. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") genrule( name = "update_SpotlightFragment", diff --git a/app/src/main/java/org/oppia/android/app/testing/activity/BUILD.bazel b/app/src/main/java/org/oppia/android/app/testing/activity/BUILD.bazel index 5e670cb5c7e..b3f231830cf 100644 --- a/app/src/main/java/org/oppia/android/app/testing/activity/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/testing/activity/BUILD.bazel @@ -5,7 +5,7 @@ graph, and to simplify UI arrangement for tests that require an activity (such a fragments (such as views). """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") # Resource shim needed so that TestActivity can build in both Gradle & Bazel. genrule( 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 de38cd46673..66d8832de03 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,7 @@ UI utilities for for managing languages & locales. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") # Resource shim needed so that AppLanguageResourceHandler can build in both Gradle & Bazel. genrule( 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 eb7f84bda27..d0aafbd2007 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,7 @@ Testing utilities for languages & locales. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "test_activity_recreator", 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 3c21abb2cb0..bc703e631de 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,7 @@ General purposes utilities to manage date and time in user-facing strings. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") # Resource shim needed so that DateTimeUtil can build in both Gradle & Bazel. genrule( 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 67d532a6a9b..c5de3371363 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,7 @@ Constructs for setting up lifecycle safe timer factory for injection in the Dagger graph. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "lifecycle_safe_timer_factory", 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 fa068ab78ea..5671f58a96f 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,7 @@ General purposes utilities corresponding to displaying math expressions & constructs. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") # Resource shim needed so that MathExpressionAccessibilityUtil can build in both Gradle & Bazel. genrule( diff --git a/app/src/main/java/org/oppia/android/app/view/BUILD.bazel b/app/src/main/java/org/oppia/android/app/view/BUILD.bazel index b81f8639a09..4536d738082 100644 --- a/app/src/main/java/org/oppia/android/app/view/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/view/BUILD.bazel @@ -2,7 +2,7 @@ Constructs for setting up views for injection in the Dagger graph. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") # TODO(#59): Define ViewComponentImpl as a library separate from views. exports_files([ diff --git a/app/src/main/java/org/oppia/android/app/viewmodel/BUILD.bazel b/app/src/main/java/org/oppia/android/app/viewmodel/BUILD.bazel index 769fb4c576a..d89b4acf356 100644 --- a/app/src/main/java/org/oppia/android/app/viewmodel/BUILD.bazel +++ b/app/src/main/java/org/oppia/android/app/viewmodel/BUILD.bazel @@ -2,7 +2,7 @@ Utilities corresponding to simplify using Jetpack's view model functionality. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "observable_array_list", 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 ed01ed8eae1..a9e26231900 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,7 @@ Library for providing top-level HTTP networking support for Oppia's App Engine backend. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "network_interceptors", 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 d7088cf7935..c87c159e8d8 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,7 @@ Library for providing a network API interface with Oppia's App Engine backend. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "api", 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 485e0124e60..301ffbe089b 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,7 @@ Library for providing model definitions for Oppia's App Engine backend endpoints. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "model", 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 8d4b3a4f783..95f2b472c81 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,7 @@ This package provides persistence to the rest of the application. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "cache_store", diff --git a/domain/BUILD.bazel b/domain/BUILD.bazel index bf096edd4cf..770db0740c3 100755 --- a/domain/BUILD.bazel +++ b/domain/BUILD.bazel @@ -3,7 +3,7 @@ This library contains the frontend controller and business service logic for the application. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") load("//domain:domain_assets.bzl", "generate_assets_list_from_text_protos") load("//domain:domain_test.bzl", "domain_test") diff --git a/domain/src/main/java/org/oppia/android/domain/audio/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/audio/BUILD.bazel index cf25c85cc5d..a3b9cbe29b4 100644 --- a/domain/src/main/java/org/oppia/android/domain/audio/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/audio/BUILD.bazel @@ -2,7 +2,7 @@ Domain services & definitions corresponding to managing and playing audio tracks. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "audio_player_controller", 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 37503b05060..252206babf9 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,7 @@ Library for providing authentication with Firebase functionality. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "authentication_controller", 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 30be62200c9..f9911c1d88a 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,7 @@ Domain components for answer classification. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "answer_classification_controller", 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 c9a0c8ed31e..c27425ae0b6 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,7 @@ Rule classifier providers for classify domain components. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "generic_rule_classifier", 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 9f24847da82..60d301d71e0 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,7 @@ Classifiers for the 'AlgebraicExpressionInput' interaction. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "algebraic_expression_input_providers", 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 479424f099e..b2d7277a874 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,7 @@ Classifiers for the 'Continue' interaction. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "continue_module", 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 d1ad2995f17..a7fc591fa7f 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,7 @@ Classifiers for the 'DragAndDropSortInput' interaction. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "drag_and_drop_sort_input_providers", 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 87b0f38ec3e..2af31f8c35b 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,7 @@ Classifiers for the 'FractionInput' interaction. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "fraction_input_providers", 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 691670a9741..5eb2e80e6d7 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,7 @@ Classifiers for the 'ImageClickInput' interaction. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "image_click_input_providers", 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 6b4752ca5e1..3d58a5ca869 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,7 @@ Classifiers for the 'ItemSelectionInput' interaction. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "item_selection_input_providers", 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 3dcf2a57cdb..0370d9fc8a3 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,7 @@ Classifiers for the 'MathEquationInput' interaction. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "math_equation_input_providers", 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 ccbe9213512..2a960fa3ff7 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,7 @@ Classifiers for the 'MultipleChoiceInput' interaction. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "multiple_choice_input_providers", 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 eb4b0b00110..b97b86a3512 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,7 @@ Classifiers for the 'NumberWithUnits' interaction. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "number_with_units_providers", 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 ded61c2a1dd..84c94c1b417 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,7 @@ Classifiers for the 'NumericExpressionInput' interaction. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "numeric_expression_input_providers", 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 a25efd74a6d..51daabfb093 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,7 @@ Classifiers for the 'NumericInput' interaction. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "numeric_input_providers", 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 be367bfdc7f..aa376304996 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,7 @@ Classifiers for the 'RatioInput' interaction. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "ratio_input_providers", 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 763bffacd05..fb3008a109d 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,7 @@ Classifiers for the 'TextInput' interaction. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "text_input_providers", 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 4285df8c762..97474cff9da 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,7 @@ Domain services & definitions corresponding to managing the system clipboard whe text. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "clipboard_controller", 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 f2299ed6cd9..b74ba793220 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,7 @@ Test-only utilities for exploration management & loading domain components. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "fake_exploration_retriever", 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 3a142430a7f..68c49091c26 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,7 @@ Domain services & definitions corresponding to user feedback reporting. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "prod_module", 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 5db57463f86..5b54b96beee 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,7 @@ Domain definitions for managing languages & locales. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "locale_controller", 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 293ffa8f4fc..0c56bb8f283 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,7 @@ Utilities for onboarding domain components. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "state_controller", 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 be23c119989..df230a3ec4c 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,7 @@ Test-only utilities for onboarding domain components. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "retriever_test_module", 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 6180098f779..ea208554ded 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,7 @@ Package for providing logging support. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "application_id_seed", 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 dcfae35e1ce..3c54e3d6c53 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,7 @@ Library for providing logging analytics to the Oppia android app. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "analytics_startup_listener", 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 1f5645eed60..fc4d5c7a062 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,7 @@ Package for testing utilities for log uploading functionality. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "fake_log_scheduler", 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 d0805571dbd..b1123fa3999 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,7 @@ Package for providing logging support for exceptions. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "controller", 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 2f8c93f1c40..88e30e105bc 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,7 @@ Library for providing log scheduling functionality to the Oppia android app. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "performance_metrics_log_scheduler", 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 2348e0caead..822397af1e6 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,7 @@ Library for providing log uploading functionality to the Oppia android app. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "initializer", 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 dca0f23dfa2..215f85d2212 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,7 @@ Library for providing logging functionality in a survey. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "survey_events_logger", 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 23a3ba5f821..608e59c379c 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,7 @@ Domain definitions and controllers for managing profiles. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "profile_management_controller", 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 a472d8e814d..7ff49ac38e6 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,7 @@ Domain definitions and controllers for managing spotlights. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "spotlight_state_controller", diff --git a/domain/src/main/java/org/oppia/android/domain/state/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/state/BUILD.bazel index aa32d0a3110..f4409d57555 100644 --- a/domain/src/main/java/org/oppia/android/domain/state/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/state/BUILD.bazel @@ -2,7 +2,7 @@ Domain services & definitions corresponding to managing ephemeral states in play sessions. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "state_deck", 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 92c999a4a8b..47dda37d050 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,7 @@ Library for providing survey functionality in the app. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "gating_controller", 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 241c5879b68..c2714676669 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,7 @@ Package for testing utilities for log uploading functionality. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "fake_log_uploader", 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 53cc31e391c..3b219829091 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,7 @@ Domain definitions for managing translations. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "translation_controller", diff --git a/domain/src/main/java/org/oppia/android/domain/util/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/util/BUILD.bazel index de927b14eaf..53c81d33ed0 100644 --- a/domain/src/main/java/org/oppia/android/domain/util/BUILD.bazel +++ b/domain/src/main/java/org/oppia/android/domain/util/BUILD.bazel @@ -2,7 +2,7 @@ General utilities for domain module. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "asset", diff --git a/instrumentation/oppia_instrumentation_test.bzl b/instrumentation/oppia_instrumentation_test.bzl index 6319bbf0ba3..91f36e625ef 100644 --- a/instrumentation/oppia_instrumentation_test.bzl +++ b/instrumentation/oppia_instrumentation_test.bzl @@ -3,7 +3,7 @@ Instrumentation macros to define up end-to-end tests. """ load("@bazel_skylib//rules:build_test.bzl", "build_test") -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") def oppia_instrumentation_test( name, 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 7bbf3e45552..7e7ab58686e 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,7 @@ This library contains the test application and modules used to build the test app for end-to-end tests. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "oppia_test_application", diff --git a/instrumentation/src/java/org/oppia/android/instrumentation/testing/BUILD.bazel b/instrumentation/src/java/org/oppia/android/instrumentation/testing/BUILD.bazel index 2ebb466bd56..a1d072a8285 100644 --- a/instrumentation/src/java/org/oppia/android/instrumentation/testing/BUILD.bazel +++ b/instrumentation/src/java/org/oppia/android/instrumentation/testing/BUILD.bazel @@ -2,7 +2,7 @@ This library contains the utilities used in end-to-end testing. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "e2e_test_helper", diff --git a/oppia_android_test.bzl b/oppia_android_test.bzl index 876f28975c5..8068c87bb16 100644 --- a/oppia_android_test.bzl +++ b/oppia_android_test.bzl @@ -2,7 +2,7 @@ Central macros pertaining to setting up tests across the codebase. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") # TODO(#1620): Remove module-specific test macros once Gradle is removed def oppia_android_module_level_test( diff --git a/scripts/BUILD.bazel b/scripts/BUILD.bazel index 01390e600e7..2199e663d4e 100644 --- a/scripts/BUILD.bazel +++ b/scripts/BUILD.bazel @@ -2,7 +2,7 @@ Kotlin-based scripts to help developers or perform continuous integration tasks. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_binary", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_binary", "kt_jvm_library") load("@rules_java//java:defs.bzl", "java_binary") load( "//scripts:script_assets.bzl", diff --git a/scripts/src/java/org/oppia/android/scripts/build/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/build/BUILD.bazel index 9daa0c3551a..96e253fe75b 100644 --- a/scripts/src/java/org/oppia/android/scripts/build/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/build/BUILD.bazel @@ -2,7 +2,7 @@ Libraries corresponding to build pipeline scripts. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "filter_per_language_resources_lib", diff --git a/scripts/src/java/org/oppia/android/scripts/ci/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/ci/BUILD.bazel index f8b345eaa80..ff9990b866d 100644 --- a/scripts/src/java/org/oppia/android/scripts/ci/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/ci/BUILD.bazel @@ -2,7 +2,7 @@ Libraries corresponding to developer scripts that help with continuous integration workflows. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "compute_affected_tests_lib", diff --git a/scripts/src/java/org/oppia/android/scripts/common/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/common/BUILD.bazel index b8cd2da2323..b9f8c452efb 100644 --- a/scripts/src/java/org/oppia/android/scripts/common/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/common/BUILD.bazel @@ -3,7 +3,7 @@ Package for common libraries that potentially support multiple scripts by perfor generic operations. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "bazel_client", diff --git a/scripts/src/java/org/oppia/android/scripts/common/model/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/common/model/BUILD.bazel index af3cc0b52d7..989cbfb1a45 100644 --- a/scripts/src/java/org/oppia/android/scripts/common/model/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/common/model/BUILD.bazel @@ -2,7 +2,7 @@ Data structures corresponding to common utilities, such as for GitHub API integration. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "github_issue", diff --git a/scripts/src/java/org/oppia/android/scripts/common/remote/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/common/remote/BUILD.bazel index fec47cca77b..f3a597add77 100644 --- a/scripts/src/java/org/oppia/android/scripts/common/remote/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/common/remote/BUILD.bazel @@ -2,7 +2,7 @@ Remote service endpoints for common shared utilities, such as for GitHub API integration. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "github_service", diff --git a/scripts/src/java/org/oppia/android/scripts/common/testing/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/common/testing/BUILD.bazel index 8e1428bfaee..c70adcf4a4e 100644 --- a/scripts/src/java/org/oppia/android/scripts/common/testing/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/common/testing/BUILD.bazel @@ -2,7 +2,7 @@ Package for test-only utilities that correspond to common script utilities. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "fake_command_executor", diff --git a/scripts/src/java/org/oppia/android/scripts/docs/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/docs/BUILD.bazel index 72ff0c07474..f1e33e9bfac 100644 --- a/scripts/src/java/org/oppia/android/scripts/docs/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/docs/BUILD.bazel @@ -2,7 +2,7 @@ Libraries corresponding to documentation-related scripts. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "kdoc_validity_check_lib", diff --git a/scripts/src/java/org/oppia/android/scripts/label/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/label/BUILD.bazel index 7ad9a92714b..3d221f7e0e3 100644 --- a/scripts/src/java/org/oppia/android/scripts/label/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/label/BUILD.bazel @@ -3,7 +3,7 @@ Libraries corresponding to accessibility label check that ensures all the activi are defined with labels. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "accessibility_label_check_lib", diff --git a/scripts/src/java/org/oppia/android/scripts/license/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/license/BUILD.bazel index 4d23d2f9f8a..db5ce6414fe 100644 --- a/scripts/src/java/org/oppia/android/scripts/license/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/license/BUILD.bazel @@ -2,7 +2,7 @@ Libraries corresponding to maven dependencies and their licenses checks. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "maven_artifact_property_fetcher", diff --git a/scripts/src/java/org/oppia/android/scripts/license/model/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/license/model/BUILD.bazel index a54cd78d3d8..1b030956df4 100644 --- a/scripts/src/java/org/oppia/android/scripts/license/model/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/license/model/BUILD.bazel @@ -2,7 +2,7 @@ Libraries corresponding to storing license details of the third-party dependencies. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "model", diff --git a/scripts/src/java/org/oppia/android/scripts/maven/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/maven/BUILD.bazel index efcf1965e7d..dfbf60e6710 100644 --- a/scripts/src/java/org/oppia/android/scripts/maven/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/maven/BUILD.bazel @@ -2,7 +2,7 @@ Libraries corresponding to attributing third-party library copyright licenses in Oppia Android. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "generate_maven_dependencies_list_lib", diff --git a/scripts/src/java/org/oppia/android/scripts/maven/model/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/maven/model/BUILD.bazel index 39107193490..9e0180a3807 100644 --- a/scripts/src/java/org/oppia/android/scripts/maven/model/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/maven/model/BUILD.bazel @@ -2,7 +2,7 @@ Data structures corresponding to parsing maven_install.json. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "model", diff --git a/scripts/src/java/org/oppia/android/scripts/regex/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/regex/BUILD.bazel index 82867e55ee1..a0e21a4ae17 100644 --- a/scripts/src/java/org/oppia/android/scripts/regex/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/regex/BUILD.bazel @@ -3,7 +3,7 @@ Libraries corresponding to regex pattern based validation checks which ensures t file path/name and content are used in the codebase. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "regex_pattern_validation_check_lib", diff --git a/scripts/src/java/org/oppia/android/scripts/telemetry/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/telemetry/BUILD.bazel index 7afddfa12db..d826ace97d4 100644 --- a/scripts/src/java/org/oppia/android/scripts/telemetry/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/telemetry/BUILD.bazel @@ -2,7 +2,7 @@ Libraries corresponding to telemetry scripts, including tools for locally analyzing event data. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "decode_user_study_event_string_lib", diff --git a/scripts/src/java/org/oppia/android/scripts/testfile/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/testfile/BUILD.bazel index 6777296ae26..a4d8c7c0074 100644 --- a/scripts/src/java/org/oppia/android/scripts/testfile/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/testfile/BUILD.bazel @@ -3,7 +3,7 @@ Libraries corresponding to test file-related checks, such as ensuring that all t (all Kotlin files) files have a corresponding test file present. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "test_file_check_lib", diff --git a/scripts/src/java/org/oppia/android/scripts/testing/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/testing/BUILD.bazel index 78b4f12e169..d9ca45340c0 100644 --- a/scripts/src/java/org/oppia/android/scripts/testing/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/testing/BUILD.bazel @@ -3,7 +3,7 @@ Package for utility libraries that aid in script-related test suites by performi arrangement or operations. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "test_bazel_workspace", diff --git a/scripts/src/java/org/oppia/android/scripts/testing/TestBazelWorkspace.kt b/scripts/src/java/org/oppia/android/scripts/testing/TestBazelWorkspace.kt index 7bec4b85889..386d5323fb7 100644 --- a/scripts/src/java/org/oppia/android/scripts/testing/TestBazelWorkspace.kt +++ b/scripts/src/java/org/oppia/android/scripts/testing/TestBazelWorkspace.kt @@ -246,7 +246,7 @@ class TestBazelWorkspace(private val temporaryRootFolder: TemporaryFolder) { if (!isConfiguredForKotlin) { // Add support for Kotlin: https://github.com/bazelbuild/rules_kotlin. val rulesKotlinReleaseUrl = - "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.5.0-alpha-2" + + "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.5.0-beta-3" + "/rules_kotlin_release.tgz" val rulesKotlinArchiveName = "io_bazel_rules_kotlin" val rulesKotlinBazelPrefix = "@$rulesKotlinArchiveName//kotlin" @@ -256,13 +256,12 @@ class TestBazelWorkspace(private val temporaryRootFolder: TemporaryFolder) { load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "$rulesKotlinArchiveName", - sha256 = "6194a864280e1989b6d8118a4aee03bb50edeeae4076e5bc30eef8a98dcd4f07", + sha256 = "58edd86f0f3c5b959c54e656b8e7eb0b0becabd412465c37a2078693c2571f7f", urls = ["$rulesKotlinReleaseUrl"], ) - load("$rulesKotlinBazelPrefix:dependencies.bzl", "kt_download_local_dev_dependencies") - load("$rulesKotlinBazelPrefix:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains") - kt_download_local_dev_dependencies() + load("$rulesKotlinBazelPrefix:repositories.bzl", "kotlin_repositories") kotlin_repositories() + load("$rulesKotlinBazelPrefix:core.bzl", "kt_register_toolchains") kt_register_toolchains() """.trimIndent() + "\n" ) diff --git a/scripts/src/java/org/oppia/android/scripts/todo/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/todo/BUILD.bazel index 351184690d0..bff6a523d44 100644 --- a/scripts/src/java/org/oppia/android/scripts/todo/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/todo/BUILD.bazel @@ -3,7 +3,7 @@ Libraries corresponding to todo-related checks to ensure all TODOs are correctly and correspond to open issues on GitHub """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "todo_collector", diff --git a/scripts/src/java/org/oppia/android/scripts/todo/model/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/todo/model/BUILD.bazel index 34cd905db58..c4eedc1ea26 100644 --- a/scripts/src/java/org/oppia/android/scripts/todo/model/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/todo/model/BUILD.bazel @@ -2,7 +2,7 @@ Libraries corresponding to data structures for representing a parsed open_issues.json file. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "todo", diff --git a/scripts/src/java/org/oppia/android/scripts/xml/BUILD.bazel b/scripts/src/java/org/oppia/android/scripts/xml/BUILD.bazel index e31ea659e02..0657b000c49 100644 --- a/scripts/src/java/org/oppia/android/scripts/xml/BUILD.bazel +++ b/scripts/src/java/org/oppia/android/scripts/xml/BUILD.bazel @@ -3,7 +3,7 @@ Libraries corresponding to XML syntax based check to ensure that all the XML fil are syntactically correct and consistent. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "string_language_translation_check_lib", diff --git a/scripts/src/javatests/org/oppia/android/scripts/build/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/build/BUILD.bazel index 572ba1f87ef..5e5127bae83 100644 --- a/scripts/src/javatests/org/oppia/android/scripts/build/BUILD.bazel +++ b/scripts/src/javatests/org/oppia/android/scripts/build/BUILD.bazel @@ -2,7 +2,7 @@ Tests corresponding to build pipeline scripts. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") kt_jvm_test( name = "FilterPerLanguageResourcesTest", diff --git a/scripts/src/javatests/org/oppia/android/scripts/ci/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/ci/BUILD.bazel index fcdb77f2f1d..fa1a3c2798a 100644 --- a/scripts/src/javatests/org/oppia/android/scripts/ci/BUILD.bazel +++ b/scripts/src/javatests/org/oppia/android/scripts/ci/BUILD.bazel @@ -2,7 +2,7 @@ Tests corresponding to developer scripts that help with continuous integration workflows. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") kt_jvm_test( name = "ComputeAffectedTestsTest", diff --git a/scripts/src/javatests/org/oppia/android/scripts/common/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/common/BUILD.bazel index 03d24a11d19..d021c5d4495 100644 --- a/scripts/src/javatests/org/oppia/android/scripts/common/BUILD.bazel +++ b/scripts/src/javatests/org/oppia/android/scripts/common/BUILD.bazel @@ -3,7 +3,7 @@ Tests corresponding to common libraries that potentially support multiple script common or generic operations. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") kt_jvm_test( name = "BazelClientTest", diff --git a/scripts/src/javatests/org/oppia/android/scripts/common/BazelClientTest.kt b/scripts/src/javatests/org/oppia/android/scripts/common/BazelClientTest.kt index 57b2f26964a..00aa6de7e9d 100644 --- a/scripts/src/javatests/org/oppia/android/scripts/common/BazelClientTest.kt +++ b/scripts/src/javatests/org/oppia/android/scripts/common/BazelClientTest.kt @@ -442,7 +442,7 @@ class BazelClientTest { val secondNewFile = File(tempFolder.root, secondFilename) firstNewFile.appendText( """ - load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test") + load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") def custom_jvm_test_base(name, srcs, deps): kt_jvm_test( name = name, diff --git a/scripts/src/javatests/org/oppia/android/scripts/common/testing/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/common/testing/BUILD.bazel index f81195ad233..4b236ea4493 100644 --- a/scripts/src/javatests/org/oppia/android/scripts/common/testing/BUILD.bazel +++ b/scripts/src/javatests/org/oppia/android/scripts/common/testing/BUILD.bazel @@ -2,7 +2,7 @@ Tests corresponding to test-only utilities that correspond to common script utilities. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") kt_jvm_test( name = "FakeCommandExecutorTest", diff --git a/scripts/src/javatests/org/oppia/android/scripts/docs/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/docs/BUILD.bazel index aacc8424486..4fc4b9a9d53 100644 --- a/scripts/src/javatests/org/oppia/android/scripts/docs/BUILD.bazel +++ b/scripts/src/javatests/org/oppia/android/scripts/docs/BUILD.bazel @@ -2,7 +2,7 @@ Tests corresponding to documentation-related scripts. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") kt_jvm_test( name = "KdocValidityCheckTest", diff --git a/scripts/src/javatests/org/oppia/android/scripts/label/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/label/BUILD.bazel index f67d999d8b7..e29f497fbf6 100644 --- a/scripts/src/javatests/org/oppia/android/scripts/label/BUILD.bazel +++ b/scripts/src/javatests/org/oppia/android/scripts/label/BUILD.bazel @@ -3,7 +3,7 @@ Tests corresponding to accessibility label check that ensures all the activities are defined with labels. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") kt_jvm_test( name = "AccessibilityLabelCheckTest", diff --git a/scripts/src/javatests/org/oppia/android/scripts/license/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/license/BUILD.bazel index 2c65ad810f8..a8019878db5 100644 --- a/scripts/src/javatests/org/oppia/android/scripts/license/BUILD.bazel +++ b/scripts/src/javatests/org/oppia/android/scripts/license/BUILD.bazel @@ -2,7 +2,7 @@ Tests corresponding to the maven dependencies and their license checks. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") kt_jvm_test( name = "LicenseTextsCheckTest", diff --git a/scripts/src/javatests/org/oppia/android/scripts/maven/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/maven/BUILD.bazel index 68b0d6fad28..b14648e3157 100644 --- a/scripts/src/javatests/org/oppia/android/scripts/maven/BUILD.bazel +++ b/scripts/src/javatests/org/oppia/android/scripts/maven/BUILD.bazel @@ -3,7 +3,7 @@ Tests corresponding to the scripts that compile third-party dependencies and ext license links. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") kt_jvm_test( name = "GenerateMavenDependenciesListTest", diff --git a/scripts/src/javatests/org/oppia/android/scripts/regex/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/regex/BUILD.bazel index 60aac88b9ef..2554607d2dc 100644 --- a/scripts/src/javatests/org/oppia/android/scripts/regex/BUILD.bazel +++ b/scripts/src/javatests/org/oppia/android/scripts/regex/BUILD.bazel @@ -3,7 +3,7 @@ Tests corresponding to regex pattern based validation checks which ensures that file path/name and content are used in the codebase. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") kt_jvm_test( name = "RegexPatternValidationCheckTest", diff --git a/scripts/src/javatests/org/oppia/android/scripts/testfile/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/testfile/BUILD.bazel index 237c59d402a..0f60064c09e 100644 --- a/scripts/src/javatests/org/oppia/android/scripts/testfile/BUILD.bazel +++ b/scripts/src/javatests/org/oppia/android/scripts/testfile/BUILD.bazel @@ -3,7 +3,7 @@ Tests corresponding to test file-related checks, such as ensuring that all the p (all Kotlin files) files have a corresponding test file present. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") kt_jvm_test( name = "TestFileCheckTest", diff --git a/scripts/src/javatests/org/oppia/android/scripts/testing/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/testing/BUILD.bazel index 5a18102f1f5..421e8a03b96 100644 --- a/scripts/src/javatests/org/oppia/android/scripts/testing/BUILD.bazel +++ b/scripts/src/javatests/org/oppia/android/scripts/testing/BUILD.bazel @@ -2,7 +2,7 @@ Tests corresponding to script test-only utility libraries. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") kt_jvm_test( name = "TestBazelWorkspaceTest", diff --git a/scripts/src/javatests/org/oppia/android/scripts/todo/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/todo/BUILD.bazel index d206ecde80e..02f414b73b0 100644 --- a/scripts/src/javatests/org/oppia/android/scripts/todo/BUILD.bazel +++ b/scripts/src/javatests/org/oppia/android/scripts/todo/BUILD.bazel @@ -3,7 +3,7 @@ Tests corresponding to todo-related checks to ensure all TODOs are correctly for and correspond to open issues on GitHub """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") kt_jvm_test( name = "TodoCollectorTest", diff --git a/scripts/src/javatests/org/oppia/android/scripts/xml/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/xml/BUILD.bazel index d1170300f87..1b2a3d64a69 100644 --- a/scripts/src/javatests/org/oppia/android/scripts/xml/BUILD.bazel +++ b/scripts/src/javatests/org/oppia/android/scripts/xml/BUILD.bazel @@ -3,7 +3,7 @@ Tests corresponding to XML syntax based check to ensure that all the XML files i syntactically correct and consistent. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test") +load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") kt_jvm_test( name = "StringLanguageTranslationCheckTest", diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel index f24555b5e38..0df7d21484a 100644 --- a/testing/BUILD.bazel +++ b/testing/BUILD.bazel @@ -3,7 +3,7 @@ This library contains fake objects used for testing as well as tests for these objects. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") load("//testing:testing_test.bzl", "testing_test") # Source files that have been migrated to their own package-based libraries. Files added to this 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 23574d297fa..3031525cb8f 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,7 @@ Package for common test utilities corresponding to data processing & data providers. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "async_result_subject", 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 31f17410282..a1be1a8f705 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,7 @@ Package for common Espresso matchers & other test utilities. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "edit_text_input_action", 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 bf9882c63b3..3412b5a1bae 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,7 @@ Package for test-only Firebase utilities. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "test_authentication_module", diff --git a/testing/src/main/java/org/oppia/android/testing/junit/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/junit/BUILD.bazel index 759997e6df1..f029c9f3709 100644 --- a/testing/src/main/java/org/oppia/android/testing/junit/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/junit/BUILD.bazel @@ -3,7 +3,7 @@ Package for test-only JUnit utilities. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "define_app_language_locale_context", 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 01b0bded674..0080c8edc31 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,7 @@ Test utilities for broad logging functionality. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "event_log_subject", diff --git a/testing/src/main/java/org/oppia/android/testing/math/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/math/BUILD.bazel index feb90a7f810..d7dc58e8d05 100644 --- a/testing/src/main/java/org/oppia/android/testing/math/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/math/BUILD.bazel @@ -2,7 +2,7 @@ General testing utilities and truth subjects for math structures and utilities. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") # TODO(#2747): Move these libraries to be under utility/.../math/testing. diff --git a/testing/src/main/java/org/oppia/android/testing/mockito/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/mockito/BUILD.bazel index 009aa532a12..d8044049aa3 100644 --- a/testing/src/main/java/org/oppia/android/testing/mockito/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/mockito/BUILD.bazel @@ -3,7 +3,7 @@ Package for Mockito-specific test utilities and helpers. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") # Library for general-purpose testing fakes. kt_android_library( 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 8d9f2088328..185cb9a268b 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,7 @@ Library for providing test-only HTTP mocks for the app's networking layer. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "network", diff --git a/testing/src/main/java/org/oppia/android/testing/networking/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/networking/BUILD.bazel index f10a196de80..e60af5c4489 100644 --- a/testing/src/main/java/org/oppia/android/testing/networking/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/networking/BUILD.bazel @@ -3,7 +3,7 @@ Package for test-specific networking utilities. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "network_connection_test_util", 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 3428020d28d..1ff35e43281 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,7 @@ Package for test-specific platform parameter utilities and helpers. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "test_constants", 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 a9a9b0a3143..11a059d491c 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,7 @@ Package for Robolectric-specific utilities and configurations. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "is_on_robolectric", 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 6877cfa3e4c..700ed274b87 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,7 @@ Package for test-only threading utilities, including classes to coordinate cross in a way that can improve test reliability, correctness, and performance. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "annotations", 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 a4d62682fe5..b68a4dd9f2e 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,7 @@ Package for test-only utilities for coordinating time, particularly in simulated environments (i.e. Robolectric). """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "fake_oppia_clock", 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 2c962fd3cd2..4c67acdc229 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,7 @@ Tests for threading-specific test utilities. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") load("//:oppia_android_test.bzl", "oppia_android_test") kt_android_library( diff --git a/third_party/versions.bzl b/third_party/versions.bzl index e113a395247..324422685b4 100644 --- a/third_party/versions.bzl +++ b/third_party/versions.bzl @@ -153,8 +153,8 @@ HTTP_DEPENDENCY_VERSIONS = { "version": "5.1", }, "rules_kotlin": { - "sha": "6194a864280e1989b6d8118a4aee03bb50edeeae4076e5bc30eef8a98dcd4f07", - "version": "v1.5.0-alpha-2", + "sha": "58edd86f0f3c5b959c54e656b8e7eb0b0becabd412465c37a2078693c2571f7f", + "version": "v1.5.0-beta-3", }, "rules_proto": { "sha": "e0cab008a9cdc2400a1d6572167bf9c5afc72e19ee2b862d18581051efab42c9", diff --git a/utility/BUILD.bazel b/utility/BUILD.bazel index 81b8cd3d39d..40ff91d8c59 100644 --- a/utility/BUILD.bazel +++ b/utility/BUILD.bazel @@ -3,7 +3,7 @@ This library contains utilities that all other modules, minus model, depend on. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") load("//utility:utility_test.bzl", "utility_test") # Source files that have been migrated to their own package-based libraries. Files added to this 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 33f4143f887..95dd274e94d 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,7 @@ General purposes utilities for Android accessibility checking. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "accessibility", 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 1a9ed34db7b..2fad5f70d6c 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,7 @@ Utilities corresponding to caching. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "asset_repository", 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 524a5c7e53a..bf50d54f406 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,7 @@ Testing utilities corresponding asset caching utilities. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "caching_test_module", 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 46290b3b89c..01fa1d04016 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,7 @@ Utilities corresponding to data. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "async_data_subscription_manager", diff --git a/utility/src/main/java/org/oppia/android/util/extensions/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/extensions/BUILD.bazel index cfc2be6bb6a..79fcf27af4a 100644 --- a/utility/src/main/java/org/oppia/android/util/extensions/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/extensions/BUILD.bazel @@ -2,7 +2,7 @@ General purposes utilities to manage extensions """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "bundle_extensions", 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 40b791ffc55..682d3f1ad45 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,7 @@ Utilities for interacting with GCS backend resources. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "annotations", 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 5c4edcc7288..32ee431966b 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,7 @@ Generic utilities for managing languages & locales. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "android_locale_profile", 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 fa840ff6152..9ff8e85fb13 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,7 @@ Testing utilities for language & locale general utilities. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "test_oppia_bidi_formatter", 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 8a05f5c64cd..0b8fc767cb7 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,7 @@ General purpose utilities for logging. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "annotations", 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 b0d26ebc6c7..cb3df472c2e 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,7 @@ Logging utility implementations backed by Firebase. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "firebase_exception_logger", 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 f2b674020e6..fa9589510e8 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,7 @@ General purpose utilities for performance metrics logging. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "performance_metrics_event_logger", diff --git a/utility/src/main/java/org/oppia/android/util/math/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/math/BUILD.bazel index 5e88101712d..782cfdb7920 100644 --- a/utility/src/main/java/org/oppia/android/util/math/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/math/BUILD.bazel @@ -2,7 +2,7 @@ General-purpose mathematics utilities, especially for supporting math-based interactions. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") android_library( name = "extensions", 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 382ebf75f64..e7cce02878e 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,7 @@ Package for networking utilities """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "connection_status", 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 adb9af41640..959a1c43f69 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,7 @@ General-purpose utilities for parsing & rendering HTML within the app. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "html_parser", 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 e88fe61795f..f70cbe826ee 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,7 @@ General-purpose utilities for image loading and processing. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "bitmap_blurrer", diff --git a/utility/src/main/java/org/oppia/android/util/parser/math/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/parser/math/BUILD.bazel index 14eee4919a5..47db75d1122 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/math/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/parser/math/BUILD.bazel @@ -2,7 +2,7 @@ Components required to render LaTeX math expressions through Glide. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "math_latex_model", diff --git a/utility/src/main/java/org/oppia/android/util/parser/svg/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/parser/svg/BUILD.bazel index b9da8543c40..f2f68defbc7 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/svg/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/parser/svg/BUILD.bazel @@ -2,7 +2,7 @@ General-purpose utilities for vector drawables and transcoders. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "block_picture_drawable", 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 1d98a6aa872..cb64f56dc4a 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,7 @@ General purposes utilities to manage directories. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "directory_management_util", diff --git a/utility/src/main/java/org/oppia/android/util/statusbar/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/statusbar/BUILD.bazel index f2830b8c7ae..fdbf021dcdd 100644 --- a/utility/src/main/java/org/oppia/android/util/statusbar/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/statusbar/BUILD.bazel @@ -2,7 +2,7 @@ Utilities for managing the Android status bar. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "status_bar_color", 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 6b423da811c..122b93c364e 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,7 @@ Utilities corresponding to system utilities such as the system clock. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "oppia_clock", 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 19d3ea5ad0c..61ee3d122a6 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,7 @@ General purpose utilities for multi-threading and concurrency. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") kt_android_library( name = "annotations", 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 03e0fdc9689..fca189182df 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,7 @@ Tests for logging utilities. """ -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") load("//:oppia_android_test.bzl", "oppia_android_test") kt_android_library( diff --git a/wiki/Oppia-Bazel-Setup-Instructions.md b/wiki/Oppia-Bazel-Setup-Instructions.md index 2ea14441319..b4d962636de 100644 --- a/wiki/Oppia-Bazel-Setup-Instructions.md +++ b/wiki/Oppia-Bazel-Setup-Instructions.md @@ -26,7 +26,7 @@ Bazel is an open-source build and test tool similar to Make, Maven, and Gradle. ### Building the app -After the installation completes you can build the app using Bazel. +After the installation completes you can build the app using Bazel. **Move your command line head to the `~/opensource/oppia-android`**, then run the below bazel command: @@ -59,7 +59,7 @@ See our [troubleshooting wiki page](https://github.com/oppia/oppia-android/wiki/ ## Concepts and Terminology **[Workspace](https://github.com/oppia/oppia-android/blob/develop/WORKSPACE)**
-A workspace is a directory where we add targeted SDK version, all the required dependencies and there required Rules. The directory containing the WORKSPACE file is the root of the main repository, which in our case is the `oppia-android` root directory is the main directory. +A workspace is a directory where we add targeted SDK version, all the required dependencies and there required Rules. The directory containing the WORKSPACE file is the root of the main repository, which in our case is the `oppia-android` root directory is the main directory. **[Packages](https://github.com/oppia/oppia-android/tree/develop/app)**
A package is defined as a directory containing a file named BUILD or BUILD.bazel. @@ -69,14 +69,14 @@ A rule specifies the relationship between inputs and outputs, and the steps to b In Android, rules are defined using `android_binary`. Android rules for testing are `android_instrumentation_test` and `android_local_test`. **[BUILD files](https://github.com/oppia/oppia-android/blob/develop/app/BUILD.bazel)**
-Every package contains a BUILD file. This file is written in Starlark Language. In this Build file for module-level, we generally define `android_library`, `kt_android_library` to build our package files as per the requirement. +Every package contains a BUILD file. This file is written in Starlark Language. In this Build file for module-level, we generally define `android_library`, `kt_android_library` to build our package files as per the requirement. **[Dependencies](https://github.com/oppia/oppia-android/blob/ba8d914480251e4a8543feb63a93b6c91e0a5a2f/BUILD.bazel#L16)**
A target A depends upon a target B if B is needed by A at build. `A -> B`
``` deps = [ "//app",] ``` -Here, `deps` is used to define the dependencies which is a type of dependencies called `deps dependencies` and it includes the files/directory/target which are dependent. From the above example the dependency is the `app` target which is defined in the [Build file of app package](https://github.com/oppia/oppia-android/blob/ba8d914480251e4a8543feb63a93b6c91e0a5a2f/app/BUILD.bazel#L616). +Here, `deps` is used to define the dependencies which is a type of dependencies called `deps dependencies` and it includes the files/directory/target which are dependent. From the above example the dependency is the `app` target which is defined in the [Build file of app package](https://github.com/oppia/oppia-android/blob/ba8d914480251e4a8543feb63a93b6c91e0a5a2f/app/BUILD.bazel#L616). Example of Dependencies 1. [srcs dependencies](https://github.com/oppia/oppia-android/blob/ba8d914480251e4a8543feb63a93b6c91e0a5a2f/app/BUILD.bazel#L617) @@ -85,9 +85,9 @@ Example of Dependencies **[Loading an extension](https://github.com/oppia/oppia-android/blob/ba8d914480251e4a8543feb63a93b6c91e0a5a2f/app/BUILD.bazel#L13)**
Bazel extensions are files ending in .bzl. Use the load statement to import a symbol from an extension.
``` -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") +load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library") ``` -Here, we are loading `kotlin.bzl` and we are going to use it with a symbol name `kt_android_library`. +Here, we are loading `android.bzl` and we are going to use it with a symbol name `kt_android_library`. Arguments to the load function must be string literals. load statements must appear at top-level in the file. **[Visibility of a file target](https://github.com/oppia/oppia-android/blob/ba8d914480251e4a8543feb63a93b6c91e0a5a2f/app/BUILD.bazel#L621)**