diff --git a/.gitignore b/.gitignore
index 16690cbb..b095846f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /app/build
 /app/*.apk
 /.gradle
+/local.properties
diff --git a/.travis.yml b/.travis.yml
index 64cd63e1..8c170954 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,15 +11,15 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-23.0.2
+    - build-tools-25.0.2
 
     # The SDK version used to compile your project
-    - android-23
+    - android-24
 
     # Additional components
     - extra-google-m2repository
     - extra-android-m2repository
-    - addon-google_apis-google-23
+    - addon-google_apis-google-24
 
     # Specify at least one system image,
     # if you need to run emulator(s) during your tests
diff --git a/app/build.gradle b/app/build.gradle
index 8f2e73c8..42898d55 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = "1.0.3"
+    ext.kotlin_version = "1.1.0"
     repositories {
         mavenCentral()
     }
@@ -15,14 +15,14 @@ apply plugin: 'net.saliman.cobertura'
 apply plugin: 'com.github.kt3k.coveralls'
 
 android {
-    buildToolsVersion "23.0.2"
+    buildToolsVersion '25.0.2'
     defaultConfig {
-        compileSdkVersion "Google Inc.:Google APIs:23"
+        compileSdkVersion "Google Inc.:Google APIs:24"
         applicationId "org.blitzortung.android.app"
-        minSdkVersion 8
-        targetSdkVersion 23
-        versionCode 187
-        versionName "1.5.16"
+        minSdkVersion 9
+        targetSdkVersion 25
+        versionCode 188
+        versionName "1.5.17"
         multiDexEnabled true
     }
     buildTypes {
@@ -31,9 +31,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    dexOptions {
-        incremental true
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -49,16 +46,18 @@ cobertura {
     coverageSourceDirs = android.sourceSets.main.java.srcDirs
 }
 
+def anko_version = '0.9.1'
+
 dependencies {
-    compile 'com.android.support:appcompat-v7:24.0.0'
+    compile 'com.android.support:appcompat-v7:25.2.0'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile 'org.jetbrains.anko:anko-sdk23:0.9' // sdk19, sdk21, sdk23 are also available
-    compile 'org.jetbrains.anko:anko-appcompat-v7:0.9' // For appcompat-v7 bindings
+    compile "org.jetbrains.anko:anko-sdk23:$anko_version" // sdk19, sdk21, sdk23 are also available
+    compile "org.jetbrains.anko:anko-appcompat-v7:$anko_version" // For appcompat-v7 bindings
     testCompile 'junit:junit:4.12'
-    testCompile 'net.wuerl.kotlin:assertj-core-kotlin:0.1.1'
-    testCompile 'com.nhaarman:mockito-kotlin:0.5.0'
+    testCompile 'net.wuerl.kotlin:assertj-core-kotlin:0.2.0'
+    testCompile 'com.nhaarman:mockito-kotlin:1.3.0'
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     testCompile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    testCompile 'org.robolectric:robolectric:3.1'
+    testCompile 'org.robolectric:robolectric:3.3'
 }
 
diff --git a/app/src/test/java/org/blitzortung/android/app/components/VersionComponentTest.kt b/app/src/test/java/org/blitzortung/android/app/components/VersionComponentTest.kt
index 262db935..78fde815 100644
--- a/app/src/test/java/org/blitzortung/android/app/components/VersionComponentTest.kt
+++ b/app/src/test/java/org/blitzortung/android/app/components/VersionComponentTest.kt
@@ -61,7 +61,7 @@ class VersionComponentTest {
     }
 
     companion object {
-        val CURRENT_VERSION_CODE = 187
-        val CURRENT_VERSION_NAME = "1.5.16"
+        val CURRENT_VERSION_CODE = 188
+        val CURRENT_VERSION_NAME = "1.5.17"
     }
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c792a9f0..70c61b02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
         classpath 'net.saliman:gradle-cobertura-plugin:2.3.1'
 
@@ -19,3 +19,7 @@ allprojects {
         jcenter()
     }
 }
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/gradle/gradle.properties b/gradle/gradle.properties
new file mode 100644
index 00000000..f98a4cc2
--- /dev/null
+++ b/gradle/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx1536M
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1b866b22..c14e3fa7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Aug 29 23:33:59 CEST 2016
+#Sun Mar 05 21:20:31 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip