Revert "Fixes mockito#2007 : Downgrade objenesis version for mockito-…

…android (mockito#2024)"

This reverts commit 626d457.

build.gradle

@@ -84,7 +84,7 @@ dependencies {
     compile libraries.bytebuddy, libraries.bytebuddyagent
 
     compileOnly libraries.junit4, libraries.hamcrest, libraries.opentest4j
-    compile libraries.objenesis3
+    compile libraries.objenesis
 
     testCompile libraries.asm
 

gradle/dependencies.gradle

@@ -26,9 +26,7 @@ libraries.errorproneTestApi = "com.google.errorprone:error_prone_test_helpers:${
 
 libraries.autoservice = "com.google.auto.service:auto-service:1.0-rc7"
 
-// objenesis 3.x fails on android instrumentation test compile. https://github.com/mockito/mockito/issues/2007
-libraries.objenesis2 = 'org.objenesis:objenesis:2.6'
-libraries.objenesis3 = 'org.objenesis:objenesis:3.1'
+libraries.objenesis = 'org.objenesis:objenesis:3.1'
 
 libraries.asm = 'org.ow2.asm:asm:7.0'
 

subprojects/android/android.gradle

@@ -3,29 +3,8 @@ description = "Mockito for Android"
 apply from: "$rootDir/gradle/java-library.gradle"
 
 dependencies {
-    compile(project.rootProject) {
-        exclude group: 'org.objenesis', module: 'objenesis'
-    }
+    compile project.rootProject
     compile libraries.bytebuddyandroid
-    compile(libraries.objenesis2) {
-        version {
-            strictly '2.6'
-        }
-        because(
-            '\n' +
-                'MOCKITO DEPENDENCY PROBLEM:\n' +
-                '\n' +
-                'Mockito core uses Objenesis 3.x and Objenesis 3.x does not work with android api 25 and below.\n' +
-                'If you have mockito-core dependency with mockito-android, remove mockito-core.\n' +
-                'If you have mockito-kotlin, exclude mockito-core.\n' +
-                'implementation("com.nhaarman.mockitokotlin2:mockito-kotlin") {\n' +
-                '    exclude group: "org.mockito", module: "mockito-core"\n' +
-                '}\n' +
-                'For more information please check; \n' +
-                '    https://github.com/mockito/mockito/pull/2024\n' +
-                '    https://github.com/mockito/mockito/pull/2007\n'
-        )
-    }
 }
 
 tasks.javadoc.enabled = false

subprojects/osgi-test/osgi-test.gradle

@@ -23,7 +23,7 @@ configurations {
 dependencies {
     testRuntimeBundles project.rootProject
     testRuntimeBundles libraries.bytebuddy
-    testRuntimeBundles libraries.objenesis3
+    testRuntimeBundles libraries.objenesis
     testRuntimeBundles tasks.testBundle.outputs.files
     testRuntimeBundles tasks.otherBundle.outputs.files
 }