diff --git a/.travis.yml b/.travis.yml
index f24dfd92f..ee06b8b70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@ sudo: false
language: android
+jdk:
+ - oraclejdk8
+
android:
components:
# Uncomment the lines below if you want to
@@ -11,10 +14,10 @@ android:
- tools
# The BuildTools version used by your project
- - build-tools-23.0.1
+ - build-tools-24.0.2
# The SDK version used to compile your project
- - android-23
+ - android-24
# Specify at least one system image
# if you need to run emulator(s) during your tests
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f249c1be..e69df5669 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
#Changelog
-## 7.3.0 (2016-09-30)
+## 7.3.2 (2016-11-21)
+
+### 增加
+* 将ak的一部分加入到UA
+
+## 7.3.1 (2016-11-06)
### 增加
* 北美上传地址
diff --git a/library/build.gradle b/library/build.gradle
index 1493827a0..c431e73f8 100755
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -25,7 +25,7 @@ android {
defaultConfig {
//applicationId "com.qiniu.android"
minSdkVersion 9
- targetSdkVersion 23
+ targetSdkVersion 24
versionCode code
versionName version
}
diff --git a/library/gradle.properties b/library/gradle.properties
index 6ccda760d..a3da2b06b 100755
--- a/library/gradle.properties
+++ b/library/gradle.properties
@@ -1,3 +1,3 @@
-POM_NAME=qiniu-android-sdk Library
+POM_NAME=qiniu-android-sdk library
POM_ARTIFACT_ID=qiniu-android-sdk
POM_PACKAGING=aar
diff --git a/library/library.iml b/library/library.iml
index 60da428ed..c344ed4cd 100644
--- a/library/library.iml
+++ b/library/library.iml
@@ -65,14 +65,6 @@
-
-
-
-
-
-
-
-
@@ -81,6 +73,14 @@
+
+
+
+
+
+
+
+
diff --git a/library/src/androidTest/java/com/qiniu/android/HttpTest.java b/library/src/androidTest/java/com/qiniu/android/HttpTest.java
index 3eceb7501..ee1426652 100644
--- a/library/src/androidTest/java/com/qiniu/android/HttpTest.java
+++ b/library/src/androidTest/java/com/qiniu/android/HttpTest.java
@@ -207,7 +207,7 @@ public void testProxy() throws Throwable {
ProxyConfiguration p = new ProxyConfiguration("115.231.183.168", 80);
Client c = new Client(p, 10, 30, null, null);
c.asyncPost("http://upproxy1.qiniu.com", "hello".getBytes(),
- x,TestConfig.ak, null, new CompletionHandler() {
+ x, TestConfig.ak, null, new CompletionHandler() {
@Override
public void complete(ResponseInfo rinfo, JSONObject response) {
Log.d("qiniutest", rinfo.toString());
diff --git a/library/src/main/java/com/qiniu/android/common/Constants.java b/library/src/main/java/com/qiniu/android/common/Constants.java
index c4ac5a2a1..3cf71f4ac 100644
--- a/library/src/main/java/com/qiniu/android/common/Constants.java
+++ b/library/src/main/java/com/qiniu/android/common/Constants.java
@@ -2,7 +2,7 @@
public final class Constants {
- public static final String VERSION = "7.3.1";
+ public static final String VERSION = "7.3.2";
public static final String UTF_8 = "utf-8";
}
diff --git a/library/src/main/java/com/qiniu/android/common/Zone.java b/library/src/main/java/com/qiniu/android/common/Zone.java
index 6edbecc7c..cdaaa036d 100644
--- a/library/src/main/java/com/qiniu/android/common/Zone.java
+++ b/library/src/main/java/com/qiniu/android/common/Zone.java
@@ -9,36 +9,36 @@ public abstract class Zone {
/**
* 华东机房, http
- * */
+ */
public static final Zone zone0 =
createZone("upload.qiniu.com", "up.qiniu.com", "183.136.139.10", "115.231.182.136");
/**
* 华北机房, http
- * */
+ */
public static final Zone zone1 =
createZone("upload-z1.qiniu.com", "up-z1.qiniu.com", "106.38.227.27", "106.38.227.28");
/**
* 华南机房, http
- * */
+ */
public static final Zone zone2 =
createZone("upload-z2.qiniu.com", "up-z2.qiniu.com", "183.60.214.197", "14.152.37.7");
/**
* 北美机房, http
- * */
+ */
public static final Zone zoneNa0 =
createZone("upload-na0.qiniu.com", "up-na0.qiniu.com", "23.236.102.3", "23.236.102.2");
/**
* 自动判断机房, http
- * */
+ */
public static final AutoZone httpAutoZone = new AutoZone(false, null);
/**
* 自动判断机房, https
- * */
+ */
public static final AutoZone httpsAutoZone = new AutoZone(true, null);
diff --git a/library/src/main/java/com/qiniu/android/http/PostArgs.java b/library/src/main/java/com/qiniu/android/http/PostArgs.java
index d1325bb79..09b5782a1 100644
--- a/library/src/main/java/com/qiniu/android/http/PostArgs.java
+++ b/library/src/main/java/com/qiniu/android/http/PostArgs.java
@@ -31,6 +31,6 @@ public final class PostArgs {
/**
* 根据用户,提供特定字符串,作为 UserAgent 的一部分,如 AK 的前 16 个字符
- * */
+ */
public String userAgentPart;
}