From b2d59f619b2453ecf5bfb42fc75b4bb7f0198656 Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Tue, 13 Aug 2024 21:06:59 +0900
Subject: [PATCH] =?UTF-8?q?chore:=20version=20catalog=E3=81=AB=E7=B5=B1?=
 =?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hideout-core/build.gradle.kts                 | 11 ++---
 libs.versions.toml                            | 47 +++++++++++++------
 owl/owl-broker/build.gradle.kts               | 21 ++++-----
 .../owl-broker-mongodb/build.gradle.kts       |  7 ++-
 owl/owl-common/build.gradle.kts               |  2 +-
 owl/owl-consumer/build.gradle.kts             | 17 +++----
 .../owl-producer-default/build.gradle.kts     | 17 +++----
 .../owl-producer-embedded/build.gradle.kts    |  6 +--
 8 files changed, 66 insertions(+), 62 deletions(-)

diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts
index 9bb9b8b1..b9c9e0f0 100644
--- a/hideout-core/build.gradle.kts
+++ b/hideout-core/build.gradle.kts
@@ -103,7 +103,7 @@ dependencies {
     implementation(libs.flyway.core)
     runtimeOnly(libs.flyway.postgresql)
 
-    implementation("dev.usbharu:owl-common-serialize-jackson:0.0.1")
+    implementation(libs.owl.common.serialize.jackson)
 
     implementation(libs.javacv) {
         exclude(module = "opencv")
@@ -122,8 +122,8 @@ dependencies {
         implementation(variantOf(libs.javacv.ffmpeg) { classifier("linux-x86_64") })
     }
 
-    implementation("dev.usbharu:http-signature:1.0.0")
-    implementation("dev.usbharu:emoji-kt:2.0.0")
+    implementation(libs.http.signature)
+    implementation(libs.emoji.kt)
 
 
 
@@ -132,10 +132,7 @@ dependencies {
     testImplementation(libs.coroutines.test)
     testImplementation(libs.ktor.client.mock)
     testImplementation(libs.h2db)
-    testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
-    testImplementation("org.mockito:mockito-inline:5.2.0")
-    testImplementation("nl.jqno.equalsverifier:equalsverifier:3.16.1")
-    testImplementation("com.jparams:to-string-verifier:1.4.8")
+    testImplementation(libs.mockito.kotlin)
 
 }
 
diff --git a/libs.versions.toml b/libs.versions.toml
index 9d1721ce..67433ef5 100644
--- a/libs.versions.toml
+++ b/libs.versions.toml
@@ -7,11 +7,12 @@ javacv-ffmpeg = "6.1.1-1.5.10"
 detekt = "1.23.6"
 coroutines = "1.8.1"
 swagger = "2.2.22"
-serialization = "1.7.1"
-kjob = "0.6.0"
 tika = "2.9.2"
 owl = "0.0.1"
 jackson = "2.17.2"
+protobuf = "4.27.3"
+grpc-java = "1.66.0"
+grpc-kotlin = "1.4.1"
 
 [libraries]
 
@@ -20,9 +21,9 @@ exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "e
 exposed-spring = { module = "org.jetbrains.exposed:exposed-spring-boot-starter", version.ref = "exposed" }
 exposed-java-time = { module = "org.jetbrains.exposed:exposed-java-time", version.ref = "exposed" }
 
-cotoutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
-cotoutines-reactor = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactor", version.ref = "coroutines" }
-cotoutines-slf4j = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-slf4j", version.ref = "coroutines" }
+coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
+coroutines-reactor = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactor", version.ref = "coroutines" }
+coroutines-slf4j = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-slf4j", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 
 javacv = { module = "org.bytedeco:javacv", version = "1.5.10" }
@@ -49,20 +50,15 @@ jakarta-annotation = { module = "jakarta.annotation:jakarta.annotation-api", ver
 swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version.ref = "swagger" }
 swagger-models = { module = "io.swagger.core.v3:swagger-models", version.ref = "swagger" }
 
-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" }
-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
-
 apache-tika-core = { module = "org.apache.tika:tika-core", version.ref = "tika" }
 apache-tika-parsers = { module = "org.apache.tika:tika-parsers", version.ref = "tika" }
 
-kjon-core = { module = "org.drewcarlson:kjob-core", version.ref = "kjob" }
-kjon-mongo = { module = "org.drewcarlson:kjob-mongo", version.ref = "kjob" }
-
 owl-producer-api = { module = "dev.usbharu:owl-producer-api", version.ref = "owl" }
 owl-producer-default = { module = "dev.usbharu:owl-producer-default", version.ref = "owl" }
 owl-producer-embedded = { module = "dev.usbharu:owl-producer-embedded", version.ref = "owl" }
 owl-broker = { module = "dev.usbharu:owl-broker", version.ref = "owl" }
 owl-broker-mongodb = { module = "dev.usbharu:owl-broker-mongodb", version.ref = "owl" }
+owl-common-serialize-jackson = { module = "dev.usbharu:owl-common-serialize-jackson", version.ref = "owl" }
 
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
 jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
@@ -88,20 +84,40 @@ h2db = { module = "com.h2database:h2", version = "2.3.232" }
 
 kotlin-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 
+grpc-kotlin-stub = { module = "io.grpc:grpc-kotlin-stub", version.ref = "grpc-kotlin" }
+grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc-java" }
+grpc-netty = { module = "io.grpc:grpc-netty", version.ref = "grpc-java" }
+protoc-gen-grpc-java = { module = "io.grpc:protoc-gen-grpc-java", version.ref = "grpc-java" }
+protoc-gen-grpc-kotlin = { module = "io.grpc:protoc-gen-grpc-kotlin", version.ref = "grpc-kotlin" }
+
+protobuf-kotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobuf" }
+protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
+
+koin-bom = { module = "io.insert-koin:koin-bom", version = "3.5.6" }
+koin-core = { module = "io.insert-koin:koin-core" }
+
+log4j2-slf4j = { module = "org.apache.logging.log4j:log4j-slf4j2-impl", version = "2.23.1" }
+
+mongodb-kotlin-coroutine = { module = "org.mongodb:mongodb-driver-kotlin-coroutine", version = "5.1.3" }
+
+mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = "5.4.0" }
+
+http-signature = { module = "dev.usbharu:http-signature", version = "1.0.0" }
+emoji-kt = { module = "dev.usbharu:emoji-kt", version = "2.0.0" }
+
 [bundles]
 
 exposed = ["exposed-core", "exposed-java-time", "exposed-jdbc", "exposed-spring"]
-coroutines = ["cotoutines-core", "cotoutines-reactor", "cotoutines-slf4j"]
+coroutines = ["coroutines-core", "coroutines-reactor", "coroutines-slf4j"]
 ktor-client = ["ktor-client-cio", "ktor-client-content-negotiation", "ktor-client-core", "ktor-client-logging-jvm", "ktor-serialization-jackson"]
 spring-boot-oauth2 = ["spring-boot-oauth2-authorization", "spring-boot-oauth2-jose", "spring-boot-oauth2-resource"]
 spring-boot-data-mongodb = ["spring-boot-data-mongodb", "spring-boot-data-mongodb-reactive"]
 openapi = ["jakarta-annotation", "jakarta-validation", "swagger-annotations", "swagger-models"]
-serialization = ["serialization-core", "serialization-json"]
 apache-tika = ["apache-tika-core", "apache-tika-parsers"]
-kjob = ["kjon-core", "kjon-mongo"]
 owl-producer = ["owl-producer-api", "owl-producer-default", "owl-producer-embedded"]
 owl-broker = ["owl-broker", "owl-broker-mongodb"]
 jackson = ["jackson-databind", "jackson-module-kotlin"]
+grpc-kotlin = ["grpc-kotlin-stub", "grpc-netty", "grpc-protobuf", "protobuf-kotlin"]
 
 [plugins]
 
@@ -111,4 +127,5 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
 kover = { id = "org.jetbrains.kotlinx.kover", version = "0.8.3" }
 openapi-generator = { id = "org.openapi.generator", version = "7.7.0" }
-license-report = { id = "com.github.jk1.dependency-license-report", version = "2.8" }
\ No newline at end of file
+license-report = { id = "com.github.jk1.dependency-license-report", version = "2.8" }
+protobuf-plugin = { id = "com.google.protobuf", version = "0.9.4" }
\ No newline at end of file
diff --git a/owl/owl-broker/build.gradle.kts b/owl/owl-broker/build.gradle.kts
index e5d7c6ef..8c055cfc 100644
--- a/owl/owl-broker/build.gradle.kts
+++ b/owl/owl-broker/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.jvm)
-    id("com.google.protobuf") version "0.9.4"
+    alias(libs.plugins.protobuf.plugin)
 }
 
 
