You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2017/12/08 00:43:11 UTC
groovy git commit: GROOVY-8407: antlr4 jar file has not been
repackaged into groovy-all-2.6.0-XXX-indy.jar
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 8ee71b384 -> 6546b0b34
GROOVY-8407: antlr4 jar file has not been repackaged into groovy-all-2.6.0-XXX-indy.jar
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/6546b0b3
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/6546b0b3
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/6546b0b3
Branch: refs/heads/GROOVY_2_6_X
Commit: 6546b0b346b62cdf4545c09b640d96f88812f9e4
Parents: 8ee71b3
Author: sunlan <su...@apache.org>
Authored: Fri Dec 8 08:43:00 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Fri Dec 8 08:43:00 2017 +0800
----------------------------------------------------------------------
gradle/assemble.gradle | 8 ++------
subprojects/parser-antlr4/build.gradle | 7 ++++---
2 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/6546b0b3/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 2e97b38..1b3a3f4 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -140,9 +140,7 @@ jar {
into('licenses')
include('asm-license.txt')
include('antlr2-license.txt')
- if (rootProject.hasProperty('useAntlr4')) {
- include('antlr4-license.txt')
- }
+ include('antlr4-license.txt')
}
from("$projectDir/notices/NOTICE-JARJAR")
from('src/resources/META-INF/groovy-release-info.properties') {
@@ -562,9 +560,7 @@ ext.distSpec = copySpec {
into('licenses') {
from 'licenses'
include 'antlr2-license.txt'
- if (rootProject.hasProperty('useAntlr4')) {
- include('antlr4-license.txt')
- }
+ include 'antlr4-license.txt'
include 'asm-license.txt'
include 'hamcrest-license.txt'
include 'jline2-license.txt'
http://git-wip-us.apache.org/repos/asf/groovy/blob/6546b0b3/subprojects/parser-antlr4/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/build.gradle b/subprojects/parser-antlr4/build.gradle
index 371e53a..903eedb 100644
--- a/subprojects/parser-antlr4/build.gradle
+++ b/subprojects/parser-antlr4/build.gradle
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-if (!rootProject.hasProperty('useAntlr4')) return
apply plugin: 'antlr'
sourceSets {
@@ -68,11 +67,13 @@ dependencies {
sourceSets.main.java.srcDirs += file("$srcMain/java");
sourceSets.main.groovy.srcDirs += file("$srcMain/groovy");
sourceSets.main.resources.srcDirs += file("$srcMain/resources");
+
+if (!rootProject.hasProperty('useAntlr4')) return
+
sourceSets.test.java.srcDirs += file("$srcTest/java");
sourceSets.test.groovy.srcDirs += file("$srcTest/groovy");
sourceSets.test.resources.srcDirs += file("$srcTest/resources");
-
allprojects {
tasks.withType(GroovyCompile) {
groovyOptions.forkOptions.jvmArgs += ["-Dgroovy.antlr4=true"]
@@ -81,4 +82,4 @@ allprojects {
test {
jvmArgs "-Dgroovy.attach.groovydoc=true", "-Dgroovy.antlr4.cache.threshold=100"
-}
\ No newline at end of file
+}