Fix #1535, part of #4120: Upgrade to rules_kotlin v1.5.0 beta 3 (#5400)

## Explanation Fixes #1535 Fixes part of #4120 This PR preps for the codebase-wide migration to Kotlin 1.6 (done in #4937) by first upgrading rules_kotlin from 1.5.0 alpha 2 to 1.5.0 beta 3. This upgrade, while small, produces a few nice benefits: - It removes the need for extra WORKSPACE dependency setup (thus addressing #1535). - It moves a bunch of rules_kotlin macros to new locations which results in changing nearly every ``BUILD.bazel`` file in the codebase. The changes are straightforward to review in isolation, so this PR acts as a means to help reduce the complexity of #4937 by pulling ahead these groups of ``BUILD.bazel`` changes while also moving rules_kotlin the smallest number of versions (ahead of the more major upgrades which will occur downstream). Note that this change is needed because: - We'll need to upgrade to a newer version of rules_kotlin in order to bring in Kotlin 1.6 support. - rules_kotlin moved these macros and using the old ones results in a _lot_ of build warnings that spam the local console when trying to build. Separately, this PR includes some minor trailing space cleanup in wiki/Oppia-Bazel-Setup-Instructions.md that was noticed when editing the file (since my local development environment auto-strips trailing spaces). ## Essential Checklist - [x] The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".) - [x] Any changes to [scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets) files have their rationale included in the PR explanation. - [x] The PR follows the [style guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide). - [x] The PR does not contain any unnecessary code changes from Android Studio ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)). - [x] The PR is made from a branch that's **not** called "develop" and is up-to-date with "develop". - [x] The PR is **assigned** to the appropriate reviewers ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)). ## For UI-specific PRs only N/A -- This should only affect build infrastructure, and barely impact resulting binary builds. --------- Co-authored-by: Adhiambo Peres <[email protected]> Co-authored-by: Sean Lip <[email protected]>
oppia · May 28, 2024 · 64ba622 · 64ba622
1 parent 6b724ac
commit 64ba622
Show file tree

Hide file tree

Showing 145 changed files with 156 additions and 160 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...rc/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel b/...rc/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
@@ -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/...in/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/BUILD.bazel b/...in/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/.../src/main/java/org/oppia/android/domain/classify/rules/numericexpressioninput/BUILD.bazel b/.../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",