Skip to content

Commit 6843b80

Browse files
committed
Collect archive and signature files in build/dist/
1 parent 0828654 commit 6843b80

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

build.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,12 @@ task assembleJavadoc(type: Sync) {
132132
destinationDir = file("${rootProject.buildDir}/javadoc")
133133
}
134134

135+
task collectSignatures(type: Sync) {
136+
destinationDir = file("${rootProject.buildDir}/dist")
137+
duplicatesStrategy DuplicatesStrategy.FAIL
138+
include '*.jar', '*.jar.asc'
139+
}
140+
135141
String getGitCommit() {
136142
def proc = "git rev-parse HEAD".execute(null, projectDir)
137143
proc.waitFor()
@@ -270,6 +276,14 @@ subprojects { project ->
270276
useGpgCmd()
271277
sign publishing.publications.jars
272278
}
279+
280+
tasks.withType(Sign) { Sign signTask ->
281+
rootProject.tasks.collectSignatures {
282+
from signTask.inputs.files
283+
from signTask.outputs.files
284+
}
285+
signTask.finalizedBy rootProject.tasks.collectSignatures
286+
}
273287
}
274288
}
275289

doc/releasing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ Release candidate versions
6060
from ASCIIdoc to Markdown and remove line wraps. Include only
6161
changes/additions since the previous release or pre-release.
6262
- Attach the signature files from
63-
`webauthn-server-attestation/build/libs/webauthn-server-attestation-X.Y.Z-RCN.jar.asc`
63+
`build/dist/webauthn-server-attestation-X.Y.Z-RCN.jar.asc`
6464
and
65-
`webauthn-server-core/build/libs/webauthn-server-core-X.Y.Z-RCN.jar.asc`.
65+
`build/dist/webauthn-server-core-X.Y.Z-RCN.jar.asc`.
6666
- Note which JDK version was used to build the artifacts.
6767
6868
@@ -147,8 +147,8 @@ Release versions
147147
from ASCIIdoc to Markdown and remove line wraps. Include all changes since
148148
the previous release (not just changes since the previous pre-release).
149149
- Attach the signature files from
150-
`webauthn-server-attestation/build/libs/webauthn-server-attestation-X.Y.Z.jar.asc`
150+
`build/dist/webauthn-server-attestation-X.Y.Z.jar.asc`
151151
and
152-
`webauthn-server-core/build/libs/webauthn-server-core-X.Y.Z.jar.asc`.
152+
`build/dist/webauthn-server-core-X.Y.Z.jar.asc`.
153153
154154
- Note which JDK version was used to build the artifacts.

0 commit comments

Comments
 (0)