summaryrefslogtreecommitdiff
path: root/src/main/java/org/mockito/Incubating.java
AgeCommit message (Collapse)Author
2017-12-13Update mockito to 2.12.0Philip P. Moltmann
Change-Id: I96a0d42128ceba1c7c5e096e3d982721a474a40c Fixes: 69848252 Test: m -j checkbuild
2017-03-07Restructure files to match upstream mockitoPaul Duffin
Makes the file structure match upstream mockito so that it is simpler to update in future. Moving the files as a separate step to upgrading makes it easier for git to track renames and simplifies future diffs and reviews. Bug: 32912773 Test: make checkbuild Change-Id: I884ba2cc2856fd19d31bdb658fa058c47d078982