Replace Jetbrains NotNull + Nullable with JSR 305

4 files changed, 7 insertions, 7 deletions

diff --git a/robolectric-sandbox/build.gradle b/robolectric-sandbox/build.gradle
index 1476a2fa1..44684f179 100644
--- a/robolectric-sandbox/build.gradle
+++ b/robolectric-sandbox/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     compile "org.ow2.asm:asm:5.0.1"
     compile "org.ow2.asm:asm-commons:5.0.1"
     compile "com.google.guava:guava:20.0"
-    compileOnly "com.intellij:annotations:12.0"
+    compileOnly "com.google.code.findbugs:jsr305:3.0.1"
 
     testCompile "junit:junit:4.12"
     testCompile "org.assertj:assertj-core:2.6.0"
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptor.java b/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptor.java
index 2125c255c..8727f9415 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptor.java
+++ b/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptor.java
@@ -1,6 +1,6 @@
 package org.robolectric.internal.bytecode;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import org.robolectric.util.Function;
 import org.robolectric.util.ReflectionHelpers;
 
@@ -22,7 +22,7 @@ public abstract class Interceptor {
 
   abstract public MethodHandle getMethodHandle(String methodName, MethodType type) throws NoSuchMethodException, IllegalAccessException;
 
-  @NotNull
+  @Nonnull
   protected static Function<Object, Object> returnDefaultValue(final MethodSignature methodSignature) {
     return new Function<Object, Object>() {
       @Override
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxClassLoader.java b/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxClassLoader.java
index ac847a072..8b1904208 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxClassLoader.java
+++ b/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxClassLoader.java
@@ -1,6 +1,6 @@
 package org.robolectric.internal.bytecode;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.FieldVisitor;
@@ -369,7 +369,7 @@ public class SandboxClassLoader extends URLClassLoader implements Opcodes {
       doSpecialHandling();
     }
 
-    @NotNull
+    @Nonnull
     private Set<String> instrumentMethods() {
       Set<String> foundMethods = new HashSet<>();
       List<MethodNode> methods = new ArrayList<>(classNode.methods);
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java b/robolectric-sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java
index 3448a0a48..1d9ec5038 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java
+++ b/robolectric-sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java
@@ -1,6 +1,6 @@
 package org.robolectric;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -590,7 +590,7 @@ public class SandboxClassLoaderTest {
     return m.invoke(shadow.directlyOn(instance, (Class<Object>) theClass));
   }
 
-  @NotNull
+  @Nonnull
   private InstrumentationConfiguration.Builder configureBuilder() {
     InstrumentationConfiguration.Builder builder = InstrumentationConfiguration.newBuilder();
     builder.doNotAcquirePackage("java.")