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/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) { 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..14e134ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +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 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