Skip to content

Commit 5e037ba

Browse files
scmacdonscmacdon
authored
Update the Kotlin build file (#5622)
Update the Kotlin build files
1 parent 8d51b94 commit 5e037ba

File tree

16 files changed

+279
-89
lines changed

16 files changed

+279
-89
lines changed

‎kotlin/services/appsync/build.gradle.kts

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
kotlin("jvm") version "1.7.10"
4+
kotlin("jvm") version "1.9.0"
55
application
66
}
77

@@ -19,19 +19,31 @@ buildscript {
1919

2020
repositories {
2121
mavenCentral()
22-
jcenter()
2322
}
2423
apply(plugin = "org.jlleitschuh.gradle.ktlint")
2524
dependencies {
26-
implementation("aws.sdk.kotlin:appsync:0.30.1-beta")
27-
implementation("aws.sdk.kotlin:sts:0.30.1-beta")
28-
implementation("aws.sdk.kotlin:s3:0.30.1-beta")
29-
implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta")
25+
implementation("aws.sdk.kotlin:appsync:0.33.1-beta")
26+
implementation("aws.sdk.kotlin:sts:0.33.1-beta")
27+
implementation("aws.sdk.kotlin:s3:0.33.1-beta")
28+
implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta")
29+
implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0")
30+
implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0")
3031
implementation("com.google.code.gson:gson:2.10")
3132
implementation("com.googlecode.json-simple:json-simple:1.1.1")
3233
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
3334
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
3435
}
3536
tasks.withType<KotlinCompile>() {
36-
kotlinOptions.jvmTarget = "1.8"
37+
kotlinOptions.jvmTarget = "17"
38+
}
39+
40+
tasks.test {
41+
useJUnitPlatform()
42+
testLogging {
43+
events("passed", "skipped", "failed")
44+
}
45+
46+
// Define the test source set
47+
testClassesDirs += files("build/classes/kotlin/test")
48+
classpath += files("build/classes/kotlin/main", "build/resources/main")
3749
}

‎kotlin/services/athena/build.gradle.kts

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
kotlin("jvm") version "1.7.10"
4+
kotlin("jvm") version "1.9.0"
55
application
66
}
77

@@ -19,16 +19,28 @@ buildscript {
1919

2020
repositories {
2121
mavenCentral()
22-
jcenter()
2322
}
2423
apply(plugin = "org.jlleitschuh.gradle.ktlint")
2524
dependencies {
26-
implementation("aws.sdk.kotlin:athena-jvm:0.30.1-beta")
27-
implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta")
25+
implementation("aws.sdk.kotlin:athena-jvm:0.33.1-beta")
26+
implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta")
27+
implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0")
28+
implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0")
2829
implementation("com.google.code.gson:gson:2.10")
2930
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
3031
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
3132
}
3233
tasks.withType<KotlinCompile>() {
33-
kotlinOptions.jvmTarget = "1.8"
34+
kotlinOptions.jvmTarget = "17"
35+
}
36+
37+
tasks.test {
38+
useJUnitPlatform()
39+
testLogging {
40+
events("passed", "skipped", "failed")
41+
}
42+
43+
// Define the test source set
44+
testClassesDirs += files("build/classes/kotlin/test")
45+
classpath += files("build/classes/kotlin/main", "build/resources/main")
3446
}

‎kotlin/services/autoscale/build.gradle.kts

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
kotlin("jvm") version "1.7.10"
4+
kotlin("jvm") version "1.9.0"
55
application
66
}
77

@@ -19,16 +19,28 @@ buildscript {
1919

2020
repositories {
2121
mavenCentral()
22-
jcenter()
2322
}
2423
apply(plugin = "org.jlleitschuh.gradle.ktlint")
2524
dependencies {
26-
implementation("aws.sdk.kotlin:autoscaling-jvm:0.30.1-beta")
27-
implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta")
25+
implementation("aws.sdk.kotlin:autoscaling-jvm:0.33.1-beta")
26+
implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta")
27+
implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0")
28+
implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0")
2829
implementation("com.google.code.gson:gson:2.10")
2930
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
3031
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
3132
}
3233
tasks.withType<KotlinCompile>() {
33-
kotlinOptions.jvmTarget = "1.8"
34+
kotlinOptions.jvmTarget = "17"
35+
}
36+
37+
tasks.test {
38+
useJUnitPlatform() // Use JUnit 5 for running tests
39+
testLogging {
40+
events("passed", "skipped", "failed")
41+
}
42+
43+
// Define the test source set
44+
testClassesDirs += files("build/classes/kotlin/test")
45+
classpath += files("build/classes/kotlin/main", "build/resources/main")
3446
}

‎kotlin/services/cloudformation/build.gradle.kts

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
kotlin("jvm") version "1.7.10"
4+
kotlin("jvm") version "1.9.0"
55
application
66
}
77

