aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2015-04-07 01:38:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-07 01:38:27 +0000
commit09b94fbb5d9cc73f0a4bcbf2a019b7f017e0db7a (patch)
treee3e3f351cfe54a022f474a5ab520f2fd4d05f636
parente5ffd50658fa8ded32def4f76ac63e3d65f1dfeb (diff)
parentf9a43730066cafd05fbc11c9fbcea5a2e48d8658 (diff)
downloadsdk-09b94fbb5d9cc73f0a4bcbf2a019b7f017e0db7a.zip
sdk-09b94fbb5d9cc73f0a4bcbf2a019b7f017e0db7a.tar.gz
sdk-09b94fbb5d9cc73f0a4bcbf2a019b7f017e0db7a.tar.bz2
am f9a43730: Merge "Update easymock version to 3.3" into studio-1.3-dev automerge: 1765a16 automerge: eb034a7
* commit 'f9a43730066cafd05fbc11c9fbcea5a2e48d8658': Update easymock version to 3.3
-rw-r--r--eclipse/build.gradle2
1 files changed, 1 insertions, 1 deletions
diff --git a/eclipse/build.gradle b/eclipse/build.gradle
index 17bde4f..c483ce7 100644
--- a/eclipse/build.gradle
+++ b/eclipse/build.gradle
@@ -69,7 +69,7 @@ def artifacts = [
'commons-codec-1.4' : 'commons-codec:commons-codec:1.4',
'commons-compress-1.0' : 'org.apache.commons:commons-compress:1.8.1',
'commons-logging-1.1.1' : 'commons-logging:commons-logging:1.1.1',
- 'easymock' : 'org.easymock:easymock:2.4',
+ 'easymock' : 'org.easymock:easymock:3.3',
'freemarker-2.3.20' : 'org.freemarker:freemarker:2.3.20',
'guava-17.0' : 'com.google.guava:guava:17.0',
'host-libprotobuf-java-2.3.0-lite' : 'com.android.tools.external:libprotobuf-java-lite:2.3.0',