Skip to content

Commit be93329

Browse files
authored
misc: upgrade to Gradle 9.0.0 (#1693)
1 parent 05ea93b commit be93329

File tree

54 files changed

+279
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+279
-70
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"id": "058bf26f-7f37-439a-9170-d0a2c9c84e3e",
3+
"type": "misc",
4+
"description": "Upgrade to Gradle 9.0.0"
5+
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package aws.sdk.kotlin.runtime.config.auth
27

38
import aws.sdk.kotlin.runtime.InternalSdkApi

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/checksums/ResolveFlexibleChecksumsConfig.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package aws.sdk.kotlin.runtime.config.checksums
27

38
import aws.sdk.kotlin.runtime.InternalSdkApi

aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/util/AwsBusinessMetricsTestUtils.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package aws.sdk.kotlin.runtime.util
27

38
import aws.sdk.kotlin.runtime.http.interceptors.businessmetrics.AwsBusinessMetric

aws-runtime/aws-config/jvm/test/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProviderTestJVM.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package aws.sdk.kotlin.runtime.auth.credentials
27

38
import aws.sdk.kotlin.runtime.auth.credentials.internal.credentials

aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/IgnoreCompositeFlexibleChecksumResponseInterceptor.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package aws.sdk.kotlin.runtime.http.interceptors
27

38
import aws.smithy.kotlin.runtime.client.ProtocolResponseInterceptorContext

aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/AwsBusinessMetricsUtils.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package aws.sdk.kotlin.runtime.http.interceptors.businessmetrics
27

38
import aws.sdk.kotlin.runtime.http.BUSINESS_METRICS_MAX_LENGTH
@@ -26,7 +31,9 @@ internal fun formatMetrics(metrics: MutableSet<BusinessMetric>, logger: Logger):
2631
true
2732
}
2833
}
29-
if (allowedMetrics.isEmpty()) return ""
34+
if (allowedMetrics.isEmpty()) {
35+
return ""
36+
}
3037
val metricsString = allowedMetrics.joinToString(",", "m/") { it.identifier }
3138
val metricsByteArray = metricsString.encodeToByteArray()
3239

build.gradle.kts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,18 @@ buildscript {
1414
// Add our custom gradle build logic to buildscript classpath
1515
classpath(libs.aws.kotlin.repo.tools.build.support)
1616
}
17+
18+
configurations.classpath {
19+
resolutionStrategy {
20+
/*
21+
Version bumping the SDK to 1.5.x in repo tools broke our buildscript classpath:
22+
java.lang.NoSuchMethodError: 'void kotlinx.coroutines.CancellableContinuation.resume(java.lang.Object, kotlin.jvm.functions.Function3)
23+
24+
FIXME: Figure out what broke our buildscipt classpath, this is a temporary fix
25+
*/
26+
force("com.squareup.okhttp3:okhttp-coroutines:5.0.0-alpha.14")
27+
}
28+
}
1729
}
1830

1931
plugins {

buildSrc/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
plugins {
27
alias(libs.plugins.kotlin.jvm)
38
`kotlin-dsl`

buildSrc/settings.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
rootProject.name = "buildSrc"
27

38
dependencyResolutionManagement {

0 commit comments

Comments
 (0)