Merge tag '0.19.0.2'

Merged changes under tag '0.19.0.2' back to master.
apache · Nov 9, 2018 · bdd3fbd · bdd3fbd
2 parents bd663a8 + c269fb0
commit bdd3fbd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/android/playground/app/build.gradle b/android/playground/app/build.gradle
@@ -13,7 +13,7 @@ android {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         versionCode 17
-        versionName "0.18.0-beta-3"
+        versionName "0.19.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         ndk{
@@ -118,7 +118,7 @@ dependencies {
     compile 'com.jakewharton.scalpel:scalpel:1.1.2'
     compile 'com.taobao.android.weex_inspection:urlconnection_interceptor:1.0.0'
     compile 'com.android.support.test.espresso:espresso-idling-resource:2.2.2'
-    compile 'com.taobao.android:weex_inspector:0.16.7'
+    compile 'com.taobao.android:weex_inspector:0.18.10'
     //compile project(":weex_inspector")
 }
 
@@ -128,4 +128,4 @@ if(file('../../license/LICENSE').exists()){
         excludes(["com/google/zxing/**/*.java","**/*.xml"])
     }
     preBuild.dependsOn licenseFormat
-}
+}
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
@@ -36,7 +36,7 @@ checkstyle {
 }
 
 
-version = "0.18.13.25"
+version = "0.19.0.4"
 
 android {
 

diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h b/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h
@@ -20,7 +20,7 @@
 #ifndef __WX_DEFINE_H__
 #define __WX_DEFINE_H__
 
-#define WX_SDK_VERSION @"0.18.0"
+#define WX_SDK_VERSION @"0.19.0"
 
 #if defined(__cplusplus)
 #define WX_EXTERN extern "C" __attribute__((visibility("default")))
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ checkstyle { @@
     }
-    version = "0.18.13.25"
+    version = "0.19.0.4"
     android {
@@ Expand Down @@