diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 698399035..efeb36aeb 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -254,6 +254,10 @@ android { lintOptions { abortOnError false } + packagingOptions { + exclude 'META-INF/NOTICE' + exclude 'META-INF/LICENSE' + } } dependencies { @@ -280,6 +284,7 @@ dependencies { testCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" androidTestCompile 'com.android.support.test:runner:0.3' + androidTestCompile "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}" } apply from: 'release.gradle' diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java index 8591cfeaa..286da50a9 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java @@ -35,7 +35,7 @@ import com.facebook.react.modules.core.Timing; import com.facebook.soloader.SoLoader; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; /** * Use this class for writing integration tests of catalyst. This class will run all JNI call