From 7b30552a3e9bb034dd94b8bb614e54e4d8f3fef9 Mon Sep 17 00:00:00 2001 From: mareksebera Date: Fri, 1 Nov 2013 09:09:35 +0100 Subject: [PATCH] Updated dependencies and version of library --- .travis.yml | 17 +++++------------ README.md | 2 +- build.gradle | 2 +- gradle.properties | 4 ++-- library/build.gradle | 4 ++-- library/src/main/AndroidManifest.xml | 4 ++-- .../com/loopj/android/http/AsyncHttpClient.java | 2 +- sample/build.gradle | 6 +++--- .../loopj/android/http/sample/PostSample.java | 2 ++ 9 files changed, 19 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7560a7bb..40336a55d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,22 +22,15 @@ before_install: - export PATH=$GRADLE_HOME/bin:$PATH # just to test gradle version, against our provided one - gradle -v - # newest android SDK 22.0.5 - - wget http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz - - tar -zxf android-sdk_r22.0.5-linux.tgz + # newest android SDK 22.3 + - wget http://dl.google.com/android/android-sdk_r22.3-linux.tgz + - tar -zxf android-sdk_r22.3-linux.tgz - export ANDROID_HOME=`pwd`/android-sdk-linux - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools # manually set sdk.dir variable, according to local paths - echo "sdk.dir=$ANDROID_HOME" > local.properties - - echo yes | android update sdk -t tools,platform-tools,extra-android-support,extra-android-m2repository,android-18 --force --no-ui - # build tools cannot be installed through "android update sdk" as of now - - wget http://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip - - mkdir -p $ANDROID_HOME/build-tools - - unzip -qq build-tools_r18.0.1-linux.zip -d $ANDROID_HOME/build-tools/ - - mv $ANDROID_HOME/build-tools/android-4.3 $ANDROID_HOME/build-tools/18.0.1 - # verify files exist in right paths - - find $ANDROID_HOME/build-tools - - file $ANDROID_HOME/build-tools/18.0.1/aapt + - echo yes | android update sdk -t tools,platform-tools,extra-android-support,extra-android-m2repository,android-19,build-tools-19.0.0 --force --no-ui + # Sonatype bypass - echo "nexusUsername=dummy" >> library/gradle.properties - echo "nexusPassword=dummy" >> library/gradle.properties diff --git a/README.md b/README.md index 2dd17dd7c..670b0313e 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ https://oss.sonatype.org/content/repositories/snapshots/com/loopj/android/androi Maven URL: https://oss.sonatype.org/content/repositories/snapshots/ GroupId: com.loopj.android ArtifactId: async-http-client -Version: 1.4.4-SNAPSHOT +Version: 1.4.5-SNAPSHOT Packaging: JAR or AAR ``` diff --git a/build.gradle b/build.gradle index 9fe1e6adc..868085567 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ def isReleaseBuild() { allprojects { group = 'com.loopj.android' - version = '1.4.4' + version = '1.4.5-SNAPSHOT' repositories { mavenCentral() diff --git a/gradle.properties b/gradle.properties index 2c0fb8c88..faf4d9555 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -VERSION_NAME=1.4.4 -VERSION_CODE=144 +VERSION_NAME=1.4.5-SNAPSHOT +VERSION_CODE=145 GROUP=com.loopj.android POM_DESCRIPTION=An Asynchronous HTTP Library for Android diff --git a/library/build.gradle b/library/build.gradle index 3c0599675..7cd3e2af7 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'android-library' android { - compileSdkVersion 18 - buildToolsVersion '18.0.1' + compileSdkVersion 19 + buildToolsVersion '19.0.0' } android.libraryVariants.all { variant -> diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 0705929fd..13d6f26ed 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionName="1.4.5-SNAPSHOT" + android:versionCode="145"> diff --git a/library/src/main/java/com/loopj/android/http/AsyncHttpClient.java b/library/src/main/java/com/loopj/android/http/AsyncHttpClient.java index 92116f4bf..c11445898 100644 --- a/library/src/main/java/com/loopj/android/http/AsyncHttpClient.java +++ b/library/src/main/java/com/loopj/android/http/AsyncHttpClient.java @@ -91,7 +91,7 @@ * */ public class AsyncHttpClient { - private static final String VERSION = "1.4.4"; + private static final String VERSION = "1.4.5"; private static final int DEFAULT_MAX_CONNECTIONS = 10; private static final int DEFAULT_SOCKET_TIMEOUT = 10 * 1000; diff --git a/sample/build.gradle b/sample/build.gradle index d388761dc..0792285ef 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -16,12 +16,12 @@ repositories { } android { - compileSdkVersion 18 - buildToolsVersion "18.0.1" + compileSdkVersion 19 + buildToolsVersion '19.0.0' defaultConfig { minSdkVersion 3 - targetSdkVersion 18 + targetSdkVersion 19 } } diff --git a/sample/src/main/java/com/loopj/android/http/sample/PostSample.java b/sample/src/main/java/com/loopj/android/http/sample/PostSample.java index 202fd480c..8ecad2b08 100644 --- a/sample/src/main/java/com/loopj/android/http/sample/PostSample.java +++ b/sample/src/main/java/com/loopj/android/http/sample/PostSample.java @@ -5,12 +5,14 @@ import org.apache.http.Header; import org.apache.http.HttpEntity; +import org.apache.http.message.BasicHeader; public class PostSample extends SampleParentActivity { private static final String LOG_TAG = "PostSample"; @Override protected void executeSample(AsyncHttpClient client, String URL, Header[] headers, HttpEntity entity, AsyncHttpResponseHandler responseHandler) { + headers = new Header[]{ new BasicHeader("Content-Type", "ee") }; client.post(this, URL, headers, entity, null, responseHandler); }