Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_5_X 421fd69ea -> 70d821132


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/70d82113
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/70d82113
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/70d82113

Branch: refs/heads/GROOVY_2_5_X
Commit: 70d8211327a4589fb6ec3167abd513bc85b1d126
Parents: 421fd69
Author: Paul King <pa...@asert.com.au>
Authored: Thu Apr 5 14:01:46 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu Apr 5 14:19:58 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/groovy/blob/70d82113/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index a584458..13358d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,14 +122,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
@@ -287,6 +279,11 @@ sourceSets {
                     'groovy/grape/*.xml'
         }
     }
+    antlr {
+        resources {
+            srcDirs = ['src/main/antlr2']
+        }
+    }
     test {
         groovy {
             srcDirs = ['src/test']
@@ -314,6 +311,21 @@ sourceSets {
     }
 }
 
+task sourceJar(type: Jar) {
+    classifier = 'sources'
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    from sourceSets.main.allSource
+    from sourceSets.antlr.allSource
+}
+
+subprojects {
+    task sourceJar(type: Jar) {
+        classifier = 'sources'
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        from sourceSets.main.allSource
+    }
+}
+
 // make sure examples can be compiled, even if we don't run them
 // todo: reorganize examples so that we can run them too
 check {

Reply via email to