From e8a98f3d6beaf839dfc7b852cb99b3ba849f9a87 Mon Sep 17 00:00:00 2001 From: Snigdha Date: Fri, 6 Nov 2026 11:01:20 -0500 Subject: [PATCH 1/3] Bump Smithy codegen to 1.74.1 --- tools/code-generation/smithy/codegen/settings.gradle.kts | 2 +- tools/code-generation/smithy/cpp-codegen/build.gradle.kts | 4 ++-- .../smithy/cpp-codegen/smithy-cpp-codegen/build.gradle.kts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/code-generation/smithy/codegen/settings.gradle.kts b/tools/code-generation/smithy/codegen/settings.gradle.kts index 6fa5c0acbd4..1cca99dd72a 100644 --- a/tools/code-generation/smithy/codegen/settings.gradle.kts +++ b/tools/code-generation/smithy/codegen/settings.gradle.kts @@ -14,7 +14,7 @@ dependencyResolutionManagement { versionCatalogs { create("codegen") { // Smithy dependencies - version("smithy", "1.73.0") // Centralize the version for Smithy-related dependencies + version("smithy", "1.74.1") // Centralize the version for Smithy-related dependencies library("model", "software.amazon.smithy", "smithy-model").versionRef("smithy") library("aws-traits", "software.amazon.smithy", "smithy-aws-traits").versionRef("smithy") library("codegen-core", "software.amazon.smithy", "smithy-codegen-core").versionRef("smithy") diff --git a/tools/code-generation/smithy/cpp-codegen/build.gradle.kts b/tools/code-generation/smithy/cpp-codegen/build.gradle.kts index 0f1df91a060..232eea17fcf 100644 --- a/tools/code-generation/smithy/cpp-codegen/build.gradle.kts +++ b/tools/code-generation/smithy/cpp-codegen/build.gradle.kts @@ -6,7 +6,7 @@ import org.gradle.api.logging.Logging import kotlin.streams.toList val logger = Logging.getLogger("MyLogger") -val smithyVersion = "1.73.0" +val smithyVersion = "1.74.1" plugins { id("java-library") @@ -20,7 +20,7 @@ repositories { buildscript { // buildscript is evaluated before script-body vals, so it keeps its own copy in sync - val smithyVersion = "1.73.0" + val smithyVersion = "1.74.1" dependencies { classpath("software.amazon.smithy:smithy-model:$smithyVersion") classpath("software.amazon.smithy:smithy-aws-traits:$smithyVersion") diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/build.gradle.kts b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/build.gradle.kts index 53e0d723ed5..65a39420abb 100644 --- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/build.gradle.kts +++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `java-library` } -val smithyVersion = "1.73.0" +val smithyVersion = "1.74.1" java { sourceCompatibility = JavaVersion.VERSION_16 From ed49675d50788224ee5b9a1041ef01f7513325d7 Mon Sep 17 00:00:00 2001 From: Snigdha Date: Fri, 6 Nov 2026 10:56:35 -0500 Subject: [PATCH 2/3] Add changelog fragment for Smithy 1.74.1 bump --- .changelog/dependency-bump-smithy-174.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changelog/dependency-bump-smithy-174.json diff --git a/.changelog/dependency-bump-smithy-174.json b/.changelog/dependency-bump-smithy-174.json new file mode 100644 index 00000000000..d162589c21b --- /dev/null +++ b/.changelog/dependency-bump-smithy-174.json @@ -0,0 +1,6 @@ +{ + "type": "dependency", + "category": "aws-cpp-sdk-core", + "contributor": "pulimsr", + "description": "Bump Smithy from 1.73.0 to 1.74.1 in the code generator" +} From 2a7e53956e814b4e47f953723f56fb2fe4ff32ff Mon Sep 17 00:00:00 2001 From: Snigdha Date: Fri, 6 Nov 2026 13:40:48 -0500 Subject: [PATCH 3/3] Read smithyVersion from gradle.properties in cpp-codegen The buildscript block runs before script-body vals exist, so it kept a duplicate copy of the version. Reading it from gradle.properties gives the buildscript, the script body and the smithy-cpp-codegen subproject one shared value. --- tools/code-generation/smithy/cpp-codegen/build.gradle.kts | 6 +++--- tools/code-generation/smithy/cpp-codegen/gradle.properties | 3 +++ .../smithy/cpp-codegen/smithy-cpp-codegen/build.gradle.kts | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/code-generation/smithy/cpp-codegen/build.gradle.kts b/tools/code-generation/smithy/cpp-codegen/build.gradle.kts index 232eea17fcf..ac65e4dbe8c 100644 --- a/tools/code-generation/smithy/cpp-codegen/build.gradle.kts +++ b/tools/code-generation/smithy/cpp-codegen/build.gradle.kts @@ -6,7 +6,7 @@ import org.gradle.api.logging.Logging import kotlin.streams.toList val logger = Logging.getLogger("MyLogger") -val smithyVersion = "1.74.1" +val smithyVersion: String by project plugins { id("java-library") @@ -19,8 +19,8 @@ repositories { } buildscript { - // buildscript is evaluated before script-body vals, so it keeps its own copy in sync - val smithyVersion = "1.74.1" + // buildscript is evaluated before script-body vals, so read the version from gradle.properties + val smithyVersion: String by project dependencies { classpath("software.amazon.smithy:smithy-model:$smithyVersion") classpath("software.amazon.smithy:smithy-aws-traits:$smithyVersion") diff --git a/tools/code-generation/smithy/cpp-codegen/gradle.properties b/tools/code-generation/smithy/cpp-codegen/gradle.properties index 5167bec761d..edb92da7a45 100644 --- a/tools/code-generation/smithy/cpp-codegen/gradle.properties +++ b/tools/code-generation/smithy/cpp-codegen/gradle.properties @@ -1,3 +1,6 @@ +# Smithy version for cpp-codegen and smithy-cpp-codegen (keep in sync with ../codegen/settings.gradle.kts) +smithyVersion=1.74.1 + org.gradle.jvmargs=-Xmx6g # Set the socket timeout to 5 minutes diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/build.gradle.kts b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/build.gradle.kts index 65a39420abb..66db1d471ac 100644 --- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/build.gradle.kts +++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `java-library` } -val smithyVersion = "1.74.1" +val smithyVersion: String by project java { sourceCompatibility = JavaVersion.VERSION_16