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/06 00:39:31 UTC
[groovy] branch master updated (7960714 -> bb1bb75)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 7960714 Tweak doco
new 7547d5b nicer placement/info for groovydocJar task
new 0f931e1 place javadoc and groovydoc jars into groovyLibrary component
new bb1bb75 typo
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/groovy/org.apache.groovy-base.gradle | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
[groovy] 03/03: typo
Posted by pa...@apache.org.
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
commit bb1bb7501aae156132d1b80ecec7b7e04a45f057
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun Dec 6 10:39:07 2020 +1000
typo
---
buildSrc/src/main/groovy/org.apache.groovy-base.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-base.gradle b/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
index b4cc858..e6fe00b 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
@@ -301,7 +301,7 @@ def shadowApi = createConsumableConfiguration(objects, tasks, configurations, 'g
def shadowRuntime = createConsumableConfiguration(objects, tasks, configurations, 'groovyRuntimeElements', Usage.JAVA_RUNTIME, 'jarjar', capabilities, targetJvmVersion)
dependencies {
// All Groovy modules depend on the Groovy BOM which itself has constraints on all
- // Groovy modules, which brings nice alignement features!
+ // Groovy modules, which brings nice alignment features!
groovyApiElements platform(project(":groovy-bom"))
groovyRuntimeElements platform(project(":groovy-bom"))
}
[groovy] 02/03: place javadoc and groovydoc jars into groovyLibrary
component
Posted by pa...@apache.org.
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
commit 0f931e1a0cee79c90e6ceed5b0fb056611175de6
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun Dec 6 10:36:53 2020 +1000
place javadoc and groovydoc jars into groovyLibrary component
---
buildSrc/src/main/groovy/org.apache.groovy-base.gradle | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-base.gradle b/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
index ee33dd1..b4cc858 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
@@ -213,12 +213,6 @@ tasks.withType(Javadoc).configureEach {
options.source = sharedConfiguration.targetJavaVersion.get()
}
-components.java {
- addVariantsFromConfiguration(configurations.groovydocElements) {
- mapToOptional()
- }
-}
-
tasks.named("compileTestGroovy") {
options.forkOptions.jvmArgs += ["-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true"]
}
@@ -283,6 +277,18 @@ def factory = objects.newInstance(Services).softwareComponentFactory
def component = factory.adhoc('groovyLibrary')
components.add(component)
+components.groovyLibrary {
+ addVariantsFromConfiguration(configurations.groovydocElements) {
+ mapToOptional()
+ }
+ addVariantsFromConfiguration(configurations.javadocElements) {
+ mapToOptional()
+ }
+ addVariantsFromConfiguration(configurations.sourcesElements) {
+ mapToOptional()
+ }
+}
+
// By declaring a codehaus capability we can tell Gradle that the user has to
// choose between "old" groovy and "new" groovy
List<String> capabilities = [
[groovy] 01/03: nicer placement/info for groovydocJar task
Posted by pa...@apache.org.
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
commit 7547d5bc089b76d66380ef7aec9724d5d83e0a27
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Dec 5 16:40:00 2020 +1000
nicer placement/info for groovydocJar task
---
buildSrc/src/main/groovy/org.apache.groovy-base.gradle | 2 ++
1 file changed, 2 insertions(+)
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-base.gradle b/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
index 596243e..ee33dd1 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-base.gradle
@@ -60,6 +60,8 @@ def generateReleaseInfo = tasks.register("generateReleaseInfo", ReleaseInfoGener
def groovydocJar = tasks.register("groovydocJar", Jar) {
from groovydoc
archiveClassifier = 'groovydoc'
+ group = 'build'
+ description = 'Assembles a jar archive containing the main groovydoc.'
}
configurations {