diff options
| author | Tobias Thierer <tobiast@google.com> | 2016-06-24 19:04:17 +0100 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2016-06-29 16:23:09 +0100 |
| commit | 6c251e20f00c7574b217bd4351ac81666f574380 (patch) | |
| tree | 2d66a76721f4c8170b990742922675f32ad38122 /pom.xml | |
| parent | 68e16131f12f0174c4c9e5785f6e63297cd02adf (diff) | |
| download | okhttp-6c251e20f00c7574b217bd4351ac81666f574380.tar.gz | |
Update OkHttp to 2.7.5 and advance okio by one commit.
This brings OkHttp and okio exactly in line with upstream commits
with no local changes.
Corresponding upstream commits:
okhttp:6e236ce3b80f21369dc544f0e1053ff71be8689b (= parent-2.7.5)
okio: 02481cc0cc84bc92e3eab6d5212a226496f56a7e
The okio commit differs from the one in the previous pull from
Sep 2015 (AOSP commit 71b9f47b26fb57ac3e436a19519c6e3ec70e86eb)
only by a single upstream commit, the switch to 8 KiB segments.
That commit was previously cherry-picked in AOSP. This CL will
temporarily revert the AOSP changes to okio, but those
AOSP changes to okio will be reapplied in the subsequent CL.
Compilation and tests do not pass after this CL, they will only
pass at the end of the chain of 11 CLs going in at the same time.
9 of these 11 CLs are in external/okhttp, the others affect
libcore and frameworks/base.
Details of behavioural changes introduced by this upgrade are at:
https://docs.google.com/document/d/19PF3Exd_q32gAGCiRFWRf0Pq_xrIWs-cRViHkFTxJg8/edit
This CL includes files that are not used in Android, such as
- top level dot files (.travis.yml etc.)
- subdirectories okurl, okhttp-apache, samples, which aren't used
- tests in okhttp-hpacktests, okhttp-ws-tests that aren't run
or test functionality that we aren't used
Test: I've run the following tests *at the end* of the chain of
commits, in cts-tradefed:
1.) run cts -p android.core.tests.libcore.package.harmony_java_net
2.) run cts -c libcore.java.net.URLConnectionTest
3.) run cts -p android.core.tests.libcore.package.okhttp
4.) run cts -p android.core.tests.libcore.package.libcore
1.-3.) all passed
4.) had 24 unrelated failures per b/29496407 and b/29744850
Change-Id: Id798d6cf49fa4a7a4ab8ae3b699a38104bf42db3
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -11,7 +11,7 @@ <groupId>com.squareup.okhttp</groupId> <artifactId>parent</artifactId> - <version>2.6.0-SNAPSHOT</version> + <version>2.7.5</version> <packaging>pom</packaging> <name>OkHttp (Parent)</name> @@ -31,6 +31,8 @@ <module>okhttp-ws</module> <module>okhttp-ws-tests</module> + <module>okhttp-logging-interceptor</module> + <module>okcurl</module> <module>mockwebserver</module> <module>samples</module> @@ -52,6 +54,7 @@ <apache.http.version>4.2.2</apache.http.version> <airlift.version>0.6</airlift.version> <guava.version>16.0</guava.version> + <android.version>4.1.1.4</android.version> <!-- Test Dependencies --> <junit.version>4.11</junit.version> @@ -61,7 +64,7 @@ <url>https://github.com/square/okhttp/</url> <connection>scm:git:https://github.com/square/okhttp.git</connection> <developerConnection>scm:git:git@github.com:square/okhttp.git</developerConnection> - <tag>HEAD</tag> + <tag>parent-2.7.5</tag> </scm> <issueManagement> @@ -113,6 +116,11 @@ <artifactId>guava</artifactId> <version>${guava.version}</version> </dependency> + <dependency> + <groupId>com.google.android</groupId> + <artifactId>android</artifactId> + <version>${android.version}</version> + </dependency> </dependencies> </dependencyManagement> |