You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2017/08/10 07:07:55 UTC
[1/3] incubator-weex git commit: * [android] Upgrade to API 25.
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev c95fc2325 -> 452c4d7d2
* [android] Upgrade to API 25.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/efd535a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/efd535a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/efd535a7
Branch: refs/heads/0.16-dev
Commit: efd535a76fece0780c5331d3b2916a368493d405
Parents: 495fc6b
Author: YorkShen <sh...@gmail.com>
Authored: Fri Jul 28 16:48:38 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Fri Jul 28 16:48:38 2017 +0800
----------------------------------------------------------------------
.travis.yml | 8 ++++----
android/build.gradle | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/efd535a7/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index e49b8ca..a62ef95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,8 +46,8 @@ matrix:
components:
- platform-tools
- tools
- - build-tools-23.0.3
- - android-23
+ - build-tools-25.0.3
+ - android-25
- extra-google-m2repository
- extra-android-m2repository
- sys-img-armeabi-v7a-android-22
@@ -77,8 +77,8 @@ before_script:
export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools
echo yes | sdkmanager platform-tools
echo yes | sdkmanager tools #tools
- echo yes | sdkmanager "build-tools;23.0.3" #build-tool
- echo yes | sdkmanager "platforms;android-23" #compile target
+ echo yes | sdkmanager "build-tools;25.0.3" #build-tool
+ echo yes | sdkmanager "platforms;android-25" #compile target
echo yes | sdkmanager "extras;android;m2repository" #support
fi
script:
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/efd535a7/android/build.gradle
----------------------------------------------------------------------
diff --git a/android/build.gradle b/android/build.gradle
index 7cc3c36..28cf76e 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -33,12 +33,12 @@ subprojects {
}
}
ext {
- compileSdkVersion=23
- buildToolsVersion="23.0.3"
+ compileSdkVersion=25
+ buildToolsVersion="25.0.3"
minSdkVersion=14
appMinSdkVersion=15
- targetSdkVersion=23
- supportLibVersion="23.4.0"
+ targetSdkVersion=25
+ supportLibVersion="25.3.1"
fastjsonLibVersion="1.1.46.android"
}
}
[2/3] incubator-weex git commit: * [android] Update to VERSION_CODE.N
Posted by ky...@apache.org.
* [android] Update to VERSION_CODE.N
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1752f06e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1752f06e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1752f06e
Branch: refs/heads/0.16-dev
Commit: 1752f06ec6304e5f716a92db572c04cb94673933
Parents: efd535a
Author: YorkShen <sh...@gmail.com>
Authored: Fri Jul 28 17:21:12 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Fri Jul 28 17:21:12 2017 +0800
----------------------------------------------------------------------
android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1752f06e/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
index c6120d5..fb9ab8b 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
@@ -28,6 +28,7 @@ import android.graphics.RectF;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.os.Build;
+import android.os.Build.VERSION_CODES;
import android.support.annotation.IntDef;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -404,10 +405,9 @@ public class WXViewUtils {
* clipPath doesn't work with rotation nor scale when API level is 24.
* As animation will not cause redraw if hardware-acceleration enabled, clipCanvas feature has
* to be disabled when API level is 24 without considering the animation property.
- * As the compile version of weex_sdk is 23, so API level 24 has to be hard-code.
*/
private static boolean clipCanvasIfAnimationExist() {
- return Build.VERSION.SDK_INT != 24;
+ return Build.VERSION.SDK_INT != VERSION_CODES.N;
}
/**
[3/3] incubator-weex git commit: Merge branch 'android-feature-api25'
of https://github.com/YorkShen/incubator-weex into 0.16-dev
Posted by ky...@apache.org.
Merge branch 'android-feature-api25' of https://github.com/YorkShen/incubator-weex into 0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/452c4d7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/452c4d7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/452c4d7d
Branch: refs/heads/0.16-dev
Commit: 452c4d7d29cfbd31cd36a0d0dfd7764597ee4ce9
Parents: c95fc23 1752f06
Author: YorkShen <sh...@gmail.com>
Authored: Thu Aug 10 15:08:07 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Thu Aug 10 15:08:07 2017 +0800
----------------------------------------------------------------------
.travis.yml | 8 ++++----
android/build.gradle | 8 ++++----
.../sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------