date:20170503

[2/3] incubator-weex git commit: Merge branch 'android-bugfix-imagesize' of github.com:misakuo/incubator-weex into 0.13-dev

2017-05-03 Thread sospartan

Merge branch 'android-bugfix-imagesize' of github.com:misakuo/incubator-weex 
into 0.13-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/e795fd5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e795fd5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e795fd5d

Branch: refs/heads/0.13-dev
Commit: e795fd5d18cef2e676774b45b4a85f3e811e7b28
Parents: bb33a75 73f1038
Author: sospartan 
Authored: Thu May 4 13:54:26 2017 +0800
Committer: sospartan 
Committed: Thu May 4 13:54:26 2017 +0800

--
 .../com/taobao/weex/ui/view/WXImageView.java| 31 +---
 1 file changed, 27 insertions(+), 4 deletions(-)
--

[3/3] incubator-weex git commit: Merge branch '0.13-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.13-dev

2017-05-03 Thread sospartan

Merge branch '0.13-dev' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.13-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/59062f36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/59062f36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/59062f36

Branch: refs/heads/0.13-dev
Commit: 59062f36c14c00da3988fa4424de6e0c1e0674cb
Parents: e795fd5 b33a2fe
Author: sospartan 
Authored: Thu May 4 13:54:38 2017 +0800
Committer: sospartan 
Committed: Thu May 4 13:54:38 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 69 
 .../WeexSDK/Sources/Component/WXAComponent.m|  8 +--
 .../Sources/Component/WXImageComponent.m|  9 ++-
 .../Sources/Component/WXVideoComponent.m| 12 ++--
 .../WeexSDK/Sources/Component/WXWebComponent.m  | 10 +--
 ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m |  8 +--
 ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m |  6 +-
 .../Sources/Protocol/WXURLRewriteProtocol.h |  5 +-
 test/scripts/util.js|  2 +-
 9 files changed, 90 insertions(+), 39 deletions(-)
--

[GitHub] incubator-weex issue #312: * [ios] update sdk version

2017-05-03 Thread weex-bot

Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/312
  

  

  
  
  1 Message
  
 
  
  

  :book:
  Executed 53 tests, with 0 failures (0 
unexpected) in 42.528 (42.598) seconds

  



  Generated by :no_entry_sign: http://danger.systems/;>danger




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-weex issue #312: * [ios] update sdk version

2017-05-03 Thread weex-bot

Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/312
  





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  





  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-weex pull request #312: * [ios] update sdk version

2017-05-03 Thread acton393

GitHub user acton393 opened a pull request:

https://github.com/apache/incubator-weex/pull/312

* [ios] update sdk version



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/acton393/incubator-weex 0.13-dev

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/312.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #312


commit 3b2ab913e548a098c28d6f9457b7d874edce386a
Author: acton393 
Date:   2017-05-04T02:53:35Z

* [ios] update sdk version




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[2/9] incubator-weex git commit: * [ios] remove unused

2017-05-03 Thread acton393

* [ios] remove unused


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8d6b37e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8d6b37e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8d6b37e6

Branch: refs/heads/0.13-dev
Commit: 8d6b37e6a482b7cb253eac4983a24aa0706485d4
Parents: cd324ad
Author: acton393 
Authored: Thu Apr 27 11:44:15 2017 +0800
Committer: acton393 
Committed: Thu Apr 27 11:44:15 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8d6b37e6/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
index 7088965..d932b52 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
@@ -295,7 +295,7 @@ static dispatch_queue_t WXImageUpdateQueue;
 WXLogDebug(@"Updating image:%@, component:%@", self.imageSrc, 
self.ref);
 NSDictionary *userInfo = @{@"imageQuality":@(self.imageQuality), 
@"imageSharp":@(self.imageSharp), @"blurRadius":@(self.blurRadius)};
 NSMutableString * newURL = [imageSrc mutableCopy];