@@ -11,15 +11,12 @@ repositories {
 }
 
 dependencies {
-    implementation("io.grpc:grpc-kotlin-stub:1.4.1")
-    implementation("io.grpc:grpc-protobuf:1.66.0")
-    implementation("com.google.protobuf:protobuf-kotlin:4.27.3")
-    implementation("io.grpc:grpc-netty:1.66.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
+    implementation(libs.bundles.grpc.kotlin)
+    implementation(libs.coroutines.core)
     implementation(project(":owl-common"))
-    implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1")
-    implementation(platform("io.insert-koin:koin-bom:3.5.6"))
-    implementation("io.insert-koin:koin-core")
+    implementation(libs.log4j2.slf4j)
+    implementation(platform(libs.koin.bom))
+    implementation(libs.koin.core)
 }
 
 tasks.test {
@@ -31,14 +28,14 @@ kotlin {
 
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:4.27.3"
+        artifact = libs.protoc.asProvider().get().toString()
     }
     plugins {
         create("grpc") {
-            artifact = "io.grpc:protoc-gen-grpc-java:1.66.0"
+            artifact = libs.protoc.gen.grpc.java.get().toString()
         }
         create("grpckt") {
-            artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"
+            artifact = libs.protoc.gen.grpc.kotlin.get().toString() + "jdk8@jar"
         }
     }
     generateProtoTasks {
diff --git a/owl/owl-broker/owl-broker-mongodb/build.gradle.kts b/owl/owl-broker/owl-broker-mongodb/build.gradle.kts
index b47f62f4..1cdc5964 100644
--- a/owl/owl-broker/owl-broker-mongodb/build.gradle.kts
+++ b/owl/owl-broker/owl-broker-mongodb/build.gradle.kts
@@ -10,12 +10,11 @@ repositories {
 }
 
 dependencies {
-    implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.1.3")
+    implementation(libs.mongodb.kotlin.coroutine)
     implementation(project(":owl-broker"))
     implementation(project(":owl-common"))
-    implementation(platform("io.insert-koin:koin-bom:3.5.6"))
-    implementation(platform("io.insert-koin:koin-annotations-bom:1.3.1"))
-    implementation("io.insert-koin:koin-core")
+    implementation(platform(libs.koin.bom))
+    implementation(libs.koin.core)
 }
 
 tasks.test {
diff --git a/owl/owl-common/build.gradle.kts b/owl/owl-common/build.gradle.kts
index bc0a491c..41f5b99f 100644
--- a/owl/owl-common/build.gradle.kts
+++ b/owl/owl-common/build.gradle.kts
@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
+    testImplementation(libs.kotlin.junit)
 }
 
 tasks.test {
diff --git a/owl/owl-consumer/build.gradle.kts b/owl/owl-consumer/build.gradle.kts
index 2284cf3b..403f8c88 100644
--- a/owl/owl-consumer/build.gradle.kts
+++ b/owl/owl-consumer/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.jvm)
-    id("com.google.protobuf") version "0.9.4"
+    alias(libs.plugins.protobuf.plugin)
 }
 
 group = "dev.usbharu"
@@ -10,12 +10,9 @@ repositories {
 }
 
 dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-    implementation("io.grpc:grpc-kotlin-stub:1.4.1")
-    implementation("io.grpc:grpc-protobuf:1.66.0")
-    implementation("com.google.protobuf:protobuf-kotlin:4.27.3")
-    implementation("io.grpc:grpc-netty:1.66.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
+    testImplementation(libs.kotlin.junit)
+    implementation(libs.bundles.grpc.kotlin)
+    implementation(libs.coroutines.core)
     implementation(project(":owl-common"))
     protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto"))
 }
@@ -29,14 +26,14 @@ kotlin {
 
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:4.27.3"
+        artifact = libs.protoc.asProvider().get().toString()
     }
     plugins {
         create("grpc") {
-            artifact = "io.grpc:protoc-gen-grpc-java:1.66.0"
+            artifact = libs.protoc.gen.grpc.java.get().toString()
         }
         create("grpckt") {
-            artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"
+            artifact = libs.protoc.gen.grpc.kotlin.get().toString() + "jdk8@jar"
         }
     }
     generateProtoTasks {
diff --git a/owl/owl-producer/owl-producer-default/build.gradle.kts b/owl/owl-producer/owl-producer-default/build.gradle.kts
index 451dbd92..7994b7f9 100644
--- a/owl/owl-producer/owl-producer-default/build.gradle.kts
+++ b/owl/owl-producer/owl-producer-default/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.jvm)
-    id("com.google.protobuf") version "0.9.4"
+    alias(libs.plugins.protobuf.plugin)
 }
 
 group = "dev.usbharu"
@@ -10,13 +10,10 @@ repositories {
 }
 
 dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
+    testImplementation(libs.kotlin.junit)
     api(project(":owl-producer:owl-producer-api"))
-    implementation("io.grpc:grpc-kotlin-stub:1.4.1")
-    implementation("io.grpc:grpc-protobuf:1.66.0")
-    implementation("com.google.protobuf:protobuf-kotlin:4.27.3")
-    implementation("io.grpc:grpc-netty:1.66.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
+    implementation(libs.bundles.grpc.kotlin)
+    implementation(libs.coroutines.core)
     implementation(project(":owl-common"))
     protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto"))
 }
@@ -30,14 +27,14 @@ kotlin {
 
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:4.27.3"
+        artifact = libs.protoc.asProvider().get().toString()
     }
     plugins {
         create("grpc") {
-            artifact = "io.grpc:protoc-gen-grpc-java:1.66.0"
+            artifact = libs.protoc.gen.grpc.java.get().toString()
         }
         create("grpckt") {
-            artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"
+            artifact = libs.protoc.gen.grpc.kotlin.get().toString() + "jdk8@jar"
         }
     }
     generateProtoTasks {
diff --git a/owl/owl-producer/owl-producer-embedded/build.gradle.kts b/owl/owl-producer/owl-producer-embedded/build.gradle.kts
index af4b3f03..6504c18d 100644
--- a/owl/owl-producer/owl-producer-embedded/build.gradle.kts
+++ b/owl/owl-producer/owl-producer-embedded/build.gradle.kts
@@ -12,9 +12,9 @@ dependencies {
     testImplementation(kotlin("test"))
     implementation(project(":owl-producer:owl-producer-api"))
     implementation(project(":owl-broker"))
-    implementation(platform("io.insert-koin:koin-bom:3.5.6"))
-    implementation("io.insert-koin:koin-core")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
+    implementation(platform(libs.koin.bom))
+    implementation(libs.koin.core)
+    implementation(libs.coroutines.core)
 }
 
 tasks.test {