chore: revert "chore: revert "feat: upgrade to Kotlin 2.2.0 (#96)" (#99)"

This reverts commit 9153b66.

Author: ianbotsf

build-plugins/build-support/build.gradle.kts

@@ -26,8 +26,8 @@ dependencies {
 
     implementation(libs.nexusPublishPlugin)
     compileOnly(gradleApi())
-    implementation("aws.sdk.kotlin:s3:1.4.+")
-    implementation("aws.sdk.kotlin:cloudwatch:1.4.+")
+    implementation(libs.aws.sdk.s3)
+    implementation(libs.aws.sdk.cloudwatch)
     testImplementation(libs.junit.jupiter)
 }
 

build.gradle.kts

@@ -4,6 +4,7 @@
  */
 plugins {
     `maven-publish`
+    alias(libs.plugins.kotlin.jvm) apply false
 }
 
 val releaseVersion = findProperty("release.version") as? String

gradle.properties

@@ -1,4 +1 @@
 kotlin.code.style=official
-
-# kotlin
-kotlinVersion=2.1.0

gradle/libs.versions.toml

@@ -1,19 +1,25 @@
 [versions]
+aws-sdk-version = "1.4.116"
+kotlin-version = "2.2.0"
 ktlint = "1.3.0"
+nexus-plugin-version = "2.0.0"
+publish-plugin-version = "1.3.1"
 smithy-version = "1.60.2"
 smithy-gradle-plugin-version = "1.3.0"
 junit-version = "5.10.1"
 
 [libraries]
+aws-sdk-cloudwatch = { module = "aws.sdk.kotlin:cloudwatch", version.ref = "aws-sdk-version" }
+aws-sdk-s3 = { module = "aws.sdk.kotlin:s3", version.ref = "aws-sdk-version" }
 ktlint-cli = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" }
-ktlint-rule-engine-core = { module = "com.pinterest.ktlint:ktlint-rule-engine-core", version.ref = "ktlint" }
 ktlint-cli-ruleset-core = { module = "com.pinterest.ktlint:ktlint-cli-ruleset-core", version.ref = "ktlint" }
 ktlint-test = {module = "com.pinterest.ktlint:ktlint-test", version.ref = "ktlint" }
-nexusPublishPlugin = { module = "io.github.gradle-nexus:publish-plugin", version = "2.0.0" }
+nexusPublishPlugin = { module = "io.github.gradle-nexus:publish-plugin", version.ref = "nexus-plugin-version" }
 smithy-model = { module = "software.amazon.smithy:smithy-model", version.ref = "smithy-version" }
 smithy-gradle-base-plugin = { module = "software.amazon.smithy.gradle:smithy-base", version.ref = "smithy-gradle-plugin-version" }
 
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-version" }
 
 [plugins]
-plugin-publish = { id = "com.gradle.plugin-publish", version = "1.3.1"}
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" }
+plugin-publish = { id = "com.gradle.plugin-publish", version.ref = "publish-plugin-version"}

settings.gradle.kts

@@ -9,12 +9,6 @@ pluginManagement {
         mavenCentral()
         gradlePluginPortal()
     }
-
-    val kotlinVersion: String by settings
-    // configure default plugin versions
-    plugins {
-        id("org.jetbrains.kotlin.jvm") version kotlinVersion
-    }
 }
 
 dependencyResolutionManagement {