diff options
| author | Ian Parkinson <ianp@google.com> | 2013-02-04 15:23:01 +0000 |
|---|---|---|
| committer | Ian Parkinson <ianp@google.com> | 2013-02-04 15:23:01 +0000 |
| commit | 426aeec61d978869bdddba8403385afe0a697653 (patch) | |
| tree | 5708f03a570c13645cd5b1244f0e64dd9ef2d677 | |
| parent | 2e11684466c45e43f1814e5867ba60364bae5a3e (diff) | |
| download | mockito-426aeec61d978869bdddba8403385afe0a697653.tar.gz | |
Update Mockito source to commit 8b2afedf3f
The only change since the previous commit of Mockito source is to remove the
unused import which required a manual change in our copy. This change ends up
effectively just removing the description of that manual change.
Change-Id: I5420d4972f84f18557e1668a9036f28ea581a8f1
| -rw-r--r-- | CHANGES.android | 4 | ||||
| -rwxr-xr-x | update_source.sh | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/CHANGES.android b/CHANGES.android deleted file mode 100644 index 302f6c6..0000000 --- a/CHANGES.android +++ /dev/null @@ -1,4 +0,0 @@ -One manual change is required after running update_source.sh: - -In src/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java, remove -the unused import org.mockito.internal.creation.jmock.ClassImposterizer. diff --git a/update_source.sh b/update_source.sh index bfe31f2..f64bf87 100755 --- a/update_source.sh +++ b/update_source.sh @@ -4,8 +4,6 @@ # # Retrieves the current Mockito source code into the current direcory, exlcuding portions related # to constructing Mock objects in the JVM. -# -# See also CHANGES.android for required manual changes to the Mockito source code. SOURCE="git://github.com/mockito/mockito.git" INCLUDE=" |