diff options
| author | Stefan Zeiger <szeiger@novocode.com> | 2015-11-27 17:19:34 +0100 |
|---|---|---|
| committer | Stefan Zeiger <szeiger@novocode.com> | 2015-11-27 17:19:34 +0100 |
| commit | fbab978c33d9fadd199eb38a07f0d7b500380307 (patch) | |
| tree | fdc0a17f908a31882c2687668a80872d4ec03ed9 | |
| parent | 2ef93ad2fe29766fbe09a3e921ad361b25abdeaf (diff) | |
| download | scala-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).
| -rw-r--r-- | build.xml | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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> <!-- =========================================================================== |