Skip to content

chore(codegen): fix gradle task dependency and duplicate handling in sourcesJar #7409

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 2 commits into from
Oct 7, 2025
Merged

chore(codegen): fix gradle task dependency and duplicate handling in sourcesJar #7409

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a45dd71
chore(codegen): fix gradle task dependency and duplicate handling in …
smilkuri Oct 6, 2025
39434c3
chore(codegen): change duplicateStrategy to include
smilkuri Oct 7, 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
3 changes: 3 additions & 0 deletions codegen/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ subprojects {
metaInf.with(licenseSpec)
from(sourceSets.main.get().allSource)
archiveClassifier.set("sources")
// Add explicit dependency on the task that generates resources
dependsOn("set-aws-sdk-versions")
duplicatesStrategy = DuplicatesStrategy.INCLUDE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using INCLUDE also seems to retain the file contents

$ codegen> jar xvf build/staging/software/amazon/smithy/typescript/smithy-aws-typescript-codegen/0.36.1/smithy-aws-typescript-codegen-0.36.1.jar

$ codegen> head -n5 META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration 
software.amazon.smithy.aws.typescript.codegen.AddEndpointsV2ParameterNameMap
software.amazon.smithy.aws.typescript.codegen.AddAwsRuntimeConfig
software.amazon.smithy.aws.typescript.codegen.AddAccountIdEndpointModeRuntimeConfig
software.amazon.smithy.aws.typescript.codegen.AddBuiltinPlugins
software.amazon.smithy.aws.typescript.codegen.AddServiceCustomizationPlugins

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As per the documentation and published artifacts on 0.36.0, the duplicates strategy should be INCLUDE

Docs: https://docs.gradle.org/current/javadoc/org/gradle/api/file/DuplicatesStrategy.html
Artifacts in 0.36.0: #7409 (comment)

}

tasks.register<Jar>("javadocJar") {
Expand Down
Loading