You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/06/08 08:33:24 UTC
[3/3] incubator-weex git commit: Merge branch 'android-robolectric'
of github.com:YorkShen/incubator-weex into 0.14-dev
Merge branch 'android-robolectric' of github.com:YorkShen/incubator-weex into 0.14-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/bd00ba86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bd00ba86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bd00ba86
Branch: refs/heads/0.14-dev
Commit: bd00ba86b4e6bf23bd43c0cf4ddb1aff3216273c
Parents: 4bc03cc 2e6d56c
Author: sospartan <so...@apache.org>
Authored: Thu Jun 8 16:33:06 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Jun 8 16:33:06 2017 +0800
----------------------------------------------------------------------
android/run-ci.sh | 2 +-
android/sdk/build.gradle | 8 ++---
.../java/com/taobao/weex/WXSDKInstanceTest.java | 26 ++++++++--------
.../weex/adapter/DefaultUriAdapterTest.java | 4 +--
.../clipboard/WXClipboardModuleTest.java | 4 +--
.../navigator/WXNavigatorModuleTest.java | 4 +--
.../appfram/storage/DefaultWXStorageTest.java | 32 +++++++++-----------
.../appfram/storage/WXStorageModuleTest.java | 16 +++++-----
.../taobao/weex/bridge/WXBridgeManagerTest.java | 14 ++++++---
.../com/taobao/weex/bridge/WXBridgeTest.java | 4 +--
.../com/taobao/weex/bridge/WXHashMapTest.java | 4 +--
.../taobao/weex/bridge/WXModuleManagerTest.java | 4 +--
.../java/com/taobao/weex/dom/WXAttrTest.java | 4 +--
.../com/taobao/weex/dom/WXDomModuleTest.java | 4 +--
.../com/taobao/weex/dom/WXDomObjectTest.java | 4 +--
.../com/taobao/weex/dom/WXDomStatementTest.java | 4 +--
.../taobao/weex/dom/WXTextDomObjectTest.java | 4 +--
.../ui/animation/WXAnimationModuleTest.java | 4 +--
.../weex/ui/component/EditComponentTest.java | 4 +--
.../taobao/weex/ui/component/TextareaTest.java | 4 +--
.../weex/ui/component/WXComponentTest.java | 4 +--
.../com/taobao/weex/ui/component/WXDivTest.java | 4 +--
.../taobao/weex/ui/component/WXEmbedTest.java | 4 +--
.../taobao/weex/ui/component/WXImageTest.java | 14 ++++-----
.../taobao/weex/ui/component/WXLoadingTest.java | 4 +--
.../taobao/weex/ui/component/WXRefreshTest.java | 4 +--
.../weex/ui/component/WXScrollerTest.java | 4 +--
.../weex/ui/component/WXSliderNeighborTest.java | 4 +--
.../taobao/weex/ui/component/WXSliderTest.java | 4 +--
.../taobao/weex/ui/component/WXSwitchTest.java | 4 +--
.../taobao/weex/ui/component/WXVideoTest.java | 4 +--
.../com/taobao/weex/ui/component/WXWebTest.java | 4 +--
.../component/helper/WXTimeInputHelperTest.java | 4 +--
.../ui/component/list/WXListComponentTest.java | 4 +--
.../taobao/weex/ui/module/WXMetaModuleTest.java | 4 +--
.../weex/ui/module/WXModalUIModuleTest.java | 4 +--
.../weex/ui/module/WXTimerModuleTest.java | 4 +--
.../weex/ui/module/WXWebViewModuleTest.java | 4 +--
.../weex/ui/view/WXCirclePageAdapterTest.java | 4 +--
.../taobao/weex/ui/view/WXScrollViewTest.java | 4 +--
.../com/taobao/weex/ui/view/WXWebViewTest.java | 9 +++---
.../weex/ui/view/gesture/WXGestureTest.java | 4 +--
.../com/taobao/weex/utils/TypefaceUtilTest.java | 4 +--
.../com/taobao/weex/utils/WXFileUtilsTest.java | 17 +++++------
.../com/taobao/weex/utils/WXLogUtilsTest.java | 7 ++---
.../weex/utils/WXReflectionUtilsTest.java | 4 +--
46 files changed, 139 insertions(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bd00ba86/android/sdk/build.gradle
----------------------------------------------------------------------
diff --cc android/sdk/build.gradle
index c8c235b,63d04b2..6b6253a
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@@ -151,13 -145,7 +149,13 @@@ dependencies
testCompile 'org.powermock:powermock-module-testng:1.6.4'
testCompile 'org.powermock:powermock-classloading-xstream:1.6.4'
testCompile "org.powermock:powermock-module-junit4-rule:1.6.4"
- testCompile 'org.robolectric:robolectric:3.0'
- testCompile "org.robolectric:shadows-httpclient:3.0"
+ testCompile 'org.robolectric:robolectric:3.3.2'
+ testCompile "org.robolectric:shadows-httpclient:3.3.2"
testCompile 'org.json:json:20160212'
-}
+}
+
+license {
+ header = file('../license/LICENSE')
+ excludes(["com/taobao/weex/dom/flex/*.java"])
+}
+preBuild.dependsOn licenseFormat