Skip to content

Commit 1e00419

Browse files
authored
chore(codegen): bump Gradle to 9.0.0 (#7390)
1 parent 97078ce commit 1e00419

File tree

7 files changed

+14
-10
lines changed

7 files changed

+14
-10
lines changed
59 Bytes
Binary file not shown.

codegen/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

codegen/gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

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

119119

120120
# Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

codegen/gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%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" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

codegen/sdk-codegen/build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,12 @@ val buildSdk = tasks.register<SmithyBuildTask>("buildSdk") {
7272
// JSON file found in aws-models/. The generated smithy-build.json file is
7373
// not committed to git since it's rebuilt each time codegen is performed.
7474
val generateSmithyBuild = tasks.register("generate-smithy-build") {
75+
val clientNameProp: String? by project
76+
val modelsDirProp: String by project
77+
val models = project.file(modelsDirProp);
78+
7579
doLast {
7680
val projectionsBuilder = Node.objectNodeBuilder()
77-
val modelsDirProp: String by project
78-
val clientNameProp: String? by project
79-
val models = project.file(modelsDirProp);
8081

8182
fileTree(models).filter { it.isFile }.files.forEach eachFile@{ file ->
8283
val model = Model.assembler()

codegen/smithy-aws-typescript-codegen/build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ dependencies {
5252
}
5353

5454
tasks.register("set-aws-sdk-versions") {
55+
val packagesDir = project.file("../../packages")
56+
val clientsDir = project.file("../../clients")
57+
5558
doLast {
5659
mkdir(layout.buildDirectory.dir("generated/resources/software/amazon/smithy/aws/typescript/codegen").get().asFile)
5760
var versionsFile = layout.buildDirectory
@@ -60,7 +63,7 @@ tasks.register("set-aws-sdk-versions") {
6063
.asFile
6164
versionsFile.printWriter().close()
6265

63-
var roots = project.file("../../packages").listFiles().toMutableList() + project.file("../../clients").listFiles().toList()
66+
var roots = packagesDir.listFiles().toMutableList() + clientsDir.listFiles().toList()
6467
roots.forEach { packageDir ->
6568
var packageJsonFile = File(packageDir, "package.json")
6669
if (packageJsonFile.isFile()) {

scripts/generate-clients/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Update this commit when taking up new changes from smithy-typescript.
22
module.exports = {
33
// Use full commit hash as we explicitly fetch it.
4-
SMITHY_TS_COMMIT: "43bec3331c9b9e5e00ce3a8113fea58fba8c59d7",
4+
SMITHY_TS_COMMIT: "ceb0a0d05333af401a18a98428b0072c401ef241",
55
};
66

77
if (module.exports.SMITHY_TS_COMMIT.length < 40) {

0 commit comments

Comments
 (0)