groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sun...@apache.org
Subject groovy git commit: Rename configuration antlr to antlr2
Date Sat, 22 Jul 2017 10:48:04 GMT
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X 30f09b2f5 -> 608c0525f


Rename configuration antlr to antlr2

(cherry picked from commit e49f69a)


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

Branch: refs/heads/GROOVY_2_6_X
Commit: 608c0525f56f223d6c2ee85e803a333bfbfd5aa7
Parents: 30f09b2
Author: sunlan <sunlan@apache.org>
Authored: Sat Jul 22 18:38:52 2017 +0800
Committer: sunlan <sunlan@apache.org>
Committed: Sat Jul 22 18:47:30 2017 +0800

----------------------------------------------------------------------
 build.gradle | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/608c0525/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 6ccaa98..0314d72 100644
--- a/build.gradle
+++ b/build.gradle
@@ -150,7 +150,7 @@ configurations {
     tools
     examplesCompile.extendsFrom compile
     examplesRuntime.extendsFrom examplesCompile
-    antlr
+    antlr2
     spec
 }
 
@@ -254,7 +254,7 @@ dependencies {
 
 // TODO use antlr plugin
 //    antlr "antlr:antlr:$antlrVersion"
-    antlr "org.apache.ant:ant-antlr:$antVersion"
+    antlr2 "org.apache.ant:ant-antlr:$antVersion"
 
     testCompile project(':groovy-ant')
     testCompile project(':groovy-test')
@@ -355,7 +355,7 @@ tasks.withType(Jar) {
 }
 
 task ensureGrammars {
-    description = 'Ensure all the Antlr generated files are up to date.'
+    description = 'Ensure all the Antlr2 generated files are up to date.'
     ext.antlrDirectory = "$projectDir/src/main/org/codehaus/groovy/antlr"
     ext.groovyParserDirectory = "$ext.antlrDirectory/parser"
     ext.javaParserDirectory = "$ext.antlrDirectory/java"
@@ -369,15 +369,15 @@ task ensureGrammars {
         new File(groovyOutDir).mkdirs()
         new File(javaOutDir).mkdirs()
         ant {
-            taskdef(name: 'antlr',
+            taskdef(name: 'antlr2',
                     classname: 'org.apache.tools.ant.taskdefs.optional.ANTLR',
-                    classpath: configurations.antlr.asPath)
+                    classpath: configurations.antlr2.asPath)
 
             mkdir dir: ext.groovyParserDirectory
-            antlr(target: "$ext.antlrDirectory/groovy.g", outputdirectory: ext.groovyOutDir)
{
+            antlr2(target: "$ext.antlrDirectory/groovy.g", outputdirectory: ext.groovyOutDir)
{
                 classpath path: configurations.compile.asPath
             }
-            antlr(target: "$ext.javaParserDirectory/java.g", outputdirectory: ext.javaOutDir)
{
+            antlr2(target: "$ext.javaParserDirectory/java.g", outputdirectory: ext.javaOutDir)
{
                 classpath path: configurations.compile.asPath
             }
         }


Mime
View raw message