Fix #4119, #4120, and part of #59: Upgrade to Kotlin 1.6.10

.bazelrc

@@ -6,5 +6,9 @@ build --android_databinding_use_v3_4_args \
     --define=android_standalone_dexing_tool=d8_compat_dx \
     --android_databinding_use_androidx
 
+# Ensure all built Java files treat warnings as errors (similar to the Kotlin configuration) to help
+# reduce code smell & potential bugs during development.
+build --javacopt="-Werror"
+
 # Show all test output by default (for better debugging).
 test --test_output=all

.github/CODEOWNERS

@@ -250,6 +250,7 @@ WORKSPACE @oppia/android-app-infrastructure-reviewers
 .bazelrc @oppia/android-app-infrastructure-reviewers
 .bazelversion @oppia/android-app-infrastructure-reviewers
 /tools/android/ @oppia/android-app-infrastructure-reviewers
+/tools/kotlin/ @oppia/android-app-infrastructure-reviewers
 
 # Configurations for Bazel-built Android App Bundles.
 /bundle_config.pb.json @oppia/android-dev-workflow-reviewers

WORKSPACE

@@ -26,20 +26,22 @@ http_archive(
 # Add support for Kotlin: https://github.com/bazelbuild/rules_kotlin.
 http_archive(
     name = "io_bazel_rules_kotlin",
+    patches = ["//tools/kotlin:add_kotlinc_optin_support.patch"],
     sha256 = HTTP_DEPENDENCY_VERSIONS["rules_kotlin"]["sha"],
     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")
+load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "kotlinc_version")
 
-kt_download_local_dev_dependencies()
-
-load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
-
-kotlin_repositories()
+# Use the 1.6 compiler since rules_kotlin 1.5 defaults to the 1.5 compiler.
+kotlin_repositories(
+    compiler_release = kotlinc_version(
+        release = "1.6.10",
+        sha256 = "432267996d0d6b4b17ca8de0f878e44d4a099b7e9f1587a98edc4d27e76c215a",
+    ),
+)
 
-kt_register_toolchains()
+register_toolchains("//tools/kotlin:kotlin_16_jdk9_toolchain")
 
 # The proto_compiler and proto_java_toolchain bindings load the protos rules needed for the model
 # module while helping us avoid the unnecessary compilation of protoc. Referecences:
@@ -128,18 +130,18 @@ git_repository(
 
 git_repository(
     name = "android-spotlight",
-    commit = "ebde38335bfb56349eae57e705b611ead9addb15",
+    commit = "cc23499d37dc8533a2876e45b5063e981a4583f4",
     remote = "https://github.com/oppia/android-spotlight",
-    shallow_since = "1668824029 -0800",
+    shallow_since = "1680147372 -0700",
 )
 
 # A custom fork of KotliTeX that removes resources artifacts that break the build, and updates the
 # min target SDK version to be compatible with Oppia.
 git_repository(
     name = "kotlitex",
-    commit = "43139c140833c7120f351d63d74b42c253d2b213",
+    commit = "ccdf4170817fa3b48b8e1e452772dd58ecb71cf2",
     remote = "https://github.com/oppia/kotlitex",
-    shallow_since = "1675741075 -0800",
+    shallow_since = "1679426649 -0700",
 )
 
 bind(
@@ -186,6 +188,7 @@ maven_install(
     maven_install_json = "//third_party:maven_install.json",
     override_targets = {
         "com.google.guava:guava": "@//third_party:com_google_guava_guava",
+        "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm": "@//third_party:kotlinx-coroutines-core-jvm",
     },
     repositories = DAGGER_REPOSITORIES + MAVEN_REPOSITORIES,
     strict_visibility = True,
@@ -206,3 +209,15 @@ http_jar(
         for url_base in DAGGER_REPOSITORIES + MAVEN_REPOSITORIES
     ],
 )
+
+http_jar(
+    name = "kotlinx-coroutines-core-jvm",
+    sha256 = HTTP_DEPENDENCY_VERSIONS["kotlinx-coroutines-core-jvm"]["sha"],
+    urls = [
+        "{0}/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/{1}/kotlinx-coroutines-core-jvm-{1}.jar".format(
+            url_base,
+            HTTP_DEPENDENCY_VERSIONS["kotlinx-coroutines-core-jvm"]["version"],
+        )
+        for url_base in DAGGER_REPOSITORIES + MAVEN_REPOSITORIES
+    ],
+)

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")
@@ -694,7 +694,6 @@ kt_android_library(
         "//app/src/main/java/org/oppia/android/app/utility/math:math_expression_accessibility_util",
         "//app/src/main/java/org/oppia/android/app/viewmodel:observable_array_list",
         "//app/src/main/java/org/oppia/android/app/viewmodel:observable_view_model",
-        "//app/src/main/java/org/oppia/android/app/viewmodel:view_model_provider",
         "//domain",
         "//domain/src/main/java/org/oppia/android/domain/audio:audio_player_controller",
         "//domain/src/main/java/org/oppia/android/domain/clipboard:clipboard_controller",

app/build.gradle

@@ -147,7 +147,6 @@ if (project.gradle.startParameter?.taskRequests?.args[0]?.remove("--list-shards"
 dependencies {
   implementation fileTree(dir: 'libs', include: ['*.jar'])
   implementation(
-      'android.arch.lifecycle:extensions:1.1.1',
       'androidx.appcompat:appcompat:1.0.2',
       'androidx.constraintlayout:constraintlayout:1.1.3',
       'androidx.core:core-ktx:1.0.2',
@@ -166,7 +165,7 @@ dependencies {
       'com.github.bumptech.glide:glide:4.11.0',
       'com.google.android.flexbox:flexbox:3.0.0',
       'com.google.android.material:material:1.3.0',
-      'com.google.dagger:dagger:2.24',
+      'com.google.dagger:dagger:2.41',
       'com.google.firebase:firebase-analytics:17.5.0',
       'com.google.firebase:firebase-analytics-ktx:17.5.0',
       'com.google.firebase:firebase-appcheck:16.0.0',
@@ -180,10 +179,10 @@ dependencies {
       'com.google.protobuf:protobuf-javalite:3.17.3',
       'nl.dionsegijn:konfetti:1.2.5',
       "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version",
-      'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1',
-      'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1',
+      'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4',
+      'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4',
       'org.mockito:mockito-core:2.7.22',
-      'com.github.oppia:android-spotlight:ebde38335bfb56349eae57e705b611ead9addb15'
+      'com.github.oppia:android-spotlight:cc23499d37dc8533a2876e45b5063e981a4583f4'
   )
   compileOnly(
       'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2',
@@ -203,7 +202,7 @@ dependencies {
       'com.google.truth.extensions:truth-liteproto-extension:1.1.3',
       'org.robolectric:annotations:4.5',
       'org.robolectric:robolectric:4.5',
-      'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2',
+      'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4',
       "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version",
       'org.mockito:mockito-core:2.7.22',
       project(":testing"),
@@ -219,7 +218,7 @@ dependencies {
       'com.google.truth:truth:1.1.3',
       'androidx.work:work-testing:2.4.0',
       'com.google.truth.extensions:truth-liteproto-extension:1.1.3',
-      'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2',
+      'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4',
       'org.mockito:mockito-android:2.7.22',
       'org.robolectric:annotations:4.5',
   )
@@ -243,13 +242,13 @@ dependencies {
       'androidx.test:orchestrator:1.2.0',
   )
   kapt(
-      'com.google.dagger:dagger-compiler:2.24'
+      'com.google.dagger:dagger-compiler:2.41'
   )
   kaptTest(
-      'com.google.dagger:dagger-compiler:2.24'
+      'com.google.dagger:dagger-compiler:2.41'
   )
   kaptAndroidTest(
-      'com.google.dagger:dagger-compiler:2.24'
+      'com.google.dagger:dagger-compiler:2.41'
   )
   // TODO(#59): Remove this once Bazel is introduced
   api project(':data')

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([

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([

app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt

@@ -138,6 +138,7 @@ class AdministratorControlsActivity :
     if (fragment is ProfileEditFragment) {
       administratorControlsActivityPresenter.handleOnBackPressed()
     } else {
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       super.onBackPressed()
     }
   }

app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt

@@ -3,7 +3,6 @@ package org.oppia.android.app.administratorcontrols
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
 import androidx.databinding.DataBindingUtil
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
@@ -62,14 +61,11 @@ class AdministratorControlsActivityPresenter @Inject constructor(
     if (isMultipane) {
       val adminControlsActivity = activity as AdministratorControlsActivity
       when (lastLoadedFragment) {
-        PROFILE_LIST_FRAGMENT -> (activity as AdministratorControlsActivity).loadProfileList()
-        APP_VERSION_FRAGMENT -> (activity as AdministratorControlsActivity).loadAppVersion()
+        PROFILE_LIST_FRAGMENT -> activity.loadProfileList()
+        APP_VERSION_FRAGMENT -> activity.loadAppVersion()
         PROFILE_EDIT_FRAGMENT -> selectedProfileId.let { profileId ->
           if (extraControlsTitle != null) {
-            (activity as AdministratorControlsActivity).loadProfileEdit(
-              profileId = profileId,
-              profileName = extraControlsTitle
-            )
+            activity.loadProfileEdit(profileId = profileId, profileName = extraControlsTitle)
             if (isProfileDeletionDialogVisible && profileId != 0) {
               val fragment = activity.supportFragmentManager.findFragmentById(
                 R.id.administrator_controls_fragment_multipane_placeholder
@@ -88,7 +84,7 @@ class AdministratorControlsActivityPresenter @Inject constructor(
 
   /** Sets up the navigation drawer. */
   private fun setUpNavigationDrawer() {
-    val toolbar = binding.administratorControlsActivityToolbar as Toolbar
+    val toolbar = binding.administratorControlsActivityToolbar
     activity.setSupportActionBar(toolbar)
     activity.supportActionBar!!.setDisplayShowHomeEnabled(true)
     navigationDrawerFragment = activity
@@ -206,9 +202,9 @@ class AdministratorControlsActivityPresenter @Inject constructor(
       outState.putString(SELECTED_CONTROLS_TITLE_SAVED_KEY, titleTextView.text.toString())
     }
     outState.putString(LAST_LOADED_FRAGMENT_EXTRA_KEY, lastLoadedFragment)
-    isProfileDeletionDialogVisible?.let {
+    isProfileDeletionDialogVisible.let {
       outState.putBoolean(IS_PROFILE_DELETION_DIALOG_VISIBLE_KEY, it)
     }
-    selectedProfileId?.let { outState.putInt(SELECTED_PROFILE_ID_SAVED_KEY, it) }
+    selectedProfileId.let { outState.putInt(SELECTED_PROFILE_ID_SAVED_KEY, it) }
   }
 }

app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt

@@ -23,6 +23,7 @@ class AppVersionActivity : InjectableAutoLocalizedAppCompatActivity() {
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       onBackPressed()
     }
     return super.onOptionsItemSelected(item)

app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionFragmentPresenter.kt

@@ -5,15 +5,14 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import org.oppia.android.app.fragment.FragmentScope
-import org.oppia.android.app.viewmodel.ViewModelProvider
 import org.oppia.android.databinding.AppVersionFragmentBinding
 import javax.inject.Inject
 
 /** The presenter for [AppVersionFragment]. */
 @FragmentScope
 class AppVersionFragmentPresenter @Inject constructor(
   private val fragment: Fragment,
-  private val viewModelProvider: ViewModelProvider<AppVersionViewModel>
+  private val appVersionViewModel: AppVersionViewModel
 ) {
   private lateinit var binding: AppVersionFragmentBinding
 
@@ -26,12 +25,8 @@ class AppVersionFragmentPresenter @Inject constructor(
     )
     binding.let {
       it.lifecycleOwner = fragment
-      it.viewModel = getAppVersionViewModel()
+      it.viewModel = appVersionViewModel
     }
     return binding.root
   }
-
-  private fun getAppVersionViewModel(): AppVersionViewModel {
-    return viewModelProvider.getForFragment(fragment, AppVersionViewModel::class.java)
-  }
 }

app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivity.kt

@@ -28,6 +28,7 @@ class ProfileAndDeviceIdActivity : InjectableAutoLocalizedAppCompatActivity() {
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       onBackPressed()
     }
     return super.onOptionsItemSelected(item)

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",

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",

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",

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",

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",

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",

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",

app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragmentPresenter.kt

@@ -8,7 +8,6 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.GridLayoutManager
 import org.oppia.android.R
 import org.oppia.android.app.recyclerview.BindableAdapter
-import org.oppia.android.app.viewmodel.ViewModelProvider
 import org.oppia.android.databinding.CompletedStoryItemBinding
 import org.oppia.android.databinding.CompletedStoryListFragmentBinding
 import javax.inject.Inject
@@ -17,7 +16,7 @@ import javax.inject.Inject
 class CompletedStoryListFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
-  private val viewModelProvider: ViewModelProvider<CompletedStoryListViewModel>,
+  private val viewModel: CompletedStoryListViewModel,
   private val singleTypeBuilderFactory: BindableAdapter.SingleTypeBuilder.Factory
 ) {
 
@@ -29,7 +28,6 @@ class CompletedStoryListFragmentPresenter @Inject constructor(
     container: ViewGroup?,
     internalProfileId: Int
   ): View? {
-    val viewModel = getCompletedStoryListViewModel()
     viewModel.setProfileId(internalProfileId)
 
     binding = CompletedStoryListFragmentBinding
@@ -61,8 +59,4 @@ class CompletedStoryListFragmentPresenter @Inject constructor(
       )
       .build()
   }
-
-  private fun getCompletedStoryListViewModel(): CompletedStoryListViewModel {
-    return viewModelProvider.getForFragment(fragment, CompletedStoryListViewModel::class.java)
-  }
 }