From 946387218d8154dcc0300d1eb2c063e4ca9a9181 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Tue, 23 Jul 2024 12:18:06 -0400 Subject: [PATCH 1/2] Update resolves-conflict-dependencies according to GK scan --- .brazil.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/.brazil.json b/.brazil.json index 922fa7fdd39..7d3caf7ed17 100644 --- a/.brazil.json +++ b/.brazil.json @@ -19,9 +19,6 @@ ], "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", "KotlinStdlib-1.9.x" ] } From 6f44fda4d73b05f90ef5845af6b7af8422bbaf8e Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Tue, 23 Jul 2024 16:45:55 -0400 Subject: [PATCH 2/2] Add kotlinx-coroutines-core to transform config for event streams --- .brazil.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.brazil.json b/.brazil.json index 9d1ce6a6e48..576969c61f8 100644 --- a/.brazil.json +++ b/.brazil.json @@ -24,6 +24,9 @@ "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.*": [ "KotlinxCoroutinesCoreJvm-1.7.x", "KotlinStdlib-1.9.x" + ], + "aws.smithy.kotlin:aws-event-stream:1.*": [ + "KotlinxCoroutinesCoreJvm-1.7.x" ] } }