You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mo...@apache.org on 2018/12/10 09:46:43 UTC
[incubator-weex] 01/01: Merge pull request #1880 from
wqyfavor/merge-rc20
This is an automated email from the ASF dual-hosted git repository.
moshen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
commit bd39c2ca9cf78b848b6562438f4bd737fa74e7bd
Merge: d4d1aa2 cb9f751
Author: wqyfavor <wq...@gmail.com>
AuthorDate: Mon Dec 10 17:46:37 2018 +0800
Merge pull request #1880 from wqyfavor/merge-rc20
Merge 0.20.0 back to master.
LICENSE | 3 +-
android/playground/app/build.gradle | 2 +-
android/sdk/build.gradle | 21 +++++-
android/sdk/gradle.properties | 19 +++++
android/sdk/proguard-rules.pro | 21 +++++-
android/sdk/publish.sh | 21 +++++-
.../WeexSDK/Sources/Layout/WXComponent+Layout.h | 79 +++++++++++++++++++-
.../WeexSDK/Sources/Layout/WXComponent+Layout.mm | 86 ++++++++++++++++++++++
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 10 +--
ios/sdk/WeexSDK/Sources/Utility/WXVersion.m | 4 +-
scripts/build_from_source.sh | 12 ++-
scripts/generate_apache_release.sh | 5 +-
weex_core/CMakeLists.txt | 18 +++++
weex_core/Source/CMakeLists.txt | 18 +++++
weex_core/Source/IPC/CMakeLists.txt | 19 +++++
.../native_render_object_utils_impl_android.cpp | 6 +-
weex_core/Source/core/data_render/class_factory.cc | 33 ++++++---
weex_core/Source/core/data_render/tokenizer.cc | 27 ++++++-
weex_core/Source/core/layout/flex_enum.h | 26 ++++---
weex_core/Source/core/layout/layout.h | 2 +-
weex_core/Source/core/layout/style.h | 2 +
weex_core/Source/third_party/json11/CMakeLists.txt | 19 +++++
weex_core/Source/weexjsc_version_script.txt | 18 +++++
weex_core/Source/wson/CMakeLists.txt | 19 +++++
24 files changed, 443 insertions(+), 47 deletions(-)