weex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ky...@apache.org
Subject [02/14] incubator-weex git commit: * [android] update cc
Date Thu, 07 Sep 2017 08:18:19 GMT
* [android] update cc


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

Branch: refs/heads/0.16-dev
Commit: 18d5dc568cbcea20a463a9c9ca8a3d43eaf79b09
Parents: fcc7eec
Author: atomtong <tong_huabing@qq.com>
Authored: Tue Aug 29 12:11:05 2017 +0800
Committer: atomtong <tong_huabing@qq.com>
Committed: Tue Aug 29 12:11:05 2017 +0800

----------------------------------------------------------------------
 android/gradle.properties                       |   5 ++--
 .../gradle/wrapper/gradle-wrapper.properties    |   1 +
 android/jacoco.gradle                           |   6 ++---
 android/playground/app/build.gradle             |   8 +-----
 .../alibaba/weex/util/JacocoCodeCoverage.java   |  26 ++++---------------
 android/playground/jacocoagent.jar              | Bin 0 -> 258512 bytes
 android/sdk/build.gradle                        |   1 +
 7 files changed, 13 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/18d5dc56/android/gradle.properties
----------------------------------------------------------------------
diff --git a/android/gradle.properties b/android/gradle.properties
index 9b2bc67..9f11f36 100755
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -11,6 +11,7 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 #Mon Jun 27 20:06:22 CST 2016
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-org.gradle.parallel=true
+org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#org.gradle.parallel=true
 android.useDeprecatedNdk=true
+org.gradle.deamon=false

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/18d5dc56/android/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 2af1c24..34ba7a6 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -4,3 +4,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/18d5dc56/android/jacoco.gradle
----------------------------------------------------------------------
diff --git a/android/jacoco.gradle b/android/jacoco.gradle
index e8ea251..0dd8d1d 100644
--- a/android/jacoco.gradle
+++ b/android/jacoco.gradle
@@ -9,9 +9,7 @@ jacoco {
 
 def coverageSourceDirs = [
         '../app/src/main/java',
-        '../../../android/sdk/src/main/java'
-
-]
+        '../../../android/sdk/src/main/java']
 
 task jacocoTestReport(type: JacocoReport) {
     group = "Reporting"
@@ -34,7 +32,7 @@ task jacocoTestReport(type: JacocoReport) {
 
 
 
-    executionData = files("$buildDir/outputs/code-coverage/connected/coverage.exec")
+    executionData = files("$buildDir/outputs/code-coverage/connected/coverage.ec")
     doFirst {
         new File("$buildDir/intermediates/classes/").eachFileRecurse { file ->
             if (file.name.contains('$$')) {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/18d5dc56/android/playground/app/build.gradle
----------------------------------------------------------------------
diff --git a/android/playground/app/build.gradle b/android/playground/app/build.gradle
index 073ad4d..1da00d1 100755
--- a/android/playground/app/build.gradle
+++ b/android/playground/app/build.gradle
@@ -1,11 +1,6 @@
 apply plugin: 'com.android.application'
 apply from: '../../jacoco.gradle'
 
-//apply plugin: 'jacoco'
-//
-//jacoco {
-//    toolVersion = "0.7.9+"
-//}
 
 android {
     compileSdkVersion project.compileSdkVersion
@@ -51,6 +46,7 @@ android {
             java {
                 srcDirs = ["src/main/java", "src/main/java_zxing"];
             }
+            resources.includes = [ '**/jacoco-agent.properties' ]
         }
     }
     lintOptions {
@@ -113,6 +109,4 @@ dependencies {
     compile 'com.taobao.android.weex_inspection:urlconnection_interceptor:1.0.0'
     compile 'com.android.support.test.espresso:espresso-idling-resource:2.2.2'
     compile 'com.taobao.android:weex_inspector:0.11.0'
-//    compile group: 'org.jruby', name: 'jruby', version: '1.4.1+'
-    compile 'org.jacoco:org.jacoco.agent:0.7.9'
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/18d5dc56/android/playground/app/src/main/java/com/alibaba/weex/util/JacocoCodeCoverage.java
----------------------------------------------------------------------
diff --git a/android/playground/app/src/main/java/com/alibaba/weex/util/JacocoCodeCoverage.java
b/android/playground/app/src/main/java/com/alibaba/weex/util/JacocoCodeCoverage.java
index faef7bb..bcef856 100644
--- a/android/playground/app/src/main/java/com/alibaba/weex/util/JacocoCodeCoverage.java
+++ b/android/playground/app/src/main/java/com/alibaba/weex/util/JacocoCodeCoverage.java
@@ -20,6 +20,8 @@
 package com.alibaba.weex.util;
 
 import android.content.Context;
+import android.util.Log;
+
 import com.taobao.weex.utils.WXLogUtils;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -74,36 +76,18 @@ public class JacocoCodeCoverage {
 	  WXLogUtils.d( TAG, "generateCoverageReport: ok! " +
 			  "file in [Android/data/com.alibaba.weex/files]" );
 
-	} catch (ClassNotFoundException e) {
-	  reportJacocoError(e);
-	} catch (SecurityException e) {
-	  reportJacocoError(e);
-	} catch (NoSuchMethodException e) {
-	  reportJacocoError(e);
-	} catch (IllegalArgumentException e) {
-	  reportJacocoError(e);
-	} catch (IllegalAccessException e) {
-	  reportJacocoError(e);
-	} catch (InvocationTargetException e) {
-	  reportJacocoError(e);
-	} catch (FileNotFoundException e){
-	  reportJacocoError(e);
-	} catch (IOException e) {
-	  reportJacocoError(e);
+	} catch (Exception e) {
+	  Log.e(TAG, e.toString());
 	} finally {
 	  if (out != null) {
 		try {
 		  out.close();
 		} catch (IOException e) {
-		  reportJacocoError(e);
+		  Log.e(TAG, e.getMessage().toString());
 		}
 	  }
 	}
   }
-
-  private static void reportJacocoError(Exception e) {
-	WXLogUtils.e(TAG, e.toString());
-  }
 }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/18d5dc56/android/playground/jacocoagent.jar
----------------------------------------------------------------------
diff --git a/android/playground/jacocoagent.jar b/android/playground/jacocoagent.jar
new file mode 100644
index 0000000..d5c4b6b
Binary files /dev/null and b/android/playground/jacocoagent.jar differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/18d5dc56/android/sdk/build.gradle
----------------------------------------------------------------------
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index a586241..0f4e178 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -165,6 +165,7 @@ dependencies {
     testCompile 'org.robolectric:robolectric:3.3.2'
     testCompile "org.robolectric:shadows-httpclient:3.3.2"
     testCompile 'org.json:json:20160212'
+
 }
 if(file('../license/LICENSE').exists()){
     license {


Mime
View raw message