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/04/05 04:02:13 UTC
groovy git commit: GROOVY-8515: groovy.g no longer included in
sources jars
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 3155090a6 -> 59d547dc7
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/59d547dc
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/59d547dc
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/59d547dc
Branch: refs/heads/GROOVY_2_6_X
Commit: 59d547dc73a411f96b36955af54ec035c32dcc5e
Parents: 3155090
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:02:07 2018 +1000
----------------------------------------------------------------------
build.gradle | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/59d547dc/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 4320f67..8fb8022 100644
--- a/build.gradle
+++ b/build.gradle
@@ -125,14 +125,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
@@ -286,6 +278,11 @@ sourceSets {
srcDirs = ['src/resources']
}
}
+ antlr2 {
+ resources {
+ srcDirs = ['src/main/antlr2']
+ }
+ }
test {
groovy {
srcDirs = ['src/test']
@@ -313,6 +310,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