Revert "misc: revert Gradle 9 upgrade (#1688)"

This reverts commit 98bc1fa.

Author: 0marperez

.changes/058bf26f-7f37-439a-9170-d0a2c9c84e3e.json

@@ -0,0 +1,5 @@
+{
+    "id": "058bf26f-7f37-439a-9170-d0a2c9c84e3e",
+    "type": "misc",
+    "description": "Upgrade to Gradle 9.0.0"
+}

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/auth/ResolveAuthSchemePreference.kt

@@ -1,3 +1,8 @@
+/*
+ * 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,3 +1,8 @@
+/*
+ * 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,3 +1,8 @@
+/*
+ * 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,3 +1,8 @@
+/*
+ * 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,3 +1,8 @@
+/*
+ * 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,3 +1,8 @@
+/*
+ * 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
@@ -26,7 +31,9 @@ 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,6 +14,18 @@ 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,3 +1,8 @@
+/*
+ * 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,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 rootProject.name = "buildSrc"
 
 dependencyResolutionManagement {