Update deps, update java docs, extract jacoco gradle logic

isuPatches · Mar 26, 2017 · d3a3a2c · d3a3a2c
1 parent 53cdb27
commit d3a3a2c
Show file tree

Hide file tree

Showing 30 changed files with 141 additions and 138 deletions.
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ Then add it as a dependency:
 Gradle:
 
 ```
-compile 'com.isupatches:wisefy:1.0.6'
+compile 'com.isupatches:wisefy:1.0.7'
 ```
 
 Maven:
@@ -50,7 +50,7 @@ Maven:
 <dependency>
   <groupId>com.isupatches</groupId>
   <artifactId>wisefy</artifactId>
-  <version>1.0.6</version>
+  <version>1.0.7</version>
   <type>pom</type>
 </dependency>
 ```

diff --git a/build.gradle b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.2'
+        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.3'
         classpath "com.github.dcendents:android-maven-gradle-plugin:1.5"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath "org.jacoco:org.jacoco.core:0.7.8"
@@ -46,7 +46,7 @@ subprojects {
 
 ext {
     GROUP = "com.isupatches"
-    VERSION_NAME = "1.0.6"
+    VERSION_NAME = "1.0.7"
 
     BINTRAY_REPO = "Maven"
     BINTRAY_NAME = "wisefy"

diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle
@@ -0,0 +1,35 @@
+apply plugin: 'jacoco'
+
+def coverageSourceDirs = [
+        '../wisefy/src/main/java'
+]
+
+def classDirs = fileTree(
+        dir: '../wisefy/build/intermediates/classes/debug/com/',
+        excludes: ['**/R.class',
+                   '**/R$*.class',
+                   '**/*$ViewBinder*.*',
+                   '**/*MembersInjector*.*',
+                   '**/BuildConfig.*',
+                   '**/Manifest*.*',
+                   '**/*$Lambda$*.class',
+                   '**/*Factory*.class',
+                   '**/*$Builder*'])
+
+task jacocoDebugTestReport(type: JacocoReport, dependsOn: ["connectedDebugAndroidTest"]) {
+    group = "Reporting"
+    description = "Generate Jacoco coverage report for debug tests"
+    classDirectories = classDirs
+    additionalSourceDirs = files(coverageSourceDirs)
+    sourceDirectories = files(coverageSourceDirs)
+    executionData = files([fileTree(dir: 'build/outputs/code-coverage/connected', include: '**/*.ec')])
+
+    onlyIf = {
+        true
+    }
+
+    reports {
+        xml.enabled = true
+        html.enabled = true
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Feb 04 20:20:36 CST 2017
+#Sat Mar 25 21:27:42 CDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
diff --git a/gradlew b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

diff --git a/javadoc/allclasses-frame.html b/javadoc/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>All Classes (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>All Classes (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/javadoc/allclasses-noframe.html b/javadoc/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>All Classes (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>All Classes (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/javadoc/com/isupatches/wisefy/WiseFy.html b/javadoc/com/isupatches/wisefy/WiseFy.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>WiseFy (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>WiseFy (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="WiseFy (wisefy 1.0.6 API)";
+            parent.document.title="WiseFy (wisefy 1.0.7 API)";
         }
     }
     catch(err) {

diff --git a/javadoc/com/isupatches/wisefy/WiseFy.withContext.html b/javadoc/com/isupatches/wisefy/WiseFy.withContext.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>WiseFy.withContext (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>WiseFy.withContext (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="WiseFy.withContext (wisefy 1.0.6 API)";
+            parent.document.title="WiseFy.withContext (wisefy 1.0.7 API)";
         }
     }
     catch(err) {

diff --git a/javadoc/com/isupatches/wisefy/package-frame.html b/javadoc/com/isupatches/wisefy/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>com.isupatches.wisefy (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>com.isupatches.wisefy (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>

diff --git a/javadoc/com/isupatches/wisefy/package-summary.html b/javadoc/com/isupatches/wisefy/package-summary.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>com.isupatches.wisefy (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>com.isupatches.wisefy (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.isupatches.wisefy (wisefy 1.0.6 API)";
+            parent.document.title="com.isupatches.wisefy (wisefy 1.0.7 API)";
         }
     }
     catch(err) {

diff --git a/javadoc/com/isupatches/wisefy/package-tree.html b/javadoc/com/isupatches/wisefy/package-tree.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>com.isupatches.wisefy Class Hierarchy (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>com.isupatches.wisefy Class Hierarchy (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.isupatches.wisefy Class Hierarchy (wisefy 1.0.6 API)";
+            parent.document.title="com.isupatches.wisefy Class Hierarchy (wisefy 1.0.7 API)";
         }
     }
     catch(err) {

diff --git a/javadoc/com/isupatches/wisefy/util/GetManagerUtil.html b/javadoc/com/isupatches/wisefy/util/GetManagerUtil.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>GetManagerUtil (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>GetManagerUtil (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="GetManagerUtil (wisefy 1.0.6 API)";
+            parent.document.title="GetManagerUtil (wisefy 1.0.7 API)";
         }
     }
     catch(err) {

diff --git a/javadoc/com/isupatches/wisefy/util/LogUtil.html b/javadoc/com/isupatches/wisefy/util/LogUtil.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>LogUtil (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>LogUtil (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="LogUtil (wisefy 1.0.6 API)";
+            parent.document.title="LogUtil (wisefy 1.0.7 API)";
         }
     }
     catch(err) {

diff --git a/javadoc/com/isupatches/wisefy/util/SSIDUtil.html b/javadoc/com/isupatches/wisefy/util/SSIDUtil.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>SSIDUtil (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>SSIDUtil (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SSIDUtil (wisefy 1.0.6 API)";
+            parent.document.title="SSIDUtil (wisefy 1.0.7 API)";
         }
     }
     catch(err) {

diff --git a/javadoc/com/isupatches/wisefy/util/package-frame.html b/javadoc/com/isupatches/wisefy/util/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>com.isupatches.wisefy.util (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>com.isupatches.wisefy.util (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>

diff --git a/javadoc/com/isupatches/wisefy/util/package-summary.html b/javadoc/com/isupatches/wisefy/util/package-summary.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>com.isupatches.wisefy.util (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>com.isupatches.wisefy.util (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.isupatches.wisefy.util (wisefy 1.0.6 API)";
+            parent.document.title="com.isupatches.wisefy.util (wisefy 1.0.7 API)";
         }
     }
     catch(err) {

diff --git a/javadoc/com/isupatches/wisefy/util/package-tree.html b/javadoc/com/isupatches/wisefy/util/package-tree.html
@@ -2,17 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>com.isupatches.wisefy.util Class Hierarchy (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>com.isupatches.wisefy.util Class Hierarchy (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.isupatches.wisefy.util Class Hierarchy (wisefy 1.0.6 API)";
+            parent.document.title="com.isupatches.wisefy.util Class Hierarchy (wisefy 1.0.7 API)";
         }
     }
     catch(err) {