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 <tong_huab...@qq.com> Authored: Fri Sep 15 12:07:27 2017 +0800 Committer: atomtong <tong_huab...@qq.com> 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) {
