Merge branch '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/2faa83f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2faa83f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2faa83f4 Branch: refs/heads/dev Commit: 2faa83f4cb3102bf22274f97c77733c19fc049da Parents: 702d04c b401806 Author: sospartan <sospar...@apache.org> Authored: Tue May 9 16:34:28 2017 +0800 Committer: sospartan <sospar...@apache.org> Committed: Tue May 9 16:34:28 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 1 + .wwprc | 3 - README_RELEASE.md | 61 +++ android/.gitignore | 4 +- android/README.md | 6 + android/build.gradle | 49 +++ android/codeStyleSettings.xml | 393 +++++++++++++++++++ android/commons/build.gradle | 38 +- android/gradle.properties | 16 + android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 52266 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + android/gradlew | 164 ++++++++ android/gradlew.bat | 90 +++++ android/license/LICENSE | 16 + android/playground/LICENSE | 202 ---------- android/playground/NOTICE | 7 - android/playground/README.md | 5 - android/playground/app/build.gradle | 25 +- android/playground/build.gradle | 22 -- android/playground/codeStyleSettings.xml | 393 ------------------- android/playground/gradle.properties | 16 - .../gradle/wrapper/gradle-wrapper.jar | Bin 51018 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 8 - android/playground/gradlew | 164 -------- android/playground/gradlew.bat | 90 ----- android/playground/settings.gradle | 10 - android/run-ci.sh | 6 +- android/sdk/.gitignore | 3 +- android/sdk/NOTICE | 13 - android/sdk/build.gradle | 64 +-- android/sdk/gradle/wrapper/gradle-wrapper.jar | Bin 53637 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 - android/sdk/gradlew | 160 -------- android/sdk/gradlew.bat | 90 ----- android/sdk/license/LICENSE | 16 - .../license/license-gradle-plugin-0.12.1.jar | Bin 329739 -> 0 bytes .../license/maven-license-plugin-1.10.b1.jar | Bin 57954 -> 0 bytes android/sdk/license/plexus-utils-3.0.24.jar | Bin 247351 -> 0 bytes .../taobao/weex/dom/WXRecyclerDomObject.java | 2 +- android/sdk/unittest.sh | 3 - android/settings.gradle | 9 + android/weex_debug/build.gradle | 25 +- .../gradle/wrapper/gradle-wrapper.jar | Bin 51018 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - android/weex_debug/gradlew | 164 -------- android/weex_debug/gradlew.bat | 90 ----- bin/commit-msg.sh | 16 + bin/dist-browser.sh | 16 + bin/dist-js-framework.sh | 16 + bin/dist-vue.sh | 17 +- bin/install-hooks.sh | 16 + bin/pre-commit.sh | 16 + bin/pre-push.sh | 16 + bin/release.sh | 16 + bin/welcome.sh | 16 + doc/source/cn/references/components/list.md | 9 + doc/source/cn/references/components/scroller.md | 6 + doc/source/cn/references/components/slider.md | 10 +- doc/source/references/components/list.md | 5 + doc/source/references/components/scroller.md | 3 + doc/source/references/components/slider.md | 4 +- html5/frameworks/legacy/core/array.js | 23 ++ html5/frameworks/legacy/core/dep.js | 23 ++ html5/frameworks/legacy/core/object.js | 23 ++ html5/frameworks/legacy/core/observer.js | 23 ++ html5/frameworks/legacy/core/state.js | 23 ++ html5/frameworks/legacy/core/watcher.js | 23 ++ .../vue/components/slider/slider-neighbor.js | 18 + .../WeexDemo/Scanner/WXScannerHistoryVC.m | 25 +- ios/sdk/LICENSE | 202 ---------- ios/sdk/NOTICE | 13 - .../Sources/Component/WXEmbedComponent.m | 6 + ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h | 1 + ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 3 +- ios/sdk/WeexSDKTests/testRootView.js | 18 + package.json | 1 + scripts/rat-ant-build.xml | 37 +- scripts/release_files.rules | 63 +++ test/run.sh | 2 +- 79 files changed, 1337 insertions(+), 1819 deletions(-) ----------------------------------------------------------------------
