File tree Expand file tree Collapse file tree 7 files changed +14
-10
lines changed
smithy-aws-typescript-codegen Expand file tree Collapse file tree 7 files changed +14
-10
lines changed Original file line number Diff line number Diff line change 1
1
distributionBase =GRADLE_USER_HOME
2
2
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
4
4
networkTimeout =10000
5
5
validateDistributionUrl =true
6
6
zipStoreBase =GRADLE_USER_HOME
Original file line number Diff line number Diff line change @@ -114,7 +114,7 @@ case "$( uname )" in #(
114
114
NONSTOP* ) nonstop=true ;;
115
115
esac
116
116
117
- CLASSPATH=$APP_HOME /gradle/wrapper/gradle-wrapper.jar
117
+ CLASSPATH=" \\\"\\\" "
118
118
119
119
120
120
# Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
213
213
set -- \
214
214
" -Dorg.gradle.appname=$APP_BASE_NAME " \
215
215
-classpath " $CLASSPATH " \
216
- org. gradle. wrapper.GradleWrapperMain \
216
+ -jar " $APP_HOME / gradle/ wrapper/gradle-wrapper.jar " \
217
217
" $@ "
218
218
219
219
# Stop when "xargs" is not available.
Original file line number Diff line number Diff line change @@ -70,11 +70,11 @@ goto fail
70
70
:execute
71
71
@ rem Setup the command line
72
72
73
- set CLASSPATH = %APP_HOME% \gradle\wrapper\gradle-wrapper.jar
73
+ set CLASSPATH =
74
74
75
75
76
76
@ 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 " %*
78
78
79
79
:end
80
80
@ rem End local scope for the variables with windows NT shell
Original file line number Diff line number Diff line change @@ -72,11 +72,12 @@ val buildSdk = tasks.register<SmithyBuildTask>("buildSdk") {
72
72
// JSON file found in aws-models/. The generated smithy-build.json file is
73
73
// not committed to git since it's rebuilt each time codegen is performed.
74
74
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
+
75
79
doLast {
76
80
val projectionsBuilder = Node .objectNodeBuilder()
77
- val modelsDirProp: String by project
78
- val clientNameProp: String? by project
79
- val models = project.file(modelsDirProp);
80
81
81
82
fileTree(models).filter { it.isFile }.files.forEach eachFile@{ file ->
82
83
val model = Model .assembler()
Original file line number Diff line number Diff line change @@ -52,6 +52,9 @@ dependencies {
52
52
}
53
53
54
54
tasks.register(" set-aws-sdk-versions" ) {
55
+ val packagesDir = project.file(" ../../packages" )
56
+ val clientsDir = project.file(" ../../clients" )
57
+
55
58
doLast {
56
59
mkdir(layout.buildDirectory.dir(" generated/resources/software/amazon/smithy/aws/typescript/codegen" ).get().asFile)
57
60
var versionsFile = layout.buildDirectory
@@ -60,7 +63,7 @@ tasks.register("set-aws-sdk-versions") {
60
63
.asFile
61
64
versionsFile.printWriter().close()
62
65
63
- var roots = project.file( " ../../packages " ). listFiles().toMutableList() + project.file( " ../../clients " ) .listFiles().toList()
66
+ var roots = packagesDir. listFiles().toMutableList() + clientsDir .listFiles().toList()
64
67
roots.forEach { packageDir ->
65
68
var packageJsonFile = File (packageDir, " package.json" )
66
69
if (packageJsonFile.isFile()) {
Original file line number Diff line number Diff line change 1
1
// Update this commit when taking up new changes from smithy-typescript.
2
2
module . exports = {
3
3
// Use full commit hash as we explicitly fetch it.
4
- SMITHY_TS_COMMIT : "43bec3331c9b9e5e00ce3a8113fea58fba8c59d7 " ,
4
+ SMITHY_TS_COMMIT : "ceb0a0d05333af401a18a98428b0072c401ef241 " ,
5
5
} ;
6
6
7
7
if ( module . exports . SMITHY_TS_COMMIT . length < 40 ) {
You can’t perform that action at this time.
0 commit comments