From 8dd8f33cddf986982f720ad803659e1ad2f91dd6 Mon Sep 17 00:00:00 2001 From: dalbodeule <11470513+dalbodeule@users.noreply.github.com> Date: Sat, 16 Nov 2024 20:35:30 +0900 Subject: [PATCH] dependencies update --- .idea/kotlinc.xml | 2 +- build.gradle.kts | 12 ++++++------ chatbot/build.gradle.kts | 14 +++++++------- common/build.gradle.kts | 16 ++++++++-------- webserver/build.gradle.kts | 14 +++++++------- .../space/mori/chzzk_bot/webserver/Main.kt | 5 +++-- 6 files changed, 32 insertions(+), 31 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 6d0ee1c..c224ad5 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index b250405..b8d5a3e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - val kotlinVersion = "2.0.0" + val kotlinVersion = "2.0.21" id("java") id("application") @@ -28,21 +28,21 @@ repositories { dependencies { // https://mvnrepository.com/artifact/ch.qos.logback/logback-classic - implementation("ch.qos.logback:logback-classic:1.5.6") + implementation("ch.qos.logback:logback-classic:1.5.12") // https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0-RC") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-reflect - implementation("org.jetbrains.kotlin:kotlin-reflect:2.0.0") + implementation("org.jetbrains.kotlin:kotlin-reflect:2.0.21") // https://mvnrepository.com/artifact/com.google.code.gson/gson implementation("com.google.code.gson:gson:2.11.0") // https://mvnrepository.com/artifact/io.github.cdimascio/dotenv-kotlin - implementation("io.github.cdimascio:dotenv-kotlin:6.4.1") + implementation("io.github.cdimascio:dotenv-kotlin:6.4.2") // https://mvnrepository.com/artifact/io.insert-koin/koin-core - implementation("io.insert-koin:koin-core:4.0.0-RC1") + implementation("io.insert-koin:koin-core:4.0.0") kotlin("stdlib") diff --git a/chatbot/build.gradle.kts b/chatbot/build.gradle.kts index 70f889d..5114398 100644 --- a/chatbot/build.gradle.kts +++ b/chatbot/build.gradle.kts @@ -11,32 +11,32 @@ repositories { dependencies { // https://mvnrepository.com/artifact/net.dv8tion/JDA - api("net.dv8tion:JDA:5.0.1") { + api("net.dv8tion:JDA:5.2.1") { exclude(module = "opus-java") } // https://mvnrepository.com/artifact/io.github.R2turnTrue/chzzk4j - implementation("io.github.R2turnTrue:chzzk4j:0.0.9") + implementation("io.github.R2turnTrue:chzzk4j:0.0.12") // https://mvnrepository.com/artifact/ch.qos.logback/logback-classic - implementation("ch.qos.logback:logback-classic:1.5.6") + implementation("ch.qos.logback:logback-classic:1.5.12") // https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0-RC") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-reflect - implementation("org.jetbrains.kotlin:kotlin-reflect:2.0.0") + implementation("org.jetbrains.kotlin:kotlin-reflect:2.0.21") // https://mvnrepository.com/artifact/com.google.code.gson/gson implementation("com.google.code.gson:gson:2.11.0") // https://mvnrepository.com/artifact/io.github.cdimascio/dotenv-kotlin - implementation("io.github.cdimascio:dotenv-kotlin:6.4.1") + implementation("io.github.cdimascio:dotenv-kotlin:6.4.2") // https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp implementation("com.squareup.okhttp3:okhttp:4.12.0") // https://mvnrepository.com/artifact/io.insert-koin/koin-core - implementation("io.insert-koin:koin-core:4.0.0-RC1") + implementation("io.insert-koin:koin-core:4.0.0") testImplementation(kotlin("test")) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 9d9dac9..3d9c74f 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -11,25 +11,25 @@ repositories { dependencies { // https://mvnrepository.com/artifact/org.jetbrains.exposed/exposed-core - api("org.jetbrains.exposed:exposed-core:0.53.0") + api("org.jetbrains.exposed:exposed-core:0.56.0") // https://mvnrepository.com/artifact/org.jetbrains.exposed/exposed-dao - api("org.jetbrains.exposed:exposed-dao:0.53.0") + api("org.jetbrains.exposed:exposed-dao:0.56.0") // https://mvnrepository.com/artifact/org.jetbrains.exposed/exposed-jdbc - api("org.jetbrains.exposed:exposed-jdbc:0.53.0") + api("org.jetbrains.exposed:exposed-jdbc:0.56.0") // https://mvnrepository.com/artifact/org.jetbrains.exposed/exposed-kotlin-datetime - api("org.jetbrains.exposed:exposed-java-time:0.53.0") + api("org.jetbrains.exposed:exposed-java-time:0.56.0") // https://mvnrepository.com/artifact/com.zaxxer/HikariCP - api("com.zaxxer:HikariCP:5.1.0") + api("com.zaxxer:HikariCP:6.1.0") // https://mvnrepository.com/artifact/ch.qos.logback/logback-classic - implementation("ch.qos.logback:logback-classic:1.5.6") + implementation("ch.qos.logback:logback-classic:1.5.12") // https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client - implementation("org.mariadb.jdbc:mariadb-java-client:3.4.1") + implementation("org.mariadb.jdbc:mariadb-java-client:3.5.0") // https://mvnrepository.com/artifact/io.github.cdimascio/dotenv-kotlin - implementation("io.github.cdimascio:dotenv-kotlin:6.4.1") + implementation("io.github.cdimascio:dotenv-kotlin:6.4.2") // https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp implementation("com.squareup.okhttp3:okhttp:4.12.0") diff --git a/webserver/build.gradle.kts b/webserver/build.gradle.kts index 23b8007..d73ec32 100644 --- a/webserver/build.gradle.kts +++ b/webserver/build.gradle.kts @@ -10,7 +10,7 @@ repositories { mavenCentral() } -val ktorVersion = "2.3.12" +val ktorVersion = "3.0.1" dependencies { implementation("io.ktor:ktor-server-core:$ktorVersion") @@ -27,21 +27,21 @@ dependencies { implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion") implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion") - implementation("io.swagger.codegen.v3:swagger-codegen-generators:1.0.50") + implementation("io.swagger.codegen.v3:swagger-codegen-generators:1.0.54") // https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0-RC") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-reflect - implementation("org.jetbrains.kotlin:kotlin-reflect:2.0.0") + implementation("org.jetbrains.kotlin:kotlin-reflect:2.0.21") // https://mvnrepository.com/artifact/io.insert-koin/koin-core - implementation("io.insert-koin:koin-core:4.0.0-RC1") + implementation("io.insert-koin:koin-core:4.0.0") // https://mvnrepository.com/artifact/ch.qos.logback/logback-classic - implementation("ch.qos.logback:logback-classic:1.5.6") + implementation("ch.qos.logback:logback-classic:1.5.12") // https://mvnrepository.com/artifact/io.github.cdimascio/dotenv-kotlin - implementation("io.github.cdimascio:dotenv-kotlin:6.4.1") + implementation("io.github.cdimascio:dotenv-kotlin:6.4.2") implementation(project(":common")) diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/Main.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/Main.kt index 819f6cb..56e2ad4 100644 --- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/Main.kt +++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/Main.kt @@ -27,6 +27,7 @@ import space.mori.chzzk_bot.webserver.routes.* import space.mori.chzzk_bot.webserver.utils.DiscordRatelimits import wsSongListRoutes import java.time.Duration +import kotlin.time.toKotlinDuration val dotenv = dotenv { ignoreIfMissing = true @@ -38,8 +39,8 @@ val redirects = mutableMapOf() val server = embeddedServer(Netty, port = 8080, ) { install(WebSockets) { - pingPeriod = Duration.ofSeconds(15) - timeout = Duration.ofSeconds(15) + pingPeriod = Duration.ofSeconds(15).toKotlinDuration() + timeout = Duration.ofSeconds(15).toKotlinDuration() maxFrameSize = Long.MAX_VALUE masking = false contentConverter = KotlinxWebsocketSerializationConverter(Json)