diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fb7f4a8a..b589d56e 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index d55c425f..a9923087 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } group = "dev.schlaubi.lavakord" -version = "3.1.0" +version = "3.1.1" allprojects { repositories { diff --git a/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/WebsocketPlayer.kt b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/WebsocketPlayer.kt index b6b5b521..e09f51ed 100644 --- a/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/WebsocketPlayer.kt +++ b/core/src/commonMain/kotlin/dev/schlaubi/lavakord/audio/internal/WebsocketPlayer.kt @@ -67,6 +67,7 @@ internal class WebsocketPlayer(internal val node: NodeImpl, internal val guildId } private fun handleNewTrack(event: TrackStartEvent) { + updateTime = Clock.System.now() lastPosition = event.track.position playingTrack = event.track } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a0f7639f..669386b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/java/build.gradle.kts b/java/build.gradle.kts index 1cc0c730..d7f079c5 100644 --- a/java/build.gradle.kts +++ b/java/build.gradle.kts @@ -21,7 +21,7 @@ kotlin { dependencies { api(projects.core) api(projects.jda) - api("net.dv8tion:JDA:4.2.1_253") { + api("net.dv8tion:JDA:5.0.0-alpha.4") { exclude(module = "opus-java") } implementation(libs.kotlinx.coroutines.jdk8) diff --git a/jda/build.gradle.kts b/jda/build.gradle.kts index c5e5a7a3..ee23a5d7 100644 --- a/jda/build.gradle.kts +++ b/jda/build.gradle.kts @@ -14,7 +14,7 @@ kotlin { jvmMain { dependencies { api(projects.core) - implementation("net.dv8tion:JDA:5.0.0-alpha.3") { + implementation("net.dv8tion:JDA:5.0.0-alpha.4") { exclude(module = "opus-java") } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 75ee2f41..305cb618 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -46,11 +46,11 @@ fun VersionCatalogBuilder.kotlinx() { alias("kotlinx-coroutines-jdk8").to("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8").versionRef(coroutines) alias("kotlinx-coroutines-test").to("org.jetbrains.kotlinx", "kotlinx-coroutines-test").versionRef(coroutines) alias("kotlinx-serialization-json").to("org.jetbrains.kotlinx", "kotlinx-serialization-json").version("1.3.2") - alias("kotlinx-datetime").to("org.jetbrains.kotlinx", "kotlinx-datetime").version("0.3.1") + alias("kotlinx-datetime").to("org.jetbrains.kotlinx", "kotlinx-datetime").version("0.3.2") } fun VersionCatalogBuilder.ktor() { - val ktor = version("ktor", "1.6.3") + val ktor = version("ktor", "1.6.7") alias("ktor-io").to("io.ktor", "ktor-io").versionRef(ktor) alias("ktor-utils").to("io.ktor", "ktor-utils").versionRef(ktor) alias("ktor-client-websockets").to("io.ktor", "ktor-client-websockets").versionRef(ktor)