Fix merge conflict

bombies · Dec 7, 2023 · 9df4d3c · 9df4d3c
2 parents 3fd0443 + 073c665
commit 9df4d3c
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -15,12 +15,12 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <kotlin.code.style>official</kotlin.code.style>
         <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
-        <kotlin.version>1.9.20</kotlin.version>
+        <kotlin.version>1.9.21</kotlin.version>
         <ktor.version>2.3.5</ktor.version>
         <koin.version>3.5.0</koin.version>
         <mockk.version>1.13.5</mockk.version>
         <kotlin.compiler.incremental>false</kotlin.compiler.incremental>
-        <serialization.version>1.6.0</serialization.version>
+        <serialization.version>1.6.2</serialization.version>
         <maven.compiler.target>17</maven.compiler.target>
         <main.class>main.main.RobertifyKt</main.class>
     </properties>
@@ -65,12 +65,12 @@
         <dependency>
             <groupId>dev.schlaubi.lavakord</groupId>
             <artifactId>lavasrc-jvm</artifactId>
-            <version>5.1.7</version>
+            <version>6.0.0</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.4.11</version>
+            <version>1.4.14</version>
         </dependency>
         <dependency>
             <groupId>io.github.cdimascio</groupId>
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>5.0.0-beta.15</version>
+            <version>5.0.0-beta.18</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
@@ -95,7 +95,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.13.0</version>
+            <version>3.14.0</version>
         </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>
@@ -110,7 +110,7 @@
         <dependency>
             <groupId>com.github.TopiSenpai.LavaSrc</groupId>
             <artifactId>lavasrc</artifactId>
-            <version>3.2.9</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.discordbots</groupId>
@@ -120,17 +120,17 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>5.0.1</version>
+            <version>5.1.0</version>
         </dependency>
         <dependency>
             <groupId>io.sentry</groupId>
             <artifactId>sentry</artifactId>
-            <version>6.31.0</version>
+            <version>7.0.0</version>
         </dependency>
         <dependency>
             <groupId>io.sentry</groupId>
             <artifactId>sentry-logback</artifactId>
-            <version>6.31.0</version>
+            <version>7.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
@@ -140,7 +140,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>24.0.1</version>
+            <version>24.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -163,7 +163,7 @@
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test-junit5</artifactId>
-            <version>1.9.10</version>
+            <version>1.9.21</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -270,23 +270,23 @@
         <dependency>
             <groupId>com.influxdb</groupId>
             <artifactId>influxdb-client-kotlin</artifactId>
-            <version>6.10.0</version>
+            <version>6.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.influxdb</groupId>
             <artifactId>flux-dsl</artifactId>
-            <version>6.10.0</version>
+            <version>6.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.6.0</version>
+            <version>5.8.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito.kotlin</groupId>
             <artifactId>mockito-kotlin</artifactId>
-            <version>5.1.0</version>
+            <version>5.2.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/kotlin/main/audiohandlers/RobertifyAudioManager.kt b/src/main/kotlin/main/audiohandlers/RobertifyAudioManager.kt
@@ -3,9 +3,9 @@ package main.audiohandlers
 //import main.utils.resume.ResumableTrack
 //import main.utils.resume.ResumableTrack.Companion.string
 //import main.utils.resume.ResumeData
-import com.github.topisenpai.lavasrc.applemusic.AppleMusicSourceManager
-import com.github.topisenpai.lavasrc.deezer.DeezerAudioSourceManager
-import com.github.topisenpai.lavasrc.spotify.SpotifySourceManager
+import com.github.topi314.lavasrc.applemusic.AppleMusicSourceManager
+import com.github.topi314.lavasrc.deezer.DeezerAudioSourceManager
+import com.github.topi314.lavasrc.spotify.SpotifySourceManager
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager
 import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager
 import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers

diff --git a/src/main/kotlin/main/audiohandlers/loaders/MainAudioLoader.kt b/src/main/kotlin/main/audiohandlers/loaders/MainAudioLoader.kt
@@ -1,6 +1,6 @@
 package main.audiohandlers.loaders
 
-import com.github.topisenpai.lavasrc.spotify.SpotifySourceManager
+import com.github.topi314.lavasrc.spotify.SpotifySourceManager
 import dev.arbjerg.lavalink.protocol.v4.Exception
 import dev.arbjerg.lavalink.protocol.v4.Playlist
 import dev.arbjerg.lavalink.protocol.v4.Track

diff --git a/src/main/kotlin/main/audiohandlers/loaders/SearchResultLoader.kt b/src/main/kotlin/main/audiohandlers/loaders/SearchResultLoader.kt
@@ -1,6 +1,6 @@
 package main.audiohandlers.loaders
 
-import com.github.topisenpai.lavasrc.spotify.SpotifySourceManager
+import com.github.topi314.lavasrc.spotify.SpotifySourceManager
 import dev.arbjerg.lavalink.protocol.v4.Exception
 import dev.arbjerg.lavalink.protocol.v4.Playlist
 import dev.arbjerg.lavalink.protocol.v4.Track

diff --git a/src/main/kotlin/main/commands/slashcommands/audio/NowPlayingCommand.kt b/src/main/kotlin/main/commands/slashcommands/audio/NowPlayingCommand.kt
@@ -1,6 +1,5 @@
 package main.commands.slashcommands.audio
 
-import com.github.topisenpai.lavasrc.mirror.MirroringAudioTrack
 import dev.minn.jda.ktx.util.SLF4J
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.MissingFieldException

diff --git a/src/main/kotlin/main/commands/slashcommands/audio/PlayCommand.kt b/src/main/kotlin/main/commands/slashcommands/audio/PlayCommand.kt
@@ -1,6 +1,6 @@
 package main.commands.slashcommands.audio
 
-import com.github.topisenpai.lavasrc.spotify.SpotifySourceManager
+import com.github.topi314.lavasrc.spotify.SpotifySourceManager
 import dev.minn.jda.ktx.interactions.components.link
 import kotlinx.coroutines.*
 import main.audiohandlers.RobertifyAudioManager

diff --git a/src/main/kotlin/main/commands/slashcommands/audio/SearchCommand.kt b/src/main/kotlin/main/commands/slashcommands/audio/SearchCommand.kt
@@ -1,6 +1,6 @@
 package main.commands.slashcommands.audio
 
-import com.github.topisenpai.lavasrc.spotify.SpotifySourceManager
+import com.github.topi314.lavasrc.spotify.SpotifySourceManager
 import kotlinx.coroutines.runBlocking
 import main.audiohandlers.RobertifyAudioManager
 import main.commands.slashcommands.SlashCommandManager.getRequiredOption

diff --git a/src/main/kotlin/main/commands/slashcommands/audio/SearchQueueCommand.kt b/src/main/kotlin/main/commands/slashcommands/audio/SearchQueueCommand.kt
@@ -1,6 +1,5 @@
 package main.commands.slashcommands.audio
 
-import com.github.topisenpai.lavasrc.mirror.MirroringAudioTrack
 import main.audiohandlers.RobertifyAudioManager
 import main.audiohandlers.utils.*
 import main.commands.slashcommands.SlashCommandManager.getRequiredOption