From bb4de9d065ec44c0028959c9c2d5903dac6f587a Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 21 Aug 2017 22:08:42 +0200 Subject: [PATCH] Migrate subsonic api module to new gradle dependencies system. Signed-off-by: Yahor Berdnikau --- 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 {