From c47f7457c0d8e8d6ccbd410d43d0dbda78edbe85 Mon Sep 17 00:00:00 2001
From: Andrew Jack <me@andrewjack.uk>
Date: Wed, 20 Jul 2016 06:43:07 -0700
Subject: [PATCH] Update OkHttp to 3.4.0 and Okio to 1.9.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
- 3.3.1 wasn't compatible with Robolectric 3.0, however 3.4.0 [fixes](https://github.com/square/okhttp/issues/2533#issuecomment-230198063) 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 https://github.com/facebook/react-native/pull/8672

Reviewed By: alsutton

Differential Revision: D3541293

Pulled By: bestander

fbshipit-source-id: 76429861b4f4df15cb9c18ab0f177daee3e1459d
---
 ReactAndroid/build.gradle                          |  8 ++++----
 ReactAndroid/src/main/third-party/java/okhttp/BUCK | 12 ++++++------
 ReactAndroid/src/main/third-party/java/okio/BUCK   |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index 7a142cefe04..52dd2258899 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -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}"
diff --git a/ReactAndroid/src/main/third-party/java/okhttp/BUCK b/ReactAndroid/src/main/third-party/java/okhttp/BUCK
index 07d870bdbbe..a6d9925259e 100644
--- a/ReactAndroid/src/main/third-party/java/okhttp/BUCK
+++ b/ReactAndroid/src/main/third-party/java/okhttp/BUCK
@@ -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(
@@ -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(
@@ -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',
 )
diff --git a/ReactAndroid/src/main/third-party/java/okio/BUCK b/ReactAndroid/src/main/third-party/java/okio/BUCK
index 3f3339840c4..900a79732a3 100644
--- a/ReactAndroid/src/main/third-party/java/okio/BUCK
+++ b/ReactAndroid/src/main/third-party/java/okio/BUCK
@@ -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',
 )