Upgrade to Kotlin 1.9.21 (#4005)

Author: rli

build.gradle.kts

@@ -27,6 +27,13 @@ allprojects {
         mavenCentral()
         gradlePluginPortal()
     }
+
+    configurations.all {
+        resolutionStrategy {
+            failOnDynamicVersions()
+            failOnChangingVersions()
+        }
+    }
 }
 
 val generateChangeLog = tasks.register<GenerateGithubChangeLog>("generateChangeLog") {

buildSrc/settings.gradle.kts

@@ -27,6 +27,8 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             from(files("../gradle/libs.versions.toml"))
+
+            apply(from = "../kotlinResolution.settings.gradle.kts")
         }
     }
 

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt

@@ -23,19 +23,16 @@ fun Project.ciOnly(block: () -> Unit) {
 fun Project.isCi() : Boolean = providers.environmentVariable("CI").isPresent
 
 fun Project.jvmTarget(): Provider<JavaVersion> = withCurrentProfileName {
-    when (it) {
-        "2021.3", "2022.2" -> JavaVersion.VERSION_11
-        else -> JavaVersion.VERSION_17
-    }
+    JavaVersion.VERSION_17
 }
 
 // https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#other-bundled-kotlin-libraries
 fun Project.kotlinTarget(): Provider<String> = withCurrentProfileName {
     when (it) {
-        "2021.3" -> KotlinVersionEnum.KOTLIN_1_5
-        "2022.2" -> KotlinVersionEnum.KOTLIN_1_6
         "2022.3" -> KotlinVersionEnum.KOTLIN_1_7
-        else -> KotlinVersionEnum.KOTLIN_1_8
+        "2023.1", "2023.2" -> KotlinVersionEnum.KOTLIN_1_8
+        "2023.3" -> KotlinVersionEnum.KOTLIN_1_9
+        else -> error("not set")
     }.version
 }
 

gradle/libs.versions.toml

@@ -14,12 +14,13 @@ junit4 = "4.13.2"
 junit5 = "5.10.1"
 # https://plugins.jetbrains.com/docs/intellij/kotlin.html#adding-kotlin-support
 # https://kotlinlang.org/docs/releases.html#release-details
-kotlin = "1.8.10"
-# potentially overridden in <root>/settings.gradle.kts
-kotlinCoroutines = "1.6.4"
-mockito = "5.8.0"
-mockitoKotlin = "5.2.1"
+kotlin = "1.9.21"
+# set in <root>/settings.gradle.kts
+kotlinCoroutines = "1.7.3"
+mockito = "4.6.1"
+mockitoKotlin = "4.0.0"
 mockk = "1.13.8"
+node-gradle = "7.0.1"
 telemetryGenerator = "1.0.171"
 testLogger = "3.1.0"
 testRetry = "1.5.2"
@@ -106,4 +107,5 @@ mockito = ["mockito-core", "mockito-kotlin"]
 sshd = ["sshd-core", "sshd-scp", "sshd-sftp"]
 
 [plugins]
-node-gradle = { id = "com.github.node-gradle.node", version = "7.0.1" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+node-gradle = { id = "com.github.node-gradle.node", version.ref = "node-gradle" }

jetbrains-gateway/build.gradle.kts

@@ -91,6 +91,10 @@ artifacts {
     add(gatewayResources.name, gatewayResourcesDir)
 }
 
+tasks.jar {
+    duplicatesStrategy = DuplicatesStrategy.WARN
+}
+
 tasks.withType<PrepareSandboxTask>().all {
     from(gatewayResourcesDir) {
         into("aws-toolkit-jetbrains/gateway-resources")
@@ -122,12 +126,3 @@ tasks.integrationTest {
     val testToken = RandomString.make(32)
     environment("CWM_HOST_STATUS_OVER_HTTP_TOKEN", testToken)
 }
-
-tasks.inspectClassesForKotlinIC {
-    // > Task :jetbrains-gateway:inspectClassesForKotlinIC FAILED
-    // * What went wrong:
-    // Execution failed for task ':jetbrains-gateway:inspectClassesForKotlinIC'.
-    // > Cannot access input property 'sourceSetOutputClassesDir$kotlin_gradle_plugin_common' of task ':jetbrains-gateway:inspectClassesForKotlinIC'. Accessing unreadable inputs or outputs is not supported. Declare the task as untracked by using Task.doNotTrackState(). See https://docs.gradle.org/8.0.2/userguide/incremental_build.html#disable-state-tracking for more details.
-    //    > Failed to normalize content of 'C:\codebuild\tmp\output\src284282039\src\github.com\aws\aws-toolkit-jetbrains\jetbrains-gateway\build\classes\kotlin\main\classpath.index'.
-    enabled = false
-}

kotlinResolution.settings.gradle.kts

@@ -0,0 +1,32 @@
+// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        maybeCreate("libs").apply {
+            // pull value from IJ library list: https://github.com/JetBrains/intellij-community/blob/<mv>/.idea/libraries/kotlinx_coroutines_jdk8.xml
+            //                              or: https://github.com/JetBrains/intellij-community/blob/<mv>/.idea/libraries/kotlinx_coroutines_core.xml
+            val version = when (providers.gradleProperty("ideProfileName").get()) {
+                "2022.3" -> {
+                    // binary compat issue in tests, but detekt requries at least kotlin 1.8
+                    version("kotlin", "1.8.20")
+                    "1.6.4"
+                }
+                "2023.1" -> {
+                    "1.6.4"
+                }
+
+                "2023.2" -> {
+                    "1.7.1"
+                }
+
+                "2023.3" -> {
+                    "1.7.3"
+                }
+                else -> { error("not set") }
+            }
+
+            version("kotlinxCoroutines", version)
+        }
+    }
+}

settings.gradle.kts

@@ -42,6 +42,8 @@ when (providers.gradleProperty("ideProfileName").get()) {
     }
 }
 
+apply(from = "kotlinResolution.settings.gradle.kts")
+
 include("jetbrains-ultimate")
 include("jetbrains-rider")
 include("intellij")