You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2018/10/30 10:18:11 UTC
[incubator-weex] 01/01: Merge branch 'release'
This is an automated email from the ASF dual-hosted git repository.
cxfeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
commit 59262eab25d3ec68aacb8e1721b285f2acdc9900
Merge: 7372a4d 88caa7f
Author: Adam Feng <cx...@gmail.com>
AuthorDate: Tue Oct 30 18:04:41 2018 +0800
Merge branch 'release'
Conflicts:
README.md
android/sdk/assets/weex-main-jsfm.js
android/sdk/assets/weex-rax-api.js
android/sdk/libs/armeabi-v7a/libweexcore.so
android/sdk/libs/armeabi/libweexcore.so
android/sdk/libs/x86/libweexcore.so
android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddElement.java
android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionMoveElement.java
android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveElement.java
android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java
ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.mm
package.json
pre-build/weex-main-jsfm.js
pre-build/weex-rax-api.js
scripts/build_from_source.sh
scripts/generate_apache_release.sh
scripts/release_files.rules
HOW-TO-BUILD.md | 21 +-
LICENSE | 213 ++++++---------------
POSSIBLE-NOTICES-FOR-BIN-DIST | 6 +
README.md | 80 ++++----
android/sdk/build.gradle | 8 +-
.../com/taobao/weex/utils/WXDataStructureUtil.java | 19 --
scripts/build_from_source.sh | 14 +-
scripts/generate_apache_release.sh | 14 +-
scripts/release_files.rules | 6 +-
.../Source/android/jniprebuild/jni_generator.py | 2 +-
weex_core/Source/android/jniprebuild/prebuild.sh | 19 ++
weex_core/Source/wson/wson.c | 18 ++
12 files changed, 184 insertions(+), 236 deletions(-)
diff --cc weex_core/Source/android/jniprebuild/jni_generator.py
index a20d277,f7c52ef..cca64e1
mode 100755,100644..100755
--- a/weex_core/Source/android/jniprebuild/jni_generator.py
+++ b/weex_core/Source/android/jniprebuild/jni_generator.py