From c861b506a3533bcea1455eed30418da6dca47014 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 3 Apr 2018 04:16:38 -0700
Subject: [PATCH] OkHttp extension - Improved configuration

- Upgrade to latest version
- Use api dependency, since application code that uses the
  extension more has to use OkHttp directly to make an
  OkHttpClient instance
- Add proguard configuration

Issue #4059

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=191422594
---
 extensions/okhttp/build.gradle       | 3 ++-
 extensions/okhttp/proguard-rules.txt | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 extensions/okhttp/proguard-rules.txt

diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index 2da245b1a5a..2f7d84d33bd 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -21,6 +21,7 @@ android {
     defaultConfig {
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
+        consumerProguardFiles 'proguard-rules.txt'
     }
 
     lintOptions {
@@ -32,7 +33,7 @@ android {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
-    implementation('com.squareup.okhttp3:okhttp:3.9.0') {
+    api('com.squareup.okhttp3:okhttp:3.10.0') {
         exclude group: 'org.json'
     }
 }
diff --git a/extensions/okhttp/proguard-rules.txt b/extensions/okhttp/proguard-rules.txt
new file mode 100644
index 00000000000..50d774a5093
--- /dev/null
+++ b/extensions/okhttp/proguard-rules.txt
@@ -0,0 +1,8 @@
+# Proguard rules specific to the OkHttp extension.
+
+# Options specified by https://github.com/square/okhttp/blob/master/README.md
+-dontwarn okhttp3.**
+-dontwarn okio.**
+-dontwarn javax.annotation.**
+-dontwarn org.conscrypt.**
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase