groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [3/3] groovy git commit: GROOVY-8515: groovy.g no longer included in sources jars
Date Thu, 05 Apr 2018 04:21:07 GMT
GROOVY-8515: groovy.g no longer included in sources jars


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/9061e93d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/9061e93d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/9061e93d

Branch: refs/heads/master
Commit: 9061e93d6d63cd0f7fe0ddd36066db8ebdcd627e
Parents: 4f508a4
Author: Paul King <paulk@asert.com.au>
Authored: Thu Apr 5 14:01:46 2018 +1000
Committer: Paul King <paulk@asert.com.au>
Committed: Thu Apr 5 14:20:51 2018 +1000

----------------------------------------------------------------------
 build.gradle | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/9061e93d/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 0ea74ed..a194a74 100644
--- a/build.gradle
+++ b/build.gradle
@@ -126,14 +126,6 @@ task(copyTestResources, type: Copy)
         .include('**/*.txt', '**/*.xml', '**/*.properties', '**/*.png', '**/*.html', '**/*.gif',
'**/*.ico', '**/*.css')
 test.dependsOn(copyTestResources)
 
-allprojects {
-    task sourceJar(type: Jar) {
-        classifier = 'sources'
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-        from sourceSets.main.allSource
-    }
-}
-
 repositories {
     // todo Some repos are needed only for some configs. Declare them just for the configuration
once Gradle allows this.
     maven { url 'http://repository.jboss.org/nexus/content/groups/m2-release-proxy' } //
examples, tools
@@ -285,6 +277,11 @@ sourceSets {
             srcDirs = ['src/resources']
         }
     }
+    antlr2 {
+        resources {
+            srcDirs = ['src/main/antlr2']
+        }
+    }
     test {
         groovy {
             srcDirs = ['src/test']
@@ -312,6 +309,21 @@ sourceSets {
     }
 }
 
+task sourceJar(type: Jar) {
+    classifier = 'sources'
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    from sourceSets.main.allSource
+    from sourceSets.antlr2.allSource
+}
+
+subprojects {
+    task sourceJar(type: Jar) {
+        classifier = 'sources'
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        from sourceSets.main.allSource
+    }
+}
+
 apply from: 'subprojects/parser-antlr4/build.gradle'
 
 // make sure examples can be compiled, even if we don't run them


Mime
View raw message