From a2528dc5f72378771a494c63e053a701a48593e5 Mon Sep 17 00:00:00 2001 From: Scott Macdonald <57190223+scmacdon@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:09:57 -0500 Subject: [PATCH] Kotlin: Update Services Gradle build files (#5636) Updated gradle build files --- kotlin/services/lex/build.gradle.kts | 25 +++++++++++---- kotlin/services/mediaconvert/build.gradle.kts | 23 ++++++++++--- .../com/kotlin/mediaconvert/CreateJob.kt | 29 +++++++++-------- .../kotlin/com/kotlin/mediaconvert/GetJob.kt | 7 ++-- .../com/kotlin/mediaconvert/ListJobs.kt | 4 +-- kotlin/services/mediastore/build.gradle.kts | 21 +++++++++--- kotlin/services/opensearch/build.gradle.kts | 21 +++++++++--- kotlin/services/personalize/build.gradle.kts | 25 +++++++++++---- kotlin/services/pinpoint/build.gradle.kts | 24 ++++++++++---- kotlin/services/polly/build.gradle.kts | 21 +++++++++--- kotlin/services/rds/build.gradle.kts | 23 +++++++++---- kotlin/services/redshift/build.gradle.kts | 24 ++++++++++---- kotlin/services/rekognition/build.gradle.kts | 25 +++++++++++---- kotlin/services/route53/build.gradle.kts | 28 ++++++++++++---- kotlin/services/s3/build.gradle.kts | 32 ++++++++++++------- kotlin/services/sagemaker/build.gradle.kts | 29 +++++++++++++---- .../services/secretsmanager/build.gradle.kts | 26 +++++++++++---- kotlin/services/ses/build.gradle.kts | 26 +++++++++++---- kotlin/services/sns/build.gradle.kts | 25 +++++++++++---- kotlin/services/sqs/build.gradle.kts | 25 +++++++++++---- .../services/stepfunctions/build.gradle.kts | 27 ++++++++++++---- kotlin/services/sts/build.gradle.kts | 25 +++++++++++---- kotlin/services/support/build.gradle.kts | 9 +++--- kotlin/services/textract/build.gradle.kts | 25 +++++++++++---- kotlin/services/translate/build.gradle.kts | 25 +++++++++++---- kotlin/services/xray/build.gradle.kts | 25 +++++++++++---- 26 files changed, 439 insertions(+), 160 deletions(-) diff --git a/kotlin/services/lex/build.gradle.kts b/kotlin/services/lex/build.gradle.kts index 4ba635bdce6..ed59d1f9c91 100644 --- a/kotlin/services/lex/build.gradle.kts +++ b/kotlin/services/lex/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,7 +13,7 @@ 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") } } @@ -23,13 +23,26 @@ repositories { } apply(plugin = "org.jlleitschuh.gradle.ktlint") dependencies { - implementation("aws.sdk.kotlin:lexruntimeservice:0.29.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.29.1-beta") + implementation("aws.sdk.kotlin:lexruntimeservice: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("aws.sdk.kotlin:lexmodelbuildingservice-jvm:0.29.1-beta") + implementation("aws.sdk.kotlin:lexmodelbuildingservice-jvm:0.33.1-beta") 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/mediaconvert/build.gradle.kts b/kotlin/services/mediaconvert/build.gradle.kts index 58d7ae695f2..ef645998b48 100644 --- a/kotlin/services/mediaconvert/build.gradle.kts +++ b/kotlin/services/mediaconvert/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 } @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath("org.jlleitschuh.gradle:ktlint-gradle:10.3.0") + classpath("org.jlleitschuh.gradle:ktlint-gradle:11.5.1") } } @@ -24,12 +24,25 @@ repositories { } apply(plugin = "org.jlleitschuh.gradle.ktlint") dependencies { - implementation("aws.sdk.kotlin:mediaconvert:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:mediaconvert: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/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/CreateJob.kt b/kotlin/services/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/CreateJob.kt index db5bcbd5e12..c3333375a7e 100644 --- a/kotlin/services/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/CreateJob.kt +++ b/kotlin/services/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/CreateJob.kt @@ -11,7 +11,7 @@ package com.kotlin.mediaconvert // snippet-start:[mediaconvert.kotlin.createjob.import] import aws.sdk.kotlin.services.mediaconvert.MediaConvertClient -import aws.sdk.kotlin.services.mediaconvert.endpoints.EndpointProvider +import aws.sdk.kotlin.services.mediaconvert.endpoints.MediaConvertEndpointProvider import aws.sdk.kotlin.services.mediaconvert.model.AacAudioDescriptionBroadcasterMix import aws.sdk.kotlin.services.mediaconvert.model.AacCodecProfile import aws.sdk.kotlin.services.mediaconvert.model.AacCodingMode @@ -84,10 +84,10 @@ import aws.sdk.kotlin.services.mediaconvert.model.InputPsiControl import aws.sdk.kotlin.services.mediaconvert.model.InputRotate import aws.sdk.kotlin.services.mediaconvert.model.InputTimecodeSource import aws.sdk.kotlin.services.mediaconvert.model.JobSettings -import aws.sdk.kotlin.services.mediaconvert.model.M3U8NielsenId3 -import aws.sdk.kotlin.services.mediaconvert.model.M3U8PcrControl -import aws.sdk.kotlin.services.mediaconvert.model.M3U8Scte35Source -import aws.sdk.kotlin.services.mediaconvert.model.M3U8Settings +import aws.sdk.kotlin.services.mediaconvert.model.M3u8NielsenId3 +import aws.sdk.kotlin.services.mediaconvert.model.M3u8PcrControl +import aws.sdk.kotlin.services.mediaconvert.model.M3u8Scte35Source +import aws.sdk.kotlin.services.mediaconvert.model.M3u8Settings import aws.sdk.kotlin.services.mediaconvert.model.MediaConvertException import aws.sdk.kotlin.services.mediaconvert.model.Output import aws.sdk.kotlin.services.mediaconvert.model.OutputGroup @@ -114,17 +114,18 @@ including your credentials. For more information, see the following documentation topic: https://docs.aws.amazon.com/sdk-for-kotlin/latest/developer-guide/setup.html + + In the following example, the output of the job is placed in the same Amazon S3 bucket in a folder named out. */ suspend fun main(args: Array) { val usage = """ - - Usage + Usage Where: mcRoleARN - the MediaConvert Role ARN. - fileInput - the URL of an Amazon S3 bucket where the input file is located. + fileInput - the URL of an Amazon S3 bucket where the input file is located (for example s3:///). """ if (args.size != 2) { @@ -136,7 +137,7 @@ suspend fun main(args: Array) { val fileInput = args[1] val mcClient = MediaConvertClient { region = "us-west-2" } val id = createMediaJob(mcClient, mcRoleARN, fileInput) - println("MediaConvert job is $id") + println("MediaConvert job $id was successfully created!") } // snippet-start:[mediaconvert.kotlin.createjob.main] @@ -159,7 +160,7 @@ suspend fun createMediaJob(mcClient: MediaConvertClient, mcRoleARN: String, file val endpointURL = res.endpoints!!.get(0).url!! val mediaConvert = MediaConvertClient.fromEnvironment { region = "us-west-2" - endpointProvider = EndpointProvider { + endpointProvider = MediaConvertEndpointProvider { Endpoint(endpointURL) } } @@ -434,17 +435,17 @@ fun createOutput( } containerSettings = ContainerSettings { container = ContainerType.M3U8 - this.m3U8Settings = M3U8Settings { + this.m3u8Settings = M3u8Settings { audioFramesPerPes = 4 - pcrControl = M3U8PcrControl.PcrEveryPesPacket + pcrControl = M3u8PcrControl.PcrEveryPesPacket pmtPid = 480 privateMetadataPid = 503 programNumber = 1 patInterval = 0 pmtInterval = 0 - scte35Source = M3U8Scte35Source.None + scte35Source = M3u8Scte35Source.None scte35Pid = 500 - nielsenId3 = M3U8NielsenId3.None + nielsenId3 = M3u8NielsenId3.None timedMetadata = TimedMetadata.None timedMetadataPid = 502 videoPid = 481 diff --git a/kotlin/services/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/GetJob.kt b/kotlin/services/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/GetJob.kt index 3f9fb34eb42..15d34861904 100644 --- a/kotlin/services/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/GetJob.kt +++ b/kotlin/services/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/GetJob.kt @@ -1,7 +1,6 @@ // snippet-sourcedescription:[GetJob.kt demonstrates how to get information about a specific AWS Elemental MediaConvert job.] // snippet-keyword:[AWS SDK for Kotlin] // snippet-service:[AWS Elemental MediaConvert] - /* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 @@ -11,11 +10,11 @@ package com.kotlin.mediaconvert // snippet-start:[mediaconvert.kotlin.get_job.import] import aws.sdk.kotlin.services.mediaconvert.MediaConvertClient -import aws.sdk.kotlin.services.mediaconvert.endpoints.EndpointProvider -import aws.smithy.kotlin.runtime.client.endpoints.Endpoint +import aws.sdk.kotlin.services.mediaconvert.endpoints.MediaConvertEndpointProvider import aws.sdk.kotlin.services.mediaconvert.model.DescribeEndpointsRequest import aws.sdk.kotlin.services.mediaconvert.model.GetJobRequest import aws.sdk.kotlin.services.mediaconvert.model.GetJobResponse +import aws.smithy.kotlin.runtime.client.endpoints.Endpoint import kotlin.system.exitProcess // snippet-end:[mediaconvert.kotlin.get_job.import] @@ -59,7 +58,7 @@ suspend fun getSpecificJob(mcClient: MediaConvertClient, jobId: String?) { val endpointURL = res.endpoints!!.get(0).url!! val mediaConvert = MediaConvertClient.fromEnvironment { region = "us-west-2" - endpointProvider = EndpointProvider { + endpointProvider = MediaConvertEndpointProvider { Endpoint(endpointURL) } } diff --git a/kotlin/services/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/ListJobs.kt b/kotlin/services/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/ListJobs.kt index e5febbff70b..04a2d8f630e 100644 --- a/kotlin/services/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/ListJobs.kt +++ b/kotlin/services/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/ListJobs.kt @@ -11,11 +11,11 @@ package com.kotlin.mediaconvert // snippet-start:[mediaconvert.kotlin.list_jobs.import] import aws.sdk.kotlin.services.mediaconvert.MediaConvertClient +import aws.sdk.kotlin.services.mediaconvert.endpoints.MediaConvertEndpointProvider import aws.sdk.kotlin.services.mediaconvert.model.DescribeEndpointsRequest import aws.sdk.kotlin.services.mediaconvert.model.JobStatus import aws.sdk.kotlin.services.mediaconvert.model.ListJobsRequest import aws.smithy.kotlin.runtime.client.endpoints.Endpoint -import aws.smithy.kotlin.runtime.client.endpoints.EndpointProvider import kotlin.system.exitProcess // snippet-end:[mediaconvert.kotlin.list_jobs.import] @@ -45,7 +45,7 @@ suspend fun listCompleteJobs(mcClient: MediaConvertClient) { val endpointURL = res.endpoints!![0].url!! val mediaConvert = MediaConvertClient.fromEnvironment { region = "us-west-2" - endpointProvider = EndpointProvider { + endpointProvider = MediaConvertEndpointProvider { Endpoint(endpointURL) } } diff --git a/kotlin/services/mediastore/build.gradle.kts b/kotlin/services/mediastore/build.gradle.kts index 47f165757e6..57c1f74173a 100644 --- a/kotlin/services/mediastore/build.gradle.kts +++ b/kotlin/services/mediastore/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 } group = "me.scmacdon" @@ -12,20 +12,31 @@ 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:mediastore:0.30.1-beta") + implementation("aws.sdk.kotlin:mediastore: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") } 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/opensearch/build.gradle.kts b/kotlin/services/opensearch/build.gradle.kts index 5989fc10af5..59f4965d6e8 100644 --- a/kotlin/services/opensearch/build.gradle.kts +++ b/kotlin/services/opensearch/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:opensearch:0.30.1-beta") + implementation("aws.sdk.kotlin:opensearch: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.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") } 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/personalize/build.gradle.kts b/kotlin/services/personalize/build.gradle.kts index 247a4bc9f42..76a06dd2eef 100644 --- a/kotlin/services/personalize/build.gradle.kts +++ b/kotlin/services/personalize/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,23 +13,34 @@ 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:personalize:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") - implementation("aws.sdk.kotlin:personalizeruntime:0.30.1-beta") + implementation("aws.sdk.kotlin:personalize:0.33.1-beta") + implementation("aws.sdk.kotlin:secretsmanager:0.33.1-beta") + implementation("aws.sdk.kotlin:personalizeruntime: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/pinpoint/build.gradle.kts b/kotlin/services/pinpoint/build.gradle.kts index 60a595183ba..5c2cf0e3a8b 100644 --- a/kotlin/services/pinpoint/build.gradle.kts +++ b/kotlin/services/pinpoint/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,34 @@ 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:pinpoint:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:pinpoint: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") + implementation("com.google.code.gson:gson:2.10.1") } 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/polly/build.gradle.kts b/kotlin/services/polly/build.gradle.kts index d913d93923c..e7cdab55fa0 100644 --- a/kotlin/services/polly/build.gradle.kts +++ b/kotlin/services/polly/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,21 +13,32 @@ 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:polly:0.30.1-beta") + implementation("aws.sdk.kotlin:polly: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.googlecode.soundlibs:jlayer:1.0.1.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/rds/build.gradle.kts b/kotlin/services/rds/build.gradle.kts index c659868a83d..1b5a0fc8e95 100644 --- a/kotlin/services/rds/build.gradle.kts +++ b/kotlin/services/rds/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:rds:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:rds: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.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/redshift/build.gradle.kts b/kotlin/services/redshift/build.gradle.kts index be5c3e909a5..a322083b635 100644 --- a/kotlin/services/redshift/build.gradle.kts +++ b/kotlin/services/redshift/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,34 @@ 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:redshift:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:redshift: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.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/rekognition/build.gradle.kts b/kotlin/services/rekognition/build.gradle.kts index 0fbfd3d2809..29f718a8682 100644 --- a/kotlin/services/rekognition/build.gradle.kts +++ b/kotlin/services/rekognition/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,35 @@ 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:rekognition:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:rekognition: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" + kotlinOptions.freeCompilerArgs += "-Xlint:-deprecation" +} + +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/route53/build.gradle.kts b/kotlin/services/route53/build.gradle.kts index e2bd1112275..dbee19d6355 100644 --- a/kotlin/services/route53/build.gradle.kts +++ b/kotlin/services/route53/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,23 +13,37 @@ 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:route53:0.29.1-beta") - implementation("aws.sdk.kotlin:route53domains:0.29.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.29.1-beta") + implementation("aws.sdk.kotlin:route53:0.33.1-beta") + implementation("aws.sdk.kotlin:route53domains: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" + kotlinOptions.freeCompilerArgs += "-Xlint:-deprecation" +} + +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/s3/build.gradle.kts b/kotlin/services/s3/build.gradle.kts index e0ba983f90b..7da16171891 100644 --- a/kotlin/services/s3/build.gradle.kts +++ b/kotlin/services/s3/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,32 +13,42 @@ 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:s3-jvm:0.26.0-beta") - implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0") - implementation("com.squareup.okhttp3:okhttp:4.10.0") - implementation("aws.smithy.kotlin:aws-signing-crt:0.21.0") - testImplementation(kotlin("test")) - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") + 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") + testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") } +tasks.withType() { + kotlinOptions.jvmTarget = "17" +} + tasks.withType() { kotlinOptions.jvmTarget = "1.8" + kotlinOptions.freeCompilerArgs += "-Xlint:-deprecation" } 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/sagemaker/build.gradle.kts b/kotlin/services/sagemaker/build.gradle.kts index 13b402603b6..013190ddc2d 100644 --- a/kotlin/services/sagemaker/build.gradle.kts +++ b/kotlin/services/sagemaker/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,39 @@ 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:sagemaker:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:sagemaker: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.withType() { + kotlinOptions.jvmTarget = "17" + kotlinOptions.freeCompilerArgs += "-Xlint:-deprecation" +} + +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/secretsmanager/build.gradle.kts b/kotlin/services/secretsmanager/build.gradle.kts index 99ddc3ae0f3..0d35b59f8e5 100644 --- a/kotlin/services/secretsmanager/build.gradle.kts +++ b/kotlin/services/secretsmanager/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,36 @@ 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:secretsmanager:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:secretsmanager: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" + kotlinOptions.freeCompilerArgs += "-Xlint:-deprecation" +} + +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/ses/build.gradle.kts b/kotlin/services/ses/build.gradle.kts index 330959cd53d..ba1de9961fa 100644 --- a/kotlin/services/ses/build.gradle.kts +++ b/kotlin/services/ses/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,18 +13,19 @@ 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:ses:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:ses: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("javax.mail:javax.mail-api:1.6.2") implementation("com.sun.mail:javax.mail:1.6.2") @@ -32,6 +33,19 @@ dependencies { 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" + kotlinOptions.freeCompilerArgs += "-Xlint:-deprecation" +} + +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/sns/build.gradle.kts b/kotlin/services/sns/build.gradle.kts index 1e1cb75a709..e58a7b483ce 100644 --- a/kotlin/services/sns/build.gradle.kts +++ b/kotlin/services/sns/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 } @@ -14,23 +14,36 @@ buildscript { } 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:sns:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:sns: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" + kotlinOptions.freeCompilerArgs += "-Xlint:-deprecation" +} + +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/sqs/build.gradle.kts b/kotlin/services/sqs/build.gradle.kts index c8b32a9af68..b7b166d95eb 100644 --- a/kotlin/services/sqs/build.gradle.kts +++ b/kotlin/services/sqs/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,18 +13,19 @@ 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:sqs:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:sqs: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") @@ -33,5 +34,17 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") } tasks.withType() { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" + kotlinOptions.freeCompilerArgs += "-Xlint:-deprecation" +} + +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/stepfunctions/build.gradle.kts b/kotlin/services/stepfunctions/build.gradle.kts index ba9aa3915e2..9ae7caba440 100644 --- a/kotlin/services/stepfunctions/build.gradle.kts +++ b/kotlin/services/stepfunctions/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,19 +13,20 @@ 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:sfn:0.30.1-beta") - implementation("aws.sdk.kotlin:iam:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:sfn:0.33.1-beta") + implementation("aws.sdk.kotlin:iam: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") @@ -33,5 +34,17 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") } tasks.withType() { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" + kotlinOptions.freeCompilerArgs += "-Xlint:-deprecation" +} + +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/sts/build.gradle.kts b/kotlin/services/sts/build.gradle.kts index 9e2006696f5..c52a019d6ec 100644 --- a/kotlin/services/sts/build.gradle.kts +++ b/kotlin/services/sts/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,35 @@ 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:sts:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:sts: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" + kotlinOptions.freeCompilerArgs += "-Xlint:-deprecation" +} + +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/support/build.gradle.kts b/kotlin/services/support/build.gradle.kts index 2ba2f6ddbbd..f9d132a0891 100644 --- a/kotlin/services/support/build.gradle.kts +++ b/kotlin/services/support/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,14 +19,15 @@ buildscript { repositories { mavenCentral() - jcenter() } apply(plugin = "org.jlleitschuh.gradle.ktlint") dependencies { - implementation("aws.sdk.kotlin:support-jvm:0.21.3-beta") + implementation("aws.sdk.kotlin:support-jvm: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.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") } tasks.withType() { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" } diff --git a/kotlin/services/textract/build.gradle.kts b/kotlin/services/textract/build.gradle.kts index 422119f2c8c..5734c1b83ff 100644 --- a/kotlin/services/textract/build.gradle.kts +++ b/kotlin/services/textract/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,35 @@ 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:textract:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:textract: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" + kotlinOptions.freeCompilerArgs += "-Xlint:-deprecation" +} + +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/translate/build.gradle.kts b/kotlin/services/translate/build.gradle.kts index 0c8725f2bdc..5d50902b410 100644 --- a/kotlin/services/translate/build.gradle.kts +++ b/kotlin/services/translate/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,35 @@ 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:translate:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:translate: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" + kotlinOptions.freeCompilerArgs += "-Xlint:-deprecation" +} + +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/xray/build.gradle.kts b/kotlin/services/xray/build.gradle.kts index cf56d8d4c71..11d241b1370 100644 --- a/kotlin/services/xray/build.gradle.kts +++ b/kotlin/services/xray/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,35 @@ 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:xray:0.30.1-beta") - implementation("aws.sdk.kotlin:secretsmanager:0.30.1-beta") + implementation("aws.sdk.kotlin:xray: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" + kotlinOptions.freeCompilerArgs += "-Xlint:-deprecation" +} + +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") }