From 95834aa94729b7dc97177a4873da47edaf06d9b2 Mon Sep 17 00:00:00 2001 From: Chao Zhang Date: Wed, 4 Dec 2019 16:55:43 -0800 Subject: [PATCH] Update mockito to 2.28.2 We have encountered exceptions when initializing the mocker maker plugin when using mockito-inline in tandem with dexmaker-mockito-inline at 2.25.0. This pull request bumped to the latest mockito2 version to pick up the update of bytebuddy. Exception https://gist.github.com/chao2zhang/ee1160612491376daf63fd5a60e1757d --- CHANGELOG.md | 1 + dexmaker-mockito-inline-extended-tests/build.gradle | 2 +- dexmaker-mockito-inline-extended/build.gradle | 2 +- dexmaker-mockito-inline-tests/build.gradle | 2 +- dexmaker-mockito-inline/build.gradle | 2 +- dexmaker-mockito-tests/build.gradle | 2 +- dexmaker-mockito/build.gradle | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd2bfcff..6b1ca5c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Version 2.25.2-SNAPSHOT - Support generating locals that reference generated class types - [#151](https://github.com/linkedin/dexmaker/pull/151) +- Update Mockito to 2.28.2 - [#153](https://github.com/linkedin/dexmaker/pull/153) ## Version 2.25.1 (2019-11-21) - Add support for abstract and native methods generation - [#144](https://github.com/linkedin/dexmaker/pull/144) diff --git a/dexmaker-mockito-inline-extended-tests/build.gradle b/dexmaker-mockito-inline-extended-tests/build.gradle index e930123d..7950bd00 100644 --- a/dexmaker-mockito-inline-extended-tests/build.gradle +++ b/dexmaker-mockito-inline-extended-tests/build.gradle @@ -50,5 +50,5 @@ dependencies { implementation 'androidx.test:runner:1.1.1' implementation 'androidx.test:rules:1.1.1' - api 'org.mockito:mockito-core:2.25.0', { exclude group: 'net.bytebuddy' } + api 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' } } diff --git a/dexmaker-mockito-inline-extended/build.gradle b/dexmaker-mockito-inline-extended/build.gradle index 45a0e70a..bf063d5c 100644 --- a/dexmaker-mockito-inline-extended/build.gradle +++ b/dexmaker-mockito-inline-extended/build.gradle @@ -126,5 +126,5 @@ repositories { dependencies { implementation project(':dexmaker-mockito-inline') - implementation 'org.mockito:mockito-core:2.25.0', { exclude group: 'net.bytebuddy' } + implementation 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' } } diff --git a/dexmaker-mockito-inline-tests/build.gradle b/dexmaker-mockito-inline-tests/build.gradle index b5d3a683..1e32e618 100644 --- a/dexmaker-mockito-inline-tests/build.gradle +++ b/dexmaker-mockito-inline-tests/build.gradle @@ -50,5 +50,5 @@ dependencies { implementation 'junit:junit:4.12' implementation 'androidx.test:runner:1.1.1' - api 'org.mockito:mockito-core:2.25.0', { exclude group: 'net.bytebuddy' } + api 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' } } diff --git a/dexmaker-mockito-inline/build.gradle b/dexmaker-mockito-inline/build.gradle index 436b4efd..5c18e30a 100644 --- a/dexmaker-mockito-inline/build.gradle +++ b/dexmaker-mockito-inline/build.gradle @@ -120,6 +120,6 @@ repositories { dependencies { implementation project(':dexmaker') - implementation 'org.mockito:mockito-core:2.25.0', { exclude group: 'net.bytebuddy' } + implementation 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' } } diff --git a/dexmaker-mockito-tests/build.gradle b/dexmaker-mockito-tests/build.gradle index fece14e0..2c9aa82b 100644 --- a/dexmaker-mockito-tests/build.gradle +++ b/dexmaker-mockito-tests/build.gradle @@ -42,5 +42,5 @@ dependencies { implementation 'androidx.test:runner:1.1.1' implementation 'junit:junit:4.12' - api 'org.mockito:mockito-core:2.25.0', { exclude group: 'net.bytebuddy' } + api 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' } } diff --git a/dexmaker-mockito/build.gradle b/dexmaker-mockito/build.gradle index b15b30c2..b8c28c84 100644 --- a/dexmaker-mockito/build.gradle +++ b/dexmaker-mockito/build.gradle @@ -26,5 +26,5 @@ repositories { dependencies { implementation project(':dexmaker') - implementation 'org.mockito:mockito-core:2.25.0', { exclude group: 'net.bytebuddy' } + implementation 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' } }