Merge branch 'release/4.3-beta3'

yukuku · Aug 25, 2015 · bba05a8 · bba05a8
2 parents 76efe4a + 08d09b2
commit bba05a8
Show file tree

Hide file tree

Showing 94 changed files with 1,393 additions and 1,005 deletions.
diff --git a/ATree/build.gradle b/ATree/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.1'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 22
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
     }
 
     compileOptions {

diff --git a/Afw/build.gradle b/Afw/build.gradle
@@ -1,14 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.1'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 22
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
     }
 
     compileOptions {

diff --git a/Afw/src/main/java/yuku/afw/rpc/AsyncRequest.java b/Afw/src/main/java/yuku/afw/rpc/AsyncRequest.java
diff --git a/Afw/src/main/java/yuku/afw/rpc/BaseData.java b/Afw/src/main/java/yuku/afw/rpc/BaseData.java
diff --git a/Afw/src/main/java/yuku/afw/rpc/Headers.java b/Afw/src/main/java/yuku/afw/rpc/Headers.java