Merge pull request #128 from longbai/add_dns

longbai · longbai · commit 0776c8942cbe · 2015-07-13T14:19:48.000+08:00
dns library 0.2
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.travis.yml b/.travis.yml
@@ -11,10 +11,10 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-21.1.2
+    - build-tools-22.0.1
 
     # The SDK version used to compile your project
-    - android-21
+    - android-22
 
     # Specify at least one system image
     # if you need to run emulator(s) during your tests
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 #Changelog
 
+## 7.0.7 (2015-07-10)
+
+### 增加
+* 使用第三方dns解析库happy-dns-android，减少解析错误
+
 ## 7.0.6.1 (2015-06-23)
 
 ### 增加
diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.5'
+}
 
 buildscript {
     repositories {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jan 07 13:33:33 CST 2015
+#Sun Jul 12 16:36:40 CST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -20,20 +20,20 @@ String version = versionName()
 int code = versionNameToCode(version)
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion '21.1.2'
+    compileSdkVersion 22
+    buildToolsVersion '22.0.1'
     defaultConfig {
         //applicationId "com.qiniu.android"
         minSdkVersion 8
-        targetSdkVersion 21
+        targetSdkVersion 22
         versionCode code
         versionName version
     }
 }
 
 dependencies {
     compile 'com.loopj.android:android-async-http:1.4.+'
-    compile 'com.qiniu:happy-dns:0.1.+'
+    compile 'com.qiniu:happy-dns:0.2.+'
 //    compile 'com.android.support:appcompat-v7:21.0.3'
     compile fileTree(include: ['*.jar'], dir: 'libs')
 }
diff --git a/library/library.iml b/library/library.iml
@@ -65,6 +65,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -85,12 +86,11 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="happy-dns-0.1.1" level="project" />
+    <orderEntry type="library" exported="" name="happy-dns-0.2.1" level="project" />
     <orderEntry type="library" exported="" name="android-async-http-1.4.7" level="project" />
   </component>
 </module>
diff --git 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.0.6.1";
+    public static final String VERSION = "7.0.7";
 
     public static final String UTF_8 = "utf-8";
 }
diff --git a/library/src/main/java/com/qiniu/android/http/ClientConnectionOperator.java b/library/src/main/java/com/qiniu/android/http/ClientConnectionOperator.java
@@ -239,7 +239,10 @@ private String[] systemResolv(String domain) throws UnknownHostException {
             }
             return x;
         }
-        return dnsResolver.query(new Domain(domain, true, false, 3600));
+        try {
+            return dnsResolver.query(new Domain(domain, true, false, 3600));
+        } catch (IOException e) {
+            throw new UnknownHostException(e.getMessage());
+        }
     }
 }
-

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`
`4`	`4`	`public final class Constants {`
`5`		`- public static final String VERSION = "7.0.6.1";`
	`5`	`+ public static final String VERSION = "7.0.7";`
`6`	`6`
`7`	`7`	`public static final String UTF_8 = "utf-8";`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,10 @@ private String[] systemResolv(String domain) throws UnknownHostException {`
`239`	`239`	`}`
`240`	`240`	`return x;`
`241`	`241`	`}`
`242`		`- return dnsResolver.query(new Domain(domain, true, false, 3600));`
	`242`	`+ try {`
	`243`	`+ return dnsResolver.query(new Domain(domain, true, false, 3600));`
	`244`	`+ } catch (IOException e) {`
	`245`	`+ throw new UnknownHostException(e.getMessage());`
	`246`	`+ }`
`243`	`247`	`}`
`244`	`248`	`}`
`245`		`-`