From 7b4dcc7a4fbbe882b84825ba9164c03aba2ae2e5 Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Fri, 28 Feb 2025 14:55:31 +0000 Subject: [PATCH 1/2] chore(codegen): bump smithy-gradle-version to 1.2.0 --- codegen/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codegen/gradle.properties b/codegen/gradle.properties index 7222c0ff2b94..f90c5a67e32b 100644 --- a/codegen/gradle.properties +++ b/codegen/gradle.properties @@ -1,2 +1,2 @@ smithyVersion=1.53.0 -smithyGradleVersion=0.6.0 +smithyGradleVersion=1.2.0 \ No newline at end of file From aa0aed40bfb2864cc96f49ef9c93634fee9c553f Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Fri, 28 Feb 2025 16:23:58 +0000 Subject: [PATCH 2/2] fix(codegen): use smithyGradleVersion in settings.gradle.kts --- .../generic-client-test-codegen/build.gradle.kts | 4 ++-- codegen/gradle.properties | 3 ++- codegen/protocol-test-codegen/build.gradle.kts | 4 ++-- codegen/sdk-codegen/build.gradle.kts | 4 ++-- codegen/settings.gradle.kts | 14 ++++++++++++++ 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/codegen/generic-client-test-codegen/build.gradle.kts b/codegen/generic-client-test-codegen/build.gradle.kts index da69f9602b98..06ecf446bbae 100644 --- a/codegen/generic-client-test-codegen/build.gradle.kts +++ b/codegen/generic-client-test-codegen/build.gradle.kts @@ -30,8 +30,8 @@ buildscript { } plugins { - val smithyGradleVersion: String by project - id("software.amazon.smithy").version(smithyGradleVersion) + val smithyPluginVersion: String by project + id("software.amazon.smithy").version(smithyPluginVersion) } dependencies { diff --git a/codegen/gradle.properties b/codegen/gradle.properties index f90c5a67e32b..5ad2b7030f34 100644 --- a/codegen/gradle.properties +++ b/codegen/gradle.properties @@ -1,2 +1,3 @@ smithyVersion=1.53.0 -smithyGradleVersion=1.2.0 \ No newline at end of file +smithyGradleVersion=1.2.0 +smithyPluginVersion=0.6.0 \ No newline at end of file diff --git a/codegen/protocol-test-codegen/build.gradle.kts b/codegen/protocol-test-codegen/build.gradle.kts index 4906051deb30..8c65e15e61ba 100644 --- a/codegen/protocol-test-codegen/build.gradle.kts +++ b/codegen/protocol-test-codegen/build.gradle.kts @@ -30,8 +30,8 @@ buildscript { } plugins { - val smithyGradleVersion: String by project - id("software.amazon.smithy").version(smithyGradleVersion) + val smithyPluginVersion: String by project + id("software.amazon.smithy").version(smithyPluginVersion) } dependencies { diff --git a/codegen/sdk-codegen/build.gradle.kts b/codegen/sdk-codegen/build.gradle.kts index f44c63022f03..abf28d79d2f1 100644 --- a/codegen/sdk-codegen/build.gradle.kts +++ b/codegen/sdk-codegen/build.gradle.kts @@ -38,8 +38,8 @@ buildscript { } plugins { - val smithyGradleVersion: String by project - id("software.amazon.smithy").version(smithyGradleVersion) + val smithyPluginVersion: String by project + id("software.amazon.smithy").version(smithyPluginVersion) } dependencies { diff --git a/codegen/settings.gradle.kts b/codegen/settings.gradle.kts index 1bc44fa3ec79..59c84108466e 100644 --- a/codegen/settings.gradle.kts +++ b/codegen/settings.gradle.kts @@ -35,3 +35,17 @@ file( .filter { it.isDirectory } .forEach { includeBuild(it.absolutePath) } } + +pluginManagement { + val smithyGradleVersion: String by settings + plugins { + id("software.amazon.smithy.gradle.smithy-jar").version(smithyGradleVersion) + id("software.amazon.smithy.gradle.smithy-base").version(smithyGradleVersion) + } + + repositories { + mavenLocal() + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file