Merge changes from topic "mockito-dexmaker-update-revert" am: eb0ac321a9 am: c48aee2265 am: 9c4802c87b

am: 9bd3ae4dfe

Change-Id: If046e1a2c8dd761b158d6275edc9358400f7469a

6 files changed, 18 insertions, 17 deletions

diff --git a/README.md b/README.md
index a2e0b8a..bbb58ba 100644
--- a/README.md
+++ b/README.md
@@ -107,19 +107,18 @@ public final class HelloWorldMaker {
 Use it in your app
 ------------------
 
-Maven users can get dexmaker from Sonatype's central repository. The Mockito dependency is optional.
+For Mockito support, download the latest .jar via Maven:
+```xml
+    <dependency>
+      <groupId>com.linkedin.dexmaker</groupId>
+      <artifactId>dexmaker-mockito</artifactId>
+      <version>2.25.0</version>
+      <type>pom</type>
+    </dependency>
+```
 
 ```
-  <dependency>
-    <groupId>com.google.dexmaker</groupId>
-    <artifactId>dexmaker</artifactId>
-    <version>1.2</version>
-  </dependency>
-  <dependency>
-    <groupId>com.google.dexmaker</groupId>
-    <artifactId>dexmaker-mockito</artifactId>
-    <version>1.2</version>
-  </dependency>
+    androidTestCompile 'com.linkedin.dexmaker:dexmaker-mockito:2.25.0'
 ```
 
 Download [dexmaker-1.2.jar](http://search.maven.org/remotecontent?filepath=com/google/dexmaker/dexmaker/1.2/dexmaker-1.2.jar)
diff --git a/README.version b/README.version
index 61b27e5..d51834c 100644
--- a/README.version
+++ b/README.version
@@ -1,5 +1,5 @@
 URL: https://github.com/linkedin/dexmaker/
-Version: master (c58ffebcbb2564c7d1fa6fb58b48f351c330296d)
+Version: master (8ff85edb2793cc1e0f6a93c67b127cb9c43d924e)
 License: Apache 2.0
 Description:
 Dexmaker is a Java-language API for doing compile time or runtime code generation targeting the Dalvik VM. Unlike cglib or ASM, this library creates Dalvik .dex files instead of Java .class files.
@@ -13,4 +13,6 @@ Local Modifications:
         Allow to share classloader via dexmaker.share_classloader system property (I324cddd644610eef811c620a1fccf6a24b2b9406)
         Do not read Build.VERSION to allow non-standard Android distributions (Ia8c4ba4c82cd6f193c565f1bfe48faffc4aac08f)
         Temporarily ignore failing test (Ibf7b6c2eb05c5ff83f0817f9224369e20c0b775d)
+        Restrict InspectClass to current thread. (Ic62951ff81bed60ac7512455fad65210e4b728a9, need upstreaming)
         Exclude Stress#mockALot from presubmit (Ic9a2927ffa07924bd759429e31c56dc1b71a826c)
+        Update to Mockito 2.25.0 and impl InlineMockMaker (29a8674036d345e4ec8635b1d38d8b2a4fe91980a, need upstreaming)
diff --git a/dexmaker-mockito-inline-extended-tests/build.gradle b/dexmaker-mockito-inline-extended-tests/build.gradle
index e930123..b5664f2 100644
--- a/dexmaker-mockito-inline-extended-tests/build.gradle
+++ b/dexmaker-mockito-inline-extended-tests/build.gradle
@@ -47,8 +47,8 @@ dependencies {
     androidTestImplementation project(':dexmaker-mockito-inline-extended')
 
     implementation 'junit:junit:4.12'
-    implementation 'androidx.test:runner:1.1.1'
-    implementation 'androidx.test:rules:1.1.1'
+    implementation 'com.android.support.test:runner:1.0.2'
+    implementation 'com.android.support.test:rules:1.0.2'
 
     api 'org.mockito:mockito-core:2.25.0', { exclude group: 'net.bytebuddy' }
 }
diff --git a/dexmaker-mockito-inline-tests/build.gradle b/dexmaker-mockito-inline-tests/build.gradle
index b5d3a68..02d0751 100644
--- a/dexmaker-mockito-inline-tests/build.gradle
+++ b/dexmaker-mockito-inline-tests/build.gradle
@@ -49,6 +49,6 @@ dependencies {
     androidTestImplementation project(':dexmaker-mockito-inline')
 
     implementation 'junit:junit:4.12'
-    implementation 'androidx.test:runner:1.1.1'
+    implementation 'com.android.support.test:runner:1.0.2'
     api 'org.mockito:mockito-core:2.25.0', { exclude group: 'net.bytebuddy' }
 }
diff --git a/dexmaker-mockito-tests/build.gradle b/dexmaker-mockito-tests/build.gradle
index fece14e..9379d17 100644
--- a/dexmaker-mockito-tests/build.gradle
+++ b/dexmaker-mockito-tests/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     compileOnly project(':dexmaker-mockito')
     androidTestImplementation project(':dexmaker-mockito')
 
-    implementation 'androidx.test:runner:1.1.1'
+    implementation 'com.android.support.test:runner:0.5'
     implementation 'junit:junit:4.12'
     api 'org.mockito:mockito-core:2.25.0', { exclude group: 'net.bytebuddy' }
 }
diff --git a/dexmaker-tests/build.gradle b/dexmaker-tests/build.gradle
index 7b2552c..5ae5f2d 100644
--- a/dexmaker-tests/build.gradle
+++ b/dexmaker-tests/build.gradle
@@ -36,6 +36,6 @@ dependencies {
     implementation project(":dexmaker")
 
     //noinspection GradleDependency
-    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'com.android.support.test:runner:0.5'
     androidTestImplementation 'junit:junit:4.12'
 }