Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Update kotlin to 1.1.3-2 version. 

Also have to update jackson to 2.9.0 that uses the same kotlin version.

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
This commit is contained in:
Yahor Berdnikau 2017-08-12 20:17:32 +02:00
parent 3c4f91efef
commit d66556e307
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dependencies.gradle
View File

@ -14,10 +14,10 @@ ext.versions = [
androidSupport : "22.2.1", androidSupport : "22.2.1",
kotlin : "1.1.2-5", kotlin : "1.1.3-2",
retrofit : "2.1.0", retrofit : "2.1.0",
jackson : "2.8.7", jackson : "2.9.0",
okhttp : "3.6.0", okhttp : "3.6.0",
junit : "4.12", junit : "4.12",
@ -41,6 +41,7 @@ ext.androidSupport = [
ext.other = [ ext.other = [
kotlinStdlib : "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin", kotlinStdlib : "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin",
kotlinReflect : "org.jetbrains.kotlin:kotlin-reflect:$versions.kotlin",
retrofit : "com.squareup.retrofit2:retrofit:$versions.retrofit", retrofit : "com.squareup.retrofit2:retrofit:$versions.retrofit",
gsonConverter : "com.squareup.retrofit2:converter-gson:$versions.retrofit", gsonConverter : "com.squareup.retrofit2:converter-gson:$versions.retrofit",
jacksonConverter : "com.squareup.retrofit2:converter-jackson:$versions.retrofit", jacksonConverter : "com.squareup.retrofit2:converter-jackson:$versions.retrofit",
@ -51,7 +52,6 @@ ext.other = [
ext.testing = [ ext.testing = [
junit : "junit:junit:$versions.junit", junit : "junit:junit:$versions.junit",
kotlinJunit : "org.jetbrains.kotlin:kotlin-test-junit:$versions.kotlin", kotlinJunit : "org.jetbrains.kotlin:kotlin-test-junit:$versions.kotlin",
kotlinReflect : "org.jetbrains.kotlin:kotlin-reflect:$versions.kotlin",
mockitoKotlin : "com.nhaarman:mockito-kotlin:$versions.mockitoKotlin", mockitoKotlin : "com.nhaarman:mockito-kotlin:$versions.mockitoKotlin",
kluent : "org.amshove.kluent:kluent:$versions.kluent", kluent : "org.amshove.kluent:kluent:$versions.kluent",
mockWebServer : "com.squareup.okhttp3:mockwebserver:$versions.okhttp", mockWebServer : "com.squareup.okhttp3:mockwebserver:$versions.okhttp",

6
subsonic-api/build.gradle
View File

@ -13,12 +13,14 @@ dependencies {
compile other.kotlinStdlib compile other.kotlinStdlib
compile other.retrofit compile other.retrofit
compile other.jacksonConverter compile other.jacksonConverter
compile other.jacksonKotlin compile(other.jacksonKotlin) {
exclude module: 'kotlin-reflect'
}
compile other.kotlinReflect // for jackson kotlin, but to use the same version
compile other.okhttpLogging compile other.okhttpLogging
testCompile testing.junit testCompile testing.junit
testCompile testing.kotlinJunit testCompile testing.kotlinJunit
testCompile testing.kotlinReflect
testCompile testing.mockitoKotlin testCompile testing.mockitoKotlin
testCompile testing.kluent testCompile testing.kluent
testCompile testing.mockWebServer testCompile testing.mockWebServer

14
ultrasonic/build.gradle
View File

@ -53,17 +53,9 @@ dependencies {
compile other.kotlinStdlib compile other.kotlinStdlib
testCompile testing.junit testCompile testing.junit
testCompile(testing.kotlinJunit) { testCompile testing.kotlinJunit
exclude module: "kotlin-stdlib" testCompile testing.mockitoKotlin
} testCompile testing.kluent
testCompile(testing.mockitoKotlin) {
exclude module: "kotlin-stdlib"
exclude module: "kotlin-reflect"
}
testCompile(testing.kluent) {
exclude module: "kotlin-stdlib"
exclude module: "kotlin-reflect"
}
} }
// Excluding all non-kotlin classes // Excluding all non-kotlin classes