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

Merge branch 'refs/heads/develop' into ddd 

# Conflicts:
#	libs.versions.toml
This commit is contained in:
usbharu 2024-06-13 15:15:16 +09:00
parent 74e10672bd 6fa3d1cd1c
commit ad9a4852f3
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs.versions.toml
View File

@ -7,7 +7,7 @@ javacv-ffmpeg = "6.1.1-1.5.10"
detekt = "1.23.6" detekt = "1.23.6"
coroutines = "1.8.1" coroutines = "1.8.1"
swagger = "2.2.22" swagger = "2.2.22"
serialization = "1.6.3" serialization = "1.7.0"
kjob = "0.6.0" kjob = "0.6.0"
tika = "2.9.2" tika = "2.9.2"
owl = "0.0.1" owl = "0.0.1"
@ -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.25.66" } aws-s3 = { module = "software.amazon.awssdk:s3", version = "2.26.1" }
jsoup = { module = "org.jsoup:jsoup", version = "1.17.2" } jsoup = { module = "org.jsoup:jsoup", version = "1.17.2" }
@ -77,7 +77,7 @@ owasp-java-html-sanitizer = { module = "com.googlecode.owasp-java-html-sanitizer
postgresql = { module = "org.postgresql:postgresql", version = "42.7.3" } postgresql = { module = "org.postgresql:postgresql", version = "42.7.3" }
imageio-webp = { module = "com.twelvemonkeys.imageio:imageio-webp", version = "3.10.1" } imageio-webp = { module = "com.twelvemonkeys.imageio:imageio-webp", version = "3.11.0" }
thumbnailator = { module = "net.coobird:thumbnailator", version = "0.4.20" } thumbnailator = { module = "net.coobird:thumbnailator", version = "0.4.20" }
@ -109,6 +109,6 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
spring-boot = { id = "org.springframework.boot", version = "3.3.0" } spring-boot = { id = "org.springframework.boot", version = "3.3.0" }
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" } kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
kover = { id = "org.jetbrains.kotlinx.kover", version = "0.8.0" } kover = { id = "org.jetbrains.kotlinx.kover", version = "0.8.1" }
openapi-generator = { id = "org.openapi.generator", version = "7.6.0" } openapi-generator = { id = "org.openapi.generator", version = "7.6.0" }
license-report = { id = "com.github.jk1.dependency-license-report", version = "2.8" } license-report = { id = "com.github.jk1.dependency-license-report", version = "2.8" }

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

@ -20,7 +20,7 @@ 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.64.0") implementation("io.grpc:grpc-protobuf:1.64.0")
implementation("com.google.protobuf:protobuf-kotlin:4.27.0") implementation("com.google.protobuf:protobuf-kotlin:4.27.1")
implementation("io.grpc:grpc-netty:1.64.0") implementation("io.grpc:grpc-netty:1.64.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"))
@ -41,7 +41,7 @@ kotlin {
protobuf { protobuf {
protoc { protoc {
artifact = "com.google.protobuf:protoc:4.27.0" artifact = "com.google.protobuf:protoc:4.27.1"
} }
plugins { plugins {
create("grpc") { create("grpc") {

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

@ -16,7 +16,7 @@ repositories {
} }
dependencies { dependencies {
implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.1.0") implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.1.1")
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"))

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

@ -14,7 +14,7 @@ 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.64.0") implementation("io.grpc:grpc-protobuf:1.64.0")
implementation("com.google.protobuf:protobuf-kotlin:4.27.0") implementation("com.google.protobuf:protobuf-kotlin:4.27.1")
implementation("io.grpc:grpc-netty:1.64.0") implementation("io.grpc:grpc-netty:1.64.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"))
@ -30,7 +30,7 @@ kotlin {
protobuf { protobuf {
protoc { protoc {
artifact = "com.google.protobuf:protoc:4.27.0" artifact = "com.google.protobuf:protoc:4.27.1"
} }
plugins { plugins {
create("grpc") { create("grpc") {

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

@ -15,7 +15,7 @@ dependencies {
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.64.0") implementation("io.grpc:grpc-protobuf:1.64.0")
implementation("com.google.protobuf:protobuf-kotlin:4.27.0") implementation("com.google.protobuf:protobuf-kotlin:4.27.1")
implementation("io.grpc:grpc-netty:1.64.0") implementation("io.grpc:grpc-netty:1.64.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"))
@ -31,7 +31,7 @@ kotlin {
protobuf { protobuf {
protoc { protoc {
artifact = "com.google.protobuf:protoc:4.27.0" artifact = "com.google.protobuf:protoc:4.27.1"
} }
plugins { plugins {
create("grpc") { create("grpc") {