Skip to content

Commit 98bc1fa

Browse files
authored
misc: revert Gradle 9 upgrade (#1688)
1 parent 20da6c0 commit 98bc1fa

File tree

54 files changed

+70
-279
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

+70
-279
lines changed

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

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

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

83
import aws.sdk.kotlin.runtime.InternalSdkApi

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

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

83
import aws.sdk.kotlin.runtime.InternalSdkApi

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

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

83
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: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
/*
2-
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3-
* SPDX-License-Identifier: Apache-2.0
4-
*/
5-
61
package aws.sdk.kotlin.runtime.auth.credentials
72

83
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: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
/*
2-
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3-
* SPDX-License-Identifier: Apache-2.0
4-
*/
5-
61
package aws.sdk.kotlin.runtime.http.interceptors
72

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

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

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

83
import aws.sdk.kotlin.runtime.http.BUSINESS_METRICS_MAX_LENGTH
@@ -31,9 +26,7 @@ internal fun formatMetrics(metrics: MutableSet<BusinessMetric>, logger: Logger):
3126
true
3227
}
3328
}
34-
if (allowedMetrics.isEmpty()) {
35-
return ""
36-
}
29+
if (allowedMetrics.isEmpty()) return ""
3730
val metricsString = allowedMetrics.joinToString(",", "m/") { it.identifier }
3831
val metricsByteArray = metricsString.encodeToByteArray()
3932

build.gradle.kts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,6 @@ 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-
}
2917
}
3018

3119
plugins {

buildSrc/build.gradle.kts

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

buildSrc/settings.gradle.kts

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

83
dependencyResolutionManagement {

0 commit comments

Comments
 (0)