misc: revert Gradle 9 upgrade

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

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

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

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

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

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<BusinessMetric>, logger: Logger):
             true
         }
     }
-    if (allowedMetrics.isEmpty()) {
-        return ""
-    }
+    if (allowedMetrics.isEmpty()) return ""
     val metricsString = allowedMetrics.joinToString(",", "m/") { it.identifier }
     val metricsByteArray = metricsString.encodeToByteArray()
 

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 {

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`

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 {

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
 
 /**

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

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

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

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

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

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

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

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

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

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

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

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<String>
+
+    /**
+     * The projection root directory
+     */
+    @get:Input
+    abstract val projectionRootDirectory: Property<String>
+
+    @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<ProtocolTestTask>("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<Copy>("copyStaticFiles-$protocolName") {
         group = "codegen"
         from(rootProject.projectDir.resolve("services/$protocolName/common/src"))
-        into(smithyBuild.smithyKotlinProjectionSrcDir(protocolName))
+        into(smithyBuild.smithyKotlinProjectionSrcDir(it.name))
     }
 
-    tasks.register<Exec>("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<ProtocolTestTask>()
+    dependsOn(allTests)
 }

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

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.36"
 
 # libs
 coroutines-version = "1.10.2"

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

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

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

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

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

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

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

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

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