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/23 10:15:38 UTC
[1/2] groovy git commit: reenable -PskipIndy for installGroovy task
plus add support for -PskipGrooid
Repository: groovy
Updated Branches:
refs/heads/master fcc9cb40a -> 4019ee00e
reenable -PskipIndy for installGroovy task plus add support for -PskipGrooid
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/32169158
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/32169158
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/32169158
Branch: refs/heads/master
Commit: 3216915885e64c8d888ebbea86d01f297a7d9454
Parents: fcc9cb4
Author: paulk <pa...@asert.com.au>
Authored: Fri Feb 23 20:05:58 2018 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Fri Feb 23 20:05:58 2018 +1000
----------------------------------------------------------------------
gradle/assemble.gradle | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/32169158/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 9a152fd..f76fe99 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -376,15 +376,19 @@ ext.distSpec = copySpec {
}
}
}
- into('indy') {
- from jarjarWithIndy
- from modules()*.jarjarWithIndy
- }
- into('grooid') {
- from { new File(jar.archivePath.parent, "${jar.baseName}-${jar.version}-grooid.jar") }
- from {
- modules()*.jar.collect { j ->
- new File(j.archivePath.parent, "${j.baseName}-${j.version}-grooid.jar")
+ if (!rootProject.hasProperty('skipIndy')) {
+ into('indy') {
+ from jarjarWithIndy
+ from modules()*.jarjarWithIndy
+ }
+ }
+ if (!rootProject.hasProperty('skipGrooid')) {
+ into('grooid') {
+ from { new File(jar.archivePath.parent, "${jar.baseName}-${jar.version}-grooid.jar") }
+ from {
+ modules()*.jar.collect { j ->
+ new File(j.archivePath.parent, "${j.baseName}-${j.version}-grooid.jar")
+ }
}
}
}
[2/2] groovy git commit: typo in groovydoc
Posted by pa...@apache.org.
typo in groovydoc
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4019ee00
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4019ee00
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4019ee00
Branch: refs/heads/master
Commit: 4019ee00e92d381e48b12b2b291c9da1044d3811
Parents: 3216915
Author: paulk <pa...@asert.com.au>
Authored: Fri Feb 23 20:15:10 2018 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Fri Feb 23 20:15:10 2018 +1000
----------------------------------------------------------------------
src/main/groovy/groovy/transform/NamedVariant.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/4019ee00/src/main/groovy/groovy/transform/NamedVariant.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/transform/NamedVariant.java b/src/main/groovy/groovy/transform/NamedVariant.java
index e3823cf..e36c64a 100644
--- a/src/main/groovy/groovy/transform/NamedVariant.java
+++ b/src/main/groovy/groovy/transform/NamedVariant.java
@@ -86,7 +86,7 @@ import java.lang.annotation.Target;
* }
* </pre>
* The generated method/constructor retains the visibility and return type of the original method/constructor
- * but the {@link @VisibilityOptions} annotation can be added to customize the visibility. You could have the
+ * but the {@link VisibilityOptions} annotation can be added to customize the visibility. You could have the
* annotated method/constructor private for instance but have the generated one be public.
*
* @see VisibilityOptions