From 2bc0be451b9cf17a52ef0094961a51e022188e2a Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Thu, 14 Aug 2025 13:34:53 -0400 Subject: [PATCH 1/3] Upgrade to Gradle 9.0.0 --- build-plugins/smithy-build/build.gradle.kts | 2 +- .../kotlin/gradle/codegen/GenerateSmithyBuildTaskTest.kt | 7 +++---- gradle.properties | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-plugins/smithy-build/build.gradle.kts b/build-plugins/smithy-build/build.gradle.kts index 4c6aceef..ce3c28d2 100644 --- a/build-plugins/smithy-build/build.gradle.kts +++ b/build-plugins/smithy-build/build.gradle.kts @@ -19,7 +19,7 @@ repositories { dependencies { implementation(libs.smithy.model) implementation(libs.smithy.gradle.base.plugin) - testImplementation(libs.junit.jupiter) + testImplementation(kotlin("test")) } gradlePlugin { diff --git a/build-plugins/smithy-build/src/test/kotlin/aws/sdk/kotlin/gradle/codegen/GenerateSmithyBuildTaskTest.kt b/build-plugins/smithy-build/src/test/kotlin/aws/sdk/kotlin/gradle/codegen/GenerateSmithyBuildTaskTest.kt index 47f6d446..1a34b3a6 100644 --- a/build-plugins/smithy-build/src/test/kotlin/aws/sdk/kotlin/gradle/codegen/GenerateSmithyBuildTaskTest.kt +++ b/build-plugins/smithy-build/src/test/kotlin/aws/sdk/kotlin/gradle/codegen/GenerateSmithyBuildTaskTest.kt @@ -10,11 +10,10 @@ import aws.sdk.kotlin.gradle.codegen.tasks.GenerateSmithyBuild import aws.sdk.kotlin.gradle.codegen.tasks.json import org.gradle.kotlin.dsl.create import org.gradle.testfixtures.ProjectBuilder -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertTrue -import org.junit.jupiter.api.Test import software.amazon.smithy.model.node.Node -import java.io.* +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertTrue class GenerateSmithyBuildTaskTest { @Test diff --git a/gradle.properties b/gradle.properties index 7fc6f1ff..36704cbc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ kotlin.code.style=official +org.gradle.configuration-cache=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bf3beeb7..4ba2524e 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-8.14.2-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 7a1925f6c816f80dfcfc3315fc330d2db4f9c3f1 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Thu, 14 Aug 2025 13:43:04 -0400 Subject: [PATCH 2/3] Leave a comment --- gradle.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gradle.properties b/gradle.properties index 36704cbc..14e134ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,4 @@ kotlin.code.style=official + +# TODO Remove once configuration cache is enabled by default org.gradle.configuration-cache=true \ No newline at end of file From 9115bb11676a470c02e6dc19214781954d0a0029 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Fri, 15 Aug 2025 13:19:43 -0400 Subject: [PATCH 3/3] Fix creation of duplicate `runtimeClasspath` configuration ``` An exception occurred applying plugin request [id: 'org.jetbrains.kotlin.jvm'] > Failed to apply plugin class 'org.gradle.api.plugins.JavaPlugin'. > Could not create domain object 'java' (JvmSoftwareComponentInternal) in SoftwareComponent container > Cannot add a configuration with name 'runtimeClasspath' as a configuration with that name already exists. ``` --- .../kotlin/aws/sdk/kotlin/gradle/codegen/SmithyBuildPlugin.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/build-plugins/smithy-build/src/main/kotlin/aws/sdk/kotlin/gradle/codegen/SmithyBuildPlugin.kt b/build-plugins/smithy-build/src/main/kotlin/aws/sdk/kotlin/gradle/codegen/SmithyBuildPlugin.kt index de0b8760..faf86a1d 100644 --- a/build-plugins/smithy-build/src/main/kotlin/aws/sdk/kotlin/gradle/codegen/SmithyBuildPlugin.kt +++ b/build-plugins/smithy-build/src/main/kotlin/aws/sdk/kotlin/gradle/codegen/SmithyBuildPlugin.kt @@ -95,7 +95,6 @@ class SmithyBuildPlugin : Plugin { listOf( "smithyCli", "smithyBuild", - "runtimeClasspath", ).map(configurations::maybeCreate) tasks.register(TASK_GENERATE_SMITHY_PROJECTIONS) {