Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C032D200CDC for ; Sat, 22 Jul 2017 12:48:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BE989168802; Sat, 22 Jul 2017 10:48:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0F4FB1687FC for ; Sat, 22 Jul 2017 12:48:05 +0200 (CEST) Received: (qmail 82481 invoked by uid 500); 22 Jul 2017 10:48:05 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 82472 invoked by uid 99); 22 Jul 2017 10:48:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Jul 2017 10:48:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 89A08DFB94; Sat, 22 Jul 2017 10:48:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sunlan@apache.org To: commits@groovy.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: groovy git commit: Rename configuration antlr to antlr2 Date: Sat, 22 Jul 2017 10:48:04 +0000 (UTC) archived-at: Sat, 22 Jul 2017 10:48:06 -0000 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 Authored: Sat Jul 22 18:38:52 2017 +0800 Committer: sunlan 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 } }