diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-11-27 21:30:47 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-11-27 21:30:47 +0100 |
| commit | a45a9abb6ec66dad873a57196ca8851bfadb5557 (patch) | |
| tree | 63e67f49b61b0854e07c35434c5cc6e2ba6ec9ef | |
| parent | 014f1922fe0a66aa85623a6c61b86be095450bf5 (diff) | |
| parent | fbab978c33d9fadd199eb38a07f0d7b500380307 (diff) | |
| download | scala-a45a9abb6ec66dad873a57196ca8851bfadb5557.tar.gz scala-a45a9abb6ec66dad873a57196ca8851bfadb5557.tar.bz2 scala-a45a9abb6ec66dad873a57196ca8851bfadb5557.zip | |
Merge pull request #4874 from szeiger/wip/upgrade-jarjar
Upgrade JarJar in the ant build
| -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> <!-- =========================================================================== |