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 2019/05/24 07:03:43 UTC
[incubator-weex] branch release/0.24 updated (047d261 -> 96ed543)
This is an automated email from the ASF dual-hosted git repository.
kyork pushed a change to branch release/0.24
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git.
from 047d261 Update Readme.md
new 2f308a8 [Android] Check weexVersion (#2451)
new 96ed543 [Android] Copy so. (#2454)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
android/sdk/build.gradle | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
[incubator-weex] 02/02: [Android] Copy so. (#2454)
Posted by ky...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kyork pushed a commit to branch release/0.24
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
commit 96ed54338eb32b9a5b0fa5fd246bb908e17ac19b
Author: YorkShen <sh...@gmail.com>
AuthorDate: Fri May 17 11:17:17 2019 +0800
[Android] Copy so. (#2454)
Use a dedicated way to copy unstripped .so file without the importable file path.
(cherry picked from commit 4da0cea70fd31f52dfa3dbb81f4a8d031b926e1c)
---
android/sdk/build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 042095b..9c7f59a 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -370,11 +370,11 @@ bintray {
afterEvaluate {
transformNativeLibsWithStripDebugSymbolForRelease << {
copy{
- from new File(project.buildDir, "intermediates/transforms/mergeJniLibs/release/folders/2000/3/main/lib")
+ from transformNativeLibsWithMergeJniLibsForRelease
into new File(project.buildDir, "unstrippedSo")
include '**/libweexjss.so', '**/libweexcore.so'
eachFile {
- it.path = "${it.relativePath.segments.first()}_${it.name}"
+ it.path = "${it.relativePath.segments[5]}_${it.name}"
}
}
}
[incubator-weex] 01/02: [Android] Check weexVersion (#2451)
Posted by ky...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kyork pushed a commit to branch release/0.24
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
commit 2f308a8e35c0c972be879aca34536c2ba48a8697
Author: YorkShen <sh...@gmail.com>
AuthorDate: Thu May 16 17:32:14 2019 +0800
[Android] Check weexVersion (#2451)
* [Android] Check weexVersion
1. The version must have 4 sections.
2. The leading three section must be number, and the last section is odd number with or without suffix string.
* [Android] Add ignoreVersionCheck
(cherry picked from commit 151c46939847185c6cc58dd97dbbee2e37e5fb18)
---
android/sdk/build.gradle | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 9304b8b..042095b 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -65,6 +65,25 @@ checkstyle {
version = project.hasProperty('weexVersion')? project.getProperty('weexVersion') : "0.24.0"
+//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")) {
+ assert version.tokenize('.').eachWithIndex { it, i ->
+ if (i < 3) {
+ assert it.isNumber()
+ } else if (i == 3) {
+ it.split("-|_").toList().eachWithIndex { inner_it, inner_i ->
+ if (inner_i == 0) {
+ assert inner_it.isNumber() && inner_it.toInteger() % 2
+ } else {
+ assert !inner_it.isNumber()
+ }
+ }.size == 4
+ } else {
+ assert false: "Please use semantic versioning witch 4 sections, you are using ${$ { i } + 1} section instead"
+ }
+ }.size == 4
+}
+
android {
compileSdkVersion project.compileSdkVersion
buildToolsVersion project.buildToolsVersion