aboutsummaryrefslogtreecommitdiffstats
path: root/okhttp-apache
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2014-02-19 09:40:26 +0000
committerNeil Fuller <nfuller@google.com>2014-03-07 14:59:36 +0000
commit3c938a3f6b61ce5e2dba0d039b03fe73b89fd26c (patch)
tree7c68df7eeaf20ea8565378e1d15253c6baa84590 /okhttp-apache
parent8db86568225323a9651646efec0c9271ec82cbf0 (diff)
downloadplatform_external_okhttp-3c938a3f6b61ce5e2dba0d039b03fe73b89fd26c.tar.gz
platform_external_okhttp-3c938a3f6b61ce5e2dba0d039b03fe73b89fd26c.tar.bz2
platform_external_okhttp-3c938a3f6b61ce5e2dba0d039b03fe73b89fd26c.zip
Update okhttp to a more recent commit.
Updating to upstream commit : 7b106923e078ac2435e8c8ce9d615f9903106ed8 / 7th Mar 2014 / main branch. The following changes were made to Android-only code: 1) HttpsHandler has been changed to deal with the fix for: https://github.com/square/okhttp/issues/184 (commit 5d7fdba). 2) Platform.java changed to accomodate changes in okhttp Platform method signatures. 3) .mk file updates to reflect src directory changes. The following changes were made to OkHttp code: 1) Removal of org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement annotation from okio/src/main/java/okio/DeflaterSink.java Change-Id: I644a883482ac7ee7d029785f110a2ca00762419b
Diffstat (limited to 'okhttp-apache')
-rw-r--r--okhttp-apache/pom.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/okhttp-apache/pom.xml b/okhttp-apache/pom.xml
index f8fa6a4..14eb349 100644
--- a/okhttp-apache/pom.xml
+++ b/okhttp-apache/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.squareup.okhttp</groupId>
<artifactId>parent</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>okhttp-apache</artifactId>