Update some dependencies

.gitignore

@@ -1,8 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea
 .DS_Store
 /build
 /captures

app/build.gradle

@@ -25,7 +25,7 @@ android {
 	}
 
 	sourceSets {
-		main.java.srcDirs += 'src/main/kotlin'
+		main.java.srcDirs = ['src/main/kotlin']
 	}
 }
 

build.gradle

@@ -6,11 +6,11 @@ buildscript {
 	}
 
 	dependencies {
-		classpath 'com.android.tools.build:gradle:2.2.0-alpha5'
-		classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
+		classpath 'com.android.tools.build:gradle:2.2.0'
+		classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 		classpath 'io.realm:realm-gradle-plugin:1.0.1'
 		classpath 'org.jacoco:org.jacoco.core:0.7.7.201606060606'
-		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.3'
+		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.4'
 		classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
 	}
 }
@@ -26,7 +26,7 @@ task clean(type: Delete) {
 }
 
 ext {
-	buildToolsVersion = '24.0.0'
+	buildToolsVersion = '24.0.2'
 	compileSdkVersion = 24
 	minSdkVersion = 9
 	targetSdkVersion = 24
@@ -35,7 +35,7 @@ ext {
 	jUnitVersion = '4.12'
 	kolumbusVersionCode = 9
 	kolumbusVersionName = '0.9'
-	kotlinVersion = '1.0.3'
-	mockitoVersion = '2.0.86-beta'
-	supportLibraryVersion = '24.0.0'
+	kotlinVersion = '1.0.4'
+	mockitoVersion = '2.2.0-beta.1'
+	supportLibraryVersion = '24.2.1'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jul 15 19:43:36 CEST 2016
+#Fri Oct 07 14:21:55 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip

gradlew

@@ -161,4 +161,9 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
+# 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 "$@"

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