From 783d1254b1698492fd8ae7e04a20115d1283ba60 Mon Sep 17 00:00:00 2001 From: Hans Boehm Date: Thu, 15 Sep 2022 01:00:33 +0000 Subject: Revert "Update to upstream dexmaker" Revert "Update CTS tests" Revert "Enforce files loaded in DexFile to be read-only" Revert "Enforce files loaded in DexFile to be read-only" Revert submission 2086507-ro_java_dcl Reason for revert: Causes ART host tests to fail. Reverted Changes: I736ccfb6d:Update CTS tests Ie081df900:Update to upstream dexmaker Id635fbc79:Enforce files loaded in DexFile to be read-only I700af94d4:Enforce files loaded in DexFile to be read-only Change-Id: I459aeb8ec63836200dd68596a5adbb5c4d9a56b5 --- dexmaker-mockito-tests/build.gradle | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'dexmaker-mockito-tests/build.gradle') diff --git a/dexmaker-mockito-tests/build.gradle b/dexmaker-mockito-tests/build.gradle index 918f277..9379d17 100644 --- a/dexmaker-mockito-tests/build.gradle +++ b/dexmaker-mockito-tests/build.gradle @@ -1,7 +1,19 @@ +buildscript { + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.13" + } +} + +apply plugin: "net.ltgt.errorprone" apply plugin: 'com.android.library' android { - compileSdkVersion 32 + compileSdkVersion 28 android { lintOptions { @@ -11,18 +23,24 @@ android { } defaultConfig { - minSdkVersion 14 - targetSdkVersion 32 + minSdkVersion 8 + targetSdkVersion 28 + versionName VERSION_NAME testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } } +repositories { + jcenter() + google() +} + dependencies { compileOnly project(':dexmaker-mockito') androidTestImplementation project(':dexmaker-mockito') - implementation 'androidx.test:runner:1.4.0' - implementation 'junit:junit:4.13.2' - api 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' } + 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' } } -- cgit v1.2.3