Unverified Commit 8db8f4b0 authored by Russell Cohen's avatar Russell Cohen Committed by GitHub
Browse files

Fix task dependency (#3420) 

## Motivation and Context
Release build was broken because `smithy-build.json` was not being
generated prior to smithyBuild actually running.

## Description
Fix task names

## Testing
Manual patch of release tag with this fix.


----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._
parent 19648ace

aws/sdk-adhoc-test/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ project.registerGenerateSmithyBuildTask(rootProject, pluginName, allCodegenTests 
project.registerGenerateCargoWorkspaceTask(rootProject, pluginName, allCodegenTests, workingDirUnderBuildDir)

project.registerGenerateCargoConfigTomlTask(layout.buildDirectory.dir(workingDirUnderBuildDir).get().asFile)



tasks["jar"].dependsOn("generateSmithyBuild")

tasks["smithyBuild"].dependsOn("generateSmithyBuild")

tasks["assemble"].finalizedBy("generateCargoWorkspace")



project.registerModifyMtimeTask()

aws/sdk/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ tasks.register<ExecRustBuildTool>("generateVersionManifest") { 
    }

}



tasks["jar"].apply {

tasks["smithyBuild"].apply {

    inputs.file(layout.buildDirectory.file("smithy-build.json"))

    inputs.dir(projectDir.resolve("aws-models"))

    dependsOn("generateSmithyBuild")

codegen-client-test/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ project.registerGenerateCargoConfigTomlTask(layout.buildDirectory.dir(workingDir 


tasks["generateSmithyBuild"].inputs.property("smithy.runtime.mode", getSmithyRuntimeMode())



tasks["jar"].dependsOn("generateSmithyBuild")

tasks["smithyBuild"].dependsOn("generateSmithyBuild")

tasks["assemble"].finalizedBy("generateCargoWorkspace")



project.registerModifyMtimeTask()

codegen-server-test/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ project.registerGenerateSmithyBuildTask(rootProject, pluginName, allCodegenTests 
project.registerGenerateCargoWorkspaceTask(rootProject, pluginName, allCodegenTests, workingDirUnderBuildDir)

project.registerGenerateCargoConfigTomlTask(layout.buildDirectory.dir(workingDirUnderBuildDir).get().asFile)



tasks["jar"].dependsOn("generateSmithyBuild")

tasks["smithyBuild"].dependsOn("generateSmithyBuild")

tasks["assemble"].finalizedBy("generateCargoWorkspace", "generateCargoConfigToml")



project.registerModifyMtimeTask()

codegen-server-test/python/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ tasks.register("stubs") { 
    }

}



tasks["jar"].dependsOn("generateSmithyBuild")

tasks["smithyBuild"].dependsOn("generateSmithyBuild")

tasks["assemble"].finalizedBy("generateCargoWorkspace")



project.registerModifyMtimeTask()