Merge pull request #139 from Haoxiqiang/feature/loopj1.4.9

1.replace apache by cz.msebera.android.httpclient

Author: longbai

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

library/build.gradle

@@ -32,13 +32,13 @@ android {
 }
 
 dependencies {
-    compile 'com.loopj.android:android-async-http:1.4.+'
+    compile 'com.loopj.android:android-async-http:1.4.9'
     compile 'com.qiniu:happy-dns:0.2.+'
 //    compile 'com.android.support:appcompat-v7:21.0.3'
     compile fileTree(include: ['*.jar'], dir: 'libs')
 }
 
-task releaseJar(type:Jar, dependsOn: 'build') {
+task releaseJar(type: Jar, dependsOn: 'build') {
     //指定生成的jar名
     baseName 'qiniu-android-sdk-' + version
     //从哪里打包class文件
@@ -48,15 +48,15 @@ task releaseJar(type:Jar, dependsOn: 'build') {
     //去掉不需要打包的目录和文件
     exclude('test/', 'BuildConfig.class', 'R.class')
     //去掉R$开头的文件
-    exclude{ it.name.startsWith('R$');}
+    exclude { it.name.startsWith('R$'); }
 }
 
 android.libraryVariants.all { variant ->
     def name = variant.buildType.name
     def task = project.tasks.create "jar${name.capitalize()}", Jar
     task.dependsOn variant.javaCompile
     task.from variant.javaCompile.destinationDir
-    task.exclude '**/R.*',  '**/R$*.*', '**/BuildConfig.class'
+    task.exclude '**/R.*', '**/R$*.*', '**/BuildConfig.class'
     artifacts.add('archives', task);
 }
 

library/src/androidTest/java/com/qiniu/android/HttpTest.java

@@ -10,13 +10,14 @@
 
 import junit.framework.Assert;
 
-import org.apache.http.Header;
-import org.apache.http.message.BasicHeader;
 import org.json.JSONObject;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import cz.msebera.android.httpclient.Header;
+import cz.msebera.android.httpclient.message.BasicHeader;
+
 /**
  * Created by bailong on 14/10/12.
  */

library/src/main/java/com/qiniu/android/http/AsyncHttpClientMod.java

@@ -3,9 +3,9 @@
 import com.loopj.android.http.AsyncHttpClient;
 import com.qiniu.android.dns.DnsManager;
 
-import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.conn.scheme.SchemeRegistry;
-import org.apache.http.params.BasicHttpParams;
+import cz.msebera.android.httpclient.conn.ClientConnectionManager;
+import cz.msebera.android.httpclient.conn.scheme.SchemeRegistry;
+import cz.msebera.android.httpclient.params.BasicHttpParams;
 
 /**
  * Created by bailong on 15/7/4.

library/src/main/java/com/qiniu/android/http/ByteArrayEntity.java

@@ -1,12 +1,13 @@
 package com.qiniu.android.http;
 
-import org.apache.http.entity.AbstractHttpEntity;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import cz.msebera.android.httpclient.entity.AbstractHttpEntity;
+
 /**
  * 定义请求字节实体及相关方法
  */

library/src/main/java/com/qiniu/android/http/ClientConnectionOperator.java

@@ -30,27 +30,27 @@
 import com.qiniu.android.dns.DnsManager;
 import com.qiniu.android.dns.Domain;
 
-import org.apache.http.HttpHost;
-import org.apache.http.conn.HttpHostConnectException;
-import org.apache.http.conn.OperatedClientConnection;
-import org.apache.http.conn.scheme.LayeredSocketFactory;
-import org.apache.http.conn.scheme.Scheme;
-import org.apache.http.conn.scheme.SchemeRegistry;
-import org.apache.http.conn.scheme.SocketFactory;
-import org.apache.http.impl.conn.DefaultClientConnection;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.HttpContext;
-
 import java.io.IOException;
 import java.net.ConnectException;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
+import cz.msebera.android.httpclient.HttpHost;
+import cz.msebera.android.httpclient.conn.HttpHostConnectException;
+import cz.msebera.android.httpclient.conn.OperatedClientConnection;
+import cz.msebera.android.httpclient.conn.scheme.LayeredSocketFactory;
+import cz.msebera.android.httpclient.conn.scheme.Scheme;
+import cz.msebera.android.httpclient.conn.scheme.SchemeRegistry;
+import cz.msebera.android.httpclient.conn.scheme.SocketFactory;
+import cz.msebera.android.httpclient.impl.conn.DefaultClientConnection;
+import cz.msebera.android.httpclient.params.HttpConnectionParams;
+import cz.msebera.android.httpclient.params.HttpParams;
+import cz.msebera.android.httpclient.protocol.HttpContext;
+
 
 /*get from 4.3, mixed 4.0*/
-public final class ClientConnectionOperator implements org.apache.http.conn.ClientConnectionOperator {
+public final class ClientConnectionOperator implements cz.msebera.android.httpclient.conn.ClientConnectionOperator {
 
 
     /**

library/src/main/java/com/qiniu/android/http/HttpManager.java

@@ -2,9 +2,6 @@
 
 import com.qiniu.android.dns.DnsManager;
 
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.message.BasicHeader;
 import org.json.JSONObject;
 
 import java.io.ByteArrayInputStream;
@@ -13,6 +10,10 @@
 import java.net.URISyntaxException;
 import java.util.Map;
 
+import cz.msebera.android.httpclient.Header;
+import cz.msebera.android.httpclient.HttpEntity;
+import cz.msebera.android.httpclient.message.BasicHeader;
+
 /**
  * 定义HTTP请求管理相关方法
  */

library/src/main/java/com/qiniu/android/http/IReport.java

@@ -1,6 +1,7 @@
 package com.qiniu.android.http;
 
-import org.apache.http.Header;
+
+import cz.msebera.android.httpclient.Header;
 
 public interface IReport {
     Header[] appendStatHeaders(Header[] headers);

library/src/main/java/com/qiniu/android/http/MultipartBuilder.java

@@ -7,16 +7,16 @@
 
 import com.qiniu.android.utils.StringUtils;
 
-import org.apache.http.message.BasicHeader;
-import org.apache.http.protocol.HTTP;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Random;
 
+import cz.msebera.android.httpclient.message.BasicHeader;
+import cz.msebera.android.httpclient.protocol.HTTP;
+
 
 final class MultipartBuilder {
 

library/src/main/java/com/qiniu/android/http/ResponseHandler.java

@@ -7,10 +7,6 @@
 import com.loopj.android.http.ResponseHandlerInterface;
 import com.qiniu.android.common.Constants;
 
-import org.apache.http.Header;
-import org.apache.http.HttpResponse;
-import org.apache.http.NoHttpResponseException;
-import org.apache.http.conn.ConnectTimeoutException;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -21,6 +17,11 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import cz.msebera.android.httpclient.Header;
+import cz.msebera.android.httpclient.HttpResponse;
+import cz.msebera.android.httpclient.NoHttpResponseException;
+import cz.msebera.android.httpclient.conn.ConnectTimeoutException;
+
 
 /**
  * 定义请求回复处理方法