You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2018/02/27 02:13:08 UTC
groovy git commit: GROOVY-8482: Build refactor impacts on release
process (additional tweaks)
Repository: groovy
Updated Branches:
refs/heads/master 33be1e1d5 -> 9e58710c3
GROOVY-8482: Build refactor impacts on release process (additional tweaks)
doc/src jars for groovy-all
correct name used for vanilla jar asc file
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/9e58710c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/9e58710c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/9e58710c
Branch: refs/heads/master
Commit: 9e58710c3c8d96274b99fcd0d8106651484c3fb0
Parents: 33be1e1
Author: paulk <pa...@asert.com.au>
Authored: Tue Feb 27 12:00:21 2018 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Tue Feb 27 12:12:41 2018 +1000
----------------------------------------------------------------------
gradle/upload.gradle | 49 ++++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/9e58710c/gradle/upload.gradle
----------------------------------------------------------------------
diff --git a/gradle/upload.gradle b/gradle/upload.gradle
index da2ce60..15f198f 100644
--- a/gradle/upload.gradle
+++ b/gradle/upload.gradle
@@ -46,32 +46,37 @@ ext.deriveFile = { File archive, String suffix -> new File(archive.parent, basen
allprojects {
if (project == rootProject || modules().contains(project)) {
+ ext.addSigFile = { File sigFile, c, ext, n ->
+ if (sigFile.exists()) {
+ project.artifacts.add('archives', sigFile) {
+ if (n) {
+ name = n
+ }
+ classifier = c
+ type = 'asc'
+ extension = ext
+ }
+ }
+ }
ext.signWithClassifier = { String c, File f ->
if (rootProject.isReleaseVersion) {
signing.sign(c, f)
def ascFile = new File(f.parent, f.name + '.asc')
- if (ascFile.exists()) {
- project.artifacts.add('archives', ascFile) {
- classifier = c
- type = 'asc'
- extension = 'jar.asc'
- }
- }
+ addSigFile(ascFile, c, 'jar.asc', null)
+ }
+ }
+ ext.signWithName = { String baseName, File f ->
+ if (rootProject.isReleaseVersion) {
+ signing.sign(null, f)
+ def ascFile = new File(f.parent, f.name + '.asc')
+ addSigFile(ascFile, null, 'jar.asc', baseName)
}
}
-
ext.signArchiveTask = { archiveTask ->
if (rootProject.isReleaseVersion) {
signing.sign(archiveTask.classifier, archiveTask.archivePath)
def ascFile = new File(archiveTask.destinationDir, archiveTask.archiveName + '.asc')
- if (ascFile.exists()) {
- project.artifacts.add('archives', ascFile) {
- name = archiveTask.baseName
- classifier = archiveTask.classifier
- type = 'asc'
- extension = archiveTask.extension + '.asc'
- }
- }
+ addSigFile(ascFile, archiveTask.classifier, archiveTask.extension + '.asc', archiveTask.baseName)
}
}
@@ -124,7 +129,7 @@ allprojects {
doFirst {
// gradle doesn't expect us to mutate configurations like we do here
// so signing the configuration won't work and we do it manually here
- signArchiveTask(jarjar.outputFile)
+ signWithName(jar.baseName, jarjar.outputFile)
signArchiveTask(sourceJar)
signArchiveTask(javadocJar)
signArchiveTask(groovydocJar)
@@ -148,17 +153,17 @@ allprojects {
dependsOn([sourceAllJar, javadocAllJar, groovydocAllJar, distBin, distDoc, dist, distBin])
doFirst {
if (!rootProject.indyCapable()) {
- throw new GradleException("You must run with JDK 7+ to upload archives")
+ throw new GradleException("Indy must be enabled to upload archives")
}
- project.artifacts.add('archives', distBin) {
- name = 'groovy-binary'
- }
+ project.artifacts.add('archives', distBin) { name = 'groovy-binary' }
+ project.artifacts.add('archives', sourceAllJar) { name = 'groovy-all' }
+ project.artifacts.add('archives', javadocAllJar) { name = 'groovy-all' }
+ project.artifacts.add('archives', groovydocAllJar) { name = 'groovy-all' }
signArchiveTask(sourceAllJar)
signArchiveTask(javadocAllJar)
signArchiveTask(groovydocAllJar)
- // TODO rework these?
if (isReleaseVersion) {
signing.sign(distBin.archivePath)
def ascFile = new File(distBin.destinationDir, distBin.archiveName + '.asc')