diff options
| author | sberlin <sberlin@d779f126-a31b-0410-b53b-1d3aecad763e> | 2010-10-27 02:40:07 +0000 |
|---|---|---|
| committer | sberlin <sberlin@d779f126-a31b-0410-b53b-1d3aecad763e> | 2010-10-27 02:40:07 +0000 |
| commit | 982f83e9d87049ccfcc2775c4b446c6a6f22d22d (patch) | |
| tree | 829b6c4412e318b027cc199e1bf8a961ef54bdef /common.xml | |
| parent | 6f0aee697724288e42823393d700ea770fd69da5 (diff) | |
| download | guice-982f83e9d87049ccfcc2775c4b446c6a6f22d22d.tar.gz | |
fix Nullability to check for "$Nullable" (the jarjar renamed "Nullable"), and fix jarjar to build using asm-3.3 (it was using 3.1, and using 3.3 fixes http://code.google.com/p/jarjar/issues/detail?id=21, where annotations on methods that are remapped are loss)
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1324 d779f126-a31b-0410-b53b-1d3aecad763e
Diffstat (limited to 'common.xml')
| -rw-r--r-- | common.xml | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -118,7 +118,7 @@ <mkdir dir="${build.dir}/dist"/> <dirname property="common.basedir" file="${ant.file.common}"/> <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" - classpath="${common.basedir}/lib/build/jarjar-1.0rc8.jar"/> + classpath="${common.basedir}/lib/build/jarjar-snapshot.jar"/> <jarjar jarfile="${build.dir}/${ant.project.name}-${version}-tests.jar"> <fileset dir="${build.dir}/test"/> <rule pattern="com.google.inject.internal.util.*" result="com.google.inject.internal.util.$@1"/> @@ -133,7 +133,7 @@ <mkdir dir="${build.dir}/dist"/> <dirname property="common.basedir" file="${ant.file.common}"/> <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" - classpath="${common.basedir}/lib/build/jarjar-1.0rc8.jar"/> + classpath="${common.basedir}/lib/build/jarjar-snapshot.jar"/> <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar"> <fileset dir="${build.dir}/classes"/> <zipfileset src="${common.basedir}/lib/build/cglib-2.2.1-snapshot.jar"/> |