Skip to content

Commit

Permalink
Update OkHttp to 3.4.0 and Okio to 1.9.0
Browse files Browse the repository at this point in the history
Summary:
- 3.3.1 wasn't compatible with Robolectric 3.0, however 3.4.0 [fixes](square/okhttp#2533 (comment)) this issue.
- Few other fixes to OkHttp mentioned in the [CHANGELOG.md](https://github.com/square/okhttp/blob/master/CHANGELOG.md)

> Fixes: #7743
>
- Android apps can recover from a `REFUSED_STREAM` in HTTP/2.
- A few other fixes mentioned in the [CHANGELOG.md](https://github.com/square/okhttp/blob/master/CHANGELOG.md)

- CircleCi
- Test with `/Examples` ✅
Closes facebook/react-native#8672

Reviewed By: alsutton

Differential Revision: D3541293

Pulled By: bestander

fbshipit-source-id: 76429861b4f4df15cb9c18ab0f177daee3e1459d
  • Loading branch information
AndrewJack authored and seraj-ahmad committed Oct 26, 2016
1 parent 696fd7b commit 2a2c0b9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions ReactAndroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,10 @@ dependencies {
compile 'com.facebook.soloader:soloader:0.1.0'
compile 'com.fasterxml.jackson.core:jackson-core:2.2.3'
compile 'com.google.code.findbugs:jsr305:3.0.0'
compile 'com.squareup.okhttp3:okhttp:3.2.0'
compile 'com.squareup.okhttp3:okhttp-urlconnection:3.2.0'
compile 'com.squareup.okhttp3:okhttp-ws:3.2.0'
compile 'com.squareup.okio:okio:1.8.0'
compile 'com.squareup.okhttp3:okhttp:3.4.1'
compile 'com.squareup.okhttp3:okhttp-urlconnection:3.4.1'
compile 'com.squareup.okhttp3:okhttp-ws:3.4.1'
compile 'com.squareup.okio:okio:1.9.0'
compile 'org.webkit:android-jsc:r174650'

testCompile "junit:junit:${JUNIT_VERSION}"
Expand Down
12 changes: 6 additions & 6 deletions ReactAndroid/src/main/third-party/java/okhttp/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ prebuilt_jar(

remote_file(
name = 'okhttp3-binary-jar',
url = 'mvn:com.squareup.okhttp3:okhttp:jar:3.2.0',
sha1 = 'f7873a2ebde246a45c2a8d6f3247108b4c88a879'
url = 'mvn:com.squareup.okhttp3:okhttp:jar:3.4.1',
sha1 = 'c7c4f9e35c2fd5900da24f9872e3971801f08ce0'
)

prebuilt_jar(
Expand All @@ -18,8 +18,8 @@ prebuilt_jar(

remote_file(
name = 'okhttp3-urlconnection-binary-jar',
url = 'mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:3.2.0',
sha1 = '6f8a4b1435c9e0a6f9c5fe4a1be46627b848fd0c'
url = 'mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:3.4.1',
sha1 = '63994437f62bc861bc20c605d12962f7246116d1'
)

prebuilt_jar(
Expand All @@ -30,6 +30,6 @@ prebuilt_jar(

remote_file(
name = 'okhttp3-ws-binary-jar',
url = 'mvn:com.squareup.okhttp3:okhttp-ws:jar:3.2.0',
sha1 = '1ea229d6984444c8c58b8e97ba4c8429d9d135b3',
url = 'mvn:com.squareup.okhttp3:okhttp-ws:jar:3.4.1',
sha1 = '8ace66ef7002d98f633377c9e67daeeb196d8c3b',
)
4 changes: 2 additions & 2 deletions ReactAndroid/src/main/third-party/java/okio/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ prebuilt_jar(

remote_file(
name = 'okio-binary-jar',
url = 'mvn:com.squareup.okio:okio:jar:1.8.0',
sha1 = '05ea7af56cc7c567ed9856d99efb30740e9b17ff',
url = 'mvn:com.squareup.okio:okio:jar:1.9.0',
sha1 = 'f824591a0016efbaeddb8300bee54832a1398cfa',
)

0 comments on commit 2a2c0b9

Please sign in to comment.