Update build dependencies (sockeqwe#235)

* Update Gradle wrapper to 3.4.1

* Update Android Gradle plugin to 2.3.1

* Update build tools to 25.0.2

* Update support libs to 25.3.1

.travis.yml

@@ -3,7 +3,7 @@ android:
   components:
   - tools
   - platform-tools
-  - build-tools-25.0.1
+  - build-tools-25.0.2
   - extra-android-m2repository
   - android-25
 #  - sys-img-armeabi-v7a-android-17

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.0'
+    classpath 'com.android.tools.build:gradle:2.3.1'
     classpath 'com.neenbedankt.gradle.plugins:android-apt:1.7'
     //  classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.5.2'
     classpath 'me.tatarka:gradle-retrolambda:3.5.0'
@@ -34,16 +34,14 @@ allprojects {
 ext {
   minSdk = 14
   targetSdk = 25
-  buildToolsVersion = '25.0.1'
+  buildToolsVersion = '25.0.2'
   compileSdkVersion = 25
 
   javaSourceCompatibility = JavaVersion.VERSION_1_7
   javaTargetCompatibility = JavaVersion.VERSION_1_7
 
   // Libraries
-  appcompat7Version = '25.2.0'
-  supportAnnotations = '25.2.0'
-  recyclerviewVersion = '25.2.0'
+  supportLibVersion = '25.3.1'
   rxjava2Version = '2.0.7'
 
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Mar 07 19:53:23 CET 2017
+#Mon Apr 10 13:22:25 SGT 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.1-all.zip

gradlew

@@ -1,17 +1,35 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -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 "$@")
+
+# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@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

mvi-common/build.gradle

@@ -34,7 +34,7 @@ dependencies {
 
   compile project(':mvp-common')
   compile 'io.reactivex.rxjava2:rxjava:' + rootProject.ext.rxjava2Version
-  compile 'com.android.support:support-annotations:' + rootProject.ext.supportAnnotations
+  compile 'com.android.support:support-annotations:' + rootProject.ext.supportLibVersion
 
   testCompile 'junit:junit:' + rootProject.ext.junitVersion
   testCompile 'com.google.code.findbugs:annotations:'+rootProject.ext.findbugsAnnotations

mvi-integration-test/build.gradle

@@ -56,5 +56,5 @@ dependencies {
 }
 
 configurations.all {
-  resolutionStrategy.force 'com.android.support:support-annotations:' + rootProject.ext.supportAnnotations
+  resolutionStrategy.force 'com.android.support:support-annotations:' + rootProject.ext.supportLibVersion
 }

mvp-common/build.gradle

@@ -16,7 +16,7 @@ for (File file : sdkHandler.sdkLoader.repositories) {
 
 dependencies {
 
-  compile 'com.android.support:support-annotations:' + rootProject.ext.supportAnnotations
+  compile 'com.android.support:support-annotations:' + rootProject.ext.supportLibVersion
 
   testCompile 'junit:junit:' + rootProject.ext.junitVersion
   testCompile 'org.mockito:mockito-core:' + rootProject.ext.mockitoVersion

mvp-nullobject-presenter/build.gradle

@@ -33,7 +33,7 @@ for (File file : sdkHandler.sdkLoader.repositories) {
 dependencies {
 
   compile project(':mvp-common')
-  compile 'com.android.support:support-annotations:' + rootProject.ext.supportAnnotations
+  compile 'com.android.support:support-annotations:' + rootProject.ext.supportLibVersion
 
   testCompile 'junit:junit:' + rootProject.ext.junitVersion
   testCompile 'org.mockito:mockito-core:' + rootProject.ext.mockitoVersion

mvp/build.gradle

@@ -39,7 +39,7 @@ android {
 
 dependencies {
 
-  compile 'com.android.support:appcompat-v7:' + rootProject.ext.appcompat7Version
+  compile 'com.android.support:appcompat-v7:' + rootProject.ext.supportLibVersion
 
   provided 'com.google.code.findbugs:annotations:'+rootProject.ext.findbugsAnnotations
 
@@ -61,4 +61,4 @@ dependencies {
     exclude module: 'hamcrest-core'
     exclude module: 'objenesis'
   }
-}
+}

presentermanager/build.gradle

@@ -38,8 +38,8 @@ android {
 
 dependencies {
 
-  compile 'com.android.support:appcompat-v7:' + rootProject.ext.appcompat7Version
-  compile 'com.android.support:support-v4:' + rootProject.ext.appcompat7Version
+  compile 'com.android.support:appcompat-v7:' + rootProject.ext.supportLibVersion
+  compile 'com.android.support:support-v4:' + rootProject.ext.supportLibVersion
 
   compile project(':mvp-common')
 

sample-mail/build.gradle

@@ -35,8 +35,8 @@ android {
 
 dependencies {
   compile fileTree(dir: 'libs', include: ['*.jar'])
-  compile 'com.android.support:appcompat-v7:' + rootProject.ext.appcompat7Version
-  compile 'com.android.support:recyclerview-v7:' + rootProject.ext.recyclerviewVersion
+  compile 'com.android.support:appcompat-v7:' + rootProject.ext.supportLibVersion
+  compile 'com.android.support:recyclerview-v7:' + rootProject.ext.supportLibVersion
 
   compile project(':mvp-lce')
 

sample-mvi/build.gradle

@@ -56,11 +56,11 @@ dependencies {
   provided 'com.google.code.findbugs:annotations:' + rootProject.ext.findbugsAnnotations
 
 
-  compile 'com.android.support:appcompat-v7:' + rootProject.ext.appcompat7Version
-  compile 'com.android.support:recyclerview-v7:' + rootProject.ext.recyclerviewVersion
-  compile 'com.android.support:transition:' + rootProject.ext.appcompat7Version
-  compile 'com.android.support:cardview-v7:' + rootProject.ext.appcompat7Version
-  compile 'com.android.support:design:' + rootProject.ext.appcompat7Version
+  compile 'com.android.support:appcompat-v7:' + rootProject.ext.supportLibVersion
+  compile 'com.android.support:recyclerview-v7:' + rootProject.ext.supportLibVersion
+  compile 'com.android.support:transition:' + rootProject.ext.supportLibVersion
+  compile 'com.android.support:cardview-v7:' + rootProject.ext.supportLibVersion
+  compile 'com.android.support:design:' + rootProject.ext.supportLibVersion
 
   compile 'com.sothree.slidinguppanel:library:3.3.1'
 

sample/build.gradle

@@ -30,9 +30,9 @@ android {
 dependencies {
   compile project(':mvp-lce')
 
-  compile 'com.android.support:design:'+ rootProject.ext.appcompat7Version
-  compile 'com.android.support:recyclerview-v7:'+ rootProject.ext.recyclerviewVersion
-  compile 'com.android.support:appcompat-v7:' + rootProject.ext.appcompat7Version
+  compile 'com.android.support:design:'+ rootProject.ext.supportLibVersion
+  compile 'com.android.support:recyclerview-v7:'+ rootProject.ext.supportLibVersion
+  compile 'com.android.support:appcompat-v7:' + rootProject.ext.supportLibVersion
 
 
   compile 'com.jakewharton:butterknife:'+rootProject.ext.butterknifeVersion

utils-fragment-integration-test/build.gradle

@@ -56,5 +56,5 @@ dependencies {
 }
 
 configurations.all {
-  resolutionStrategy.force 'com.android.support:support-annotations:' + rootProject.ext.supportAnnotations
+  resolutionStrategy.force 'com.android.support:support-annotations:' + rootProject.ext.supportLibVersion
 }

utils-fragment/build.gradle

@@ -43,5 +43,5 @@ android {
 }
 
 dependencies {
-  compile 'com.android.support:appcompat-v7:'+rootProject.ext.appcompat7Version
+  compile 'com.android.support:appcompat-v7:'+rootProject.ext.supportLibVersion
 }