From aba83a8033d934808ae9e95b203b822622f6c9b7 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Wed, 17 Sep 2025 17:11:36 -0400 Subject: [PATCH 1/3] Revert "misc: upgrade to Gradle 9.0.0 (#1665)" This reverts commit 61a691922c0c30d5d438d88c31bec470f1bb8bb9. --- .../058bf26f-7f37-439a-9170-d0a2c9c84e3e.json | 5 -- build.gradle.kts | 12 ---- codegen/protocol-tests/build.gradle.kts | 65 +++++++++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- .../dynamodb-mapper/build.gradle.kts | 2 +- hll/hll-codegen/build.gradle.kts | 6 +- .../hll/codegen/core/TemplateEngineTest.kt | 4 +- .../hll/codegen/core/TemplateProcessorTest.kt | 4 +- .../kotlin/hll/codegen/util/StringsTest.kt | 4 +- settings.gradle.kts | 1 + tests/codegen/checksums/build.gradle.kts | 8 ++- 11 files changed, 64 insertions(+), 49 deletions(-) delete mode 100644 .changes/058bf26f-7f37-439a-9170-d0a2c9c84e3e.json diff --git a/.changes/058bf26f-7f37-439a-9170-d0a2c9c84e3e.json b/.changes/058bf26f-7f37-439a-9170-d0a2c9c84e3e.json deleted file mode 100644 index 9dd46f72f00..00000000000 --- a/.changes/058bf26f-7f37-439a-9170-d0a2c9c84e3e.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "id": "058bf26f-7f37-439a-9170-d0a2c9c84e3e", - "type": "misc", - "description": "Upgrade to Gradle 9.0.0" -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index b586dc2c034..e027ebcf246 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,18 +14,6 @@ buildscript { // Add our custom gradle build logic to buildscript classpath classpath(libs.aws.kotlin.repo.tools.build.support) } - - configurations.classpath { - resolutionStrategy { - /* - Version bumping the SDK to 1.5.x in repo tools broke our buildscript classpath: - java.lang.NoSuchMethodError: 'void kotlinx.coroutines.CancellableContinuation.resume(java.lang.Object, kotlin.jvm.functions.Function3) - - FIXME: Figure out what broke our buildscipt classpath, this is a temporary fix - */ - force("com.squareup.okhttp3:okhttp-coroutines:5.0.0-alpha.14") - } - } } plugins { diff --git a/codegen/protocol-tests/build.gradle.kts b/codegen/protocol-tests/build.gradle.kts index 06b31a2ef6c..7064d116b31 100644 --- a/codegen/protocol-tests/build.gradle.kts +++ b/codegen/protocol-tests/build.gradle.kts @@ -73,38 +73,63 @@ dependencies { codegen(libs.smithy.aws.protocol.tests) } +abstract class ProtocolTestTask @Inject constructor(private val project: Project) : DefaultTask() { + /** + * The projection + */ + @get:Input + abstract val projectionName: Property + + /** + * The projection root directory + */ + @get:Input + abstract val projectionRootDirectory: Property + + @TaskAction + fun runTests() { + val projectionRootDir = project.file(projectionRootDirectory.get()) + println("[$projectionName] buildDir: $projectionRootDir") + if (!projectionRootDir.exists()) { + throw GradleException("$projectionRootDir does not exist") + } + val wrapper = if (System.getProperty("os.name").lowercase().contains("windows")) "gradlew.bat" else "gradlew" + val gradlew = project.rootProject.file(wrapper).absolutePath + + // NOTE - this still requires us to publish to maven local. + project.exec { + workingDir = projectionRootDir + executable = gradlew + args = listOf("test") + } + } +} + smithyBuild.projections.forEach { val protocolName = it.name - val dirProvider = smithyBuild - .smithyKotlinProjectionPath(protocolName) - .map { file(it.toString()) } + tasks.register("testProtocol-$protocolName") { + dependsOn(tasks.generateSmithyProjections) + group = "Verification" + projectionName.set(it.name) + projectionRootDirectory.set(smithyBuild.smithyKotlinProjectionPath(it.name).map { it.toString() }) + } + // FIXME This is a hack to work around how protocol tests aren't in the actual service model and thus codegen + // separately from service customizations. val copyStaticFiles = tasks.register("copyStaticFiles-$protocolName") { group = "codegen" from(rootProject.projectDir.resolve("services/$protocolName/common/src")) - into(smithyBuild.smithyKotlinProjectionSrcDir(protocolName)) + into(smithyBuild.smithyKotlinProjectionSrcDir(it.name)) } - tasks.register("testProtocol-$protocolName") { - group = "Verification" - dependsOn(tasks.generateSmithyProjections, copyStaticFiles) - - doFirst { - val dir = dirProvider.get() - require(dir.exists()) { "$dir does not exist" } - - val wrapper = if (System.getProperty("os.name").lowercase().contains("windows")) "gradlew.bat" else "gradlew" - val gradlew = rootProject.layout.projectDirectory.file(wrapper).asFile.absolutePath - - workingDir = dir - executable = gradlew - args = listOf("test") - } + tasks.generateSmithyProjections.configure { + finalizedBy(copyStaticFiles) } } tasks.register("testAllProtocols") { group = "Verification" - dependsOn(tasks.matching { it.name.startsWith("testProtocol-") }) + val allTests = tasks.withType() + dependsOn(allTests) } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4ba2524eb95..bf3beeb7dd3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-9.0.0-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts index a8f3af51954..53ad4cd2875 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts +++ b/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts @@ -113,7 +113,7 @@ if (project.NATIVE_ENABLED) { } } - listOf("jvmSourcesJar", "metadataSourcesJar", "jvmProcessResources").forEach { + listOf("jvmSourcesJar", "metadataSourcesJar").forEach { tasks.named(it) { dependsOn(moveGenSrc) } diff --git a/hll/hll-codegen/build.gradle.kts b/hll/hll-codegen/build.gradle.kts index 19c65cade4b..12769452a1f 100644 --- a/hll/hll-codegen/build.gradle.kts +++ b/hll/hll-codegen/build.gradle.kts @@ -30,7 +30,11 @@ dependencies { api(project(":aws-runtime:aws-core")) implementation(libs.ksp.api) implementation(libs.smithy.kotlin.runtime.core) - testImplementation(kotlin("test")) + + testImplementation(libs.junit.jupiter) + testImplementation(libs.junit.jupiter.params) + testImplementation(libs.kotest.assertions.core.jvm) + testImplementation(libs.kotlin.test.junit5) } val sourcesJar by tasks.creating(Jar::class) { diff --git a/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateEngineTest.kt b/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateEngineTest.kt index d4c87b7ca40..c853b989f7f 100644 --- a/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateEngineTest.kt +++ b/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateEngineTest.kt @@ -4,8 +4,8 @@ */ package aws.sdk.kotlin.hll.codegen.core -import kotlin.test.Test -import kotlin.test.assertEquals +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import kotlin.test.assertFailsWith class TemplateEngineTest { diff --git a/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateProcessorTest.kt b/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateProcessorTest.kt index 36beab13464..ffc793866f7 100644 --- a/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateProcessorTest.kt +++ b/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/core/TemplateProcessorTest.kt @@ -6,9 +6,9 @@ package aws.sdk.kotlin.hll.codegen.core import aws.sdk.kotlin.hll.codegen.model.TypeRef import aws.sdk.kotlin.hll.codegen.model.TypeVar -import kotlin.test.Test +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import kotlin.test.assertContains -import kotlin.test.assertEquals class TemplateProcessorTest { @Test diff --git a/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/util/StringsTest.kt b/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/util/StringsTest.kt index b630ce18956..c2f85036c6d 100644 --- a/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/util/StringsTest.kt +++ b/hll/hll-codegen/src/test/kotlin/aws/sdk/kotlin/hll/codegen/util/StringsTest.kt @@ -4,8 +4,8 @@ */ package aws.sdk.kotlin.hll.codegen.util -import kotlin.test.Test -import kotlin.test.assertEquals +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test class StringsTest { @Test diff --git a/settings.gradle.kts b/settings.gradle.kts index 826adedd84d..c8be4492931 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -87,6 +87,7 @@ if ("dynamodb".isBootstrappedService) { include(":hll:dynamodb-mapper:dynamodb-mapper-schema-codegen") include(":hll:dynamodb-mapper:dynamodb-mapper-annotations") include(":hll:dynamodb-mapper:dynamodb-mapper-schema-generator-plugin") + include(":hll:dynamodb-mapper:tests:dynamodb-mapper-schema-generator-plugin-test") } else { logger.warn(":services:dynamodb is not bootstrapped, skipping :hll:dynamodb-mapper and subprojects") } diff --git a/tests/codegen/checksums/build.gradle.kts b/tests/codegen/checksums/build.gradle.kts index a15cd29fe02..829c149cd5c 100644 --- a/tests/codegen/checksums/build.gradle.kts +++ b/tests/codegen/checksums/build.gradle.kts @@ -10,10 +10,12 @@ import aws.sdk.kotlin.tests.codegen.Model description = "AWS SDK for Kotlin's checksums codegen test suite" +val tests = listOf( + CodegenTest("checksums", Model("checksums.smithy"), "aws.sdk.kotlin.test#TestService"), +) + smithyBuild { - listOf( - CodegenTest("checksums", Model("checksums.smithy"), "aws.sdk.kotlin.test#TestService"), - ).forEach { test -> + this@Build_gradle.tests.forEach { test -> projections.register(test.name) { imports = listOf(layout.projectDirectory.file(test.model.path + test.model.fileName).asFile.absolutePath) smithyKotlinPlugin { From 24715fe9404bb3872bac842439c588da0fdad235 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Wed, 17 Sep 2025 17:11:45 -0400 Subject: [PATCH 2/3] Revert " misc: enable custom ktlint rules (#1683)" This reverts commit 7f4d194ab77cb349d4cbe1062e8f4b662458b987. --- .../runtime/config/auth/ResolveAuthSchemePreference.kt | 5 ----- .../config/checksums/ResolveFlexibleChecksumsConfig.kt | 5 ----- .../kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt | 5 ----- .../credentials/ProfileCredentialsProviderTestJVM.kt | 5 ----- ...noreCompositeFlexibleChecksumResponseInterceptor.kt | 5 ----- .../businessmetrics/AwsBusinessMetricsUtils.kt | 9 +-------- buildSrc/build.gradle.kts | 5 ----- buildSrc/settings.gradle.kts | 5 ----- .../kotlin/aws/sdk/kotlin/tests/codegen/CodegenTest.kt | 5 ----- buildSrc/src/main/kotlin/dokka-convention.gradle.kts | 5 ----- .../kotlin/codegen/ModuleDocumentationIntegration.kt | 5 ----- .../CredentialsBusinessMetricsIntegration.kt | 5 ----- .../EndpointBusinessMetricsIntegration.kt | 5 ----- .../codegen/model/traits/testing/SmokeTestTraits.kt | 5 ----- .../AwsSmokeTestsRunnerGeneratorIntegration.kt | 5 ----- .../smoketests/SmokeTestsDenyListIntegration.kt | 5 ----- .../testing/SmokeTestFailHttpEngineIntegration.kt | 5 ----- .../testing/SmokeTestSuccessHttpEngineIntegration.kt | 5 ----- .../codegen/ModuleDocumentationIntegrationTest.kt | 5 ----- .../codegen/endpoints/BindAwsEndpointBuiltinsTest.kt | 5 ----- .../cloudwatch-logs-graalvm/src/main/kotlin/Main.kt | 5 ----- gradle/libs.versions.toml | 2 +- .../hll/dynamodbmapper/codegen/model/MapperTypes.kt | 5 ----- .../dynamodb-mapper-ops-codegen/build.gradle.kts | 5 ----- .../dynamodb-mapper-schema-codegen/build.gradle.kts | 5 ----- .../codegen/annotations/AnnotationsProcessorOptions.kt | 5 ----- .../plugins/SchemaGeneratorPluginExtension.kt | 5 ----- .../plugins/SchemaGeneratorPluginTest.kt | 5 ----- .../src/test/resources/BuilderNotRequired.kt | 5 ----- .../src/test/resources/IgnoredProperty.kt | 5 ----- .../src/test/resources/RenamedPartitionKey.kt | 5 ----- .../src/test/resources/User.kt | 5 ----- .../custom-item-converter/CustomItemConverter.kt | 5 ----- .../test/resources/custom-item-converter/CustomUser.kt | 5 ----- .../hll/dynamodbmapper/operations/PaginatedScanTest.kt | 5 ----- .../kotlin/aws/sdk/kotlin/hll/codegen/model/Types.kt | 5 ----- .../kotlin/hll/codegen/rendering/BuilderRenderer.kt | 9 +-------- .../sdk/kotlin/hll/codegen/rendering/RenderOptions.kt | 5 ----- hll/hll-mapping-core/build.gradle.kts | 5 ----- .../bedrock/BedrockEnvironmentBearerTokenTest.kt | 10 +++------- services/route53/e2eTest/src/Route53UriTest.kt | 5 ----- services/s3/e2eTest/src/S3ChecksumTest.kt | 5 ----- settings.gradle.kts | 7 ------- tests/codegen/build.gradle.kts | 5 ----- tests/codegen/checksums/build.gradle.kts | 4 ---- 45 files changed, 6 insertions(+), 230 deletions(-) diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/auth/ResolveAuthSchemePreference.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/auth/ResolveAuthSchemePreference.kt index f06879eaf44..41071beb707 100644 --- a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/auth/ResolveAuthSchemePreference.kt +++ b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/auth/ResolveAuthSchemePreference.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.runtime.config.auth import aws.sdk.kotlin.runtime.InternalSdkApi diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveFlexibleChecksumsConfig.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveFlexibleChecksumsConfig.kt index 1859c5b43fe..5925fb858f0 100644 --- a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveFlexibleChecksumsConfig.kt +++ b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveFlexibleChecksumsConfig.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.runtime.config.checksums import aws.sdk.kotlin.runtime.InternalSdkApi diff --git a/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt b/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt index dbc213438f9..71467475b34 100644 --- a/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt +++ b/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.runtime.util import aws.sdk.kotlin.runtime.http.interceptors.businessmetrics.AwsBusinessMetric diff --git a/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProviderTestJVM.kt b/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProviderTestJVM.kt index 3cc0e2f5cd4..802f8f253db 100644 --- a/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProviderTestJVM.kt +++ b/aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProviderTestJVM.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.runtime.auth.credentials import aws.sdk.kotlin.runtime.auth.credentials.internal.credentials diff --git a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/IgnoreCompositeFlexibleChecksumResponseInterceptor.kt b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/IgnoreCompositeFlexibleChecksumResponseInterceptor.kt index dad6d3654e8..75c70913894 100644 --- a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/IgnoreCompositeFlexibleChecksumResponseInterceptor.kt +++ b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/IgnoreCompositeFlexibleChecksumResponseInterceptor.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.runtime.http.interceptors import aws.smithy.kotlin.runtime.client.ProtocolResponseInterceptorContext diff --git a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/AwsBusinessMetricsUtils.kt b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/AwsBusinessMetricsUtils.kt index 239686ee3df..56f88433456 100644 --- a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/AwsBusinessMetricsUtils.kt +++ b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/AwsBusinessMetricsUtils.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.runtime.http.interceptors.businessmetrics import aws.sdk.kotlin.runtime.http.BUSINESS_METRICS_MAX_LENGTH @@ -31,9 +26,7 @@ internal fun formatMetrics(metrics: MutableSet, logger: Logger): true } } - if (allowedMetrics.isEmpty()) { - return "" - } + if (allowedMetrics.isEmpty()) return "" val metricsString = allowedMetrics.joinToString(",", "m/") { it.identifier } val metricsByteArray = metricsString.encodeToByteArray() diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 60e7ba27f4f..ea81e7825a9 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - plugins { alias(libs.plugins.kotlin.jvm) `kotlin-dsl` diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index fa909303793..62991c1ef50 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - rootProject.name = "buildSrc" dependencyResolutionManagement { diff --git a/buildSrc/src/main/kotlin/aws/sdk/kotlin/tests/codegen/CodegenTest.kt b/buildSrc/src/main/kotlin/aws/sdk/kotlin/tests/codegen/CodegenTest.kt index 9facb987866..764e0abc44b 100644 --- a/buildSrc/src/main/kotlin/aws/sdk/kotlin/tests/codegen/CodegenTest.kt +++ b/buildSrc/src/main/kotlin/aws/sdk/kotlin/tests/codegen/CodegenTest.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.tests.codegen /** diff --git a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts index b7bca271f10..15605bcb111 100644 --- a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - import org.jsoup.Jsoup import kotlin.io.path.ExperimentalPathApi import kotlin.io.path.PathWalkOption diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegration.kt index a559d714c0b..433cfb0d492 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegration.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegration.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.codegen import software.amazon.smithy.aws.traits.ServiceTrait diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/CredentialsBusinessMetricsIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/CredentialsBusinessMetricsIntegration.kt index ea240f5f5cf..162c12dbb09 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/CredentialsBusinessMetricsIntegration.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/CredentialsBusinessMetricsIntegration.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.codegen.businessmetrics import aws.sdk.kotlin.codegen.AwsRuntimeTypes diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/EndpointBusinessMetricsIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/EndpointBusinessMetricsIntegration.kt index ef59d7bf05a..8641a8ac634 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/EndpointBusinessMetricsIntegration.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/EndpointBusinessMetricsIntegration.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.codegen.businessmetrics import aws.sdk.kotlin.codegen.AwsRuntimeTypes diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/testing/SmokeTestTraits.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/testing/SmokeTestTraits.kt index 4d67c7549b3..6805c3bad1f 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/testing/SmokeTestTraits.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/testing/SmokeTestTraits.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.codegen.model.traits.testing import software.amazon.smithy.model.node.ObjectNode diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/AwsSmokeTestsRunnerGeneratorIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/AwsSmokeTestsRunnerGeneratorIntegration.kt index da154161601..1e694ae4bbc 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/AwsSmokeTestsRunnerGeneratorIntegration.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/AwsSmokeTestsRunnerGeneratorIntegration.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.codegen.smoketests import aws.sdk.kotlin.codegen.AwsRuntimeTypes diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/SmokeTestsDenyListIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/SmokeTestsDenyListIntegration.kt index 500cb2ea183..06222e6c603 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/SmokeTestsDenyListIntegration.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/SmokeTestsDenyListIntegration.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.codegen.smoketests import software.amazon.smithy.kotlin.codegen.KotlinSettings diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestFailHttpEngineIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestFailHttpEngineIntegration.kt index fb718146311..ad6bd0ee95e 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestFailHttpEngineIntegration.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestFailHttpEngineIntegration.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.codegen.smoketests.testing import aws.sdk.kotlin.codegen.model.traits.testing.TestFailedResponseTrait diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestSuccessHttpEngineIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestSuccessHttpEngineIntegration.kt index a31744be236..03077a4cd5a 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestSuccessHttpEngineIntegration.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/testing/SmokeTestSuccessHttpEngineIntegration.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.codegen.smoketests.testing import aws.sdk.kotlin.codegen.model.traits.testing.TestFailedResponseTrait diff --git a/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegrationTest.kt b/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegrationTest.kt index bbd3ce3d751..cd288b5782d 100644 --- a/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegrationTest.kt +++ b/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/ModuleDocumentationIntegrationTest.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.codegen import software.amazon.smithy.build.MockManifest diff --git a/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/endpoints/BindAwsEndpointBuiltinsTest.kt b/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/endpoints/BindAwsEndpointBuiltinsTest.kt index e1d08153704..2fa1877fe52 100644 --- a/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/endpoints/BindAwsEndpointBuiltinsTest.kt +++ b/codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/endpoints/BindAwsEndpointBuiltinsTest.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.codegen.endpoints import software.amazon.smithy.kotlin.codegen.core.KotlinWriter diff --git a/examples/cloudwatch-logs-graalvm/src/main/kotlin/Main.kt b/examples/cloudwatch-logs-graalvm/src/main/kotlin/Main.kt index 5375a73eee5..1b23bd43e36 100644 --- a/examples/cloudwatch-logs-graalvm/src/main/kotlin/Main.kt +++ b/examples/cloudwatch-logs-graalvm/src/main/kotlin/Main.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.example import aws.sdk.kotlin.services.cloudwatchlogs.CloudWatchLogsClient diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7dc204bb4a1..179bfe40252 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ ksp-version = "2.2.0-2.0.2" # Keep in sync with kotlin-version dokka-version = "2.0.0" -aws-kotlin-repo-tools-version = "0.4.49" +aws-kotlin-repo-tools-version = "0.4.48" # libs coroutines-version = "1.10.2" diff --git a/hll/dynamodb-mapper/dynamodb-mapper-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/model/MapperTypes.kt b/hll/dynamodb-mapper/dynamodb-mapper-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/model/MapperTypes.kt index 06860dbf113..6b8d38c2fca 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/model/MapperTypes.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/model/MapperTypes.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.hll.dynamodbmapper.codegen.model import aws.sdk.kotlin.hll.codegen.model.Type diff --git a/hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/build.gradle.kts index 6806b439851..32160f166e1 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/build.gradle.kts +++ b/hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/build.gradle.kts @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - /* * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts index 202f5a60899..b5a14e2a01e 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - /* * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/AnnotationsProcessorOptions.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/AnnotationsProcessorOptions.kt index 308e29e4ff9..aa8954422a9 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/AnnotationsProcessorOptions.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/AnnotationsProcessorOptions.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.hll.dynamodbmapper.codegen.annotations import aws.smithy.kotlin.runtime.collections.AttributeKey diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginExtension.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginExtension.kt index ba317f015e9..590d848e463 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginExtension.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginExtension.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.hll.dynamodbmapper.plugins import aws.sdk.kotlin.hll.codegen.rendering.Visibility diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt index ac261b9fb4f..42601bebbeb 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.hll.dynamodbmapper.plugins import org.gradle.testkit.runner.GradleRunner diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/BuilderNotRequired.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/BuilderNotRequired.kt index b4901ccc67a..2861b2c8f6d 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/BuilderNotRequired.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/BuilderNotRequired.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package org.example import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbAttribute diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/IgnoredProperty.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/IgnoredProperty.kt index 28a3a5b7500..ff9c091258a 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/IgnoredProperty.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/IgnoredProperty.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package org.example import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbAttribute diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/RenamedPartitionKey.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/RenamedPartitionKey.kt index 78a04a2cd49..e507c9af815 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/RenamedPartitionKey.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/RenamedPartitionKey.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package org.example import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbAttribute diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/User.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/User.kt index 1dfbc76281b..65cbdea0620 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/User.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/User.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package org.example import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbAttribute diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomItemConverter.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomItemConverter.kt index 0cbe80001a2..abe58305992 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomItemConverter.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomItemConverter.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package my.custom.item.converter import aws.sdk.kotlin.hll.dynamodbmapper.items.AttributeDescriptor diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomUser.kt b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomUser.kt index b47aca28c04..75fe3234cdb 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomUser.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomUser.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package org.example import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbItem diff --git a/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PaginatedScanTest.kt b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PaginatedScanTest.kt index 71acfb4034d..17870798ee9 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PaginatedScanTest.kt +++ b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PaginatedScanTest.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.hll.dynamodbmapper.operations import aws.sdk.kotlin.hll.dynamodbmapper.items.* diff --git a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/model/Types.kt b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/model/Types.kt index ec38a7405f3..64400b17a79 100644 --- a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/model/Types.kt +++ b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/model/Types.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.hll.codegen.model import aws.sdk.kotlin.runtime.InternalSdkApi diff --git a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/BuilderRenderer.kt b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/BuilderRenderer.kt index 0bf676c1fb6..d14733105f4 100644 --- a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/BuilderRenderer.kt +++ b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/BuilderRenderer.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.hll.codegen.rendering import aws.sdk.kotlin.hll.codegen.core.CodeGenerator @@ -70,9 +65,7 @@ public class BuilderRenderer( private fun renderProperty(member: Member) { val dslInfo = member.dslInfo - if (dslInfo != null) { - blankLine() - } + if (dslInfo != null) blankLine() write("#Lvar #L: #T = null", ctx.attributes.visibility, member.name, member.type.nullable()) diff --git a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/RenderOptions.kt b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/RenderOptions.kt index fa062084e59..514988feee5 100644 --- a/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/RenderOptions.kt +++ b/hll/hll-codegen/src/main/kotlin/aws/sdk/kotlin/hll/codegen/rendering/RenderOptions.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.hll.codegen.rendering import aws.smithy.kotlin.runtime.collections.AttributeKey diff --git a/hll/hll-mapping-core/build.gradle.kts b/hll/hll-mapping-core/build.gradle.kts index 7f3f61454d1..b7c2dc41027 100644 --- a/hll/hll-mapping-core/build.gradle.kts +++ b/hll/hll-mapping-core/build.gradle.kts @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - import aws.sdk.kotlin.gradle.kmp.kotlin /* diff --git a/services/bedrock/common/test/aws/sdk/kotlin/services/bedrock/BedrockEnvironmentBearerTokenTest.kt b/services/bedrock/common/test/aws/sdk/kotlin/services/bedrock/BedrockEnvironmentBearerTokenTest.kt index 28b12cb9bf4..19a2a351c11 100644 --- a/services/bedrock/common/test/aws/sdk/kotlin/services/bedrock/BedrockEnvironmentBearerTokenTest.kt +++ b/services/bedrock/common/test/aws/sdk/kotlin/services/bedrock/BedrockEnvironmentBearerTokenTest.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.services.bedrock import aws.sdk.kotlin.services.bedrock.auth.finalizeBearerTokenConfig @@ -30,8 +25,8 @@ import kotlin.test.assertNotNull import kotlin.test.assertTrue class BedrockEnvironmentBearerTokenTest { - private fun mockHttpClient(handler: (HttpRequest) -> HttpResponse): HttpClientEngine = - object : HttpClientEngineBase("test engine") { + private fun mockHttpClient(handler: (HttpRequest) -> HttpResponse): HttpClientEngine { + return object : HttpClientEngineBase("test engine") { override val config: HttpClientEngineConfig = HttpClientEngineConfig.Default override suspend fun roundTrip(context: ExecutionContext, request: HttpRequest): HttpCall { @@ -39,6 +34,7 @@ class BedrockEnvironmentBearerTokenTest { return HttpCall(request, response, Instant.now(), Instant.now()) } } + } private val mockPlatformProvider = TestPlatformProvider( env = mapOf("AWS_BEARER_TOKEN_BEDROCK" to "bedrock-token"), diff --git a/services/route53/e2eTest/src/Route53UriTest.kt b/services/route53/e2eTest/src/Route53UriTest.kt index 0d9de9b4a66..6ec9e6ac25d 100644 --- a/services/route53/e2eTest/src/Route53UriTest.kt +++ b/services/route53/e2eTest/src/Route53UriTest.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.services.route53 import aws.sdk.kotlin.runtime.auth.credentials.StaticCredentialsProvider diff --git a/services/s3/e2eTest/src/S3ChecksumTest.kt b/services/s3/e2eTest/src/S3ChecksumTest.kt index e5814d2dcc8..cf0df9ba826 100644 --- a/services/s3/e2eTest/src/S3ChecksumTest.kt +++ b/services/s3/e2eTest/src/S3ChecksumTest.kt @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - package aws.sdk.kotlin.e2etest import aws.sdk.kotlin.e2etest.S3TestUtils.deleteBucketContents diff --git a/settings.gradle.kts b/settings.gradle.kts index c8be4492931..6dc165db0f0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,13 +30,6 @@ dependencyResolutionManagement { repositories { mavenLocal() mavenCentral() - maven { - name = "kotlinRepoTools" - url = java.net.URI("https://d2gys1nrxnjnyg.cloudfront.net/releases") - content { - includeGroupByRegex("""aws\.sdk\.kotlin.*""") - } - } } } diff --git a/tests/codegen/build.gradle.kts b/tests/codegen/build.gradle.kts index c193c20c26d..ecdae5f6ccc 100644 --- a/tests/codegen/build.gradle.kts +++ b/tests/codegen/build.gradle.kts @@ -1,8 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - import aws.sdk.kotlin.gradle.codegen.dsl.generateSmithyProjections plugins { diff --git a/tests/codegen/checksums/build.gradle.kts b/tests/codegen/checksums/build.gradle.kts index 829c149cd5c..6e7795fe4a6 100644 --- a/tests/codegen/checksums/build.gradle.kts +++ b/tests/codegen/checksums/build.gradle.kts @@ -1,7 +1,3 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ import aws.sdk.kotlin.gradle.codegen.dsl.smithyKotlinPlugin import aws.sdk.kotlin.gradle.codegen.smithyKotlinProjectionSrcDir From a042d05907acf0a4234b1abff2ab9d847658d327 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Wed, 17 Sep 2025 17:34:23 -0400 Subject: [PATCH 3/3] Revert aws-kotlin-repo-tools version --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 179bfe40252..a3698519dff 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ ksp-version = "2.2.0-2.0.2" # Keep in sync with kotlin-version dokka-version = "2.0.0" -aws-kotlin-repo-tools-version = "0.4.48" +aws-kotlin-repo-tools-version = "0.4.36" # libs coroutines-version = "1.10.2"