Merge pull request #1416 from RetroMusicPlayer/dev-alpha

Fix #1415

app/build.gradle

@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'com.google.devtools.ksp'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 apply plugin: 'kotlin-parcelize'
 
@@ -124,7 +123,7 @@ dependencies {
     def room_version = '2.5.0-alpha02'
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
-    ksp "androidx.room:room-compiler:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
 
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
@@ -177,5 +176,5 @@ dependencies {
     implementation 'com.github.dhaval2404:imagepicker:2.1'
     implementation 'me.zhanghai.android.fastscroll:library:1.1.8'
     implementation 'cat.ereza:customactivityoncrash:2.4.0'
-    implementation 'me.tankery.lib:circularSeekBar:1.4.0'
+    implementation 'me.tankery.lib:circularSeekBar:1.4.1'
 }

app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt

@@ -697,6 +697,7 @@ class MusicService : MediaBrowserServiceCompat(),
 
     override fun onTrackWentToNext() {
         if (pendingQuit || repeatMode == REPEAT_MODE_NONE && isLastTrack) {
+            playbackManager.setNextDataSource(null)
             pause(false)
             seek(0)
             if (pendingQuit) {

app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt

@@ -88,7 +88,7 @@ class PlaybackManager(val context: Context) {
         playback?.setDataSource(song, force, completion)
     }
 
-    fun setNextDataSource(trackUri: String) {
+    fun setNextDataSource(trackUri: String?) {
         playback?.setNextDataSource(trackUri)
     }
 

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     ext {
         lifecycle_version='2.5.1'
         navigation_version = '2.5.1'
-        mdc_version = '1.7.0-beta01'
+        mdc_version = '1.7.0-rc01'
         preference_version = '1.2.0'
         appcompat_version = '1.5.0'
         core_version='1.8.0'
@@ -21,22 +21,9 @@ buildscript {
     }
 }
 plugins {
-    id 'com.google.devtools.ksp' version '1.7.10-1.0.6' apply false
     id "com.github.ben-manes.versions" version "0.42.0"
 }
 
-def isNonStable = { String version ->
-    def stableKeyword = ['RELEASE', 'FINAL', 'GA'].any { it -> version.toUpperCase().contains(it) }
-    def regex = /^[0-9,.v-]+(-r)?$/
-    return !stableKeyword && !(version ==~ regex)
-}
-
-tasks.named("dependencyUpdates").configure {
-    rejectVersionIf {
-        isNonStable(it.candidate.version)
-    }
-}
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }