diff --git a/kotlin/services/forecast/build.gradle.kts b/kotlin/services/forecast/build.gradle.kts index 364993f05db..47b260fe5e1 100644 --- a/kotlin/services/forecast/build.gradle.kts +++ b/kotlin/services/forecast/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version "1.9.0" application } @@ -19,16 +19,27 @@ buildscript { repositories { mavenCentral() - jcenter() } apply(plugin = "org.jlleitschuh.gradle.ktlint") dependencies { - implementation("aws.sdk.kotlin:forecast:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:forecast:0.33.1-beta") + implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta") + implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0") + implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0") implementation("com.google.code.gson:gson:2.10") testImplementation("org.junit.jupiter:junit-jupiter:5.9.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") } tasks.withType() { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" +} +tasks.test { + useJUnitPlatform() + testLogging { + events("passed", "skipped", "failed") + } + + // Define the test source set + testClassesDirs += files("build/classes/kotlin/test") + classpath += files("build/classes/kotlin/main", "build/resources/main") } diff --git a/kotlin/services/glue/build.gradle.kts b/kotlin/services/glue/build.gradle.kts index e6e4c906d50..2f52ddaf99d 100644 --- a/kotlin/services/glue/build.gradle.kts +++ b/kotlin/services/glue/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version "1.9.0" application } @@ -19,16 +19,28 @@ buildscript { repositories { mavenCentral() - jcenter() } apply(plugin = "org.jlleitschuh.gradle.ktlint") dependencies { - implementation("aws.sdk.kotlin:glue:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:glue:0.33.1-beta") + implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta") + implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0") + implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0") implementation("com.google.code.gson:gson:2.10") testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") } tasks.withType() { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" +} + +tasks.test { + useJUnitPlatform() + testLogging { + events("passed", "skipped", "failed") + } + + // Define the test source set + testClassesDirs += files("build/classes/kotlin/test") + classpath += files("build/classes/kotlin/main", "build/resources/main") } diff --git a/kotlin/services/iam/build.gradle.kts b/kotlin/services/iam/build.gradle.kts index 7b23926730c..8645c0b0430 100644 --- a/kotlin/services/iam/build.gradle.kts +++ b/kotlin/services/iam/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version "1.9.0" application } @@ -19,19 +19,30 @@ buildscript { repositories { mavenCentral() - jcenter() } apply(plugin = "org.jlleitschuh.gradle.ktlint") dependencies { - implementation("aws.sdk.kotlin:iam:0.30.1-beta") - implementation("aws.sdk.kotlin:sts:0.30.1-beta") - implementation("aws.sdk.kotlin:s3:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:iam:0.33.1-beta") + implementation("aws.sdk.kotlin:sts:0.33.1-beta") + implementation("aws.sdk.kotlin:s3:0.33.1-beta") + implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta") + implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0") + implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0") implementation("com.google.code.gson:gson:2.10") implementation("com.googlecode.json-simple:json-simple:1.1.1") testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") } tasks.withType() { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" +} +tasks.test { + useJUnitPlatform() + testLogging { + events("passed", "skipped", "failed") + } + + // Define the test source set + testClassesDirs += files("build/classes/kotlin/test") + classpath += files("build/classes/kotlin/main", "build/resources/main") } diff --git a/kotlin/services/kendra/build.gradle.kts b/kotlin/services/kendra/build.gradle.kts index 5b482ef71f2..5ecc62db816 100644 --- a/kotlin/services/kendra/build.gradle.kts +++ b/kotlin/services/kendra/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version "1.9.0" application } @@ -19,16 +19,29 @@ buildscript { repositories { mavenCentral() - jcenter() } + apply(plugin = "org.jlleitschuh.gradle.ktlint") dependencies { - implementation("aws.sdk.kotlin:kendra:0.30.1-beta") + implementation("aws.sdk.kotlin:kendra:0.33.1-beta") + implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta") testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") + implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0") + implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("com.google.code.gson:gson:2.10") } tasks.withType() { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" +} +tasks.test { + useJUnitPlatform() + testLogging { + events("passed", "skipped", "failed") + } + + // Define the test source set + testClassesDirs += files("build/classes/kotlin/test") + classpath += files("build/classes/kotlin/main", "build/resources/main") } diff --git a/kotlin/services/keyspaces/build.gradle.kts b/kotlin/services/keyspaces/build.gradle.kts index e75f0783abd..7e860144ca8 100644 --- a/kotlin/services/keyspaces/build.gradle.kts +++ b/kotlin/services/keyspaces/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version "1.9.0" application } @@ -23,8 +23,10 @@ repositories { } apply(plugin = "org.jlleitschuh.gradle.ktlint") dependencies { - implementation("aws.sdk.kotlin:keyspaces:0.30.1-beta") + implementation("aws.sdk.kotlin:keyspaces:0.33.1-beta") implementation("com.datastax.oss:java-driver-core:4.15.0") + implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0") + implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0") implementation("software.aws.mcs:aws-sigv4-auth-cassandra-java-driver-plugin:4.0.8") testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") @@ -32,5 +34,5 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") } tasks.withType() { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" } diff --git a/kotlin/services/kinesis/build.gradle.kts b/kotlin/services/kinesis/build.gradle.kts index 5e2a365f5e3..24ea5a9cc20 100644 --- a/kotlin/services/kinesis/build.gradle.kts +++ b/kotlin/services/kinesis/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version "1.9.0" application } @@ -23,11 +23,23 @@ repositories { } apply(plugin = "org.jlleitschuh.gradle.ktlint") dependencies { - implementation("aws.sdk.kotlin:kinesis:0.30.1-beta") + implementation("aws.sdk.kotlin:kinesis:0.33.1-beta") + implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0") + implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0") testImplementation("org.junit.jupiter:junit-jupiter:5.9.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") implementation("com.fasterxml.jackson.core:jackson-databind:2.14.0") } tasks.withType() { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" +} +tasks.test { + useJUnitPlatform() + testLogging { + events("passed", "skipped", "failed") + } + + // Define the test source set + testClassesDirs += files("build/classes/kotlin/test") + classpath += files("build/classes/kotlin/main", "build/resources/main") } diff --git a/kotlin/services/kms/build.gradle.kts b/kotlin/services/kms/build.gradle.kts index ab5cefcefd1..11b9fbb917e 100644 --- a/kotlin/services/kms/build.gradle.kts +++ b/kotlin/services/kms/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version "1.9.0" application } @@ -19,16 +19,28 @@ buildscript { repositories { mavenCentral() - jcenter() } apply(plugin = "org.jlleitschuh.gradle.ktlint") dependencies { - implementation("aws.sdk.kotlin:kms:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:kms:0.33.1-beta") + implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta") + implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0") + implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0") implementation("com.google.code.gson:gson:2.10") testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") } tasks.withType() { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" +} + +tasks.test { + useJUnitPlatform() + testLogging { + events("passed", "skipped", "failed") + } + + // Define the test source set + testClassesDirs += files("build/classes/kotlin/test") + classpath += files("build/classes/kotlin/main", "build/resources/main") } diff --git a/kotlin/services/lambda/build.gradle.kts b/kotlin/services/lambda/build.gradle.kts index ab242ac03dc..a46ffacb0fc 100644 --- a/kotlin/services/lambda/build.gradle.kts +++ b/kotlin/services/lambda/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version "1.9.0" application } @@ -13,22 +13,33 @@ buildscript { maven("https://plugins.gradle.org/m2/") } dependencies { - classpath("org.jlleitschuh.gradle:ktlint-gradle:10.3.0") + classpath("org.jlleitschuh.gradle:ktlint-gradle:11.5.1") } } repositories { mavenCentral() - jcenter() } apply(plugin = "org.jlleitschuh.gradle.ktlint") dependencies { - implementation("aws.sdk.kotlin:lambda:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:lambda:0.33.1-beta") + implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta") + implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0") + implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0") implementation("com.google.code.gson:gson:2.10") testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") } tasks.withType() { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" +} +tasks.test { + useJUnitPlatform() + testLogging { + events("passed", "skipped", "failed") + } + + // Define the test source set + testClassesDirs += files("build/classes/kotlin/test") + classpath += files("build/classes/kotlin/main", "build/resources/main") }