Merge "Revert "Update to upstream dexmaker"" am: 6f5561ba7b am: d30351c99c am: 79aba3b995 am: 7213f34055

Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2216810

Change-Id: I2651a6e6817c811080dbee496f9beefc972cb7bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 17 insertions, 13 deletions

diff --git a/dexmaker-mockito/build.gradle b/dexmaker-mockito/build.gradle
index c3095ad..b15b30c 100644
--- a/dexmaker-mockito/build.gradle
+++ b/dexmaker-mockito/build.gradle
@@ -1,26 +1,30 @@
-plugins {
-    id("net.ltgt.errorprone") version "1.3.0"
+buildscript {
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.13"
+    }
 }
 
-description = "Implementation of the Mockito API for use on the Android Dalvik VM"
-
-apply plugin: 'java-library'
+apply plugin: "net.ltgt.errorprone"
+apply plugin: 'java'
 apply from: "$rootDir/gradle/publishing.gradle"
 
+version = VERSION_NAME
+description = "Implementation of the Mockito API for use on the Android Dalvik VM"
+
 targetCompatibility = '1.7'
 sourceCompatibility = '1.7'
 
-tasks.withType(JavaCompile) {
-    options.errorprone {
-        disable("StringSplitter")
-    }
+repositories {
+    jcenter()
 }
 
 dependencies {
-    errorprone "com.google.errorprone:error_prone_core:2.5.1"
-    errorproneJavac "com.google.errorprone:javac:9+181-r4173-1"
-
     implementation project(':dexmaker')
 
-    api 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' }
+    implementation 'org.mockito:mockito-core:2.25.0', { exclude group: 'net.bytebuddy' }
 }