summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorStefan Zeiger <szeiger@novocode.com>2015-11-27 17:19:34 +0100
committerStefan Zeiger <szeiger@novocode.com>2015-11-27 17:19:34 +0100
commitfbab978c33d9fadd199eb38a07f0d7b500380307 (patch)
treefdc0a17f908a31882c2687668a80872d4ec03ed9 /build.xml
parent2ef93ad2fe29766fbe09a3e921ad361b25abdeaf (diff)
downloadscala-fbab978c33d9fadd199eb38a07f0d7b500380307.tar.gz
scala-fbab978c33d9fadd199eb38a07f0d7b500380307.tar.bz2
scala-fbab978c33d9fadd199eb38a07f0d7b500380307.zip
Upgrade JarJar in the ant build
This switches the JarJar dependency over to the Pantsbuild fork, which supports Java 8 bytecode and is already used by the sbt build. Shading of the embedded JLine is currently broken in 2.12 with the old version (the shaded classes are not created).
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index 3a1ef358ac..d5b88fabb5 100644
--- a/build.xml
+++ b/build.xml
@@ -270,7 +270,7 @@ TODO:
</artifact:dependencies>
<artifact:dependencies pathId="jarjar.classpath">
- <dependency groupId="com.googlecode.jarjar" artifactId="jarjar" version="1.3"/>
+ <dependency groupId="org.pantsbuild" artifactId="jarjar" version="1.6.0"/>
</artifact:dependencies>
<!-- JUnit -->
@@ -999,7 +999,7 @@ TODO:
</patternset>
<taskdef resource="scala/tools/ant/sabbus/antlib.xml" classpathref="starr.compiler.path"/>
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="jarjar.classpath" />
+ <taskdef name="jarjar" classname="org.pantsbuild.jarjar.JarJarTask" classpathref="jarjar.classpath" />
</target>
<!-- ===========================================================================