oppia · BenHenning · Jun 12, 2024 · Jan 11, 2022 · Jan 11, 2022 · Jan 11, 2022
diff --git a/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragment.kt b/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragment.kt
@@ -46,7 +46,8 @@ class TopicPracticeFragment : InjectableFragment() {
     var selectedSkillId = HashMap<Int, MutableList<String>>()
     if (savedInstanceState != null) {
       selectedIdList = savedInstanceState.getIntegerArrayList(SUBTOPIC_ID_LIST_ARGUMENT_KEY)!!
-      @Suppress("UNCHECKED_CAST") // Not quite safe. TODO(#4437): Convert this to a type-safe proto.
+      // TODO(#4437): Convert this to a type-safe proto.
+      @Suppress("UNCHECKED_CAST") // Not quite safe.
       selectedSkillId = savedInstanceState
         .getSerializable(SKILL_ID_LIST_ARGUMENT_KEY)!! as HashMap<Int, MutableList<String>>
     }

diff --git a/config/proguard/kotlin-proguard-rules.pro b/config/proguard/kotlin-proguard-rules.pro
@@ -24,13 +24,11 @@
 -dontwarn sun.misc.Signal
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 
-# TODO(#4120): Reevaluate if these exemptions are needed long-term.
--dontwarn kotlin.text.Regex$splitToSequence*
-# Potentially a Kotlin 1.4-only exception.
--dontwarn kotlin.time.jdk8.DurationConversionsJDK8Kt
-# This seems to be a Kotlin 1.6-specific issue. It seems safe to ignore since the class appears to
-# be fully generated.
+# The entirety of ClassValueCtorCache is ignored for warnings because it tries to reference an
+# inherited method from java.lang.ClassValue (which isn't available in the Android SDK). It will
+# eventually be an option per https://issuetracker.google.com/issues/196063118, though only on U+
+# devices. This is safe to ignore because kotlinx.coroutines avoids using ExceptionConstructors.kt
+# (which houses ClassValueCtorCache & the cache it's referencing) when on Android, per:
+# https://github.com/Kotlin/kotlinx.coroutines/pull/2997, specifically:
+# https://github.com/Kotlin/kotlinx.coroutines/blob/3574c2/kotlinx-coroutines-core/jvm/src/internal/ExceptionsConstructor.kt#L17.
 -dontwarn kotlinx.coroutines.internal.ClassValueCtorCache
--dontwarn kotlinx.coroutines.DelayKt
--dontwarn kotlinx.coroutines.flow.Flow*
--dontwarn kotlinx.coroutines.flow.SharingStartedKt
diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
@@ -527,7 +527,7 @@ class ExplorationProgressController @Inject constructor(
       when {
         commandQueue == null ->
           AsyncResult.Failure(IllegalStateException("Session isn't initialized yet."))
-        !commandQueue.offer(message) ->
+        !commandQueue.trySend(message).isSuccess ->
           AsyncResult.Failure(IllegalStateException(lazyFailureMessage()))
         // Ensure that the result is first reset since there will be a delay before the message is
         // processed (if there's a flow).

diff --git a/...src/main/java/org/oppia/android/domain/oppialogger/analytics/CpuPerformanceSnapshotter.kt b/...src/main/java/org/oppia/android/domain/oppialogger/analytics/CpuPerformanceSnapshotter.kt
@@ -126,7 +126,7 @@ class CpuPerformanceSnapshotter(
   }
 
   private fun sendSwitchIconificationCommand(newIconification: AppIconification) {
-    commandQueue.offer(CommandMessage.SwitchIconification(newIconification)).apply {
+    commandQueue.trySend(CommandMessage.SwitchIconification(newIconification)).isSuccess.apply {
       if (!this) {
         val exception = IllegalStateException("Iconification switching failed")
         consoleLogger.e(

diff --git a/...n/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgressController.kt b/...n/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgressController.kt
@@ -439,7 +439,7 @@ class QuestionAssessmentProgressController @Inject constructor(
       when {
         commandQueue == null ->
           AsyncResult.Failure(IllegalStateException("Session isn't initialized yet."))
-        !commandQueue.offer(message) ->
+        !commandQueue.trySend(message).isSuccess ->
           AsyncResult.Failure(IllegalStateException(lazyFailureMessage()))
         // Ensure that the result is first reset since there will be a delay before the message is
         // processed (if there's a flow).

diff --git a/scripts/assets/maven_dependencies.textproto b/scripts/assets/maven_dependencies.textproto
@@ -1253,8 +1253,8 @@ maven_dependency {
   }
 }
 maven_dependency {
-  artifact_name: "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"
-  artifact_version: "1.6.0"
+  artifact_name: "org.jetbrains.kotlin:kotlin-stdlib:1.6.21"
+  artifact_version: "1.6.21"
   license {
     license_name: "The Apache License, Version 2.0"
     original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -1264,8 +1264,8 @@ maven_dependency {
   }
 }
 maven_dependency {
-  artifact_name: "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0"
-  artifact_version: "1.6.0"
+  artifact_name: "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21"
+  artifact_version: "1.6.21"
   license {
     license_name: "The Apache License, Version 2.0"
     original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -1275,8 +1275,8 @@ maven_dependency {
   }
 }
 maven_dependency {
-  artifact_name: "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0"
-  artifact_version: "1.6.0"
+  artifact_name: "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21"
+  artifact_version: "1.6.21"
   license {
     license_name: "The Apache License, Version 2.0"
     original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -1286,8 +1286,8 @@ maven_dependency {
   }
 }
 maven_dependency {
-  artifact_name: "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0"
-  artifact_version: "1.6.0"
+  artifact_name: "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21"
+  artifact_version: "1.6.21"
   license {
     license_name: "The Apache License, Version 2.0"
     original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -1297,8 +1297,8 @@ maven_dependency {
   }
 }
 maven_dependency {
-  artifact_name: "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1"
-  artifact_version: "1.4.1"
+  artifact_name: "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
+  artifact_version: "1.6.4"
   license {
     license_name: "The Apache Software License, Version 2.0"
     original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -1308,8 +1308,8 @@ maven_dependency {
   }
 }
 maven_dependency {
-  artifact_name: "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1"
-  artifact_version: "1.4.1"
+  artifact_name: "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
+  artifact_version: "1.6.4"
   license {
     license_name: "The Apache Software License, Version 2.0"
     original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -1319,8 +1319,8 @@ maven_dependency {
   }
 }
 maven_dependency {
-  artifact_name: "org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.4.1"
-  artifact_version: "1.4.1"
+  artifact_name: "org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.6.4"
+  artifact_version: "1.6.4"
   license {
     license_name: "The Apache Software License, Version 2.0"
     original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"

@@ -119,8 +119,7 @@ kt_jvm_import(
     visibility = ["@maven//:__subpackages__"],
     deps = [
         ":_stopgap_lib_for_kotlinx_coroutines_desugar_do_not_depend",
-        "//third_party:org_jetbrains_kotlin_kotlin-stdlib-common",
-        "//third_party:org_jetbrains_kotlin_kotlin-stdlib-jdk8",
+        "//third_party:org_jetbrains_kotlin_kotlin-stdlib-jdk8_jar",
     ],
 )
 

@@ -73,9 +73,9 @@ MAVEN_PRODUCTION_DEPENDENCY_VERSIONS = {
     "org.checkerframework:checker-compat-qual": "2.5.5",
     "org.checkerframework:checker-qual": "3.21.3",
     "org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar": "1.3.72",
-    "org.jetbrains.kotlinx:kotlinx-coroutines-android": "1.4.1",
-    "org.jetbrains.kotlinx:kotlinx-coroutines-core": "1.4.1",
-    "org.jetbrains.kotlinx:kotlinx-coroutines-guava": "1.4.1",
+    "org.jetbrains.kotlinx:kotlinx-coroutines-android": "1.6.4",
+    "org.jetbrains.kotlinx:kotlinx-coroutines-core": "1.6.4",
+    "org.jetbrains.kotlinx:kotlinx-coroutines-guava": "1.6.4",
     "org.jetbrains:annotations:jar": "13.0",
 }