-WX_REWRITE_URL(imageSrc, WXResourceTypeImage, self.weexInstance);
+WX_REWRITE_URL(imageSrc, WXResourceTypeImage, self.weexInstance)
 __weak typeof(self) weakSelf = self;
 dispatch_async(dispatch_get_main_queue(), ^{
 weakSelf.imageOperation = [[weakSelf imageLoader] 
downloadImageWithURL:newURL imageFrame:weakSelf.calculatedFrame 
userInfo:userInfo completed:^(UIImage *image, NSError *error, BOOL finished) {

[3/9] incubator-weex git commit: Merge branch '0.12-dev' of https://github.com/cxfeng1/incubator-weex into 0.13-dev

2017-05-03 Thread acton393

Merge branch '0.12-dev' of https://github.com/cxfeng1/incubator-weex into 
0.13-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/981a161d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/981a161d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/981a161d

Branch: refs/heads/0.13-dev
Commit: 981a161d3f9880c230555cdd61491070e6f42636
Parents: 8d6b37e cf8c054
Author: acton393 
Authored: Thu Apr 27 12:08:16 2017 +0800
Committer: acton393 
Committed: Thu Apr 27 12:08:16 2017 +0800

--
 package.json|   1 +
 test/pages/attributes/compositing.vue   |  89 +++
 test/pages/css/border.vue   | 283 +++
 test/screenshot/border-ios.png  | Bin 0 -> 168396 bytes
 test/screenshot/compositing-ios.png | Bin 0 -> 228661 bytes
 test/scripts/attributes/compositing.test.js |  63 +
 test/scripts/css/border.test.js |  63 +
 test/scripts/util.js|  33 +++
 8 files changed, 532 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/981a161d/package.json
--

[9/9] incubator-weex git commit: Merge branch '0.13-dev' of https://github.com/acton393/incubator-weex into apache-0.13-dev

2017-05-03 Thread acton393

Merge branch '0.13-dev' of https://github.com/acton393/incubator-weex into 
apache-0.13-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/b33a2fea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b33a2fea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b33a2fea

Branch: refs/heads/0.13-dev
Commit: b33a2fea4c18d5728470831354529d4e44017507
Parents: 73f5dee ee0e8df
Author: acton393 
Authored: Wed May 3 21:12:55 2017 +0800
Committer: acton393 
Committed: Wed May 3 21:12:55 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXAComponent.m|  8 
 ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m|  9 +++--
 ios/sdk/WeexSDK/Sources/Component/WXVideoComponent.m| 12 ++--
 ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m  | 10 +-
 ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m |  8 
 ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m |  6 +++---
 ios/sdk/WeexSDK/Sources/Protocol/WXURLRewriteProtocol.h |  5 ++---
 7 files changed, 31 insertions(+), 27 deletions(-)
--

[GitHub] incubator-weex pull request #296: * [ios] try to fix obj dealloc unexpected

2017-05-03 Thread asfgit

Github user asfgit closed the pull request at:

https://github.com/apache/incubator-weex/pull/296


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[5/9] incubator-weex git commit: * [ios] bugfix image background color

2017-05-03 Thread acton393

* [ios] bugfix image background color


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ec82dadc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ec82dadc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ec82dadc

Branch: refs/heads/0.13-dev
Commit: ec82dadc81f11348da62c18a6c7070a6b2ec5f4f
Parents: ef5ed1d
Author: acton393 
Authored: Thu Apr 27 19:39:08 2017 +0800
Committer: acton393 
Committed: Thu Apr 27 19:39:08 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ec82dadc/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
index d932b52..2c759eb 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
@@ -173,6 +173,11 @@ static dispatch_queue_t WXImageUpdateQueue;
 
 }
 
+- (BOOL)_needsDrawBorder
+{
+return NO;
+}
+
 - (BOOL)needsDrawRect
 {
 if (_isCompositingChild) {

[4/9] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.12-dev' into 0.13-dev

2017-05-03 Thread acton393

Merge remote-tracking branch 'upstream/0.12-dev' into 0.13-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/ef5ed1df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ef5ed1df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ef5ed1df

Branch: refs/heads/0.13-dev
Commit: ef5ed1df69b3da5759a826b0e4fcad165f20d566
Parents: 981a161 3bac9eb
Author: acton393 
Authored: Thu Apr 27 14:47:26 2017 +0800
Committer: acton393 
Committed: Thu Apr 27 14:47:26 2017 +0800

--
 .eslintrc | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--

[1/9] incubator-weex git commit: * [ios] fix obj dealloc unexpected

2017-05-03 Thread acton393

Repository: incubator-weex
Updated Branches:
  refs/heads/0.13-dev 73f5dee3a -> b33a2fea4


* [ios] fix obj dealloc unexpected


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cd324ad7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cd324ad7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cd324ad7

Branch: refs/heads/0.13-dev
Commit: cd324ad719f60985eafc95f9e431e452a857051d
Parents: 0f75fe1
Author: acton393 
Authored: Thu Apr 27 11:39:36 2017 +0800
Committer: acton393 
Committed: Thu Apr 27 11:39:36 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXAComponent.m|  8 
 ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m|  4 ++--
 ios/sdk/WeexSDK/Sources/Component/WXVideoComponent.m| 12 ++--
 ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m  | 10 +-
 ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m |  8 
 ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m |  6 +++---
 ios/sdk/WeexSDK/Sources/Protocol/WXURLRewriteProtocol.h |  5 ++---
 7 files changed, 26 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cd324ad7/ios/sdk/WeexSDK/Sources/Component/WXAComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXAComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXAComponent.m
index f5320e3..1893817 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXAComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXAComponent.m
@@ -61,9 +61,9 @@
 - (void)openURL
 {
 if (_href && [_href length] > 0) {
-NSMutableString *newHref = [_href mutableCopy];
-WX_REWRITE_URL(_href, WXResourceTypeLink, self.weexInstance, )
-if (!newHref) {
+NSMutableString *newURL = [_href mutableCopy];
+WX_REWRITE_URL(_href, WXResourceTypeLink, self.weexInstance)
+if (!newURL) {
 return;
 }
 id navigationHandler = [WXHandlerFactory 
handlerForProtocol:@protocol(WXNavigationProtocol)];
@@ -71,7 +71,7 @@
 completion:
 withContainer:)]) {
 __weak typeof(self) weexSelf = self;
-[navigationHandler pushViewControllerWithParam:@{@"url":newHref} 
completion:^(NSString *code, NSDictionary *responseData) {
+[navigationHandler pushViewControllerWithParam:@{@"url":newURL} 
completion:^(NSString *code, NSDictionary *responseData) {
 WXLogDebug(@"Push success -> %@", weexSelf.href);
 } withContainer:self.weexInstance.viewController];
 } else {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cd324ad7/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
index 0e9d4e9..7088965 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
@@ -256,7 +256,7 @@ static dispatch_queue_t WXImageUpdateQueue;
 if (placeholderSrc) {
 WXLogDebug(@"Updating image, component:%@, placeholder:%@ ", self.ref, 
placeholderSrc);
 NSMutableString *newURL = [_placeholdSrc mutableCopy];
-WX_REWRITE_URL(_placeholdSrc, WXResourceTypeImage, self.weexInstance, 
)
+WX_REWRITE_URL(_placeholdSrc, WXResourceTypeImage, self.weexInstance)
 
 __weak typeof(self) weakSelf = self;
 self.placeholderOperation = [[self imageLoader] 
downloadImageWithURL:newURL imageFrame:self.calculatedFrame userInfo:nil 
completed:^(UIImage *image, NSError *error, BOOL finished) {
@@ -295,7 +295,7 @@ static dispatch_queue_t WXImageUpdateQueue;
 WXLogDebug(@"Updating image:%@, component:%@", self.imageSrc, 
self.ref);
 NSDictionary *userInfo = @{@"imageQuality":@(self.imageQuality), 
@"imageSharp":@(self.imageSharp), @"blurRadius":@(self.blurRadius)};
 NSMutableString * newURL = [imageSrc mutableCopy];
-WX_REWRITE_URL(imageSrc, WXResourceTypeImage, self.weexInstance, 
)
+WX_REWRITE_URL(imageSrc, WXResourceTypeImage, self.weexInstance);
 __weak typeof(self) weakSelf = self;
 dispatch_async(dispatch_get_main_queue(), ^{
 weakSelf.imageOperation = [[weakSelf imageLoader] 
downloadImageWithURL:newURL imageFrame:weakSelf.calculatedFrame 
userInfo:userInfo completed:^(UIImage *image, NSError *error, BOOL finished) {

[8/9] incubator-weex git commit: Merge branch '0.13-dev' into 0.13-dev

2017-05-03 Thread acton393

Merge branch '0.13-dev' into 0.13-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/ee0e8df3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ee0e8df3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ee0e8df3

Branch: refs/heads/0.13-dev
Commit: ee0e8df3a9d34b0feeb1fd069e0ca7f51ced861f
Parents: f9df145 bb31e8e
Author: acton393 
Authored: Wed May 3 21:02:00 2017 +0800
Committer: GitHub 
Committed: Wed May 3 21:02:00 2017 +0800

--
 .travis.yml |   3 +-
 android/.gitignore  |   4 +-
 android/README.md   |   6 +
 android/build.gradle|  44 +++
 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 |  27 +-
 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   |   4 +-
 android/sdk/.gitignore  |   3 +-
 android/sdk/NOTICE  |  13 -
 android/sdk/build.gradle|  51 +--
 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
 android/sdk/unittest.sh |   3 -
 android/settings.gradle |   9 +
 android/weex_debug/build.gradle |  35 +-
 .../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 -
 test/run.sh |   2 +-
 test/scripts/util.js|   2 +-
 45 files changed, 799 insertions(+), 1580 deletions(-)
--

[7/9] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.13-dev' into 0.13-dev

2017-05-03 Thread acton393

Merge remote-tracking branch 'upstream/0.13-dev' into 0.13-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/f9df145f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f9df145f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f9df145f

Branch: refs/heads/0.13-dev
Commit: f9df145f003b32f36a142d1ed18a532fbb782541
Parents: 6ddff9f 9e93fc6
Author: acton393 
Authored: Wed May 3 14:19:59 2017 +0800
Committer: acton393 
Committed: Wed May 3 14:19:59 2017 +0800

--
 .travis.yml |   7 +
 .../java/com/alibaba/weex/WXPageActivity.java   |   3 +-
 android/run-ci.sh   |   2 +-
 android/sdk/libs/armeabi/libweexjsc.so  | Bin 7815820 -> 7652256 bytes
 .../java/com/taobao/weex/WXSDKInstance.java |   5 +
 .../com/taobao/weex/dom/TextDecorationSpan.java |  55 ++
 .../java/com/taobao/weex/dom/WXDomObject.java   |  51 ++---
 .../taobao/weex/dom/WXRecyclerDomObject.java|   8 +-
 .../main/java/com/taobao/weex/dom/WXStyle.java  | 193 +--
 .../com/taobao/weex/dom/WXTextDomObject.java|  11 +-
 .../weex/dom/action/GetComponentRectAction.java |  29 +--
 .../taobao/weex/ui/component/WXScroller.java|  16 +-
 .../weex/ui/component/WXTextDecoration.java |   1 +
 .../java/com/taobao/weex/utils/WXUtils.java |  60 +-
 .../java/com/taobao/weex/utils/WXUtilsTest.java |  16 +-
 dangerfile-junit.js |  80 
 dangerfile.js   |   4 +-
 .../WeexDemo/Scanner/WXScannerHistoryVC.m   |  25 ++-
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   |   2 +-
 .../Sources/Component/WXImageComponent.m|  13 +-
 .../WeexSDK/Sources/Component/WXTextComponent.m |  29 ++-
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m |   1 +
 package.json|  10 +-
 test/pages/components/hyperlink.vue |  31 +++
 test/pages/components/hyperlink_target.vue  |  22 +++
 test/pages/modules/vue_timer.vue|  75 +++
 test/pages/modules/we_timer.we  |  73 +++
 test/scripts/components/hyperlink.test.js   |  44 +
 test/scripts/components/text.test.js|   2 +-
 test/scripts/modules/timer.test.js  | 100 ++
 30 files changed, 853 insertions(+), 115 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f9df145f/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
--

[GitHub] incubator-weex issue #296: * [ios] try to fix obj dealloc unexpected

2017-05-03 Thread weex-bot

Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/296
  

  

  
  
  1 Message
  
 
  
  

  :book:
  Executed 53 tests, with 0 failures (0 
unexpected) in 52.609 (52.709) seconds

  



  Generated by :no_entry_sign: http://danger.systems/;>danger




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-weex pull request #289: + [ios] add timer method

2017-05-03 Thread asfgit

Github user asfgit closed the pull request at:

https://github.com/apache/incubator-weex/pull/289


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[2/3] incubator-weex git commit: + [ios] remove timer by callbackid

2017-05-03 Thread acton393

+ [ios] remove timer by callbackid


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8456c352
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8456c352
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8456c352

Branch: refs/heads/0.13-dev
Commit: 8456c3526756ddf59b8aca7b92c3e06ded214312
Parents: d651a97
Author: é½å±± 
Authored: Tue Apr 25 01:23:25 2017 +0800
Committer: é½å±± 
Committed: Tue Apr 25 01:23:25 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 60 ++--
 .../WeexSDK/Sources/Component/WXListComponent.m |  2 +-
 2 files changed, 45 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8456c352/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m 
b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
index 1131116..613df1d 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
@@ -44,6 +44,7 @@
 
 @property (nonatomic, strong)  JSContext *jsContext;
 @property (nonatomic, strong)  NSMutableArray *timers;
+@property (nonatomic, strong)  NSMutableDictionary *callbacks;
 
 @end
 
@@ -59,6 +60,7 @@
 _jsContext.name = @"Weex Context";
 }
 _timers = [NSMutableArray new];
+_callbacks = [NSMutableDictionary new];
 
 __weak typeof(self) weakSelf = self;
 
@@ -84,8 +86,8 @@
 [weakSelf triggerClearInterval:[appid toString] ret:[ret toString] 
arg:[arg toString]];
 };
 
-_jsContext[@"clearTimeoutWeex"] = ^(JSValue *appid, JSValue 
*ret,JSValue *arg) {
-[weakSelf triggerClearTimeout:[appid toString] ret:[ret toString] 
arg:[arg toString]];
+_jsContext[@"clearTimeoutWeex"] = ^(JSValue *ret) {
+[weakSelf triggerClearTimeout:[ret toString]];
 };
 
 _jsContext[@"nativeLog"] = ^() {
@@ -262,13 +264,37 @@
 #pragma mark - Public
 -(void)removeTimers:(NSString *)instance
 {
-if(instance && [_timers containsObject:instance])
-{
-[_timers removeObject:instance];
+if([_callbacks objectForKey:instance]){
+NSMutableArray *arr = [_callbacks objectForKey:instance];
+if(arr && [arr count]>0){
+for (NSString *callback in arr) {
+if([_timers containsObject:callback]){
+[_timers removeObject:callback];
+}
+}
+}
 }
 }
 
 #pragma mark - Private
+-(void)addInstance:(NSString *)instance callback:(NSString *)callback
+{
+if(instance.length > 0){
+if([_callbacks objectForKey:instance]){
+NSMutableArray *arr = [_callbacks objectForKey:instance];
+if (callback.length>0 && ![arr containsObject:callback]) {
+[arr addObject:callback];
+[_callbacks setObject:arr forKey:instance];
+}
+}else {
+NSMutableArray *arr = [NSMutableArray new];
+if (callback.length>0 && ![arr containsObject:callback]) {
+[arr addObject:callback];
+[_callbacks setObject:arr forKey:instance];
+}
+}
+}
+}
 
 - (void)triggerTimeout:(void(^)())block
 {
@@ -277,7 +303,7 @@
 
 - (void)callBack:(NSDictionary *)dic
 {
-if([dic objectForKey:@"appid"] && [_timers containsObject:[dic 
objectForKey:@"appid"]]) {
+if([dic objectForKey:@"ret"] && [_timers containsObject:[dic 
objectForKey:@"ret"]]) {
 [[WXSDKManager bridgeMgr] callBack:[dic objectForKey:@"appid"] 
funcId:[dic objectForKey:@"ret"]  params:[dic objectForKey:@"arg"] 
keepAlive:NO];
 }
 }
@@ -285,7 +311,7 @@
 
 - (void)callBackInterval:(NSDictionary *)dic
 {
-if([dic objectForKey:@"appid"] && [_timers containsObject:[dic 
objectForKey:@"appid"]]) {
+if([dic objectForKey:@"ret"] && [_timers containsObject:[dic 
objectForKey:@"ret"]]) {
 [[WXSDKManager bridgeMgr] callBack:[dic objectForKey:@"appid"] 
funcId:[dic objectForKey:@"ret"]  params:nil keepAlive:YES];
 [self triggerInterval:[dic objectForKey:@"appid"] ret:[dic 
objectForKey:@"ret"] arg:[dic objectForKey:@"arg"]];
 }
@@ -298,8 +324,9 @@
 if(WXFloatEqual(interval,0)) {
 return;
 }
-if(![_timers containsObject:appid]){
-[_timers addObject:appid];
+if(![_timers containsObject:ret]){
+[_timers addObject:ret];
+[self addInstance:appid callback:ret];
 }
 dispatch_time_t time = dispatch_time(DISPATCH_TIME_NOW, 
interval*NSEC_PER_SEC);
 dispatch_after(time,

[3/3] incubator-weex git commit: Merge branch 'ios-timer-0.13-dev' of https://github.com/kfeagle/incubator-weex into apache-0.13-dev

2017-05-03 Thread acton393

Merge branch 'ios-timer-0.13-dev' of https://github.com/kfeagle/incubator-weex 
into apache-0.13-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/73f5dee3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/73f5dee3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/73f5dee3

Branch: refs/heads/0.13-dev
Commit: 73f5dee3a0bf7a19091fe54bb6ed8bd8a60a9df5
Parents: bb31e8e 8456c35
Author: acton393 
Authored: Wed May 3 21:09:25 2017 +0800
Committer: acton393 
Committed: Wed May 3 21:09:25 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 69 
 1 file changed, 58 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/73f5dee3/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
--

[1/3] incubator-weex git commit: + [ios] add timer

2017-05-03 Thread acton393

Repository: incubator-weex
Updated Branches:
  refs/heads/0.13-dev bb31e8efb -> 73f5dee3a


+ [ios] add timer


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d651a97a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d651a97a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d651a97a

Branch: refs/heads/0.13-dev
Commit: d651a97a0ff6d1bcca0159e6d9510f6341c66e94
Parents: 9381c91
Author: é½å±± 
Authored: Tue Apr 25 00:35:25 2017 +0800
Committer: é½å±± 
Committed: Tue Apr 25 00:35:25 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 23 ++--
 1 file changed, 21 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d651a97a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m 
b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
index 7d58cf3..1131116 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
@@ -78,7 +78,14 @@
 
 _jsContext[@"setIntervalWeex"] = ^(JSValue *appid, JSValue 
*ret,JSValue *arg) {
 [weakSelf triggerInterval:[appid toString] ret:[ret toString] 
arg:[arg toString]];
-
+};
+
+_jsContext[@"clearIntervalWeex"] = ^(JSValue *appid, JSValue 
*ret,JSValue *arg) {
+[weakSelf triggerClearInterval:[appid toString] ret:[ret toString] 
arg:[arg toString]];
+};
+
+_jsContext[@"clearTimeoutWeex"] = ^(JSValue *appid, JSValue 
*ret,JSValue *arg) {
+[weakSelf triggerClearTimeout:[appid toString] ret:[ret toString] 
arg:[arg toString]];
 };
 
 _jsContext[@"nativeLog"] = ^() {
@@ -282,7 +289,6 @@
 [[WXSDKManager bridgeMgr] callBack:[dic objectForKey:@"appid"] 
funcId:[dic objectForKey:@"ret"]  params:nil keepAlive:YES];
 [self triggerInterval:[dic objectForKey:@"appid"] ret:[dic 
objectForKey:@"ret"] arg:[dic objectForKey:@"arg"]];
 }
-
 }
 
 - (void)triggerTimeout:(NSString *)appid ret:(NSString *)ret arg:(NSString 
*)arg
@@ -324,4 +330,17 @@
 });
 }
 
+- (void)triggerClearInterval:(NSString *)appid ret:(NSString *)ret 
arg:(NSString *)arg
+{
+if(![_timers containsObject:appid]){
+[_timers removeObject:appid];
+}
+}
+
+- (void)triggerClearTimeout:(NSString *)appid ret:(NSString *)ret 
arg:(NSString *)arg
+{
+if(![_timers containsObject:appid]){
+[_timers removeObject:appid];
+}
+}
 @end

[GitHub] incubator-weex issue #296: * [ios] try to fix obj dealloc unexpected

2017-05-03 Thread weex-bot

Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/296
  





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  





  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-weex pull request #311: 解决rewrite协议的一个bug

2017-05-03 Thread asfgit

Github user asfgit closed the pull request at:

https://github.com/apache/incubator-weex/pull/311


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[2/2] incubator-weex git commit: Merge branch '0.13-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.13-dev

2017-05-03 Thread acton393

Merge branch '0.13-dev' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.13-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/bb31e8ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bb31e8ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bb31e8ef

Branch: refs/heads/0.13-dev
Commit: bb31e8efb39708c25515ef3db215aed59039fbb1
Parents: 97d868a e704ea2
Author: acton393 
Authored: Wed May 3 20:55:10 2017 +0800
Committer: acton393 
Committed: Wed May 3 20:55:10 2017 +0800

--
 .travis.yml  |  2 +-
 android/build.gradle |  4 ++--
 android/gradle/wrapper/gradle-wrapper.properties |  4 ++--
 android/playground/app/build.gradle  |  2 +-
 android/weex_debug/build.gradle  | 10 +-
 test/scripts/util.js |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)
--

[1/2] incubator-weex git commit: 解决rewrite协议的一个bug

2017-05-03 Thread acton393

Repository: incubator-weex
Updated Branches:
  refs/heads/0.13-dev e704ea25b -> bb31e8efb


è§£å³rewriteåè®®çä¸ä¸ªbug


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/97d868a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/97d868a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/97d868a2

Branch: refs/heads/0.13-dev
Commit: 97d868a2a8c0d3670fb474b0d37c3cccee3541f9
Parents: 5c1ffb7
Author: æº¯å® 
Authored: Wed May 3 20:35:16 2017 +0800
Committer: æº¯å® 
Committed: Wed May 3 20:35:16 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Protocol/WXURLRewriteProtocol.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/97d868a2/ios/sdk/WeexSDK/Sources/Protocol/WXURLRewriteProtocol.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Protocol/WXURLRewriteProtocol.h 
b/ios/sdk/WeexSDK/Sources/Protocol/WXURLRewriteProtocol.h
index af57fd7..1c40796 100644
--- a/ios/sdk/WeexSDK/Sources/Protocol/WXURLRewriteProtocol.h
+++ b/ios/sdk/WeexSDK/Sources/Protocol/WXURLRewriteProtocol.h
@@ -27,7 +27,7 @@ do {\
 (*newUrl) = nil;\
 id rewriteHandler = [WXHandlerFactory 
handlerForProtocol:@protocol(WXURLRewriteProtocol)];\
 if ([rewriteHandler 
respondsToSelector:@selector(rewriteURL:withResourceType:withInstance:)]) {\
-(*newUrl) = [[rewriteHandler rewriteURL:url 
withResourceType:WXResourceTypeLink withInstance:instance].absoluteString 
mutableCopy];\
+(*newUrl) = [[rewriteHandler rewriteURL:url 
withResourceType:resourceType withInstance:instance].absoluteString 
mutableCopy];\
 }\
 } while(0);

[GitHub] incubator-weex issue #311: 解决rewrite协议的一个bug

2017-05-03 Thread weex-bot

Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/311
  

  

  
  
  1 Message
  
 
  
  

  :book:
  Executed 53 tests, with 0 failures (0 
unexpected) in 64.340 (64.402) seconds

  



  Generated by :no_entry_sign: http://danger.systems/;>danger




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-weex issue #311: 解决rewrite协议的一个bug

2017-05-03 Thread weex-bot

Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/311
  





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  





  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-weex pull request #311: 解决rewrite协议的一个bug

2017-05-03 Thread gunerguner

GitHub user gunerguner opened a pull request:

https://github.com/apache/incubator-weex/pull/311

è§£å³rewriteåè®®çä¸ä¸ªbug

fix a bug on WXURLRewriteProtocol.h.
The unfixed code will lead to a bug which cause the implement of 
WXURLRewriteProtocol would receive a static resource type.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/gunerguner/incubator-weex 0.13-dev

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/311.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #311


commit 97d868a2a8c0d3670fb474b0d37c3cccee3541f9
Author: æº¯å® 
Date:   2017-05-03T12:35:16Z

è§£å³rewriteåè®®çä¸ä¸ªbug




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

incubator-weex git commit: * [test] update apk name in test/script/util.js

2017-05-03 Thread kyork

Repository: incubator-weex
Updated Branches:
  refs/heads/0.13-dev bb33a758c -> e704ea25b


* [test] update apk name in test/script/util.js


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e704ea25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e704ea25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e704ea25

Branch: refs/heads/0.13-dev
Commit: e704ea25bcc55e45d87cd74aa3ffaa291a6721f8
Parents: bb33a75
Author: YorkShen 
Authored: Wed May 3 19:57:46 2017 +0800
Committer: YorkShen 
Committed: Wed May 3 19:57:46 2017 +0800

--
 test/scripts/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e704ea25/test/scripts/util.js
--
diff --git a/test/scripts/util.js b/test/scripts/util.js
index 81dc100..d09f16e 100644
--- a/test/scripts/util.js
+++ b/test/scripts/util.js
@@ -42,7 +42,7 @@ var androidOpts = {
   platformName: 'Android',
   target: 'android',
   slowEnv: isRunInCI,
-  app: path.join(__dirname, '..', 
`../android/playground/app/build/outputs/apk/playground.apk`)
+  app: path.join(__dirname, '..', 
`../android/playground/app/build/outputs/apk/playground-debug.apk`)
 };
 
 var androidChromeOpts = {

[GitHub] incubator-weex pull request #309: [android] use android folder as gradle pro...

2017-05-03 Thread sospartan

Github user sospartan closed the pull request at:

https://github.com/apache/incubator-weex/pull/309


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-weex issue #309: [android] use android folder as gradle project ro...

2017-05-03 Thread sospartan

Github user sospartan commented on the issue:

https://github.com/apache/incubator-weex/pull/309
  
Close this. Already merged use cherrypick.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-weex pull request #310: * [android] Update build.gradle

2017-05-03 Thread asfgit

Github user asfgit closed the pull request at:

https://github.com/apache/incubator-weex/pull/310


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[1/2] incubator-weex git commit: * [android] Update build.gradle

2017-05-03 Thread sospartan

Repository: incubator-weex
Updated Branches:
  refs/heads/0.13-dev 5c1ffb7cd -> bb33a758c


* [android] Update build.gradle


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a332b2d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a332b2d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a332b2d3

Branch: refs/heads/0.13-dev
Commit: a332b2d330358b370fd3666360a8f522de329a35
Parents: 5c1ffb7
Author: YorkShen 
Authored: Wed May 3 18:08:46 2017 +0800
Committer: YorkShen 
Committed: Wed May 3 18:08:46 2017 +0800

--
 android/build.gradle |  4 ++--
 android/gradle/wrapper/gradle-wrapper.properties |  4 ++--
 android/playground/app/build.gradle  |  2 +-
 android/weex_debug/build.gradle  | 10 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a332b2d3/android/build.gradle
--
diff --git a/android/build.gradle b/android/build.gradle
index 990f492..25d281b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -30,10 +30,10 @@ subprojects {
 }
 ext {
 compileSdkVersion=24
-buildToolsVersion="23.0.2"
+buildToolsVersion="24.0.3"
 minSdkVersion=14
 appMinSdkVersion=15
-targetSdkVersion=23
+targetSdkVersion=24
 supportLibVersion="24.2.0"
 fastjsonLibVersion="1.1.46.android"
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a332b2d3/android/gradle/wrapper/gradle-wrapper.properties
--
diff --git a/android/gradle/wrapper/gradle-wrapper.properties 
b/android/gradle/wrapper/gradle-wrapper.properties
index c4ff567..d795868 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed May 03 10:14:11 CST 2017
+#Wed May 03 18:06:49 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a332b2d3/android/playground/app/build.gradle
--
diff --git a/android/playground/app/build.gradle 
b/android/playground/app/build.gradle
index a90b91c..c1d5da1 100755
--- a/android/playground/app/build.gradle
+++ b/android/playground/app/build.gradle
@@ -64,7 +64,7 @@ android {
 
 dependencies {
 compile fileTree(include: ['*.jar'], dir: 'libs')
-androidTestCompile 'com.android.support:support-annotations:23.2.1'
+androidTestCompile 
"com.android.support:support-annotations:${project.supportLibVersion}"
 androidTestCompile 'junit:junit:4.12'
 androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
 
androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2.2', {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a332b2d3/android/weex_debug/build.gradle
--
diff --git a/android/weex_debug/build.gradle b/android/weex_debug/build.gradle
index acef635..32b59ab 100644
--- a/android/weex_debug/build.gradle
+++ b/android/weex_debug/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-compileSdkVersion 23
-buildToolsVersion "23.0.2"
+compileSdkVersion project.compileSdkVersion
+buildToolsVersion project.buildToolsVersion
 
 defaultConfig {
-minSdkVersion 14
-targetSdkVersion 23
+minSdkVersion project.minSdkVersion
+targetSdkVersion project.targetSdkVersion
 versionCode 1
 versionName "1.0"
 }
@@ -31,7 +31,7 @@ android {
 dependencies {
 compile fileTree(include: ['*.jar'], dir: 'libs')
 testCompile 'junit:junit:4.12'
-provided 'com.android.support:appcompat-v7:23.1.1'
+provided "com.android.support:appcompat-v7:${project.supportLibVersion}"
 compile 'com.squareup.okhttp:okhttp-ws:2.3.0'
 provided "com.alibaba:fastjson:${project.fastjsonLibVersion}"
 //compile 'com.taobao.android:weex_sdk:0.4.+'

[GitHub] incubator-weex issue #310: * [android] Update build.gradle

2017-05-03 Thread weex-bot

Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/310
  

  

  
  
  1 Message
  
 
  
  

  :book:
  Executed 53 tests, with 0 failures (0 
unexpected) in 64.270 (64.396) seconds

  



  Generated by :no_entry_sign: http://danger.systems/;>danger




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-weex issue #310: * [android] Update build.gradle

2017-05-03 Thread weex-bot

Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/310
  





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  





  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

svn commit: r19456 - /dev/incubator/weex/weex-jars.tar.gz

2017-05-03 Thread sospartan

Author: sospartan
Date: Wed May  3 10:04:01 2017
New Revision: 19456

Log:
add weex jars used in apache release

Added:
dev/incubator/weex/weex-jars.tar.gz   (with props)

Added: dev/incubator/weex/weex-jars.tar.gz
==
Binary file - no diff available.

Propchange: dev/incubator/weex/weex-jars.tar.gz
--
svn:mime-type = application/octet-stream

[1/2] incubator-weex git commit: * [android] use android folder as gradle project root

2017-05-03 Thread sospartan

Repository: incubator-weex
Updated Branches:
  refs/heads/dev 7a8eac827 -> 703213e95


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/703213e9/android/playground/settings.gradle
--
diff --git a/android/playground/settings.gradle 
b/android/playground/settings.gradle
deleted file mode 100755
index 2dda97a..000
--- a/android/playground/settings.gradle
+++ /dev/null
@@ -1,10 +0,0 @@
-include ':app'
-
-include ":weex_sdk"
-project(":weex_sdk").projectDir=new File("../sdk")
-
-include ":commons"
-project(":commons").projectDir=new File("../commons")
-
-include ":weex_debug"
-project(":weex_debug").projectDir=new File("../weex_debug")

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/703213e9/android/run-ci.sh
--
diff --git a/android/run-ci.sh b/android/run-ci.sh
index fae4e74..d7f1bdc 100755
--- a/android/run-ci.sh
+++ b/android/run-ci.sh
@@ -1,4 +1,4 @@
-# !/bin/sh -eu
-cd playground
+# will not exist if err
 ./gradlew assembleDebug :weex_sdk:testDebugUnitTest --info -PdisableCov=true 
-PtargetSDK=19 -Dorg.gradle.daemon=true -Dorg.gradle.parallel=true 
-Dorg.gradle.jvmargs="-Xmx512m -XX:+HeapDumpOnOutOfMemoryError" 
-Dfile.encoding=UTF-8
-COLUMNS=2000 ps -m -o pid,rss,command > ../sdk/build/reports/memdump.txt
\ No newline at end of file
+COLUMNS=2000 ps -m -o pid,rss,command > sdk/build/reports/memdump.txt
+

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/703213e9/android/sdk/.gitignore
--
diff --git a/android/sdk/.gitignore b/android/sdk/.gitignore
index ddff309..8311cb9 100755
--- a/android/sdk/.gitignore
+++ b/android/sdk/.gitignore
@@ -11,4 +11,5 @@ bin
 gen
 *.iml
 lint.xml
-project.properties
\ No newline at end of file
+project.properties
+assets/main.js
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/703213e9/android/sdk/NOTICE
--
diff --git a/android/sdk/NOTICE b/android/sdk/NOTICE
deleted file mode 100755
index 31c68ce..000
--- a/android/sdk/NOTICE
+++ /dev/null
@@ -1,13 +0,0 @@
-Weex Sdk Android
-Copyright 2016 Alibaba Group
-
-This product includes software developed at Alibaba Group. 
(http://www.alibabagroup.com)
-
-This product contains software 
css-layout(https://github.com/facebook/css-layout) developed
-by Facebook Inc., licensed under the BSD License.
-
-This product contains software React 
Native(https://github.com/facebook/react-native) developed
-by Facebook Inc., licensed under the BSD License.
-
-This product contains software Guava(https://github.com/google/guava) developed
-by Google Inc. , licensed under the Apache License.

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/703213e9/android/sdk/build.gradle
--
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 9e76745..4283830 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -1,24 +1,10 @@
 buildscript {
-repositories {
-mavenCentral()
-jcenter()
-}
 dependencies {
-classpath 'com.android.tools.build:gradle:2.1.3'
-classpath files('license/license-gradle-plugin-0.12.1.jar')
-classpath files('license/maven-license-plugin-1.10.b1.jar')
-classpath files('license/plexus-utils-3.0.24.jar')
 classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.5.0'
 }
 }
 
-
-plugins {
-id "com.github.hierynomus.license" version "0.13.1"
-}
-
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.hierynomus.license'
 apply plugin: 'checkstyle'
 
 ext.disableCov = project.hasProperty('disableCov') ? 
project.getProperty('disableCov') : 'false'
@@ -49,8 +35,8 @@ checkstyle {
 version = "0.9.4"
 
 android {
-compileSdkVersion 23
-buildToolsVersion "23.0.2"
+compileSdkVersion project.compileSdkVersion
+buildToolsVersion project.buildToolsVersion
 resourcePrefix "weex"
 
 useLibrary 'org.apache.http.legacy'
@@ -123,12 +109,12 @@ android {
 
 dependencies {
 compile fileTree(include: ['*.jar'], dir: 'libs')
-provided 'com.android.support:recyclerview-v7:23.1.1'
-provided 'com.android.support:support-v4:23.1.1'
-provided 'com.android.support:appcompat-v7:23.1.1'
-provided 'com.alibaba:fastjson:1.1.46.android'
+provided "com.android.support:recyclerview-v7:${project.supportLibVersion}"
+provided "com.android.support:support-v4:${project.supportLibVersion}"
+provided "com.android.support:appcompat-v7:${project.supportLibVersion}"
+provided "com.alibaba:fastjson:${project.fastjsonLibVersion}"
 
-testCompile 'com.alibaba:fastjson:1.1.46.android'
+testCompile "com.alibaba:fastjson:${project.fastjsonLibVersion}"
 testCompile

[1/2] incubator-weex git commit: * [android] use android folder as gradle project root

2017-05-03 Thread sospartan

Repository: incubator-weex
Updated Branches:
  refs/heads/0.13-dev 9e93fc656 -> 5c1ffb7cd


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5c1ffb7c/android/playground/settings.gradle
--
diff --git a/android/playground/settings.gradle 
b/android/playground/settings.gradle
deleted file mode 100755
index 2dda97a..000
--- a/android/playground/settings.gradle
+++ /dev/null
@@ -1,10 +0,0 @@
-include ':app'
-
-include ":weex_sdk"
-project(":weex_sdk").projectDir=new File("../sdk")
-
-include ":commons"
-project(":commons").projectDir=new File("../commons")
-
-include ":weex_debug"
-project(":weex_debug").projectDir=new File("../weex_debug")

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5c1ffb7c/android/run-ci.sh
--
diff --git a/android/run-ci.sh b/android/run-ci.sh
index 930fffd..d7f1bdc 100755
--- a/android/run-ci.sh
+++ b/android/run-ci.sh
@@ -1,4 +1,4 @@
 # will not exist if err
-cd playground
 ./gradlew assembleDebug :weex_sdk:testDebugUnitTest --info -PdisableCov=true 
-PtargetSDK=19 -Dorg.gradle.daemon=true -Dorg.gradle.parallel=true 
-Dorg.gradle.jvmargs="-Xmx512m -XX:+HeapDumpOnOutOfMemoryError" 
-Dfile.encoding=UTF-8
-COLUMNS=2000 ps -m -o pid,rss,command > ../sdk/build/reports/memdump.txt
\ No newline at end of file
+COLUMNS=2000 ps -m -o pid,rss,command > sdk/build/reports/memdump.txt
+

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5c1ffb7c/android/sdk/.gitignore
--
diff --git a/android/sdk/.gitignore b/android/sdk/.gitignore
index ddff309..8311cb9 100755
--- a/android/sdk/.gitignore
+++ b/android/sdk/.gitignore
@@ -11,4 +11,5 @@ bin
 gen
 *.iml
 lint.xml
-project.properties
\ No newline at end of file
+project.properties
+assets/main.js
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5c1ffb7c/android/sdk/NOTICE
--
diff --git a/android/sdk/NOTICE b/android/sdk/NOTICE
deleted file mode 100755
index 31c68ce..000
--- a/android/sdk/NOTICE
+++ /dev/null
@@ -1,13 +0,0 @@
-Weex Sdk Android
-Copyright 2016 Alibaba Group
-
-This product includes software developed at Alibaba Group. 
(http://www.alibabagroup.com)
-
-This product contains software 
css-layout(https://github.com/facebook/css-layout) developed
-by Facebook Inc., licensed under the BSD License.
-
-This product contains software React 
Native(https://github.com/facebook/react-native) developed
-by Facebook Inc., licensed under the BSD License.
-
-This product contains software Guava(https://github.com/google/guava) developed
-by Google Inc. , licensed under the Apache License.

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5c1ffb7c/android/sdk/build.gradle
--
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index a2e44c4..db47809 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -1,24 +1,10 @@
 buildscript {
-repositories {
-mavenCentral()
-jcenter()
-}
 dependencies {
-classpath 'com.android.tools.build:gradle:2.1.3'
-classpath files('license/license-gradle-plugin-0.12.1.jar')
-classpath files('license/maven-license-plugin-1.10.b1.jar')
-classpath files('license/plexus-utils-3.0.24.jar')
 classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.5.0'
 }
 }
 
-
-plugins {
-id "com.github.hierynomus.license" version "0.13.1"
-}
-
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.hierynomus.license'
 apply plugin: 'checkstyle'
 
 ext.disableCov = project.hasProperty('disableCov') ? 
project.getProperty('disableCov') : 'false'
@@ -49,8 +35,8 @@ checkstyle {
 version = "0.9.4"
 
 android {
-compileSdkVersion 23
-buildToolsVersion "23.0.2"
+compileSdkVersion project.compileSdkVersion
+buildToolsVersion project.buildToolsVersion
 resourcePrefix "weex"
 
 useLibrary 'org.apache.http.legacy'
@@ -129,12 +115,12 @@ android {
 
 dependencies {
 compile fileTree(include: ['*.jar'], dir: 'libs')
-provided 'com.android.support:recyclerview-v7:23.1.1'
-provided 'com.android.support:support-v4:23.1.1'
-provided 'com.android.support:appcompat-v7:23.1.1'
-provided 'com.alibaba:fastjson:1.1.46.android'
+provided "com.android.support:recyclerview-v7:${project.supportLibVersion}"
+provided "com.android.support:support-v4:${project.supportLibVersion}"
+provided "com.android.support:appcompat-v7:${project.supportLibVersion}"
+provided "com.alibaba:fastjson:${project.fastjsonLibVersion}"
 
-testCompile 'com.alibaba:fastjson:1.1.46.android'
+testCompile "com.alibaba:fastjson:${project.fastjsonLibVersion}"
 testCompile 'junit:junit:4.12'

[2/2] incubator-weex git commit: * [android] use android folder as gradle project root

2017-05-03 Thread sospartan

* [android] use android folder as gradle project root

* Use 'android' folder as weex-android-gradle-project root
* Fix build.gradle files not use same version(gradle version,build tool 
version, etc.)
* Replace gradle license jars with mvn repo dependency
* update compileSDKVersion to 24
* remove gradle license, this plugin no longer working and we have ci to detect 
license


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5c1ffb7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5c1ffb7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5c1ffb7c

Branch: refs/heads/0.13-dev
Commit: 5c1ffb7cd5d2f3e5ced66aff105d6f3e3893fcc5
Parents: 9e93fc6
Author: sospartan 
Authored: Wed May 3 13:26:15 2017 +0800
Committer: sospartan 
Committed: Wed May 3 16:56:28 2017 +0800

--
 .travis.yml |   1 +
 android/.gitignore  |   4 +-
 android/README.md   |   6 +
 android/build.gradle|  44 +++
 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   |   4 +-
 android/sdk/.gitignore  |   3 +-
 android/sdk/NOTICE  |  13 -
 android/sdk/build.gradle|  51 +--
 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
 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 -
 test/run.sh |   2 +-
 44 files changed, 791 insertions(+), 1572 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5c1ffb7c/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index ae8d3fe..3a72194 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,6 +44,7 @@ matrix:
 - platform-tools
 - tools
 - build-tools-23.0.2
+- android-24
 - android-23
 - android-22
 - extra-google-m2repository

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5c1ffb7c/android/.gitignore
--
diff --git a/android/.gitignore b/android/.gitignore
index 17536d9..34dae53 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -3,4 +3,6 @@
 local.properties
 *iml
 build
-captures
\ No newline at end of file
+captures
+.settings
+.project
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5c1ffb7c/android/README.md
--
diff --git a/android/README.md b/android/README.md
new file mode

37 matches

Mail list logo