Skip to content

chore(codegen): bump Gradle to 9.0.0 #7390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 30, 2025
+14 −10
Merged

chore(codegen): bump Gradle to 9.0.0 #7390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c210638
chore(codegen): move invocation of task project outside of execution …
trivikr Sep 30, 2025
8547c61
chore(codegen): bump Gradle to 9.0.0
trivikr Sep 30, 2025
44ac5d3
chore(codegen): update smithy-ts commit
trivikr Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified codegen/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion codegen/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions codegen/gradlew
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
CLASSPATH="\\\"\\\""


# Determine the Java command to use to start the JVM.
Expand Down Expand Up @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"

# Stop when "xargs" is not available.
Expand Down
4 changes: 2 additions & 2 deletions codegen/gradlew.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ goto fail
:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
set CLASSPATH=


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*

:end
@rem End local scope for the variables with windows NT shell
Expand Down
7 changes: 4 additions & 3 deletions codegen/sdk-codegen/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,12 @@ val buildSdk = tasks.register<SmithyBuildTask>("buildSdk") {
// JSON file found in aws-models/. The generated smithy-build.json file is
// not committed to git since it's rebuilt each time codegen is performed.
val generateSmithyBuild = tasks.register("generate-smithy-build") {
val clientNameProp: String? by project
val modelsDirProp: String by project
val models = project.file(modelsDirProp);

doLast {
val projectionsBuilder = Node.objectNodeBuilder()
val modelsDirProp: String by project
val clientNameProp: String? by project
val models = project.file(modelsDirProp);

fileTree(models).filter { it.isFile }.files.forEach eachFile@{ file ->
val model = Model.assembler()
Expand Down
5 changes: 4 additions & 1 deletion codegen/smithy-aws-typescript-codegen/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ dependencies {
}

tasks.register("set-aws-sdk-versions") {
val packagesDir = project.file("../../packages")
val clientsDir = project.file("../../clients")

doLast {
mkdir(layout.buildDirectory.dir("generated/resources/software/amazon/smithy/aws/typescript/codegen").get().asFile)
var versionsFile = layout.buildDirectory
Expand All @@ -60,7 +63,7 @@ tasks.register("set-aws-sdk-versions") {
.asFile
versionsFile.printWriter().close()

var roots = project.file("../../packages").listFiles().toMutableList() + project.file("../../clients").listFiles().toList()
var roots = packagesDir.listFiles().toMutableList() + clientsDir.listFiles().toList()
roots.forEach { packageDir ->
var packageJsonFile = File(packageDir, "package.json")
if (packageJsonFile.isFile()) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate-clients/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Update this commit when taking up new changes from smithy-typescript.
module.exports = {
// Use full commit hash as we explicitly fetch it.
SMITHY_TS_COMMIT: "43bec3331c9b9e5e00ce3a8113fea58fba8c59d7",
SMITHY_TS_COMMIT: "ceb0a0d05333af401a18a98428b0072c401ef241",
};

if (module.exports.SMITHY_TS_COMMIT.length < 40) {
Expand Down
Loading