usbharu
/
Hideout
mirror of https://github.com/usbharu/Hideout.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into auth2

This commit is contained in:
usbharu 2024-08-09 00:37:39 +09:00 committed by GitHub
parent 2cfc8bc0d8 71c1b74975
commit cf71c17464
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs.versions.toml
View File

@ -1,6 +1,6 @@
[versions] [versions]
kotlin = "2.0.0" kotlin = "2.0.10"
ktor = "2.3.12" ktor = "2.3.12"
exposed = "0.53.0" exposed = "0.53.0"
javacv-ffmpeg = "6.1.1-1.5.10" javacv-ffmpeg = "6.1.1-1.5.10"
@ -69,7 +69,7 @@ jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-
blurhash = { module = "io.trbl:blurhash", version = "1.0.0" } blurhash = { module = "io.trbl:blurhash", version = "1.0.0" }
aws-s3 = { module = "software.amazon.awssdk:s3", version = "2.26.29" } aws-s3 = { module = "software.amazon.awssdk:s3", version = "2.27.0" }
jsoup = { module = "org.jsoup:jsoup", version = "1.18.1" } jsoup = { module = "org.jsoup:jsoup", version = "1.18.1" }

2
owl/build.gradle.kts
View File

@ -22,7 +22,7 @@ subprojects {
} }
dependencies { dependencies {
implementation("org.slf4j:slf4j-api:2.0.13") implementation("org.slf4j:slf4j-api:2.0.14")
testImplementation("org.junit.jupiter:junit-jupiter:5.10.3") testImplementation("org.junit.jupiter:junit-jupiter:5.10.3")

6
owl/owl-broker/build.gradle.kts
View File

@ -13,9 +13,9 @@ repositories {
dependencies { dependencies {
implementation("io.grpc:grpc-kotlin-stub:1.4.1") implementation("io.grpc:grpc-kotlin-stub:1.4.1")
implementation("io.grpc:grpc-protobuf:1.65.1") implementation("io.grpc:grpc-protobuf:1.66.0")
implementation("com.google.protobuf:protobuf-kotlin:4.27.3") implementation("com.google.protobuf:protobuf-kotlin:4.27.3")
implementation("io.grpc:grpc-netty:1.65.1") implementation("io.grpc:grpc-netty:1.66.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") 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")
@ -36,7 +36,7 @@ protobuf {
} }
plugins { plugins {
create("grpc") { create("grpc") {
artifact = "io.grpc:protoc-gen-grpc-java:1.65.1" artifact = "io.grpc:protoc-gen-grpc-java:1.66.0"
} }
create("grpckt") { create("grpckt") {
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar" artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"

2
owl/owl-broker/owl-broker-mongodb/build.gradle.kts
View File

@ -11,7 +11,7 @@ repositories {
} }
dependencies { dependencies {
implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.1.2") implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.1.3")
implementation(project(":owl-broker")) implementation(project(":owl-broker"))
implementation(project(":owl-common")) implementation(project(":owl-common"))
implementation(platform("io.insert-koin:koin-bom:3.5.6")) implementation(platform("io.insert-koin:koin-bom:3.5.6"))

6
owl/owl-consumer/build.gradle.kts
View File

@ -13,9 +13,9 @@ repositories {
dependencies { dependencies {
testImplementation("org.jetbrains.kotlin:kotlin-test") testImplementation("org.jetbrains.kotlin:kotlin-test")
implementation("io.grpc:grpc-kotlin-stub:1.4.1") implementation("io.grpc:grpc-kotlin-stub:1.4.1")
implementation("io.grpc:grpc-protobuf:1.65.1") implementation("io.grpc:grpc-protobuf:1.66.0")
implementation("com.google.protobuf:protobuf-kotlin:4.27.3") implementation("com.google.protobuf:protobuf-kotlin:4.27.3")
implementation("io.grpc:grpc-netty:1.65.1") implementation("io.grpc:grpc-netty:1.66.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") 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"))
@ -34,7 +34,7 @@ protobuf {
} }
plugins { plugins {
create("grpc") { create("grpc") {
artifact = "io.grpc:protoc-gen-grpc-java:1.65.1" artifact = "io.grpc:protoc-gen-grpc-java:1.66.0"
} }
create("grpckt") { create("grpckt") {
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar" artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"

6
owl/owl-producer/owl-producer-default/build.gradle.kts
View File

@ -14,9 +14,9 @@ dependencies {
testImplementation("org.jetbrains.kotlin:kotlin-test") testImplementation("org.jetbrains.kotlin:kotlin-test")
api(project(":owl-producer:owl-producer-api")) api(project(":owl-producer:owl-producer-api"))
implementation("io.grpc:grpc-kotlin-stub:1.4.1") implementation("io.grpc:grpc-kotlin-stub:1.4.1")
implementation("io.grpc:grpc-protobuf:1.65.1") implementation("io.grpc:grpc-protobuf:1.66.0")
implementation("com.google.protobuf:protobuf-kotlin:4.27.3") implementation("com.google.protobuf:protobuf-kotlin:4.27.3")
implementation("io.grpc:grpc-netty:1.65.1") implementation("io.grpc:grpc-netty:1.66.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") 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"))
@ -35,7 +35,7 @@ protobuf {
} }
plugins { plugins {
create("grpc") { create("grpc") {
artifact = "io.grpc:protoc-gen-grpc-java:1.65.1" artifact = "io.grpc:protoc-gen-grpc-java:1.66.0"
} }
create("grpckt") { create("grpckt") {
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar" artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"