Use OkHttp 3 as the sole shipping Downloader.

srkns · Jan 4, 2017 · 6f7f14d · 6f7f14d
1 parent dd6e496
commit 6f7f14d
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 609 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -5,14 +5,13 @@ ext {
   targetSdkVersion = 25
   sourceCompatibilityVersion = JavaVersion.VERSION_1_7
   targetCompatibilityVersion = JavaVersion.VERSION_1_7
-  okhttp3Version = '3.0.1'
+  okhttpVersion = '3.0.1'
   supportLibrariesVersion = '25.1.0'
 
   dep = [
       androidPlugin      : 'com.android.tools.build:gradle:2.1.3',
-      okhttp             : 'com.squareup.okhttp:okhttp:2.7.1',
-      okhttp3            : "com.squareup.okhttp3:okhttp:$okhttp3Version",
-      mockWebServer      : "com.squareup.okhttp3:mockwebserver:$okhttp3Version",
+      okhttp             : "com.squareup.okhttp3:okhttp:$okhttpVersion",
+      mockWebServer      : "com.squareup.okhttp3:mockwebserver:$okhttpVersion",
       pollexor           : 'com.squareup:pollexor:2.0.4',
       supportV4          : "com.android.support:support-v4:$supportLibrariesVersion",
       supportAnnotations : "com.android.support:support-annotations:$supportLibrariesVersion",

diff --git a/picasso-pollexor/build.gradle b/picasso-pollexor/build.gradle
@@ -18,6 +18,7 @@ android {
   lintOptions {
     textOutput 'stdout'
     textReport true
+    lintConfig file('lint.xml')
   }
 
   dexOptions {

diff --git a/picasso-pollexor/lint.xml b/picasso-pollexor/lint.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+  <issue id="InvalidPackage" severity="error">
+    <ignore regexp="okio-.*jar"/>
+  </issue>
+</lint>
diff --git a/picasso-sample/build.gradle b/picasso-sample/build.gradle
@@ -7,7 +7,6 @@ buildscript {
 apply plugin: 'com.android.application'
 
 dependencies {
-  compile dep.okhttp
   compile dep.supportV4
   compile dep.supportAnnotations
   compile project(':picasso')

diff --git a/picasso/build.gradle b/picasso/build.gradle
@@ -18,6 +18,7 @@ android {
   lintOptions {
     textOutput 'stdout'
     textReport true
+    lintConfig file('lint.xml')
   }
 
   dexOptions {
@@ -32,8 +33,7 @@ android {
 }
 
 dependencies {
-  provided dep.okhttp
-  provided dep.okhttp3
+  compile dep.okhttp
   compile dep.supportAnnotations
   testCompile dep.junit
   testCompile dep.fest

diff --git a/picasso/lint.xml b/picasso/lint.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+  <issue id="InvalidPackage" severity="error">
+    <ignore regexp="okio-.*jar"/>
+  </issue>
+</lint>
diff --git a/picasso/src/main/java/com/squareup/picasso/OkHttpDownloader.java b/picasso/src/main/java/com/squareup/picasso/OkHttpDownloader.java
diff --git a/picasso/src/main/java/com/squareup/picasso/Picasso.java b/picasso/src/main/java/com/squareup/picasso/Picasso.java
@@ -874,7 +874,7 @@ public Picasso build() {
       Context context = this.context;
 
       if (downloader == null) {
-        downloader = Utils.createDefaultDownloader(context);
+        downloader = new OkHttp3Downloader(context);
       }
       if (cache == null) {
         cache = new LruCache(context);

diff --git a/picasso/src/main/java/com/squareup/picasso/UrlConnectionDownloader.java b/picasso/src/main/java/com/squareup/picasso/UrlConnectionDownloader.java