[GitHub] incubator-weex pull request #705: * [android] gradle update to version 3.3 a...

[asfgit]

Github user asfgit closed the pull request at:

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


---

[2/2] incubator-weex git commit: * [android] update ci -- gradle wrapper --gradle-version 3.3

[kyork]

* [android] update ci -- gradle wrapper --gradle-version 3.3


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

Branch: refs/heads/0.16-dev
Commit: e52d273e27e87da3773e65f3aaeae33ecf6b4f02
Parents: ecc2166
Author: atomtong 
Authored: Fri Sep 15 14:41:47 2017 +0800
Committer: atomtong 
Committed: Fri Sep 15 14:41:47 2017 +0800

--
 scripts/build_from_source.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e52d273e/scripts/build_from_source.sh
--
diff --git a/scripts/build_from_source.sh b/scripts/build_from_source.sh
index 1b114e7..132efb0 100644
--- a/scripts/build_from_source.sh
+++ b/scripts/build_from_source.sh
@@ -34,7 +34,7 @@ sleep 2
 cp packages/weex-js-framework/index.min.js ios_sdk/WeexSDK/Resources/main.js
 cp packages/weex-js-framework/index.min.js android_sdk/assets/main.js
 
-gradle wrapper --gradle-version 2.14.1
+gradle wrapper --gradle-version 3.3
 echo 'include ":android_sdk"'>settings.gradle
 ./gradlew :android_sdk:assemble -PasfRelease
 

[1/2] incubator-weex git commit: * [android] gradle update to version 3.3 and fix javadoc issues

[kyork]

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 55d7c3573 -> e52d273e2


* [android] gradle update to version 3.3 and fix javadoc issues


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

Branch: refs/heads/0.16-dev
Commit: ecc2166e45a235f3c78eba552c9a3f0651c106fc
Parents: 55d7c35
Author: atomtong 
Authored: Fri Sep 15 12:07:27 2017 +0800
Committer: atomtong 
Committed: Fri Sep 15 12:07:27 2017 +0800

--
 android/build.gradle   | 13 -
 android/gradle/wrapper/gradle-wrapper.properties   |  2 +-
 .../src/main/java/com/taobao/weex/WXSDKInstance.java   |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ecc2166e/android/build.gradle
--
diff --git a/android/build.gradle b/android/build.gradle
index 28cf76e..9c0e2d5 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -5,12 +5,13 @@ buildscript {
 jcenter()
 }
 dependencies {
-classpath 'com.android.tools.build:gradle:2.1.3'
+classpath 'com.android.tools.build:gradle:2.3.3'
 }
 }
 
 plugins {
 id "de.undercouch.download" version "3.2.0"
+//id "com.github.dcendents.android-maven" version "1.5"
 }
 
 repositories {
@@ -29,7 +30,9 @@ subprojects {
 jcenter()
 }
 dependencies {
-classpath 'com.android.tools.build:gradle:2.1.3'
+classpath 'com.android.tools.build:gradle:2.3.3'
+classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
+classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 }
 }
 ext {
@@ -43,6 +46,6 @@ subprojects {
 }
 }
 
-task clean(type: Delete) {
-delete rootProject.buildDir
-}
+//task clean(type: Delete) {
+//delete rootProject.buildDir
+//}

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ecc2166e/android/gradle/wrapper/gradle-wrapper.properties
--
diff --git a/android/gradle/wrapper/gradle-wrapper.properties 
b/android/gradle/wrapper/gradle-wrapper.properties
index d795868..73990aa 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ecc2166e/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 537f43a..fcdcd0d 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -1500,7 +1500,7 @@ public class WXSDKInstance implements 
IWXActivityStateListener,DomContext, View.
* Check whether the current module registered the event
* @param eventName EventName register in weex
* @param module Events occur in this Module
-   * @return  register->true
+   * @return  boolean true
*/
   public boolean checkModuleEventRegistered(String eventName,WXModule module) {
 if (module != null) {

incubator-weex git commit: * [doc] Update doc format.

[kyork]

Repository: incubator-weex
Updated Branches:
  refs/heads/dev bdd6f1b5b -> 81aa503ee


* [doc] Update doc format.


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

Branch: refs/heads/dev
Commit: 81aa503ee9008d7f093ae270594579dd7bcd6f20
Parents: bdd6f1b
Author: YorkShen 
Authored: Fri Sep 15 16:27:36 2017 +0800
Committer: YorkShen 
Committed: Fri Sep 15 16:27:36 2017 +0800

--
 doc/source/references/common-style.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/81aa503e/doc/source/references/common-style.md
--
diff --git a/doc/source/references/common-style.md 
b/doc/source/references/common-style.md
index 9c1251f..359b0e0 100644
--- a/doc/source/references/common-style.md
+++ b/doc/source/references/common-style.md
@@ -203,9 +203,9 @@ Currently supported format:
 * scaleX(  )
 * scaleY(  )
 * rotate(  )
-- rotateX(  ) v0.14+
-- rotateY(  ) v0.14+
-- perspective(  ), supported for Android 4.1 and above. v0.16+
+* rotateX(  ) v0.14+
+* rotateY(  ) v0.14+
+* perspective(  ), supported for Android 4.1 and above. v0.16+
 * transform-origin: number/percentage/keyword(top/left/right/bottom)
 
 ### Example

[GitHub] incubator-weex issue #706: * [android] fix tracing crash

[weex-bot]

Github user weex-bot commented on the issue:

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





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  

  :warning:
  This PR should update related documents as well. 

  





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




---

[GitHub] incubator-weex pull request #706: * [android] fix tracing crash

[misakuo]

GitHub user misakuo opened a pull request:

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

* [android] fix tracing crash



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

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-tracing-crash

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

https://github.com/apache/incubator-weex/pull/706.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 #706


commit f1ce1009a804307bb01e8e4a421a15899bad0a7c
Author: misakuo 
Date:   2017-09-15T08:14:02Z

* [android] fix tracing crash




---