@@ -19,16 +19,28 @@ buildscript {
1919

2020
repositories {
2121
mavenCentral()
22-
jcenter()
2322
}
2423
apply(plugin = "org.jlleitschuh.gradle.ktlint")
2524
dependencies {
26-
implementation("aws.sdk.kotlin:cloudformation:0.30.1-beta")
27-
implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta")
25+
implementation("aws.sdk.kotlin:cloudformation:0.33.1-beta")
26+
implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta")
27+
implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0")
28+
implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0")
2829
implementation("com.google.code.gson:gson:2.10")
2930
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
3031
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
3132
}
3233
tasks.withType<KotlinCompile>() {
33-
kotlinOptions.jvmTarget = "1.8"
34+
kotlinOptions.jvmTarget = "17"
35+
}
36+
37+
tasks.test {
38+
useJUnitPlatform() // Use JUnit 5 for running tests
39+
testLogging {
40+
events("passed", "skipped", "failed")
41+
}
42+
43+
// Define the test source set
44+
testClassesDirs += files("build/classes/kotlin/test")
45+
classpath += files("build/classes/kotlin/main", "build/resources/main")
3446
}

‎kotlin/services/cloudtrail/build.gradle.kts

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
kotlin("jvm") version "1.7.10"
4+
kotlin("jvm") version "1.9.0"
55
application
66
}
77

@@ -19,16 +19,28 @@ buildscript {
1919

2020
repositories {
2121
mavenCentral()
22-
jcenter()
2322
}
2423
apply(plugin = "org.jlleitschuh.gradle.ktlint")
2524
dependencies {
26-
implementation("aws.sdk.kotlin:cloudtrail:0.30.1-beta")
27-
implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta")
25+
implementation("aws.sdk.kotlin:cloudtrail:0.33.1-beta")
26+
implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta")
27+
implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0")
28+
implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0")
2829
implementation("com.google.code.gson:gson:2.10")
2930
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
3031
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
3132
}
3233
tasks.withType<KotlinCompile>() {
33-
kotlinOptions.jvmTarget = "1.8"
34+
kotlinOptions.jvmTarget = "17"
35+
}
36+
37+
tasks.test {
38+
useJUnitPlatform() // Use JUnit 5 for running tests
39+
testLogging {
40+
events("passed", "skipped", "failed")
41+
}
42+
43+
// Define the test source set
44+
testClassesDirs += files("build/classes/kotlin/test")
45+
classpath += files("build/classes/kotlin/main", "build/resources/main")
3446
}

‎kotlin/services/cloudwatch/build.gradle.kts

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
kotlin("jvm") version "1.7.10"
4+
kotlin("jvm") version "1.9.0"
55
application
66
}
77

@@ -19,20 +19,32 @@ buildscript {
1919

2020
repositories {
2121
mavenCentral()
22-
jcenter()
2322
}
2423
apply(plugin = "org.jlleitschuh.gradle.ktlint")
2524
dependencies {
26-
implementation("aws.sdk.kotlin:cloudwatch-jvm:0.30.1-beta")
27-
implementation("aws.sdk.kotlin:cloudwatchevents-jvm:0.30.1-beta")
28-
implementation("aws.sdk.kotlin:cloudwatchlogs-jvm:0.30.1-beta")
29-
implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta")
25+
implementation("aws.sdk.kotlin:cloudwatch-jvm:0.33.1-beta")
26+
implementation("aws.sdk.kotlin:cloudwatchevents-jvm:0.33.1-beta")
27+
implementation("aws.sdk.kotlin:cloudwatchlogs-jvm:0.33.1-beta")
28+
implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta")
29+
implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0")
30+
implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0")
3031
implementation("com.google.code.gson:gson:2.10")
3132
implementation("com.fasterxml.jackson.core:jackson-core:2.14.2")
3233
implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2")
3334
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
3435
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
3536
}
3637
tasks.withType<KotlinCompile>() {
37-
kotlinOptions.jvmTarget = "1.8"
38+
kotlinOptions.jvmTarget = "17"
39+
}
40+
41+
tasks.test {
42+
useJUnitPlatform() // Use JUnit 5 for running tests
43+
testLogging {
44+
events("passed", "skipped", "failed")
45+
}
46+
47+
// Define the test source set
48+
testClassesDirs += files("build/classes/kotlin/test")
49+
classpath += files("build/classes/kotlin/main", "build/resources/main")
3850
}

‎kotlin/services/codepipeline/build.gradle.kts

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
kotlin("jvm") version "1.7.10"
4+
kotlin("jvm") version "1.9.0"
55
application
66
}
77

