Set up resolves-conflict-dependencies for K2 upgrade

lauzadis · lauzadis · commit 9c5f8f31aa97 · 2024-07-10T09:55:38.000-04:00
diff --git a/.brazil.json b/.brazil.json
@@ -63,10 +63,14 @@
       ],
       "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"
       ]
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,14 @@`
`63`	`63`	`],`
`64`	`64`	`"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.*": [`
`65`	`65`	`"KotlinStdlibCommon-1.9.x",`
`66`		`- "KotlinStdlibJdk8-1.9.x"`
	`66`	`+ "KotlinStdlibJdk8-1.9.x",`
	`67`	`+ "KotlinxCoroutinesCoreJvm-1.7.x"`
`67`	`68`	`],`
`68`	`69`	`"org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.*": [`
`69`	`70`	`"KotlinStdlibJdk8-1.9.x"`
	`71`	`+ ],`
	`72`	`+ "org.jetbrains.kotlin:kotlin-stdlib:1.9.*": [`
	`73`	`+ "KotlinStdlib-1.9.x"`
`70`	`74`	`]`
`71`	`75`	`}`
`72`	`76`	`}`