Merge pull request #42 from YangSen-qn/master

Opitimize Multi Server concurrent resolve

CHANGELOG.md

@@ -1,4 +1,7 @@
 #Changelog
+## 2.0.1 (2021-08-19)
+* 优化多 Server 并发解析
+
 ## 2.0.0 (2021-08-19)
 * 处理加密模式 ECB 不安全问题
 * 删除 com.qiniu.android.dns.http.DnspodEnterprise

README.md

@@ -18,7 +18,7 @@
 ### 通过maven
 * Android Studio中添加dependencies 或者 在项目中添加maven依赖
 ```
-implementation 'com.qiniu:happy-dns:2.0.0'
+implementation 'com.qiniu:happy-dns:2.0.1'
 ```
 
 

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.6.4'
 //        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 //        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -14,3 +14,5 @@ POM_LICENCE_DIST=repo
 
 POM_DEVELOPER_ID=qiniu
 POM_DEVELOPER_NAME=Qiniu
+
+android.useAndroidX=true

library/build.gradle

@@ -3,7 +3,7 @@ import java.util.regex.Matcher
 apply plugin: 'com.android.library'
 
 def versionName() {
-    String config = 'library/src/main/java/com/qiniu/android/dns/Version.java'
+    String config = getProjectDir().getPath() + '/src/main/java/com/qiniu/android/dns/Version.java'
     String fileContents = new File(config).text
     Matcher myMatcher = fileContents =~ /VERSION = "(.+)";/
     String version = myMatcher[0][1]
@@ -20,12 +20,12 @@ String version = versionName()
 int code = versionNameToCode(version)
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
     defaultConfig {
         //applicationId "com.qiniu.android.dns"
-        minSdkVersion 9
-        targetSdkVersion 27
+        minSdkVersion 14
+        targetSdkVersion 30
         versionCode code
         versionName version
     }
@@ -53,10 +53,16 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation 'com.android.support.test:runner:0.4.1'
-    androidTestImplementation 'com.android.support.test:rules:0.4.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:2.2.1'
+
+    androidTestCompileOnly project(path: ':library')
+
+    androidTestImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    androidTestImplementation 'androidx.test:core:1.5.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation "com.android.support:support-annotations:28.0.0"
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test:rules:1.0.2'
 }
 
 task releaseJar(type: Jar, dependsOn: 'build') {