Merge branch 'develop'

Signed-off-by: Óscar García Amor <ogarcia@connectical.com>

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/android:api-27-alpha
+      - image: circleci/android:api-28
     working_directory: ~/ultrasonic
     envoronment:
       JVM_OPTS: -Xmx3200m
@@ -25,12 +25,12 @@ jobs:
       - run:
           name: unit-tests
           command: |
-            ./gradlew :subsonic-api:test :cache:test :ultrasonic:testDebugUnitTest
+            ./gradlew ciTest testDebugUnitTest
             ./gradlew jacocoFullReport
             bash <(curl -s https://codecov.io/bash)
       - run:
           name: lint
-          command: ./gradlew lint
+          command: ./gradlew :ultrasonic:lintRelease
       - run:
           name: assemble release build
           command: ./gradlew assembleRelease
@@ -40,6 +40,8 @@ jobs:
           key: gradle-cache-{{ checksum "dependencies.gradle" }}
       - store_artifacts:
           path: ultrasonic/build/reports
+          destination: reports
+      - store_artifacts:
           path: subsonic-api/build/reports
           destination: reports
       - store_artifacts:

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,tr_TR:tr,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE,bg_BG:bg,el_GR:el,kn_IN:kn-rIN,cs_CZ:cs,sr:sr,he:iw,id:in,lt_LT:lt,km_KH:km-rKH,th_TH:th
+lang_map = nl_NL:nl,pl_PL:pl,fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,tr_TR:tr,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE,bg_BG:bg,el_GR:el,kn_IN:kn-rIN,cs_CZ:cs,sr:sr,he:iw,id:in,lt_LT:lt,km_KH:km-rKH,th_TH:th,ru_RU:ru,it_IT:it
 
 [ultrasonic.app]
 file_filter = ultrasonic/src/main/res/values-<lang>/strings.xml

README.md

@@ -5,12 +5,22 @@
 
 Ultrasonic is free and open-source music streaming Android client for [Subsonic](http://www.subsonic.org/) [API](http://www.subsonic.org/pages/api.jsp) (version 1.7.0 or higher) compatible servers.
 
+## Help wanted
+
+We currently don't have that much time to spend developing Subsonic, so any
+contributions or active developers are always welcomed.
+
 ## Download
 
 App is available to download at following stores:
 
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="70">](https://play.google.com/store/apps/details?id=org.moire.ultrasonic)
 [<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="70">](https://f-droid.org/packages/org.moire.ultrasonic/)
+[<img src="https://ultrasonic.github.io/assets/img/get-it-on-github.png" alt="Get it on GitHub" height="70">](https://github.com/ultrasonic/ultrasonic/releases)
+
+**Warning**: All three versions (Google Play, F-Droid and the APKs) are not
+compatible (not signed by the same key)! You must uninstall one to install
+the other, which will delete all your data.
 
 ## Bugs and issues
 

build.gradle

@@ -2,6 +2,11 @@
 buildscript {
     apply from: 'dependencies.gradle'
 
+    ext.bootstrap = [
+            kotlinModule : "${project.rootDir}/gradle_scripts/kotlin-module-bootstrap.gradle",
+            androidModule : "${project.rootDir}/gradle_scripts/android-module-bootstrap.gradle"
+    ]
+
     repositories {
         jcenter()
         google()
@@ -12,9 +17,7 @@ buildscript {
         classpath gradlePlugins.kotlin
         classpath gradlePlugins.ktlintGradle
         classpath gradlePlugins.detekt
-        classpath(gradlePlugins.jacocoAndroid) {
-            exclude group: 'org.codehaus.groovy', module: 'groovy-all'
-        }
+        classpath gradlePlugins.jacoco
     }
 }
 

cache/build.gradle

@@ -1,46 +0,0 @@
-apply plugin: 'java-library'
-apply plugin: 'kotlin'
-apply plugin: 'jacoco'
-apply from: '../gradle_scripts/code_quality.gradle'
-
-dependencies {
-    api project(':domain')
-    api other.kotlinStdlib
-    api other.twitterSerial
-
-    testImplementation testing.junit
-    testImplementation testing.kotlinJunit
-    testImplementation testing.mockito
-    testImplementation testing.mockitoInline
-    testImplementation testing.mockitoKotlin
-    testImplementation testing.kluent
-}
-
-jacoco {
-    toolVersion(versions.jacoco)
-}
-
-ext {
-    jacocoExclude = []
-}
-
-jacocoTestReport {
-    reports {
-        html.enabled true
-        csv.enabled false
-        xml.enabled true
-    }
-
-    afterEvaluate {
-        classDirectories = files(classDirectories.files.collect {
-            fileTree(dir: it, excludes: jacocoExclude)
-        })
-    }
-}
-
-test.finalizedBy jacocoTestReport
-test {
-    jacoco {
-        excludes += jacocoExclude
-    }
-}

core/cache/build.gradle

@@ -0,0 +1,12 @@
+apply from: bootstrap.kotlinModule
+
+dependencies {
+    api project(':core:domain')
+    api other.twitterSerial
+
+    testImplementation testing.kotlinJunit
+    testImplementation testing.mockito
+    testImplementation testing.mockitoInline
+    testImplementation testing.mockitoKotlin
+    testImplementation testing.kluent
+}

core/domain/build.gradle

@@ -0,0 +1,10 @@
+apply from: bootstrap.kotlinModule
+
+ext {
+    jacocoExclude = [
+            '**/domain/**'
+    ]
+}
+dependencies {
+    api other.semver
+}

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt

@@ -63,7 +63,9 @@ class MusicDirectory {
         var type: String? = null,
         var created: Date? = null,
         var closeness: Int = 0,
-        var bookmarkPosition: Int = 0
+        var bookmarkPosition: Int = 0,
+        var userRating: Int? = null,
+        var averageRating: Float? = null
     ) : Serializable {
         fun setDuration(duration: Long) {
             this.duration = duration.toInt()

core/library/build.gradle

@@ -0,0 +1,13 @@
+apply from: bootstrap.androidModule
+apply plugin: 'com.android.library'
+
+android {
+    lintOptions {
+        baselineFile file("lint-baseline.xml")
+        abortOnError true
+    }
+}
+
+dependencies {
+    api androidSupport.support
+}

core/library/src/main/AndroidManifest.xml

@@ -3,6 +3,4 @@
       package="com.mobeta.android.dslv"
       android:versionCode="4"
       android:versionName="0.6.1">
-    <uses-sdk android:targetSdkVersion="7"
-      android:minSdkVersion="7" />
-</manifest> 
+</manifest>

core/menudrawer/build.gradle

@@ -0,0 +1,8 @@
+apply from: bootstrap.androidModule
+
+android {
+    lintOptions {
+        baselineFile file("lint-baseline.xml")
+        abortOnError true
+    }
+}

core/menudrawer/src/main/AndroidManifest.xml

@@ -3,6 +3,4 @@
       package="net.simonvt.menudrawer"
       android:versionCode="6"
       android:versionName="3.0.2">
-
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16" />
 </manifest>

core/pulltorefresh/build.gradle

@@ -0,0 +1,8 @@
+apply from: bootstrap.androidModule
+
+android {
+    lintOptions {
+        baselineFile file("lint-baseline.xml")
+        abortOnError true
+    }
+}

core/pulltorefresh/src/main/AndroidManifest.xml

@@ -3,6 +3,4 @@
     package="com.handmark.pulltorefresh.library"
     android:versionCode="2110"
     android:versionName="2.1.1">
-
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16" />
 </manifest>