You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by lu...@apache.org on 2019/07/15 13:01:18 UTC
[incubator-weex] branch master updated: [Android] Update
build.gradle and TravisCI (#2703)
This is an automated email from the ASF dual-hosted git repository.
luckychen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/master by this push:
new 05555b3 [Android] Update build.gradle and TravisCI (#2703)
05555b3 is described below
commit 05555b3629fffcc279f3c9ebfec127cc49a4e864
Author: YorkShen <sh...@gmail.com>
AuthorDate: Mon Jul 15 21:01:12 2019 +0800
[Android] Update build.gradle and TravisCI (#2703)
* Update build.gradle and submodule
* Remove gradle-wrapper in sdk dir.
* Update danger.js
* Update submodule
* Update travis
* Update build.gradle
* Update travis
---
.travis.yml | 3 ++-
android/build.gradle | 3 ---
android/sdk/build.gradle | 6 +++---
android/sdk/gradle/wrapper/gradle-wrapper.jar | Bin 52266 -> 0 bytes
android/sdk/gradle/wrapper/gradle-wrapper.properties | 6 ------
dangerfile-android.js | 4 +---
weex-playground | 2 +-
7 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a6c8505..7a5d60d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -90,7 +90,8 @@ script:
echo "The value of hasAndroidFile is ${hasAndroidFile}"
if [[ "$hasAndroidFile" =~ "hasAndroidFile" ]]; then
cd android
- ./gradlew clean install ${GRADLE_ABI} --info
+ ./gradlew clean install -PbuildRuntimeApi=true ${GRADLE_ABI} --info
+ ./gradlew install -PbuildRuntimeApi=false ${GRADLE_ABI} --info
fi
;;
"jsfm" )
diff --git a/android/build.gradle b/android/build.gradle
index b8646ac..b378333 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -57,12 +57,9 @@ ext {
targetSdkVersion=26
supportLibVersion="26.0.2"
fastjsonLibVersion="1.1.46.android"
- //Default value for buildCpp is true
- buildCpp = !project.hasProperty("buildCpp") || buildCpp.equals("true")
//Default value for disableCov is false
disableCov = project.hasProperty("disableCov") && disableCov.equals("true")
implementFromWeex = true
-
}
//task clean(type: Delete) {
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 9085083..a89d87d 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -48,13 +48,13 @@ checkstyle {
toolVersion = '6.9'
}
-version = project.hasProperty('weexVersion') ? project.getProperty('weexVersion') : "0.20.0.1"
+version = project.hasProperty('weexVersion') ? project.getProperty('weexVersion') : '0.26.0.1'
//Check version, the version must have 4 sections. The leading three section must be number, and the last section is odd number with or without suffix string.
if (!project.hasProperty('ignoreVersionCheck') || !project.getProperty('ignoreVersionCheck').equals("true")) {
version.tokenize('.').eachWithIndex { it, i ->
if (i < 3) {
- assert it.isNumber() : "Please use semantic versioning witch 4 sections, you are using ${$ { i } + 1} section instead."
+ assert it.isNumber() : "Please use semantic versioning witch 4 sections, you are using ${${i} + 1} section instead."
} else if (i == 3) {
it.split("[-_]").toList().eachWithIndex { inner_it, inner_i ->
if (inner_i == 0) {
@@ -64,7 +64,7 @@ if (!project.hasProperty('ignoreVersionCheck') || !project.getProperty('ignoreVe
}
}.size == 4
} else {
- assert false: "Please use semantic versioning witch 4 sections, you are using ${$ { i } + 1} section instead."
+ assert false: "Please use semantic versioning witch 4 sections, you are using ${${i} + 1} section instead."
}
}
}
diff --git a/android/sdk/gradle/wrapper/gradle-wrapper.jar b/android/sdk/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index b5166da..0000000
Binary files a/android/sdk/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/android/sdk/gradle/wrapper/gradle-wrapper.properties b/android/sdk/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index d649982..0000000
--- a/android/sdk/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed May 03 18:06:49 CST 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http://gw.alicdn.com/bao/uploaded/LB1J5WLJVXXXXcMXpXXXXXXXXXX.zip
diff --git a/dangerfile-android.js b/dangerfile-android.js
index 59e39dd..0ee29d6 100644
--- a/dangerfile-android.js
+++ b/dangerfile-android.js
@@ -33,9 +33,7 @@ const getFileType = file => {
return type_ios_sdk;
} else if (file.match(/WeexSDKTests\//)) {
return type_ios_test;
- } else if (file.match(/android\/sdk\/src\/test\/.+\.java/)) {
- return type_android_test;
- } else if (file.match(/android\/sdk\/src\/main\/java\/.+\.java/)) {
+ } else if (file.match(/android\/sdk\//)) {
return type_android_sdk;
} else if (file.match(/html5\/(shared|frameworks|render|runtime|services)\/.+\.js/)) {
return type_jsfm;
diff --git a/weex-playground b/weex-playground
index b8c57bf..1341be3 160000
--- a/weex-playground
+++ b/weex-playground
@@ -1 +1 @@
-Subproject commit b8c57bf48acd8b0d5a0701f39dadb698824f4007
+Subproject commit 1341be37c6184f61bae9e6f917b09005f29df974