kageru/discord-kagebot
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Update dependencies

This commit is contained in:
kageru 2019-09-17 22:04:52 +02:00
parent 684926f1c5
commit c49a122622
Signed by: kageru
GPG Key ID: 8282A2BEA4ADA3D2
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle.kts
View File

@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
kotlin("jvm") version "1.3.41" kotlin("jvm") version "1.3.50"
id("com.github.johnrengelman.shadow") version "5.1.0" apply true id("com.github.johnrengelman.shadow") version "5.1.0" apply true
application application
} }
@ -38,13 +38,13 @@ dependencies {
implementation(kotlin("stdlib-jdk8")) implementation(kotlin("stdlib-jdk8"))
implementation("org.javacord:javacord:3.0.4") implementation("org.javacord:javacord:3.0.4")
implementation("org.mapdb:mapdb:3.0.7") implementation("org.mapdb:mapdb:3.0.7")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0-RC") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.1")
testImplementation("io.kotlintest:kotlintest-runner-junit5:3.3.2") testImplementation("io.kotlintest:kotlintest-runner-junit5:3.4.1")
testImplementation("io.mockk:mockk:1.9.3") testImplementation("io.mockk:mockk:1.9.3")
// these two are needed to access javacord internals (such as reading from sent embeds during tests) // these two are needed to access javacord internals (such as reading from sent embeds during tests)
testImplementation("org.javacord:javacord-core:3.0.4") testImplementation("org.javacord:javacord-core:3.0.4")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.9.9") testImplementation("com.fasterxml.jackson.core:jackson-databind:2.9.9.3")
} }
tasks.withType<KotlinCompile> { tasks.withType<KotlinCompile> {

8
src/main/kotlin/moe/kageru/kagebot/Util.kt
View File

@ -54,7 +54,7 @@ object Util {
} }
private fun <T> Optional<T>.toNullable(): T? { private fun <T> Optional<T>.toNullable(): T? {
return ifNotEmpty { it } return orElse(null)
} }
fun findUser(idOrName: String): User? { fun findUser(idOrName: String): User? {
@ -73,11 +73,13 @@ object Util {
try { try {
join() join()
} catch (e: CompletionException) { } catch (e: CompletionException) {
Log.warn("""Error during CompletableFuture: Log.warn(
"""Error during CompletableFuture:
|$e |$e
|${e.localizedMessage} |${e.localizedMessage}
|${e.stackTrace.joinToString("\n\t")} |${e.stackTrace.joinToString("\n\t")}
""".trimMargin()) """.trimMargin()
)
// we don’t care about this error, but I don’t want to spam stdout // we don’t care about this error, but I don’t want to spam stdout
} }
return isCompletedExceptionally return isCompletedExceptionally