Dependency added, build script updated, renamed all org.apache.http d…

…ependency to cz.msebera.android.httpclient
xxjy · Sep 12, 2015 · 15f9556 · 15f9556
1 parent 00165f4
commit 15f9556
Show file tree

Hide file tree

Showing 71 changed files with 1,136 additions and 1,165 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: android
 jdk: openjdk7
 android:
   components:
-    - build-tools-23.0.0
+    - build-tools-23.0.1
     - extra-android-support
     - extra-android-m2repository
     - android-23

diff --git a/build.gradle b/build.gradle
@@ -17,6 +17,7 @@ allprojects {
     version = '1.4.9-SNAPSHOT'
 
     repositories {
+        mavenLocal()
         mavenCentral()
     }
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -2,8 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '23.0.0'
-    useLibrary 'org.apache.http.legacy'
+    buildToolsVersion '23.0.1'
 
     defaultConfig {
         minSdkVersion 3
@@ -24,6 +23,10 @@ android {
     }
 }
 
+dependencies {
+    compile 'cz.msebera.android:httpclient:4.3.3'
+}
+
 android.libraryVariants.all { variant ->
     def name = variant.buildType.name
     def task = project.tasks.create "jar${name.capitalize()}", Jar

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.loopj.android.http">
+    package="com.loopj.android.http">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
 </manifest>