Funkwhale/ultrasonic-app-subsonic-android
1
0
Fork 0
mirror of https://github.com/ultrasonic/ultrasonic synced 2025-01-20 20:29:59 +01:00
Code Issues Releases Wiki Activity

Merge pull request #33 from ultrasonic/update-gradle

Browse Source 
Update gradle
This commit is contained in:
Yahor Berdnikau 2017-08-22 20:17:26 +02:00 committed by GitHub
commit b6e96f6310
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependencies.gradle
View File

@ -2,7 +2,7 @@ ext.versions = [
minSdk : 14, minSdk : 14,
targetSdk : 22, targetSdk : 22,
compileSdk : 22, compileSdk : 22,
gradle : '3.5', gradle : '4.1',
buildTools : "25.0.3", buildTools : "25.0.3",
androidTools : "2.3.3", androidTools : "2.3.3",

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Sun Jul 30 22:48:59 CEST 2017 #Mon Aug 21 21:36:22 CEST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

28
subsonic-api/build.gradle
View File

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