diff options
| author | Jacob Logsdon <jlogs@google.com> | 2022-08-08 18:38:58 -0700 |
|---|---|---|
| committer | Jacob Logsdon <jlogs@google.com> | 2022-08-10 00:46:02 +0000 |
| commit | 2dd2136888b7da1112473fef4106da56b0d51565 (patch) | |
| tree | 846a5dabf35daa642977005114cc316d55bae7f2 | |
| parent | 5da7487dca53d3fa25b41351de93d77a375a6610 (diff) | |
| download | data-binding-2dd2136888b7da1112473fef4106da56b0d51565.tar.gz | |
update Mockito to 3.12.4 for jdk17 upgrade
Removing dexmaker which uses old versions of mockito not compatible with newer java runtimes, as it doesn't appear used anymore.
Change-Id: I1424479e4e00babfd0c2a092ba6363cf29737060
| -rw-r--r-- | compilationTests/BUILD.bazel | 2 | ||||
| -rw-r--r-- | integration-tests-support/TestApp/app/build.gradle | 4 | ||||
| -rw-r--r-- | integration-tests/TestApp/app/build.gradle | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/compilationTests/BUILD.bazel b/compilationTests/BUILD.bazel index 39358c85..f7c6c741 100644 --- a/compilationTests/BUILD.bazel +++ b/compilationTests/BUILD.bazel @@ -139,6 +139,6 @@ maven_repository( "@maven//:org.jetbrains.kotlin.kotlin-stdlib-jdk7_1.4.32", "@maven//:org.jetbrains.kotlin.kotlin-stdlib-jdk8_1.4.31", "@maven//:org.jetbrains.kotlin.kotlin-stdlib-jdk8_1.5.21", - "@maven//:org.mockito.mockito-core_3.0.0", + "@maven//:org.mockito.mockito-core_3.12.4", ], ) diff --git a/integration-tests-support/TestApp/app/build.gradle b/integration-tests-support/TestApp/app/build.gradle index 1522a484..c410b2b5 100644 --- a/integration-tests-support/TestApp/app/build.gradle +++ b/integration-tests-support/TestApp/app/build.gradle @@ -45,9 +45,7 @@ dependencies { exclude module: 'support-annotations' } testImplementation 'junit:junit:4.12' - androidTestImplementation "org.mockito:mockito-core:3.0.0" - androidTestImplementation "com.google.dexmaker:dexmaker:1.2" - androidTestImplementation "com.google.dexmaker:dexmaker-mockito:1.2" + androidTestImplementation "org.mockito:mockito-core:3.12.4" } gradle.projectsEvaluated { diff --git a/integration-tests/TestApp/app/build.gradle b/integration-tests/TestApp/app/build.gradle index 440be3a8..3171b4d3 100644 --- a/integration-tests/TestApp/app/build.gradle +++ b/integration-tests/TestApp/app/build.gradle @@ -47,9 +47,7 @@ dependencies { exclude module: 'support-annotations' } testImplementation 'junit:junit:4.12' - androidTestImplementation "org.mockito:mockito-core:3.0.0" - androidTestImplementation "com.linkedin.dexmaker:dexmaker:2.19.0" - androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:2.19.0" + androidTestImplementation "org.mockito:mockito-core:3.12.4" } gradle.projectsEvaluated { |