slf4j / gson / kotlin

Author: rli

buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts

@@ -48,9 +48,11 @@ configurations {
 
         // Exclude dependencies that ship with iDE
         exclude(group = "org.slf4j")
-        // we want kotlinx-coroutines-debug and kotlinx-coroutines-test
-        exclude(group = "org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm")
-        exclude(group = "org.jetbrains.kotlinx", "kotlinx-coroutines-core")
+        if (!name.startsWith("kotlinCompiler")) {
+            // we want kotlinx-coroutines-debug and kotlinx-coroutines-test
+            exclude(group = "org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm")
+            exclude(group = "org.jetbrains.kotlinx", "kotlinx-coroutines-core")
+        }
 
         resolutionStrategy.eachDependency {
             if (requested.group == "org.jetbrains.kotlinx" && requested.name.startsWith("kotlinx-coroutines")) {

buildSrc/src/main/kotlin/toolkit-publishing-conventions.gradle.kts

@@ -54,7 +54,8 @@ 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 = "org.slf4j")
+        exclude(group = "com.google.code.gson")
+        exclude(group = "org.slf4j", module = "slf4j-jdk14")
         exclude(group = "org.jetbrains.kotlin")
         exclude(group = "org.jetbrains.kotlinx")
     }

gradle/libs.versions.toml

@@ -19,7 +19,7 @@ junit4 = "4.13.2"
 junit5 = "5.11.0"
 # https://plugins.jetbrains.com/docs/intellij/kotlin.html#adding-kotlin-support
 # https://kotlinlang.org/docs/releases.html#release-details
-kotlin = "2.0.0"
+kotlin = "2.1.20"
 # set in <root>/settings.gradle.kts
 kotlinCoroutines = "1.8.0"
 lsp4j = "0.24.0"

plugins/core/build.gradle.kts

@@ -15,6 +15,7 @@ dependencies {
     implementation(project(":plugin-core:resources"))
     implementation(project(":plugin-core:sdk-codegen"))
     implementation(project(":plugin-core:webview"))
+    implementation(libs.slf4j.api)
 }
 
 tasks.check {

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/TextUtils.kt

@@ -29,7 +29,7 @@ fun formatText(project: Project, language: Language, content: String): String {
  * Designed to convert underscore separated words (e.g. UPDATE_COMPLETE) into title cased human readable text
  * (e.g. Update Complete)
  */
-fun String.toHumanReadable() = StringUtil.toTitleCase(toLowerCase().replace('_', ' '))
+fun String.toHumanReadable() = StringUtil.toTitleCase(lowercase().replace('_', ' '))
 
 fun generateUnifiedPatch(patch: String, filePath: String): TextFilePatch {
     val unifiedPatch = "--- $filePath\n+++ $filePath\n$patch"