From faef7c77c6366b5e71951f120d7addc46555ab32 Mon Sep 17 00:00:00 2001
From: Max Mitchell <maxmm@google.com>
Date: Fri, 13 Nov 2026 11:45:21 -0800
Subject: [PATCH] Keep the app's kotlinx-coroutines at
 kotlinx-coroutines-test's version

PiperOrigin-RevId: 1021205363
---
 app/build.gradle.kts      | 4 ++++
 gradle/libs.versions.toml | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f506b194..85c5e52f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -157,6 +157,10 @@ dependencies {
     //Kotlin serialization
     implementation(libs.kotlinx.serialization.json)
 
+    // Instrumented tests run against the app APK's kotlinx-coroutines, so keep it at the version
+    // kotlinx-coroutines-test needs.
+    implementation(platform(libs.kotlinx.coroutines.bom))
+
     implementation(libs.appcompat.v7)
     implementation(libs.appcompat.v7.resources)
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 06282866..fde7ba28 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,6 +12,7 @@ junit = "4.13.2"
 junitVersion = "1.3.0"
 espressoCore = "3.7.0"
 kotlinxSerializationJson = "1.10.0"
+kotlinxCoroutines = "1.10.2"
 lifecycleRuntimeKtx = "2.10.0"
 activityCompose = "1.13.0"
 composeBom = "2026.03.00"
@@ -42,7 +43,6 @@ errorprone = "2.50.0"
 mockito = "5.23.0"
 mockitoKotlin = "6.2.3"
 coreTesting = "2.2.0"
-kotlinxCoroutinesTest = "1.10.2"
 turbine = "1.2.1"
 material3WindowSizeClass = "1.4.0"
 robolectric = "4.16.1"
@@ -93,6 +93,7 @@ androidx-navigation-compose = { group = "androidx.navigation", name = "navigatio
 androidx-window-core = { group = "androidx.window", name = "window-core", version.ref = "windowCore" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "roomCompiler" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
+kotlinx-coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version.ref = "kotlinxCoroutines" }
 material3-adaptive-navigation-suite-android = { group = "androidx.compose.material3", name = "material3-adaptive-navigation-suite-android", version.ref = "material3AdaptiveNavigationSuiteAndroidVersion" }
 androidx-ink-authoring-android = { group = "androidx.ink", name = "ink-authoring-android", version.ref = "ink" }
 androidx-input-motionprediction = { group = "androidx.input", name = "input-motionprediction", version.ref = "inputMotionprediction" }
@@ -101,7 +102,7 @@ androidx-ink-brush-compose = { group = "androidx.ink", name = "ink-brush-compose
 androidx-ink-geometry-compose = { group = "androidx.ink", name = "ink-geometry-compose", version.ref = "ink" }
 
 # AI Brush Designer CLI
-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesTest" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
 picocli = { module = "info.picocli:picocli", version.ref = "picocli" }
 jline = { module = "org.jline:jline", version.ref = "jline" }
 google-genai = { module = "com.google.genai:google-genai", version.ref = "genai" }
@@ -111,7 +112,7 @@ errorprone-annotations = { module = "com.google.errorprone:error_prone_annotatio
 mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockitoKotlin" }
 androidx-arch-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "coreTesting" }
-kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
 hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hiltAndroid" }
 turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
 mockito-android = { module = "org.mockito:mockito-android", version.ref = "mockito" }