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 2020/12/01 04:43:40 UTC
[groovy] branch master updated: build tweaks
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new f8f5cb5 build tweaks
f8f5cb5 is described below
commit f8f5cb5ea5bf42de0ee32c9df97be045b04b0a35
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Dec 1 14:43:20 2020 +1000
build tweaks
---
buildSrc/src/main/groovy/org.apache.groovy-distribution.gradle | 5 ++++-
buildSrc/src/main/groovy/org.apache.groovy-published-library.gradle | 4 ++--
.../main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy | 4 +++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-distribution.gradle b/buildSrc/src/main/groovy/org.apache.groovy-distribution.gradle
index fe399fb..d9787bb 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-distribution.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-distribution.gradle
@@ -212,7 +212,7 @@ interface Services {
SoftwareComponentFactory getSoftwareComponentFactory()
}
-// The Gradle distribution module isn't a Java library
+// The Groovy distribution module isn't a Java library
// so we create a custom publication
def factory = objects.newInstance(Services).softwareComponentFactory
def component = factory.adhoc('groovyDistribution')
@@ -227,6 +227,9 @@ def bin = configurations.create("distributionBinary") {
outgoing {
artifacts {
artifact tasks.named('distBin')
+ artifact tasks.named('distSrc')
+ artifact tasks.named('distDoc')
+ artifact tasks.named('distSdk')
}
}
}
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-published-library.gradle b/buildSrc/src/main/groovy/org.apache.groovy-published-library.gradle
index 2d60810..f947227 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-published-library.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-published-library.gradle
@@ -17,11 +17,11 @@ if (pluginManager.hasPlugin('java-platform')) {
publishing {
repositories {
maven {
- name "FileRepo"
+ name "LocalFile"
url "${rootProject.buildDir}/repo"
}
maven {
- name "ApacheRepo"
+ name "Apache"
url findProperty('groovyVersion').contains('SNAPSHOT')
? 'https://repository.apache.org/content/repositories/snapshots'
: 'https://repository.apache.org/service/local/staging/deploy/maven2'
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy b/buildSrc/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy
index 28cedbb..72fdd0f 100644
--- a/buildSrc/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy
+++ b/buildSrc/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy
@@ -147,7 +147,9 @@ class SharedConfiguration {
boolean shouldSign(TaskExecutionGraph taskGraph) {
trySign.get() || (config.isReleaseVersion.get() &&
- (taskGraph.hasTask(':artifactoryPublish') || forceSign.get()))
+ (forceSign.get() || [':artifactoryPublish', ':publishAllPublicationsToApacheRepository'].any {
+ taskGraph.hasTask(it)
+ }))
}
boolean hasAllKeyDetails() {