Merge branch 'develop' into revert-325-renovate/org.openapi.generator-7.x

This commit is contained in:
usbharu 2024-05-12 02:30:47 +09:00 committed by GitHub
commit 2a30afde4e
5 changed files with 6 additions and 6 deletions

View File

@ -1,11 +1,11 @@
[versions] [versions]
kotlin = "1.9.23" kotlin = "1.9.24"
ktor = "2.3.9" ktor = "2.3.9"
exposed = "0.49.0" exposed = "0.49.0"
javacv-ffmpeg = "6.1.1-1.5.10" javacv-ffmpeg = "6.1.1-1.5.10"
detekt = "1.23.6" detekt = "1.23.6"
coroutines = "1.8.0" coroutines = "1.8.1"
swagger = "2.2.6" swagger = "2.2.6"
serialization = "1.6.3" serialization = "1.6.3"
kjob = "0.6.0" kjob = "0.6.0"

View File

@ -21,7 +21,7 @@ dependencies {
implementation("io.grpc:grpc-protobuf:1.63.0") implementation("io.grpc:grpc-protobuf:1.63.0")
implementation("com.google.protobuf:protobuf-kotlin:4.26.1") implementation("com.google.protobuf:protobuf-kotlin:4.26.1")
implementation("io.grpc:grpc-netty:1.63.0") implementation("io.grpc:grpc-netty:1.63.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
implementation(project(":owl-common")) implementation(project(":owl-common"))
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1") implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1")
implementation(platform("io.insert-koin:koin-bom:3.5.6")) implementation(platform("io.insert-koin:koin-bom:3.5.6"))

View File

@ -16,7 +16,7 @@ dependencies {
implementation("io.grpc:grpc-protobuf:1.63.0") implementation("io.grpc:grpc-protobuf:1.63.0")
implementation("com.google.protobuf:protobuf-kotlin:4.26.1") implementation("com.google.protobuf:protobuf-kotlin:4.26.1")
implementation("io.grpc:grpc-netty:1.63.0") implementation("io.grpc:grpc-netty:1.63.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
implementation(project(":owl-common")) implementation(project(":owl-common"))
protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto")) protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto"))
} }

View File

@ -17,7 +17,7 @@ dependencies {
implementation("io.grpc:grpc-protobuf:1.63.0") implementation("io.grpc:grpc-protobuf:1.63.0")
implementation("com.google.protobuf:protobuf-kotlin:4.26.1") implementation("com.google.protobuf:protobuf-kotlin:4.26.1")
implementation("io.grpc:grpc-netty:1.63.0") implementation("io.grpc:grpc-netty:1.63.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
implementation(project(":owl-common")) implementation(project(":owl-common"))
protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto")) protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto"))
} }

View File

@ -15,7 +15,7 @@ dependencies {
implementation(project(":owl-broker")) implementation(project(":owl-broker"))
implementation(platform("io.insert-koin:koin-bom:3.5.6")) implementation(platform("io.insert-koin:koin-bom:3.5.6"))
implementation("io.insert-koin:koin-core") implementation("io.insert-koin:koin-core")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
} }
tasks.test { tasks.test {