From 697a68963279c869043b38a94cb1fd4505d1a9a4 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sat, 20 Jan 2018 11:27:34 +0100 Subject: [PATCH 1/4] Decrease target sdk version to 22. This is required for a new release as runtime permissions support is not yet implemented. Signed-off-by: Yahor Berdnikau --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index ff608274..6c932026 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,6 +1,6 @@ ext.versions = [ minSdk : 14, - targetSdk : 23, + targetSdk : 22, compileSdk : 27, gradle : '4.4.1', @@ -12,7 +12,7 @@ ext.versions = [ jacocoAndroid : "0.1.2", buildVersioning : "1.6.0", - androidSupport : "23.4.0", + androidSupport : "22.2.1", kotlin : "1.2.10", From 88053c0ccc29868b34cff0b6e4978259a38d16bf Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sat, 20 Jan 2018 11:28:34 +0100 Subject: [PATCH 2/4] Change ci image api to 27. To be on the same value with compile sdk. Signed-off-by: Yahor Berdnikau --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 28eac599..fc710f6c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: circleci/android:api-26-alpha + - image: circleci/android:api-27-alpha working_directory: ~/ultrasonic envoronment: JVM_OPTS: -Xmx3200m From 1cdf76db8b698c9e93596cb83c5dab0ce5bb5bdf Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sat, 20 Jan 2018 12:52:17 +0100 Subject: [PATCH 3/4] Add some several gradle optimizations. Enabled parallel build, configure on demand, caching output of tasks. Signed-off-by: Yahor Berdnikau --- gradle.properties | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 gradle.properties diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..68967e5e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.parallel=true +org.gradle.configureondemand=true +org.gradle.caching=true \ No newline at end of file From 365bd96f568c46583e93164bc9dcb17767fed4ed Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sat, 20 Jan 2018 12:53:26 +0100 Subject: [PATCH 4/4] Remove unnecessary cast. Signed-off-by: Yahor Berdnikau --- .../kotlin/org/moire/ultrasonic/subsonic/RestErrorMapper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/RestErrorMapper.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/RestErrorMapper.kt index 5d84442e..d4470f6f 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/RestErrorMapper.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/RestErrorMapper.kt @@ -21,7 +21,7 @@ import org.moire.ultrasonic.service.SubsonicRESTException fun SubsonicRESTException.getLocalizedErrorMessage(context: Context): String = when (error) { is Generic -> { - val message = (error as Generic).message + val message = error.message val errorMessage = if (message == "") { context.getString(R.string.api_subsonic_generic_no_message) } else {