Release 0.12.0

README.md

@@ -9,9 +9,9 @@
 [7]: https://github.com/MinnDevelopment/strumbot
 [8]: https://minndevelopment.github.io/jda-ktx/
 
-[![Kotlin](https://img.shields.io/badge/kotlin-1.9.22-blue.svg?logo=kotlin)](http://kotlinlang.org)
-[![kotlinx-coroutines](https://img.shields.io/badge/kotlinx.coroutines-1.7.3-blue.svg?logo=kotlin)][2]
-[![JDA](https://img.shields.io/badge/JDA-5.0.0--beta.20-blue.svg)][1]
+[![Kotlin](https://img.shields.io/badge/kotlin-2.0.0-blue.svg?logo=kotlin)](http://kotlinlang.org)
+[![kotlinx-coroutines](https://img.shields.io/badge/kotlinx.coroutines-1.8.1-blue.svg?logo=kotlin)][2]
+[![JDA](https://img.shields.io/badge/JDA-5.0.0-blue.svg)][1]
 [![docs](https://img.shields.io/github/deployments/minndevelopment/jda-ktx/github-pages?label=docs)][8]
 [ ![](https://img.shields.io/maven-central/v/club.minnced/jda-ktx) ](https://search.maven.org/artifact/club.minnced/jda-ktx)
 
@@ -22,9 +22,9 @@ Great in combination with [kotlinx-coroutines][2] and [jda-reactor][3].
 
 ## Required Dependencies
 
-- Kotlin **1.9.22**
-- kotlinx.coroutines **1.7.3**
-- JDA **5.0.0-beta.20**
+- Kotlin **2.0.0**
+- kotlinx.coroutines **1.8.1**
+- JDA **5.0.0**
 
 ## Examples
 

build.gradle.kts

@@ -16,15 +16,15 @@ plugins {
     `maven-publish`
     signing
 
-    kotlin("jvm") version "1.+"
+    kotlin("jvm") version "2.0.0"
     id("io.github.gradle-nexus.publish-plugin") version "1.+"
     id("io.gitlab.arturbosch.detekt") version "1.+"
     id("org.jetbrains.dokka") version "1.+"
 }
 
 group = "club.minnced"
-version = "0.11.0-beta.20"
-val jdaVersion = "5.0.0-beta.20"
+version = "0.12.0"
+val jdaVersion = "5.0.0"
 
 
 
@@ -69,10 +69,10 @@ configure<JavaPluginExtension> {
 }
 
 tasks.withType<KotlinCompile> {
+    kotlinOptions.allWarningsAsErrors = true
     kotlinOptions.jvmTarget = "1.8"
     kotlinOptions.freeCompilerArgs = listOf(
         "-Xjvm-default=all",  // use default methods in interfaces
-        "-Xlambdas=indy"      // use invokedynamic lambdas instead of synthetic classes
     )
 }
 

buildscript-gradle.lockfile

@@ -9,55 +9,52 @@ com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.7=classpath
 com.fasterxml.jackson.module:jackson-module-kotlin:2.12.7=classpath
 com.fasterxml.jackson:jackson-bom:2.12.7=classpath
 com.fasterxml.woodstox:woodstox-core:6.2.4=classpath
+com.google.code.gson:gson:2.8.9=classpath
 io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin:1.3.0=classpath
 io.github.gradle-nexus:publish-plugin:1.3.0=classpath
-io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.4=classpath
-io.gitlab.arturbosch.detekt:io.gitlab.arturbosch.detekt.gradle.plugin:1.23.4=classpath
+io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6=classpath
+io.gitlab.arturbosch.detekt:io.gitlab.arturbosch.detekt.gradle.plugin:1.23.6=classpath
+it.unimi.dsi:fastutil-core:8.5.12=classpath
 jakarta.activation:jakarta.activation-api:1.2.1=classpath
 jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 org.codehaus.woodstox:stax2-api:4.2.1=classpath
-org.freemarker:freemarker:2.3.31=classpath
-org.jetbrains.dokka:analysis-markdown:1.9.10=classpath
-org.jetbrains.dokka:dokka-base:1.9.10=classpath
-org.jetbrains.dokka:dokka-core:1.9.10=classpath
-org.jetbrains.dokka:dokka-gradle-plugin:1.9.10=classpath
-org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.9.10=classpath
+org.freemarker:freemarker:2.3.32=classpath
+org.jetbrains.dokka:analysis-markdown:1.9.20=classpath
+org.jetbrains.dokka:dokka-base:1.9.20=classpath
+org.jetbrains.dokka:dokka-core:1.9.20=classpath
+org.jetbrains.dokka:dokka-gradle-plugin:1.9.20=classpath
+org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.9.20=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-build-tools-api:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-native-utils:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-project-model:1.9.22=classpath
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-build-statistics:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-build-tools-api:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-native-utils:2.0.0=classpath
 org.jetbrains.kotlin:kotlin-reflect:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath
-org.jetbrains.kotlin:kotlin-tooling-core:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.9.22=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.3=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.3=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3=classpath
-org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.5=classpath
+org.jetbrains.kotlin:kotlin-tooling-core:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-util-io:2.0.0=classpath
+org.jetbrains.kotlin:kotlin-util-klib:2.0.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3=classpath
+org.jetbrains.kotlinx:kotlinx-html-jvm:0.9.1=classpath
 org.jetbrains:annotations:13.0=classpath
-org.jetbrains:markdown-jvm:0.3.1=classpath
-org.jetbrains:markdown:0.3.1=classpath
-org.jsoup:jsoup:1.15.3=classpath
+org.jetbrains:markdown-jvm:0.5.2=classpath
+org.jetbrains:markdown:0.5.2=classpath
+org.jsoup:jsoup:1.16.1=classpath
 empty=

gradle.lockfile

@@ -1,33 +1,33 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-ch.qos.logback:logback-classic:1.4.14=compileClasspath
-ch.qos.logback:logback-core:1.4.14=compileClasspath
+ch.qos.logback:logback-classic:1.5.6=compileClasspath
+ch.qos.logback:logback-core:1.5.6=compileClasspath
 club.minnced:discord-webhooks:0.8.4=compileClasspath
 club.minnced:opus-java-api:1.1.1=compileClasspath,runtimeClasspath
 club.minnced:opus-java-natives:1.1.1=compileClasspath,runtimeClasspath
 club.minnced:opus-java:1.1.1=compileClasspath,runtimeClasspath
-com.fasterxml.jackson.core:jackson-annotations:2.16.0=runtimeClasspath
-com.fasterxml.jackson.core:jackson-core:2.16.0=runtimeClasspath
-com.fasterxml.jackson.core:jackson-databind:2.16.0=runtimeClasspath
-com.fasterxml.jackson:jackson-bom:2.16.0=runtimeClasspath
+com.fasterxml.jackson.core:jackson-annotations:2.17.0=runtimeClasspath
+com.fasterxml.jackson.core:jackson-core:2.17.0=runtimeClasspath
+com.fasterxml.jackson.core:jackson-databind:2.17.0=runtimeClasspath
+com.fasterxml.jackson:jackson-bom:2.17.0=runtimeClasspath
 com.neovisionaries:nv-websocket-client:2.14=compileClasspath,runtimeClasspath
 com.squareup.okhttp3:okhttp:4.12.0=compileClasspath,runtimeClasspath
 com.squareup.okio:okio-jvm:3.6.0=compileClasspath,runtimeClasspath
 com.squareup.okio:okio:3.6.0=compileClasspath,runtimeClasspath
-net.dv8tion:JDA:5.0.0-beta.20=compileClasspath,runtimeClasspath
+net.bytebuddy:byte-buddy:1.14.9=runtimeClasspath
+net.dv8tion:JDA:5.0.0=compileClasspath,runtimeClasspath
 net.java.dev.jna:jna:4.4.0=runtimeClasspath
-net.sf.trove4j:trove4j:3.0.3=runtimeClasspath
+net.sf.trove4j:core:3.1.0=runtimeClasspath
 org.apache.commons:commons-collections4:4.4=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=compileClasspath,runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.9.22=compileClasspath,runtimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3=compileClasspath,runtimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3=compileClasspath,runtimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3=compileClasspath,runtimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.0.0=compileClasspath,runtimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1=compileClasspath,runtimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1=compileClasspath,runtimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1=compileClasspath,runtimeClasspath
 org.jetbrains:annotations:23.0.0=compileClasspath,runtimeClasspath
 org.json:json:20230618=compileClasspath
-org.slf4j:slf4j-api:1.7.36=runtimeClasspath
-org.slf4j:slf4j-api:2.0.7=compileClasspath
+org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath
 empty=

src/main/kotlin/dev/minn/jda/ktx/coroutines/coroutines.kt

@@ -16,6 +16,7 @@
 
 package dev.minn.jda.ktx.coroutines
 
+import kotlinx.coroutines.future.await
 import kotlinx.coroutines.suspendCancellableCoroutine
 import net.dv8tion.jda.api.requests.RestAction
 import net.dv8tion.jda.api.utils.concurrent.Task
@@ -28,15 +29,11 @@ import kotlin.coroutines.resumeWithException
  *
  * @return Result
  */
-suspend fun <T> CompletableFuture<T>.await() = suspendCancellableCoroutine<T> {
-    it.invokeOnCancellation { cancel(true) }
-    whenComplete { r, e ->
-        when {
-            e != null -> it.resumeWithException(e)
-            else -> it.resume(r)
-        }
-    }
-}
+@Deprecated(
+    "This is obsolete, kotlin coroutines already provide awaiting futures.",
+    replaceWith = ReplaceWith(expression = "this.await()", imports = ["kotlinx.coroutines.future.await"]),
+    level = DeprecationLevel.WARNING)
+suspend fun <T> CompletableFuture<T>.await(): T = this.await()
 
 /**
  * Awaits the result of this RestAction