You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by jl...@apache.org on 2012/08/12 11:43:05 UTC

svn commit: r1372074 - in /incubator/easyant/plugins/trunk/compile-groovy: module.ivy src/main/resources/compile-groovy.ant src/test/antunit/compile-groovy-test.xml

Author: jlboudart
Date: Sun Aug 12 11:43:04 2012
New Revision: 1372074

URL: http://svn.apache.org/viewvc?rev=1372074&view=rev
Log:
Use groovy 2.0

Modified:
    incubator/easyant/plugins/trunk/compile-groovy/module.ivy
    incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant
    incubator/easyant/plugins/trunk/compile-groovy/src/test/antunit/compile-groovy-test.xml

Modified: incubator/easyant/plugins/trunk/compile-groovy/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-groovy/module.ivy?rev=1372074&r1=1372073&r2=1372074&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-groovy/module.ivy (original)
+++ incubator/easyant/plugins/trunk/compile-groovy/module.ivy Sun Aug 12 11:43:04 2012
@@ -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"/>

Modified: incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant?rev=1372074&r1=1372073&r2=1372074&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant (original)
+++ incubator/easyant/plugins/trunk/compile-groovy/src/main/resources/compile-groovy.ant Sun Aug 12 11:43:04 2012
@@ -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>

Modified: incubator/easyant/plugins/trunk/compile-groovy/src/test/antunit/compile-groovy-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/compile-groovy/src/test/antunit/compile-groovy-test.xml?rev=1372074&r1=1372073&r2=1372074&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/compile-groovy/src/test/antunit/compile-groovy-test.xml (original)
+++ incubator/easyant/plugins/trunk/compile-groovy/src/test/antunit/compile-groovy-test.xml Sun Aug 12 11:43:04 2012
@@ -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">