From 69912495f9e28cfc2e71bfc0ee754a0085723466 Mon Sep 17 00:00:00 2001
From: Dulmandakh <dulmandakh@gmail.com>
Date: Wed, 8 Aug 2018 13:58:06 -0700
Subject: [PATCH] Bump imagepipeline-okhttp3 to 1.10.0 (#20580)

Summary:
This is a small missing piece from https://github.com/facebook/react-native/commit/b6f2aad9c0119d11e52978ff3fa9c6f269f04a14 and will complete fresco version bump.
Pull Request resolved: https://github.com/facebook/react-native/pull/20580

Differential Revision: D9228658

Pulled By: hramos

fbshipit-source-id: 9cf1509a590cedfe4c3358006cfb62533058e946
---
 ReactAndroid/build.gradle                                 | 8 ++++----
 ReactAndroid/gradle.properties                            | 3 +++
 .../third-party/android/support/v7/appcompat-orig/BUCK    | 3 ++-
 ReactAndroid/src/test/java/com/facebook/react/views/BUCK  | 1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index b05e615139..c98c5fb639 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -297,12 +297,12 @@ dependencies {
     compile 'javax.inject:javax.inject:1'
     compile 'com.android.support:appcompat-v7:26.1.0'
     compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0'
-    compile 'com.facebook.fresco:fresco:1.10.0'
-    compile 'com.facebook.fresco:imagepipeline-okhttp3:1.9.0'
+    compile "com.facebook.fresco:fresco:${FRESCO_VERSION}"
+    compile "com.facebook.fresco:imagepipeline-okhttp3:${FRESCO_VERSION}"
     compile 'com.facebook.soloader:soloader:0.5.1'
     compile 'com.google.code.findbugs:jsr305:3.0.2'
-    compile 'com.squareup.okhttp3:okhttp:3.10.0'
-    compile 'com.squareup.okhttp3:okhttp-urlconnection:3.10.0'
+    compile "com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}"
+    compile "com.squareup.okhttp3:okhttp-urlconnection:${OKHTTP_VERSION}"
     compile 'com.squareup.okio:okio:1.14.0'
     compile 'org.webkit:android-jsc:r174650'
 
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index ad7d105604..35b82ce516 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -10,3 +10,6 @@ POWERMOCK_VERSION=1.6.2
 ROBOLECTRIC_VERSION=3.0
 JUNIT_VERSION=4.12
 FEST_ASSERT_CORE_VERSION=2.0M10
+
+FRESCO_VERSION=1.10.0
+OKHTTP_VERSION=3.10.0
diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK
index 1dda81db73..386e71b135 100644
--- a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK
+++ b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_android_resource", "rn_prebuilt_jar")
+load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_android_resource", "react_native_dep", "rn_prebuilt_jar")
 
 # This is a bit messy and hopefully a temporary thing
 # The problem is that Gradle extracts appcompat resources into app namespace, com.facebook.react
@@ -19,6 +19,7 @@ rn_android_library(
     ],
     exported_deps = [
         ":classes-for-react-native",
+        react_native_dep("third-party/android/support-annotations:android-support-annotations"),
     ],
 )
 
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/BUCK b/ReactAndroid/src/test/java/com/facebook/react/views/BUCK
index c50da6f542..bb9559a90b 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/BUCK
@@ -14,6 +14,7 @@ rn_robolectric_test(
         react_native_dep("libraries/fresco/fresco-react-native:fresco-react-native"),
         react_native_dep("libraries/fresco/fresco-react-native:imagepipeline"),
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/fest:fest"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_dep("third-party/java/junit:junit"),