From da190aaf192e92510694e917c9affdf4bd98b58f Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Wed, 10 Jul 2024 13:41:54 -0400
Subject: [PATCH] misc: set up resolves-conflict-dependencies for K2 upgrade
 (#1355)

---
 .brazil.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.brazil.json b/.brazil.json
index 40566118f5c..367f03dc009 100644
--- 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"
       ]
     }
   }