From 9dc8d55897635b3f5b04fe38977d8f9c9000748e Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathamesh.m@rejolut.com>
Date: Wed, 31 Aug 2022 23:38:50 +0530
Subject: [PATCH 1/2] Updated dependencies and removed ksp for now as Glide
 doesn't support it yet

---
 app/build.gradle |  5 ++---
 build.gradle     | 15 +--------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5f121b2e0..c1b380230 100644
--- a/app/build.gradle
+++ b/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'
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 21f1f5722..bb3063dd8 100644
--- a/build.gradle
+++ b/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
 }
\ No newline at end of file

From 644640c14f1e110e9a62635f48f5f1a65d80e937 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathamesh.m@rejolut.com>
Date: Wed, 31 Aug 2022 23:41:31 +0530
Subject: [PATCH 2/2] Fixed Last track of queue playing again when gapless
 playback is on

---
 .../java/code/name/monkey/retromusic/service/MusicService.kt    | 1 +
 .../java/code/name/monkey/retromusic/service/PlaybackManager.kt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
index 2d4ca51d5..3ddd8c086 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
+++ b/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) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt b/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt
index 9ea6107d7..d38c80d2d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt
+++ b/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)
     }