Skip to content

Commit

Permalink
Update mockito to 2.28.2
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Chao Zhang authored and drewhannay committed Dec 5, 2019
1 parent 38802ef commit 4d0ce55
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion dexmaker-mockito-inline-extended-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
}
2 changes: 1 addition & 1 deletion dexmaker-mockito-inline-extended/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
}
2 changes: 1 addition & 1 deletion dexmaker-mockito-inline-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
}
2 changes: 1 addition & 1 deletion dexmaker-mockito-inline/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
}

2 changes: 1 addition & 1 deletion dexmaker-mockito-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
}
2 changes: 1 addition & 1 deletion dexmaker-mockito/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
}

0 comments on commit 4d0ce55

Please sign in to comment.