diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4bc8eab9..28eac599 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,6 +34,7 @@ jobs:
           key: gradle-cache-{{ checksum "dependencies.gradle" }}
       - store_artifacts:
           path: ultrasonic/build/reports
+          path: subsonic-api/build/reports
           destination: reports
       - store_artifacts:
           path: build/reports/jacoco/jacocoFullReport/
diff --git a/dependencies.gradle b/dependencies.gradle
index 1ba0e4f0..6121ccd2 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -6,8 +6,8 @@ ext.versions = [
 
         buildTools           : "25.0.3",
         androidTools         : "2.3.3",
-        ktlint               : "0.9.0",
-        ktlintGradle         : "2.1.0",
+        ktlint               : "0.12.1",
+        ktlintGradle         : "2.3.0",
         detekt               : "1.0.0.RC5-4",
         jacoco               : "0.7.9",
         jacocoAndroid        : "0.1.2",
diff --git a/gradle_scripts/code_quality.gradle b/gradle_scripts/code_quality.gradle
index bc4fa9d4..3992a621 100644
--- a/gradle_scripts/code_quality.gradle
+++ b/gradle_scripts/code_quality.gradle
@@ -7,6 +7,7 @@ if (isCodeQualityEnabled) {
 
     ktlint {
         version = versions.ktlint
+        android = true
     }
 }
 
diff --git a/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/CommonFunctions.kt b/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/CommonFunctions.kt
index e984c6c0..564d02a1 100644
--- a/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/CommonFunctions.kt
+++ b/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/CommonFunctions.kt
@@ -46,8 +46,8 @@ fun parseDate(dateAsString: String): Calendar {
     return result
 }
 
-fun <T: SubsonicResponse> checkErrorCallParsed(mockWebServerRule : MockWebServerRule,
-                                               apiRequest: () -> Response<T>): T {
+fun <T : SubsonicResponse> checkErrorCallParsed(mockWebServerRule: MockWebServerRule,
+                                                apiRequest: () -> Response<T>): T {
     mockWebServerRule.enqueueResponse("generic_error_response.json")
 
     val response = apiRequest()