From c917bcb1a6e0a8358640599682ef5c0c086b6238 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 16 Nov 2017 22:04:38 +0100 Subject: [PATCH] Update ktlint to 0.12.1 version. Also updated ktlint-gradle to 2.3.0 version. Added ktlint reports to circle CI. Signed-off-by: Yahor Berdnikau --- .circleci/config.yml | 1 + dependencies.gradle | 4 ++-- gradle_scripts/code_quality.gradle | 1 + .../org/moire/ultrasonic/api/subsonic/CommonFunctions.kt | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) 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 checkErrorCallParsed(mockWebServerRule : MockWebServerRule, - apiRequest: () -> Response): T { +fun checkErrorCallParsed(mockWebServerRule: MockWebServerRule, + apiRequest: () -> Response): T { mockWebServerRule.enqueueResponse("generic_error_response.json") val response = apiRequest()