misc: set up resolves-conflict-dependencies for K2 upgrade (#1355)

awslabs · Jul 10, 2024 · da190aa · da190aa
1 parent 75179c7
commit da190aa
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.brazil.json b/.brazil.json
@@ -22,10 +22,14 @@
     "resolvesConflictDependencies": {
       "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.*": [
         "KotlinStdlibCommon-1.9.x",
-        "KotlinStdlibJdk8-1.9.x"
+        "KotlinStdlibJdk8-1.9.x",
+        "KotlinxCoroutinesCoreJvm-1.7.x"
       ],
       "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.*": [
         "KotlinStdlibJdk8-1.9.x"
+      ],
+      "org.jetbrains.kotlin:kotlin-stdlib:1.9.*": [
+        "KotlinStdlib-1.9.x"
       ]
     }
   }