Use groovy 2.0
git-svn-id: https://svn.apache.org/repos/asf/incubator/easyant/plugins/trunk@1372074 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/compile-groovy/module.ivy b/compile-groovy/module.ivy
index 4d342dd..e78fff8 100644
--- a/compile-groovy/module.ivy
+++ b/compile-groovy/module.ivy
@@ -18,6 +18,7 @@
<info organisation="org.apache.easyant.plugins" module="compile-groovy" revision="0.9">
<description>This module provides groovy compilation feature.</description>
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+<ea:plugin module="antunit" revision="0.9"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
diff --git a/compile-groovy/src/main/resources/compile-groovy.ant b/compile-groovy/src/main/resources/compile-groovy.ant
index 90fc149..4c4d658 100644
--- a/compile-groovy/src/main/resources/compile-groovy.ant
+++ b/compile-groovy/src/main/resources/compile-groovy.ant
@@ -27,6 +27,7 @@
<ea:parameter property="compile.groovy.includes.pattern" default="**/*.groovy" description="Pattern describing files included in compilation process" />
<ea:parameter property="compile.groovy.excludes.pattern" default="" description="Pattern describing files excluded in compilation process" />
+ <ea:parameter property="compile.groovy.indy" default="false" description="Enable compilation with the invoke dynamic support when using Groovy 2.0 and beyond and running on JDK 7"/>
<available file="${src.main.groovy}" property="has.src.main.groovy" />
@@ -36,7 +37,7 @@
<ea:parameter property="project.ivy.instance" default="project.ivy.instance"
description="the ivy instance name for your project" />
- <ea:findclasspath pathid="resolved.groovy.classpath" organisation="org.codehaus.groovy" module="groovy-all" revision="1.6.0">
+ <ea:findclasspath pathid="resolved.groovy.classpath" organisation="org.codehaus.groovy" module="groovy-all" revision="2.0.0">
<ea:project-dependency-strategy />
<ea:environment-strategy env="GROOVY_HOME"/>
<ea:basic-configuration-strategy />
@@ -78,7 +79,7 @@
-->
<groovyc srcdir="${src.main.groovy}" destdir="${target.main.classes}"
classpathref="compile.main.classpath"
- includeantruntime="no"
+ indy="${compile.groovy.indy}"
includes="${compile.groovy.includes.pattern}"
excludes="${compile.groovy.excludes.pattern}" />
</target>
diff --git a/compile-groovy/src/test/antunit/compile-groovy-test.xml b/compile-groovy/src/test/antunit/compile-groovy-test.xml
index 577310b..10abc9b 100644
--- a/compile-groovy/src/test/antunit/compile-groovy-test.xml
+++ b/compile-groovy/src/test/antunit/compile-groovy-test.xml
@@ -48,6 +48,7 @@
<au:assertPropertyEquals name="compile.groovy.includes.pattern" value="**/*.groovy"/>
<au:assertPropertyEquals name="compile.groovy.excludes.pattern" value=""/>
<au:assertPropertyEquals name="has.src.main.groovy" value="true"/>
+ <au:assertPropertyEquals name="compile.groovy.indy" value="false"/>
</target>
<target name="test-compile-groovy:configure" depends="-compile-groovy:configure">