@@ -19,16 +19,28 @@ buildscript {
1919

2020
repositories {
2121
mavenCentral()
22-
jcenter()
2322
}
2423
apply(plugin = "org.jlleitschuh.gradle.ktlint")
2524
dependencies {
26-
implementation("aws.sdk.kotlin:codepipeline-jvm:0.30.1-beta")
27-
implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta")
25+
implementation("aws.sdk.kotlin:codepipeline-jvm:0.33.1-beta")
26+
implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta")
27+
implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0")
28+
implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0")
2829
implementation("com.google.code.gson:gson:2.10")
2930
testImplementation("org.junit.jupiter:junit-jupiter:5.9.0")
3031
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
3132
}
3233
tasks.withType<KotlinCompile>() {
33-
kotlinOptions.jvmTarget = "1.8"
34+
kotlinOptions.jvmTarget = "17"
35+
}
36+
37+
tasks.test {
38+
useJUnitPlatform() // Use JUnit 5 for running tests
39+
testLogging {
40+
events("passed", "skipped", "failed")
41+
}
42+
43+
// Define the test source set
44+
testClassesDirs += files("build/classes/kotlin/test")
45+
classpath += files("build/classes/kotlin/main", "build/resources/main")
3446
}

‎kotlin/services/cognito/build.gradle.kts

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
kotlin("jvm") version "1.7.10"
4+
kotlin("jvm") version "1.9.0"
55
application
66
}
77

@@ -19,17 +19,29 @@ buildscript {
1919

2020
repositories {
2121
mavenCentral()
22-
jcenter()
2322
}
2423
apply(plugin = "org.jlleitschuh.gradle.ktlint")
2524
dependencies {
26-
implementation("aws.sdk.kotlin:cognitoidentityprovider:0.30.1-beta")
27-
implementation("aws.sdk.kotlin:cognitoidentity:0.30.1-beta")
28-
implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta")
25+
implementation("aws.sdk.kotlin:cognitoidentityprovider:0.33.1-beta")
26+
implementation("aws.sdk.kotlin:cognitoidentity:0.33.1-beta")
27+
implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta")
28+
implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0")
29+
implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0")
2930
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
3031
implementation("com.google.code.gson:gson:2.10")
3132
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
3233
}
3334
tasks.withType<KotlinCompile>() {
34-
kotlinOptions.jvmTarget = "1.8"
35+
kotlinOptions.jvmTarget = "17"
36+
}
37+
38+
tasks.test {
39+
useJUnitPlatform() // Use JUnit 5 for running tests
40+
testLogging {
41+
events("passed", "skipped", "failed")
42+
}
43+
44+
// Define the test source set
45+
testClassesDirs += files("build/classes/kotlin/test")
46+
classpath += files("build/classes/kotlin/main", "build/resources/main")
3547
}

‎kotlin/services/comprehend/build.gradle.kts

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
kotlin("jvm") version "1.7.10"
4+
kotlin("jvm") version "1.9.0"
55
application
66
}
77

@@ -20,17 +20,29 @@ buildscript {
2020

2121
repositories {
2222
mavenCentral()
23-
jcenter()
2423
}
2524
apply(plugin = "org.jlleitschuh.gradle.ktlint")
2625

2726
dependencies {
28-
implementation("aws.sdk.kotlin:comprehend:0.30.1-beta")
29-
implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta")
27+
implementation("aws.sdk.kotlin:comprehend:0.33.1-beta")
28+
implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta")
29+
implementation("aws.smithy.kotlin:http-client-engine-okhttp:0.28.0")
30+
implementation("aws.smithy.kotlin:http-client-engine-crt:0.28.0")
3031
implementation("com.google.code.gson:gson:2.10")
3132
testImplementation("org.junit.jupiter:junit-jupiter:5.9.0")
3233
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
3334
}
3435
tasks.withType<KotlinCompile>() {
35-
kotlinOptions.jvmTarget = "1.8"
36+
kotlinOptions.jvmTarget = "17"
37+
}
38+
39+
tasks.test {
40+
useJUnitPlatform() // Use JUnit 5 for running tests
41+
testLogging {
42+
events("passed", "skipped", "failed")
43+
}
44+
45+
// Define the test source set
46+
testClassesDirs += files("build/classes/kotlin/test")
47+
classpath += files("build/classes/kotlin/main", "build/resources/main")
3648
}

0 commit comments

Comments
 (0)