Merge pull request square#1031 from square/jw/okhttp-two-five-final

OKHttp 2.5.0 release version.
huwei5318 · Aug 26, 2015 · 93bd511 · 93bd511
2 parents 4a4fbdf + eac69ff
commit 93bd511
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,7 @@
     <!-- Dependencies -->
     <android.version>4.1.1.4</android.version>
     <android.platform>16</android.platform>
-    <okhttp.version>2.5.0-SNAPSHOT</okhttp.version>
+    <okhttp.version>2.5.0</okhttp.version>
     <animal.sniffer.version>1.14</animal.sniffer.version>
 
     <!-- Adapter Dependencies -->

diff --git a/retrofit/src/main/java/retrofit/Platform.java b/retrofit/src/main/java/retrofit/Platform.java
@@ -18,11 +18,9 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import com.squareup.okhttp.OkHttpClient;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;
 import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
 import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
 
 class Platform {
@@ -55,14 +53,6 @@ CallAdapter.Factory defaultCallAdapterFactory(Executor callbackExecutor) {
     return DefaultCallAdapter.FACTORY;
   }
 
-  OkHttpClient defaultClient() {
-    OkHttpClient client = new OkHttpClient();
-    client.setConnectTimeout(15, TimeUnit.SECONDS);
-    client.setReadTimeout(15, TimeUnit.SECONDS);
-    client.setWriteTimeout(15, TimeUnit.SECONDS);
-    return client;
-  }
-
   boolean isDefaultMethod(Method method) {
     return false;
   }

diff --git a/retrofit/src/main/java/retrofit/Retrofit.java b/retrofit/src/main/java/retrofit/Retrofit.java
@@ -256,7 +256,7 @@ public Retrofit build() {
 
       OkHttpClient client = this.client;
       if (client == null) {
-        client = Platform.get().defaultClient();
+        client = new OkHttpClient();
       }
 
       // Make a defensive copy of the adapters and add the default Call adapter.