From 490d8d1bf7e68b1c6192b73166fd4f5f36a6dc7c Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Mon, 15 Jul 2024 14:22:12 -0400 Subject: [PATCH 1/2] Update transformation configuration --- .brazil.json | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/.brazil.json b/.brazil.json index 367f03dc009..70d53add8b2 100644 --- a/.brazil.json +++ b/.brazil.json @@ -1,13 +1,7 @@ { "dependencies": { - "org.jetbrains.kotlin:kotlin-stdlib-common:1.9.*": "KotlinStdlibCommon-1.9.x", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.*": "KotlinStdlibJdk8-1.9.x", "org.jetbrains.kotlin:kotlin-stdlib:1.9.*": "KotlinStdlib-1.9.x", - "org.jetbrains.kotlinx:atomicfu-jvm:0.23.1": "AtomicfuJvm-0.23.1", - "org.jetbrains.kotlinx:atomicfu:0.23.1": "Atomicfu-0.23.1", - "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.*": "KotlinxCoroutinesCoreJvm-1.7.x", - "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.*": "KotlinxCoroutinesCore-1.7.x", - "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.*": "KotlinxCoroutinesJdk8-1.7.x" + "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.*": "KotlinxCoroutinesCore-1.7.x" }, "packageHandlingRules": { "versioning": { @@ -20,16 +14,14 @@ "aws.sdk.kotlin:version-catalog" ], "resolvesConflictDependencies": { - "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.*": [ - "KotlinStdlibCommon-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" + ], + "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.*": [ + "KotlinxCoroutinesCoreJvm-1.7.x", + "KotlinStdlibCommon-1.9.x", + "KotlinStdlibJdk8-1.9.x", + "KotlinStdlibJdk7-1.9.x" ] } } From d5ed87ea87df2c1fc7b944ba7a2c63f157b3aa69 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Mon, 15 Jul 2024 15:04:35 -0400 Subject: [PATCH 2/2] aws-sdk-kotlin currently uses kotlinx-coroutines-core-jvm. Also Jdk8 depends on Stdlib --- .brazil.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.brazil.json b/.brazil.json index 70d53add8b2..922fa7fdd39 100644 --- a/.brazil.json +++ b/.brazil.json @@ -1,7 +1,7 @@ { "dependencies": { "org.jetbrains.kotlin:kotlin-stdlib:1.9.*": "KotlinStdlib-1.9.x", - "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.*": "KotlinxCoroutinesCore-1.7.x" + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.*": "KotlinxCoroutinesCoreJvm-1.7.x" }, "packageHandlingRules": { "versioning": { @@ -17,11 +17,12 @@ "org.jetbrains.kotlin:kotlin-stdlib:1.9.*": [ "KotlinStdlib-1.9.x" ], - "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.*": [ + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.*": [ "KotlinxCoroutinesCoreJvm-1.7.x", "KotlinStdlibCommon-1.9.x", "KotlinStdlibJdk8-1.9.x", - "KotlinStdlibJdk7-1.9.x" + "KotlinStdlibJdk7-1.9.x", + "KotlinStdlib-1.9.x" ] } }