diff --git a/build.gradle.kts b/build.gradle.kts index 0e67478..20490c9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.3.41" + kotlin("jvm") version "1.3.50" id("com.github.johnrengelman.shadow") version "5.1.0" apply true application } @@ -38,13 +38,13 @@ dependencies { implementation(kotlin("stdlib-jdk8")) implementation("org.javacord:javacord:3.0.4") 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") // 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("com.fasterxml.jackson.core:jackson-databind:2.9.9") + testImplementation("com.fasterxml.jackson.core:jackson-databind:2.9.9.3") } tasks.withType { diff --git a/src/main/kotlin/moe/kageru/kagebot/Util.kt b/src/main/kotlin/moe/kageru/kagebot/Util.kt index 626cdca..7d53cf3 100644 --- a/src/main/kotlin/moe/kageru/kagebot/Util.kt +++ b/src/main/kotlin/moe/kageru/kagebot/Util.kt @@ -54,7 +54,7 @@ object Util { } private fun Optional.toNullable(): T? { - return ifNotEmpty { it } + return orElse(null) } fun findUser(idOrName: String): User? { @@ -73,11 +73,13 @@ object Util { try { join() } catch (e: CompletionException) { - Log.warn("""Error during CompletableFuture: + Log.warn( + """Error during CompletableFuture: |$e |${e.localizedMessage} |${e.stackTrace.joinToString("\n\t")} - """.trimMargin()) + """.trimMargin() + ) // we don’t care about this error, but I don’t want to spam stdout } return isCompletedExceptionally