diff -Nru gradle-1.2/gradle/dependencies.gradle gradle-1.2-gil/gradle/dependencies.gradle
--- gradle-1.2/gradle/dependencies.gradle 2012-09-12 12:46:12.000000000 +0200
+++ gradle-1.2-gil/gradle/dependencies.gradle 2012-09-22 11:38:02.533046051 +0200
@@ -82,7 +82,12 @@
dom4j: 'dom4j:dom4j:1.6.1@jar',
guava: 'com.google.guava:guava:11.0.2@jar',
jsr305: 'com.google.code.findbugs:jsr305:1.3.9',
- groovy: 'org.codehaus.groovy:groovy-all:1.8.6@jar',
+ groovy: [
+ 'org.codehaus.groovy:groovy:1.8.6@jar',
+ 'asm:asm-all:3.3.1@jar',
+ 'antlr:antlr:2.7.7@jar',
+ 'commons-cli:commons-cli:1.2@jar'
+ ],
jaxen: 'jaxen:jaxen:1.1@jar',
jcip: "net.jcip:jcip-annotations:1.0",
jna: 'net.java.dev.jna:jna:3.2.7@jar',
diff -Nru gradle-1.2/subprojects/core/src/main/groovy/org/gradle/api/internal/DefaultClassPathProvider.java gradle-1.2-gil/subprojects/core/src/main/groovy/org/gradle/api/internal/DefaultClassPathProvider.java
--- gradle-1.2/subprojects/core/src/main/groovy/org/gradle/api/internal/DefaultClassPathProvider.java 2012-08-28 00:02:32.000000000 +0200
+++ gradle-1.2-gil/subprojects/core/src/main/groovy/org/gradle/api/internal/DefaultClassPathProvider.java 2012-09-22 11:39:52.631006796 +0200
@@ -47,8 +47,16 @@
classpath = classpath.plus(moduleRegistry.getExternalModule("ant-launcher").getClasspath());
return classpath;
}
- if (name.equals("GROOVY")) {
- return moduleRegistry.getExternalModule("groovy-all").getClasspath();
+ if (name.equals("GROOVY") || name.equals("LOCAL_GROOVY")) {
+ ClassPath classpath = new DefaultClassPath();
+ classpath = classpath.plus(moduleRegistry.getExternalModule("groovy-all").getClasspath());
+
+ if (name.equals("LOCAL_GROOVY"))
+ classpath = classpath.plus(moduleRegistry.getExternalModule("antlr").getClasspath());
+
+ classpath = classpath.plus(moduleRegistry.getExternalModule("asm-all").getClasspath());
+ classpath = classpath.plus(moduleRegistry.getExternalModule("commons-cli").getClasspath());
+ return classpath;
}
return null;
diff -Nru gradle-1.2/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderRegistry.java gradle-1.2-gil/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderRegistry.java
--- gradle-1.2/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderRegistry.java 2012-08-28 00:02:32.000000000 +0200
+++ gradle-1.2-gil/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderRegistry.java 2012-09-22 11:40:40.452383898 +0200
@@ -55,7 +55,7 @@
rootClassLoader.allowPackage("org.apache.tools.ant");
rootClassLoader.allowPackage("groovy");
rootClassLoader.allowPackage("org.codehaus.groovy");
- rootClassLoader.allowPackage("groovyjarjarantlr");
+ rootClassLoader.allowPackage("antlr");
rootClassLoader.allowPackage("org.apache.ivy");
rootClassLoader.allowPackage("org.slf4j");
rootClassLoader.allowPackage("org.apache.commons.logging");