Merge main into feature/q-lsp-chat

aws-toolkit-automation · web-flow · commit 7c104ec3ccd3 · 2025-04-28T15:34:56.000-04:00
diff --git a/buildSrc/src/main/kotlin/toolkit-publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/toolkit-publishing-conventions.gradle.kts
@@ -55,7 +55,6 @@ configurations {
     // Make sure we exclude stuff we either A) ships with IDE, B) we don't use to cut down on size
     runtimeClasspath {
         exclude(group = "com.google.code.gson")
-        exclude(group = "org.slf4j", module = "slf4j-jdk14")
         exclude(group = "org.jetbrains.kotlin")
         exclude(group = "org.jetbrains.kotlinx")
     }
diff --git a/plugins/core/build.gradle.kts b/plugins/core/build.gradle.kts
@@ -16,6 +16,7 @@ dependencies {
     implementation(project(":plugin-core:sdk-codegen"))
     implementation(project(":plugin-core:webview"))
     implementation(libs.slf4j.api)
+    implementation(libs.slf4j.jdk14)
 }
 
 tasks.check {

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ configurations {`
`55`	`55`	`// Make sure we exclude stuff we either A) ships with IDE, B) we don't use to cut down on size`
`56`	`56`	`runtimeClasspath {`
`57`	`57`	`exclude(group = "com.google.code.gson")`
`58`		`- exclude(group = "org.slf4j", module = "slf4j-jdk14")`
`59`	`58`	`exclude(group = "org.jetbrains.kotlin")`
`60`	`59`	`exclude(group = "org.jetbrains.kotlinx")`
`61`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ dependencies {`
`16`	`16`	`implementation(project(":plugin-core:sdk-codegen"))`
`17`	`17`	`implementation(project(":plugin-core:webview"))`
`18`	`18`	`implementation(libs.slf4j.api)`
	`19`	`+ implementation(libs.slf4j.jdk14)`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`tasks.check {`