aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2015-04-07 01:20:54 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-04-07 01:20:54 +0000
commitf9a43730066cafd05fbc11c9fbcea5a2e48d8658 (patch)
treee3e3f351cfe54a022f474a5ab520f2fd4d05f636
parente6aac48c7da09c20abcafba8ab003848aa8448bc (diff)
parenteb034a75e79556e0fe8b25453b422b2901a3b853 (diff)
downloadsdk-f9a43730066cafd05fbc11c9fbcea5a2e48d8658.zip
sdk-f9a43730066cafd05fbc11c9fbcea5a2e48d8658.tar.gz
sdk-f9a43730066cafd05fbc11c9fbcea5a2e48d8658.tar.bz2
Merge "Update easymock version to 3.3" into studio-1.3-dev automerge: 1765a16
automerge: eb034a7 * commit 'eb034a75e79556e0fe8b25453b422b2901a3b853': 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',