From a1e59efceb896f9000f2e209e4ad7a17a7110542 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <egorr.berd@gmail.com>
Date: Mon, 21 Aug 2017 21:47:22 +0200
Subject: [PATCH 1/2] Update gradle to 4.1 version.

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
---
 dependencies.gradle                      |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 54783 -> 54783 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 577cd6a3..b537882e 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -2,7 +2,7 @@ ext.versions = [
         minSdk               : 14,
         targetSdk            : 22,
         compileSdk           : 22,
-        gradle               : '3.5',
+        gradle               : '4.1',
 
         buildTools           : "25.0.3",
         androidTools         : "2.3.3",
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 29cbbca5153ca4958d1b15c73eb11792b3260204..8194cd0496da1cfab0e4d17536d53b35b1f0117f 100644
GIT binary patch
delta 28
hcmeyrn)&}~<_*?ISi0AUdT+KrQXmLsP2POf2LQt?4Bh|$

delta 28
hcmeyrn)&}~<_*?ISY)^T^V)2Gq(BhNn!Nd{4*<;K4dws<

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d29fa4cd..8a475695 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jul 30 22:48:59 CEST 2017
+#Mon Aug 21 21:36:22 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

From bb4de9d065ec44c0028959c9c2d5903dac6f587a Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <egorr.berd@gmail.com>
Date: Mon, 21 Aug 2017 22:08:42 +0200
Subject: [PATCH 2/2] Migrate subsonic api module to new gradle dependencies
 system.

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
---
 subsonic-api/build.gradle | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/subsonic-api/build.gradle b/subsonic-api/build.gradle
index 172cae30..7fbf319c 100644
--- a/subsonic-api/build.gradle
+++ b/subsonic-api/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'kotlin'
+apply plugin: 'java-library'
 apply plugin: 'jacoco'
 apply from: '../gradle_scripts/code_quality.gradle'
 
@@ -6,29 +7,28 @@ sourceSets {
     main.java.srcDirs += "${projectDir}/src/main/kotlin"
     test.java.srcDirs += "${projectDir}/src/integrationTest/kotlin"
     test.resources.srcDirs += "${projectDir}/src/integrationTest/resources"
-    test.output.resourcesDir = test.output.classesDir
 }
 
 dependencies {
-    compile other.kotlinStdlib
-    compile other.retrofit
-    compile other.jacksonConverter
-    compile(other.jacksonKotlin) {
+    api other.kotlinStdlib
+    api other.retrofit
+    implementation other.jacksonConverter
+    implementation(other.jacksonKotlin) {
         exclude module: 'kotlin-reflect'
     }
-    compile other.kotlinReflect // for jackson kotlin, but to use the same version
-    compile other.okhttpLogging
+    implementation other.kotlinReflect // for jackson kotlin, but to use the same version
+    implementation other.okhttpLogging
 
-    testCompile testing.junit
-    testCompile testing.kotlinJunit
-    testCompile testing.mockitoKotlin
-    testCompile testing.kluent
-    testCompile testing.mockWebServer
-    testCompile testing.apacheCodecs
+    testImplementation testing.junit
+    testImplementation testing.kotlinJunit
+    testImplementation testing.mockitoKotlin
+    testImplementation testing.kluent
+    testImplementation testing.mockWebServer
+    testImplementation testing.apacheCodecs
 }
 
 jacoco {
-    toolVersion = versions.jacoco
+    toolVersion(versions.jacoco)
 }
 
 ext {