Repository: groovy Updated Branches: refs/heads/parrot 8b4cdff35 -> 0e51066af
Bump jarjar to 1.4.1, bump gradle to 3.2.1, refine jarjar rule for antlr4 Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/0e51066a Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/0e51066a Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/0e51066a Branch: refs/heads/parrot Commit: 0e51066afeaae7d8b862a7dccf971c2bdcae0541 Parents: 8b4cdff Author: Daniel Sun <sun...@apache.org> Authored: Mon Nov 28 19:47:30 2016 +0800 Committer: Daniel Sun <sun...@apache.org> Committed: Mon Nov 28 19:47:30 2016 +0800 ---------------------------------------------------------------------- build.gradle | 7 ++++--- gradle/assemble.gradle | 3 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- lib/jarjar-1.4.1.jar | Bin 0 -> 127181 bytes 4 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/0e51066a/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index c33f324..7dad8c8 100644 --- a/build.gradle +++ b/build.gradle @@ -153,10 +153,10 @@ ext { commonsHttpClientVersion = '3.1' eclipseOsgiVersion = '3.9.1-v20140110-1610' gparsVersion = '1.2.1' - gradleVersion = '3.1' + gradleVersion = '3.2.1' ivyVersion = '2.4.0' jansiVersion = '1.13' - jarjarVersion = '1.3' + jarjarVersion = '1.4.1' jlineVersion = '2.14.2' jmockVersion = '1.2.0' logbackVersion = '1.1.7' @@ -208,7 +208,8 @@ dependencies { testCompile "org.slf4j:jcl-over-slf4j:$slf4jVersion" testCompile "com.thoughtworks.qdox:qdox:$qdoxVersion" - tools "com.googlecode.jarjar:jarjar:$jarjarVersion" +// tools "com.googlecode.jarjar:jarjar:$jarjarVersion" + tools files("lib/jarjar-${jarjarVersion}.jar") tools "org.jboss.bridger:bridger:$bridgerVersion" tools("net.sourceforge.cobertura:cobertura:$coberturaVersion") { http://git-wip-us.apache.org/repos/asf/groovy/blob/0e51066a/gradle/assemble.gradle ---------------------------------------------------------------------- diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle index 84af440..aa35cc9 100644 --- a/gradle/assemble.gradle +++ b/gradle/assemble.gradle @@ -193,7 +193,8 @@ allprojects { zipfileset(src: configurations.runtime.files.find { file -> file.name.startsWith('asm-util') }, includes: 'org/objectweb/asm/util/Printer.class,org/objectweb/asm/util/Textifier.class,org/objectweb/asm/util/Trace*') } - rule pattern: 'antlr.**', result: 'groovyjarjarantlr.@1' + rule pattern: 'antlr.**', result: 'groovyjarjarantlr.@1' // antlr2 + rule pattern: 'org.antlr.**', result: 'groovyjarjarantlr4.@1' // antlr4 rule pattern: 'org.objectweb.**', result: 'groovyjarjarasm.@1' rule pattern: 'org.apache.commons.cli.**', result: 'groovyjarjarcommonscli.@1' } http://git-wip-us.apache.org/repos/asf/groovy/blob/0e51066a/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5e7d5bc..143c4f7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip http://git-wip-us.apache.org/repos/asf/groovy/blob/0e51066a/lib/jarjar-1.4.1.jar ---------------------------------------------------------------------- diff --git a/lib/jarjar-1.4.1.jar b/lib/jarjar-1.4.1.jar new file mode 100644 index 0000000..b85742a Binary files /dev/null and b/lib/jarjar-1.4.1.jar differ
