From 239769e641d91c5ad506a55f1d75a53560e8b402 Mon Sep 17 00:00:00 2001 From: KimDoubleB Date: Wed, 18 Sep 2024 21:56:38 +0900 Subject: [PATCH] chore: set dependency using version catalog (`libs.versions.toml`) --- .../src/main/kotlin/piikii-convention.gradle.kts | 12 +++++------- gradle/libs.versions.toml | 11 ++++++++++- piikii-application/build.gradle.kts | 6 +----- piikii-bootstrap/build.gradle.kts | 12 ++++++------ piikii-common/build.gradle.kts | 2 +- piikii-input-http/build.gradle.kts | 9 +-------- piikii-output-cache/caffeine/build.gradle.kts | 3 +-- piikii-output-cache/redis/build.gradle.kts | 3 +-- piikii-output-eventbroker/kafka/build.gradle.kts | 2 +- .../postgresql/build.gradle.kts | 3 +-- piikii-output-storage/ncp/build.gradle.kts | 7 +------ piikii-output-web/avocado/build.gradle.kts | 2 +- piikii-output-web/lemon/build.gradle.kts | 2 +- piikii-output-web/tmap/build.gradle.kts | 2 +- 14 files changed, 32 insertions(+), 44 deletions(-) diff --git a/buildSrc/src/main/kotlin/piikii-convention.gradle.kts b/buildSrc/src/main/kotlin/piikii-convention.gradle.kts index f1a48617..622c3f5c 100644 --- a/buildSrc/src/main/kotlin/piikii-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/piikii-convention.gradle.kts @@ -23,13 +23,11 @@ group = "com.piikii" version = "0.0.1-SNAPSHOT" dependencies { - implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - implementation("org.jetbrains.kotlin:kotlin-reflect") - implementation("org.springframework.boot:spring-boot-autoconfigure") - implementation("io.github.microutils:kotlin-logging-jvm:3.0.5") - - testImplementation("org.springframework.boot:spring-boot-starter-test") - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + annotationProcessor(libs.spring.boot.annotation.processor) + annotationProcessor(libs.bundles.spring.common) + annotationProcessor(libs.bundles.kotlin.spring) + testImplementation(libs.bundles.test.implementation) + testRuntimeOnly(libs.bundles.test.runtime) } // piikii common 의존성 전체 추가 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 09f99307..b6e5cb0d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -51,7 +51,16 @@ kotlin-junit5 = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit5" } junit = { group = "org.junit.platform", name = "junit-platform-launcher" } [bundles] +spring-common = ["spring-boot-starter-autoconfigure"] kotlin-spring = ["kotlin-refelct", "kotlin-jackson", "kotlin-logging"] -spring-autoconfigure = ["spring-boot-starter-autoconfigure"] test-implementation = ["spring-boot-starter-test", "kotlin-junit5"] test-runtime = ["junit"] + +bootstarp = ["spring-boot-starter-web", "spring-boot-starter-actuator", "opentelemetry-starter"] +bootstarp-runtime = ["micrometer-prometheus"] +domain-application = ["spring-boot-docs", "spring-transaction"] +adaptor-input-http = ["spring-boot-starter-web", "spring-boot-starter-aop", "spring-boot-docs", "spring-boot-starter-validation"] +adaptor-persistence-postgresql = ["spring-boot-starter-jpa", "postgresql"] +adaptor-storage = ["spring-web", "aws-sdk-s3", "jaxb-api", "jaxb-runtime"] +adaptor-cache-redis = ["spring-boot-starter-cache", "spring-boot-starter-redis"] +adaptor-cache-caffeine = ["spring-boot-starter-cache", "caffeine"] diff --git a/piikii-application/build.gradle.kts b/piikii-application/build.gradle.kts index c6611a8b..dd8e0a70 100644 --- a/piikii-application/build.gradle.kts +++ b/piikii-application/build.gradle.kts @@ -3,11 +3,7 @@ plugins { } dependencies { - // for docs - implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0") - - // for transaction - implementation("org.springframework:spring-tx:6.1.10") + implementation(libs.bundles.domain.application) } diff --git a/piikii-bootstrap/build.gradle.kts b/piikii-bootstrap/build.gradle.kts index bce0778c..77e9ea17 100644 --- a/piikii-bootstrap/build.gradle.kts +++ b/piikii-bootstrap/build.gradle.kts @@ -18,14 +18,14 @@ dependencies { implementation(project(":piikii-output-web:avocado")) implementation(project(":piikii-output-web:lemon")) implementation(project(":piikii-output-web:tmap")) - implementation("org.springframework.boot:spring-boot-starter-web") - implementation("org.springframework.boot:spring-boot-starter-actuator") - implementation("io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter") - runtimeOnly("io.micrometer:micrometer-registry-prometheus") + + implementation(libs.bundles.bootstarp) + runtimeOnly(libs.bundles.bootstarp.runtime) + testImplementation(project(":piikii-application")) - // 현재 미사용으로 의존성 추가 제외 - // implementation(project(":piikii-output-eventbroker:kafka")) +// 현재 미사용으로 의존성 추가 제외 +// implementation(project(":piikii-output-eventbroker:kafka")) } tasks { diff --git a/piikii-common/build.gradle.kts b/piikii-common/build.gradle.kts index 3069e41d..cf20844d 100644 --- a/piikii-common/build.gradle.kts +++ b/piikii-common/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { // for RestClient dependencies { - implementation("org.springframework:spring-web") { + implementation(libs.spring.web) { exclude("org.springframework:spring-beans") exclude("org.springframework:spring-core") exclude("org.springframework:spring-aop") diff --git a/piikii-input-http/build.gradle.kts b/piikii-input-http/build.gradle.kts index 54708359..4672dda7 100644 --- a/piikii-input-http/build.gradle.kts +++ b/piikii-input-http/build.gradle.kts @@ -4,12 +4,5 @@ plugins { dependencies { implementation(project(":piikii-application")) - implementation("org.springframework.boot:spring-boot-starter-web") - implementation("org.springframework.boot:spring-boot-starter-aop") - - // for docs - implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0") - - // for validation - implementation("org.springframework.boot:spring-boot-starter-validation") + implementation(libs.bundles.adaptor.input.http) } diff --git a/piikii-output-cache/caffeine/build.gradle.kts b/piikii-output-cache/caffeine/build.gradle.kts index f9cf727f..362fa51c 100644 --- a/piikii-output-cache/caffeine/build.gradle.kts +++ b/piikii-output-cache/caffeine/build.gradle.kts @@ -3,6 +3,5 @@ plugins { } dependencies { - implementation("org.springframework.boot:spring-boot-starter-cache") - implementation("com.github.ben-manes.caffeine:caffeine") + implementation(libs.bundles.adaptor.cache.caffeine) } diff --git a/piikii-output-cache/redis/build.gradle.kts b/piikii-output-cache/redis/build.gradle.kts index f04e5207..094b29d2 100644 --- a/piikii-output-cache/redis/build.gradle.kts +++ b/piikii-output-cache/redis/build.gradle.kts @@ -4,6 +4,5 @@ plugins { dependencies { implementation(project(":piikii-application")) - implementation("org.springframework.boot:spring-boot-starter-cache") - implementation("org.springframework.boot:spring-boot-starter-data-redis") + implementation(libs.bundles.adaptor.cache.redis) } diff --git a/piikii-output-eventbroker/kafka/build.gradle.kts b/piikii-output-eventbroker/kafka/build.gradle.kts index 79d5fad8..a2cc82bd 100644 --- a/piikii-output-eventbroker/kafka/build.gradle.kts +++ b/piikii-output-eventbroker/kafka/build.gradle.kts @@ -4,5 +4,5 @@ plugins { dependencies { implementation(project(":piikii-application")) - implementation("org.springframework.kafka:spring-kafka") + implementation(libs.spring.kafka) } diff --git a/piikii-output-persistence/postgresql/build.gradle.kts b/piikii-output-persistence/postgresql/build.gradle.kts index 6806955d..4b7106a7 100644 --- a/piikii-output-persistence/postgresql/build.gradle.kts +++ b/piikii-output-persistence/postgresql/build.gradle.kts @@ -4,8 +4,7 @@ plugins { dependencies { implementation(project(":piikii-application")) - implementation("org.springframework.boot:spring-boot-starter-data-jpa") - implementation("org.postgresql:postgresql") + implementation(libs.bundles.adaptor.persistence.postgresql) } allOpen { diff --git a/piikii-output-storage/ncp/build.gradle.kts b/piikii-output-storage/ncp/build.gradle.kts index 6d83f432..eb74c230 100644 --- a/piikii-output-storage/ncp/build.gradle.kts +++ b/piikii-output-storage/ncp/build.gradle.kts @@ -4,10 +4,5 @@ plugins { dependencies { implementation(project(":piikii-application")) - annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") - - implementation("org.springframework:spring-web") - implementation("com.amazonaws:aws-java-sdk-s3:1.11.238") - implementation("javax.xml.bind:jaxb-api:2.3.1") - implementation("org.glassfish.jaxb:jaxb-runtime:2.3.1") + implementation(libs.bundles.adaptor.storage) } diff --git a/piikii-output-web/avocado/build.gradle.kts b/piikii-output-web/avocado/build.gradle.kts index c81bacc1..a262c7ea 100644 --- a/piikii-output-web/avocado/build.gradle.kts +++ b/piikii-output-web/avocado/build.gradle.kts @@ -4,5 +4,5 @@ plugins { dependencies { implementation(project(":piikii-application")) - implementation("org.springframework:spring-web") + implementation(libs.spring.web) } diff --git a/piikii-output-web/lemon/build.gradle.kts b/piikii-output-web/lemon/build.gradle.kts index c81bacc1..a262c7ea 100644 --- a/piikii-output-web/lemon/build.gradle.kts +++ b/piikii-output-web/lemon/build.gradle.kts @@ -4,5 +4,5 @@ plugins { dependencies { implementation(project(":piikii-application")) - implementation("org.springframework:spring-web") + implementation(libs.spring.web) } diff --git a/piikii-output-web/tmap/build.gradle.kts b/piikii-output-web/tmap/build.gradle.kts index c81bacc1..a262c7ea 100644 --- a/piikii-output-web/tmap/build.gradle.kts +++ b/piikii-output-web/tmap/build.gradle.kts @@ -4,5 +4,5 @@ plugins { dependencies { implementation(project(":piikii-application")) - implementation("org.springframework:spring-web") + implementation(libs.spring.web) }