Some updates

- Bump Gradle to 8.3
- Bump Kotlin to 1.9.10
- Bump Kord to 0.11.0
- Bump ksp to 1.9.10-1.0.13
- Fix bug causing injected tracks to play after queue finished

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
-kotlin = "1.9.0"
+kotlin = "1.9.10"
 kordex = "1.5.8-SNAPSHOT"
 kmongo = "4.10.0"
 coroutines = "1.7.3"
-serialization = "1.6.0-RC"
-ktor = "2.3.3"
-kord = "0.10.0-SNAPSHOT"
+serialization = "1.6.0"
+ktor = "2.3.4"
+kord = "0.11.0"
 jjwt = "0.11.5"
-api = "3.23.6"
-ksp = "1.9.0-1.0.11"
+api = "3.24.0"
+ksp = "1.9.10-1.0.13"
 lavakord = "feature-new-lavasrc-fields-20230814.202530-2"
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/MusicPlayer.kt

@@ -201,7 +201,7 @@ class MusicPlayer(val link: Link, private val guild: GuildBehavior) :
         updateMusicChannelMessage()
     }
 
-    suspend fun injectTrack(identifier: String, noReplace: Boolean = false, playOptionsBuilder: PlayOptions.() -> Unit) = lock.withLock<Unit> {
+    suspend fun injectTrack(identifier: String, noReplace: Boolean = false, playOptionsBuilder: PlayOptions.() -> Unit) = lock.withLock {
         dontQueue = true
         val currentTrack = playingTrack
         if (currentTrack != null && !noReplace) {
@@ -241,25 +241,27 @@ class MusicPlayer(val link: Link, private val guild: GuildBehavior) :
             dontQueue = event.reason == Message.EmittedEvent.TrackEndEvent.AudioTrackEndReason.REPLACED
         }
         if (savedTrack != null && event.reason != Message.EmittedEvent.TrackEndEvent.AudioTrackEndReason.REPLACED) {
-            val track = savedTrack ?: return
+            val track = savedTrack ?: return@onTrackEnd
             savedTrack = null
             player.playTrack(track.track.track) {
                 position = track.position
                 filters = track.filters
                 volume = track.volume
             }
-            return
+            return@onTrackEnd
         }
         if ((!repeat && !loopQueue && queue.isEmpty()) && event.reason != Message.EmittedEvent.TrackEndEvent.AudioTrackEndReason.REPLACED) {
             val autoPlayTrack = findNextAutoPlayedSong(event.track)
             if (autoPlayTrack != null) {
                 queue.add(SimpleQueuedTrack(autoPlayTrack, guild.kord.selfId))
             } else {
+                playingTrack = null
+                updateMusicChannelMessage()
                 leaveTimeout = lavakord.launch {
                     delay(MusicSettingsDatabase.findGuild(guild).leaveTimeout)
                     stop()
                 }
-                return
+                return@onTrackEnd
             }
         }
 
@@ -297,7 +299,7 @@ class MusicPlayer(val link: Link, private val guild: GuildBehavior) :
                 filters = maybeSavedTrack.filters
                 volume = maybeSavedTrack.volume
             }
-            return
+            return@skip
         }
         if (canSkip) {
             startNextSong()
@@ -308,7 +310,7 @@ class MusicPlayer(val link: Link, private val guild: GuildBehavior) :
     }
 
     suspend fun skipChapter() = lock.withLock {
-        val chapterTrack = (playingTrack as? ChapterQueuedTrack) ?: return
+        val chapterTrack = (playingTrack as? ChapterQueuedTrack) ?: return@skipChapter
         val chapter = chapterTrack.nextChapter()
         player.seekTo(chapter.start)
         updateMusicChannelMessage()