From cb7ffbb2592a217f71ba985c8da9b48db3da7d52 Mon Sep 17 00:00:00 2001
From: Sinan Kozak <sinan.kozak@scout24.com>
Date: Wed, 26 Aug 2020 19:08:13 +0300
Subject: [PATCH] Fixes #2007 : Downgrade objenesis version for mockito-android

---
 build.gradle                           | 2 +-
 gradle/dependencies.gradle             | 4 +++-
 subprojects/android/android.gradle     | 1 +
 subprojects/osgi-test/osgi-test.gradle | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 217f71d4b2..e30ddb1a5a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -88,7 +88,7 @@ dependencies {
     compile libraries.bytebuddy, libraries.bytebuddyagent
 
     compileOnly libraries.junit4, libraries.hamcrest, libraries.opentest4j
-    compile libraries.objenesis
+    compile libraries.objenesis3
 
     testCompile libraries.asm
 
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 9ae3679927..f907965b08 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -25,7 +25,9 @@ libraries.errorproneTestApi = "com.google.errorprone:error_prone_test_helpers:${
 
 libraries.autoservice = "com.google.auto.service:auto-service:1.0-rc5"
 
-libraries.objenesis = 'org.objenesis:objenesis:3.1'
+// 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.asm = 'org.ow2.asm:asm:7.0'
 
diff --git a/subprojects/android/android.gradle b/subprojects/android/android.gradle
index 8f86eabb98..ec7b6b6333 100644
--- a/subprojects/android/android.gradle
+++ b/subprojects/android/android.gradle
@@ -5,6 +5,7 @@ apply from: "$rootDir/gradle/java-library.gradle"
 dependencies {
     compile project.rootProject
     compile libraries.bytebuddyandroid
+    compile libraries.objenesis2
 }
 
 tasks.javadoc.enabled = false
diff --git a/subprojects/osgi-test/osgi-test.gradle b/subprojects/osgi-test/osgi-test.gradle
index 8ebcc042f3..ad5964c543 100644
--- a/subprojects/osgi-test/osgi-test.gradle
+++ b/subprojects/osgi-test/osgi-test.gradle
@@ -23,7 +23,7 @@ configurations {
 dependencies {
     testRuntimeBundles project.rootProject
     testRuntimeBundles libraries.bytebuddy
-    testRuntimeBundles libraries.objenesis
+    testRuntimeBundles libraries.objenesis3
     testRuntimeBundles tasks.testBundle.outputs.files
     testRuntimeBundles tasks.otherBundle.outputs.files
 }