Bump Android plugin for Gradle to v2.3.0 & modify gen_methodcount_badge work with the latest tools

Author: h6ah4i

Diff for: build.gradle

@@ -3,9 +3,13 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url  "http://dl.bintray.com/vigidroid/maven"
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'me.vigi:fat-aar-plugin:0.2.8'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

Diff for: gen_methodscount_badge.sh

@@ -1,10 +1,10 @@
 #! /usr/bin/env bash
 
-
-rm -rf "./methodscount/build/dependencies"
+# assemble library
+./gradlew :library:assembleRelease > /dev/null
 
 # assemble fat-aar and copy dependencies
-./gradlew :methodscount:copyDependencies > /dev/null
+./gradlew :methodscount:assembleRelease > /dev/null
 
 BUILD_TOOOLS_VERSION=$(ls $ANDROID_HOME/build-tools/ | sort -n -r | head -n 1)
 BUILD_TOOOLS_DIR="$ANDROID_HOME/build-tools/$BUILD_TOOOLS_VERSION"
@@ -19,12 +19,31 @@ function aar-method-counts() {
     mkdir -p "$aar_unzip_dest"
 
     unzip "$aar_file" -d "$aar_unzip_dest" > /dev/null
-    "$BUILD_TOOOLS_DIR/dx"\
-        --dex --no-optimize \
-        --output="$aar_unzip_dest/classes.dex" \
-        "$aar_unzip_dest/classes.jar"
-    
-    dex-method-counts "$aar_unzip_dest/classes.dex" | grep 'Overall method count:' | sed -E 's/Overall method count: ([0-9]+)/\1/g'
+    jar-method-counts "$aar_unzip_dest/classes.jar"
+}
+
+function aar-deps-method-counts() {
+    local aar_file=$1
+    local aar_basename=$(basename $aar_file '.aar')
+    local aar_unzip_dest="/tmp/aar-deps-method-counts/$aar_basename"
+
+    rm -rf "$aar_unzip_dest"
+    mkdir -p "$aar_unzip_dest"
+
+    unzip "$aar_file" -d "$aar_unzip_dest" > /dev/null
+
+    DEPS_JARS=$(find "$aar_unzip_dest/libs" -type f -name '*.jar' | grep -v 'library-unspecified.jar')
+    deps_method_counts=0
+
+    IFS=$'\n'
+    for dep_jar in $(echo "$DEPS_JARS"); do
+       count=$(jar-method-counts "$dep_jar")
+       deps_method_counts=$(($deps_method_counts + $count))
+       # echo "$(basename $dep_jar) $deps_method_counts  $count"
+    done
+    unset IFS
+
+    echo "$deps_method_counts"
 }
 
 function jar-method-counts() {
@@ -55,9 +74,8 @@ function file_size() {
     ) | awk '{print $1}'
 }
 
-LIBRARY_AAR="./methodscount/build/dependencies/library-release.aar"
-DEPENDENCIES_AARS=$(find ./methodscount/build/dependencies -type f -name '*.aar' | grep -v 'library-release.aar')
-DEPENDENCIES_JARS=$(find ./methodscount/build/dependencies -type f -name '*.jar')
+LIBRARY_AAR="./library/build/outputs/aar/library-release.aar"
+DEPS_LIBRARY_AAR="./methodscount/build/outputs/aar/methodscount-release.aar"
 
 #
 # count library's method counts
@@ -67,20 +85,7 @@ lib_method_counts=$(aar-method-counts "$LIBRARY_AAR")
 #
 # count dependencies' method counts
 #
-deps_method_counts=0
-IFS=$'\n'
-for dep_aar in $(echo "$DEPENDENCIES_AARS"); do
-    count=$(aar-method-counts "$dep_aar")
-    deps_method_counts=$(($deps_method_counts + $count))
-    # echo "$(basename $dep_aar) $deps_method_counts  $count"
-done
-
-for dep_jar in $(echo "$DEPENDENCIES_JARS"); do
-    count=$(jar-method-counts "$dep_jar")
-    deps_method_counts=$(($deps_method_counts + $count))
-    # echo "$(basename $dep_jar) $deps_method_counts  $count"
-done
-unset IFS
+deps_method_counts=$(aar-deps-method-counts "$DEPS_LIBRARY_AAR")
 
 #
 # library version
@@ -95,6 +100,8 @@ lib_file_size_kb=$(( ($lib_file_size + 999) / 1000 ))
 
 methodscount_site_url="http://www.methodscount.com/?lib=com.h6ah4i.android.widget.advrecyclerview%3Aadvrecyclerview%3A$lib_version"
 methodscount_badge_url="https://img.shields.io/badge/Methods and size-core: $lib_method_counts | deps: $deps_method_counts | $lib_file_size_kb KB-e91e63.svg"
+methodscount_badge_url=$(echo "$methodscount_badge_url" | sed -E 's/ /%20/g' | sed 's/|/%7C/g')
 
 # echo "<a href=\"$methodscount_site_url\"><img src=\"$methodscount_badge_url\"/></a>"
 echo "[![Method Count]($methodscount_badge_url) ]($methodscount_site_url)"
+

Diff for: gradle.properties

@@ -17,3 +17,4 @@ org.gradle.jvmargs=-Xmx1536M
 # 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
 org.gradle.parallel=true
+android.enableBuildCache=false

Diff for: gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Tue Oct 04 08:03:25 JST 2016
+#Sun Mar 12 14:19:50 JST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

Diff for: gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,16 +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 "$@")
+
+# 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
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

Diff for: gradlew

@@ -16,7 +16,7 @@
 
 apply plugin: 'com.android.library'
 
-apply from: 'https://raw.githubusercontent.com/adwiv/android-fat-aar/master/fat-aar.gradle'
+apply plugin: 'me.vigi.fat-aar'
 
 // Common configurations
 apply from: '../common/android-set-common-properties.gradle'
@@ -36,15 +36,12 @@ android {
         debug {
         }
     }
-}
 
-task copyDependencies(type: Copy) {
-    dependsOn build
-    from configurations.compile
-    into "${project.projectDir}/build/dependencies"
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {
-  embedded project(':library')
+  embed project(':library')
 }
-

Diff for: methodscount/build.gradle

@@ -14,5 +14,10 @@
        limitations under the License.
 -->
 <manifest
-    package="methodscount">
+    package="methodscount"
+    xmlns:tools="http://schemas.android.com/tools">
+    <!---
+      NOTE: xmlns:tools is required to workaround the following issue:
+      https://github.com/Vigi0303/fat-aar-plugin/issues/2
+    -->
 </manifest>