diff options
| -rw-r--r-- | common.xml | 4 | ||||
| -rw-r--r-- | core/src/com/google/inject/internal/Nullability.java | 4 | ||||
| -rw-r--r-- | lib/build/jarjar-1.0rc8.jar | bin | 112749 -> 0 bytes | |||
| -rw-r--r-- | lib/build/jarjar-snapshot.jar | bin | 0 -> 113332 bytes |
4 files changed, 5 insertions, 3 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"/> diff --git a/core/src/com/google/inject/internal/Nullability.java b/core/src/com/google/inject/internal/Nullability.java index cd99579d..fe72f007 100644 --- a/core/src/com/google/inject/internal/Nullability.java +++ b/core/src/com/google/inject/internal/Nullability.java @@ -22,7 +22,9 @@ public class Nullability { 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 Binary files differdeleted file mode 100644 index 89390bf3..00000000 --- a/lib/build/jarjar-1.0rc8.jar +++ /dev/null diff --git a/lib/build/jarjar-snapshot.jar b/lib/build/jarjar-snapshot.jar Binary files differnew file mode 100644 index 00000000..9e989418 --- /dev/null +++ b/lib/build/jarjar-snapshot.jar |