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
diff --git a/common.xml b/common.xml
index a9f50e5..1f284ba 100644
--- a/common.xml
+++ b/common.xml
@@ -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"/>
diff --git a/core/src/com/google/inject/internal/Nullability.java b/core/src/com/google/inject/internal/Nullability.java
index cd99579..fe72f00 100644
--- a/core/src/com/google/inject/internal/Nullability.java
+++ b/core/src/com/google/inject/internal/Nullability.java
@@ -22,7 +22,9 @@
public static boolean allowsNull(Annotation[] annotations) {
for(Annotation a : annotations) {
- if ("Nullable".equals(a.annotationType().getSimpleName())) {
+ String name = a.annotationType().getSimpleName();
+ // Check for $Nullable also because jarjar renames it.
+ if ("Nullable".equals(name) || "$Nullable".equals(name)) {
return true;
}
}
diff --git a/lib/build/jarjar-1.0rc8.jar b/lib/build/jarjar-1.0rc8.jar
deleted file mode 100644
index 89390bf..0000000
--- a/lib/build/jarjar-1.0rc8.jar
+++ /dev/null
Binary files differ
diff --git a/lib/build/jarjar-snapshot.jar b/lib/build/jarjar-snapshot.jar
new file mode 100644
index 0000000..9e98941
--- /dev/null
+++ b/lib/build/jarjar-snapshot.jar
Binary files differ
