diff --git a/build.gradle.kts b/build.gradle.kts index 23f749cb6..0c7a35721 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,12 +2,13 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +@Suppress("DSL_SCOPE_VIOLATION") plugins { jacoco - kotlin("jvm") version Dependencies.kotlinVersion - kotlin("plugin.noarg") version Dependencies.kotlinVersion - kotlin("plugin.allopen") version Dependencies.kotlinVersion + alias(libs.plugins.kotlin.jvm) + alias(libs.plugins.kotlin.noarg) + alias(libs.plugins.kotlin.allopen) } allprojects { @@ -37,7 +38,7 @@ subprojects { java.targetCompatibility = javaVersion dependencies { - implementation(Dependencies.koltin) + implementation(rootProject.libs.koltin) } allOpen { diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt deleted file mode 100644 index 8aad24fdf..000000000 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ /dev/null @@ -1,82 +0,0 @@ -@file:Suppress("unused", "SpellCheckingInspection", "MemberVisibilityCanBePrivate") - -import org.gradle.api.artifacts.dsl.DependencyHandler - -object Dependencies { - const val kotlinVersion = "1.7.0" - const val springCoreVersion = "5.3.21" - const val springBootVersion = "2.7.1" - const val springDataJpaVersion = "2.7.1" - const val coroutineVersion = "1.6.3" - - // kotlin - const val koltin = "org.jetbrains.kotlin:kotlin-stdlib-jdk8" - const val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect" - - // Common - const val javaPersistenceApi = "javax.persistence:javax.persistence-api:2.2" - const val slf4j = "org.slf4j:slf4j-api:1.7.36" - const val logback = "ch.qos.logback:logback-classic:1.2.11" - const val hibernate = "org.hibernate:hibernate-core:5.6.9.Final" - const val hibernateReactive = "org.hibernate.reactive:hibernate-reactive-core:1.1.6.Final" - const val eclipselink = "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.10" - const val jacksonKotlinModule = "com.fasterxml.jackson.module:jackson-module-kotlin" - const val agroalPool = "io.agroal:agroal-pool:2.0" - const val vertxJdbcClient = "io.vertx:vertx-jdbc-client:4.3.1" - const val coroutineJdk8 = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutineVersion" - const val coroutineReactor = "org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$coroutineVersion" - - // SpringBoot - const val springBootStarter = "org.springframework.boot:spring-boot-starter:${springBootVersion}" - const val springBootAutoconfigure = "org.springframework.boot:spring-boot-autoconfigure:${springBootVersion}" - const val springBootConfigurationProcessor = - "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}" - const val springBootBom = "org.springframework.boot:spring-boot-dependencies:${springBootVersion}" - - const val springBootWeb = "org.springframework.boot:spring-boot-starter-web:${springBootVersion}" - const val springBootWebflux = "org.springframework.boot:spring-boot-starter-webflux:${springBootVersion}" - const val springBootJpa = "org.springframework.boot:spring-boot-starter-data-jpa:${springBootVersion}" - const val springBootTest = "org.springframework.boot:spring-boot-starter-test:${springBootVersion}" - - // Spring - const val springCore = "org.springframework:spring-core:${springCoreVersion}" - const val springBeans = "org.springframework:spring-beans:${springCoreVersion}" - const val springJpa = "org.springframework.data:spring-data-jpa:${springDataJpaVersion}" - const val springBatchInfrastructure = "org.springframework.batch:spring-batch-infrastructure:4.3.6" - - // Test - const val junit = "org.junit.jupiter:junit-jupiter:5.8.2" - const val assertJ = "org.assertj:assertj-core:3.22.0" - const val mockk = "io.mockk:mockk:1.12.4" - - const val h2 = "com.h2database:h2:2.1.214" - - const val mutinyVersion = "1.6.0" - const val mutinyCore = "io.smallrye.reactive:mutiny:$mutinyVersion" - const val mutinyKotlin = "io.smallrye.reactive:mutiny-kotlin:$mutinyVersion" - val mutiny = listOf(mutinyCore, mutinyKotlin) -} - -fun DependencyHandler.api(dependencies: List) { - dependencies.forEach { - add("api", it) - } -} - -fun DependencyHandler.implementation(dependencies: List) { - dependencies.forEach { - add("implementation", it) - } -} - -fun DependencyHandler.compileOnly(dependencies: List) { - dependencies.forEach { - add("compileOnly", it) - } -} - -fun DependencyHandler.testImplementation(dependencies: List) { - dependencies.forEach { - add("testImplementation", it) - } -} diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 28080f942..9afab53a6 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -3,13 +3,13 @@ apply() dependencies { api(Modules.query) - compileOnly(Dependencies.javaPersistenceApi) - compileOnly(Dependencies.slf4j) - compileOnly(Dependencies.hibernate) + compileOnly(libs.java.persistence.api) + compileOnly(libs.slf4j) + compileOnly(libs.hibernate) testImplementation(Modules.testFixtureCore) testImplementation(Modules.testFixtureEntity) - testImplementation(Dependencies.javaPersistenceApi) - testImplementation(Dependencies.hibernate) - testImplementation(Dependencies.h2) + testImplementation(libs.java.persistence.api) + testImplementation(libs.hibernate) + testImplementation(libs.h2) } diff --git a/eclipselink/build.gradle.kts b/eclipselink/build.gradle.kts index add0e4e68..143c14742 100644 --- a/eclipselink/build.gradle.kts +++ b/eclipselink/build.gradle.kts @@ -3,13 +3,13 @@ apply() dependencies { api(Modules.core) - compileOnly(Dependencies.eclipselink) - compileOnly(Dependencies.javaPersistenceApi) - compileOnly(Dependencies.slf4j) + compileOnly(libs.eclipselink) + compileOnly(libs.java.persistence.api) + compileOnly(libs.slf4j) testImplementation(Modules.core) testImplementation(Modules.testFixtureIntegration) - testImplementation(Dependencies.eclipselink) - testImplementation(Dependencies.javaPersistenceApi) - testImplementation(Dependencies.h2) + testImplementation(libs.eclipselink) + testImplementation(libs.java.persistence.api) + testImplementation(libs.h2) } diff --git a/examples/eclipselink/build.gradle.kts b/examples/eclipselink/build.gradle.kts index 2d3eb15fe..a519e5fe7 100644 --- a/examples/eclipselink/build.gradle.kts +++ b/examples/eclipselink/build.gradle.kts @@ -4,10 +4,10 @@ coverage { dependencies { implementation(Modules.eclipselink) - implementation(Dependencies.eclipselink) - implementation(Dependencies.javaPersistenceApi) - implementation(Dependencies.logback) - implementation(Dependencies.h2) + implementation(libs.eclipselink) + implementation(libs.java.persistence.api) + implementation(libs.logback) + implementation(libs.h2) testImplementation(Modules.testFixtureCore) } diff --git a/examples/hibernate/build.gradle.kts b/examples/hibernate/build.gradle.kts index d9f41fbd0..6e5bb66a9 100644 --- a/examples/hibernate/build.gradle.kts +++ b/examples/hibernate/build.gradle.kts @@ -4,9 +4,9 @@ coverage { dependencies { implementation(Modules.hibernate) - implementation(Dependencies.hibernate) - implementation(Dependencies.logback) - implementation(Dependencies.h2) + implementation(libs.hibernate) + implementation(libs.logback) + implementation(libs.h2) testImplementation(Modules.testFixtureCore) } diff --git a/examples/spring-boot-2.4/build.gradle.kts b/examples/spring-boot-2.4/build.gradle.kts index 595888a70..5b9fd5cba 100644 --- a/examples/spring-boot-2.4/build.gradle.kts +++ b/examples/spring-boot-2.4/build.gradle.kts @@ -22,8 +22,8 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-data-jpa") - implementation(Dependencies.jacksonKotlinModule) - implementation(Dependencies.h2) + implementation(libs.jackson.kotlin.module) + implementation(libs.h2) implementation(platform("org.springframework.boot:spring-boot-dependencies:${"2.4.13"}")) testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/examples/spring-boot-2.5/build.gradle.kts b/examples/spring-boot-2.5/build.gradle.kts index d040c58ba..b74ad1c52 100644 --- a/examples/spring-boot-2.5/build.gradle.kts +++ b/examples/spring-boot-2.5/build.gradle.kts @@ -22,8 +22,8 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-data-jpa") - implementation(Dependencies.jacksonKotlinModule) - implementation(Dependencies.h2) + implementation(libs.jackson.kotlin.module) + implementation(libs.h2) implementation(platform("org.springframework.boot:spring-boot-dependencies:2.5.14")) testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/examples/spring-boot-2.6/build.gradle.kts b/examples/spring-boot-2.6/build.gradle.kts index 2930287be..34d0bea14 100644 --- a/examples/spring-boot-2.6/build.gradle.kts +++ b/examples/spring-boot-2.6/build.gradle.kts @@ -18,8 +18,8 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-data-jpa") - implementation(Dependencies.jacksonKotlinModule) - implementation(Dependencies.h2) + implementation(libs.jackson.kotlin.module) + implementation(libs.h2) implementation(platform("org.springframework.boot:spring-boot-dependencies:2.6.9")) testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/examples/spring-boot-2.7/build.gradle.kts b/examples/spring-boot-2.7/build.gradle.kts index 65e035eca..e1e4b2101 100644 --- a/examples/spring-boot-2.7/build.gradle.kts +++ b/examples/spring-boot-2.7/build.gradle.kts @@ -1,5 +1,6 @@ +@Suppress("DSL_SCOPE_VIOLATION") plugins { - id("org.springframework.boot") version Dependencies.springBootVersion + alias(libs.plugins.spring.boot) kotlin("plugin.spring") kotlin("plugin.jpa") } @@ -16,11 +17,11 @@ dependencies { // implementation("com.linecorp.kotlin-jdsl:spring-data-kotlin-jdsl-starter:x.y.z") implementation(Modules.springDataStarter) - implementation(Dependencies.springBootWeb) - implementation(Dependencies.springBootJpa) - implementation(Dependencies.jacksonKotlinModule) - implementation(Dependencies.h2) - implementation(platform(Dependencies.springBootBom)) + implementation(libs.spring.boot.web) + implementation(libs.spring.boot.jpa) + implementation(libs.jackson.kotlin.module) + implementation(libs.h2) + implementation(platform(libs.spring.boot.bom)) - testImplementation(Dependencies.springBootTest) + testImplementation(libs.spring.boot.test) } diff --git a/examples/spring-boot-hibernate-reactive-2.6/build.gradle.kts b/examples/spring-boot-hibernate-reactive-2.6/build.gradle.kts index 0b5417dea..1aa2cdb57 100644 --- a/examples/spring-boot-hibernate-reactive-2.6/build.gradle.kts +++ b/examples/spring-boot-hibernate-reactive-2.6/build.gradle.kts @@ -16,17 +16,17 @@ dependencies { implementation(Modules.query) // implementation("com.linecorp.kotlin-jdsl:spring-data-kotlin-jdsl-hibernate-reactive:x.y.z") implementation(Modules.springDataHibernateReactive) - implementation(Dependencies.hibernateReactive) - implementation(Dependencies.coroutineJdk8) - implementation(Dependencies.coroutineReactor) - implementation(Dependencies.mutiny) + implementation(libs.hibernate.reactive) + implementation(libs.coroutine.jdk8) + implementation(libs.coroutine.reactor) + implementation(libs.bundles.mitiny) implementation(Modules.testFixtureHibernateReactive) implementation("org.springframework.boot:spring-boot-starter-webflux") - implementation("org.springframework.boot:spring-boot-starter-data-jpa:") - implementation(Dependencies.jacksonKotlinModule) - implementation(Dependencies.h2) + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation(libs.jackson.kotlin.module) + implementation(libs.h2) implementation(platform("org.springframework.boot:spring-boot-dependencies:2.6.8")) testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/examples/spring-boot-hibernate-reactive-2.7/build.gradle.kts b/examples/spring-boot-hibernate-reactive-2.7/build.gradle.kts index 5ce24c781..692ce4bb4 100644 --- a/examples/spring-boot-hibernate-reactive-2.7/build.gradle.kts +++ b/examples/spring-boot-hibernate-reactive-2.7/build.gradle.kts @@ -1,5 +1,6 @@ +@Suppress("DSL_SCOPE_VIOLATION") plugins { - id("org.springframework.boot") version Dependencies.springBootVersion + alias(libs.plugins.spring.boot) kotlin("plugin.spring") kotlin("plugin.jpa") } @@ -16,18 +17,18 @@ dependencies { implementation(Modules.query) // implementation("com.linecorp.kotlin-jdsl:spring-data-kotlin-jdsl-hibernate-reactive:x.y.z") implementation(Modules.springDataHibernateReactive) - implementation(Dependencies.hibernateReactive) - implementation(Dependencies.coroutineJdk8) - implementation(Dependencies.coroutineReactor) - implementation(Dependencies.mutiny) + implementation(libs.hibernate.reactive) + implementation(libs.coroutine.jdk8) + implementation(libs.coroutine.reactor) + implementation(libs.bundles.mitiny) implementation(Modules.testFixtureHibernateReactive) - implementation(Dependencies.springBootWebflux) - implementation(Dependencies.springBootJpa) - implementation(Dependencies.jacksonKotlinModule) - implementation(Dependencies.h2) - implementation(platform(Dependencies.springBootBom)) + implementation(libs.spring.boot.webflux) + implementation(libs.spring.boot.jpa) + implementation(libs.jackson.kotlin.module) + implementation(libs.h2) + implementation(platform(libs.spring.boot.bom)) - testImplementation(Dependencies.springBootTest) + testImplementation(libs.spring.boot.test) } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fcea..ae04661ee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hibernate-reactive/build.gradle.kts b/hibernate-reactive/build.gradle.kts index c0ed19a8a..bd013df3e 100644 --- a/hibernate-reactive/build.gradle.kts +++ b/hibernate-reactive/build.gradle.kts @@ -3,17 +3,17 @@ apply() dependencies { api(Modules.reactiveCore) - compileOnly(Dependencies.hibernateReactive) - compileOnly(Dependencies.slf4j) - compileOnly(Dependencies.mutiny) + compileOnly(libs.hibernate.reactive) + compileOnly(libs.slf4j) + compileOnly(libs.bundles.mitiny) - testImplementation(Dependencies.mutiny) - testImplementation(Dependencies.coroutineJdk8) + testImplementation(libs.bundles.mitiny) + testImplementation(libs.coroutine.jdk8) testImplementation(Modules.testFixtureIntegrationReactive) testImplementation(Modules.testFixtureHibernateReactive) - testImplementation(Dependencies.hibernateReactive) - testImplementation(Dependencies.kotlinReflect) - testImplementation(Dependencies.h2) - testImplementation(Dependencies.agroalPool) - testImplementation(Dependencies.vertxJdbcClient) + testImplementation(libs.hibernate.reactive) + testImplementation(libs.kotlin.reflect) + testImplementation(libs.h2) + testImplementation(libs.agroal.pool) + testImplementation(libs.vertx.jdbc.client) } diff --git a/hibernate/build.gradle.kts b/hibernate/build.gradle.kts index e31a21aa8..9d650aa0b 100644 --- a/hibernate/build.gradle.kts +++ b/hibernate/build.gradle.kts @@ -3,11 +3,11 @@ apply() dependencies { api(Modules.core) - compileOnly(Dependencies.hibernate) - compileOnly(Dependencies.slf4j) + compileOnly(libs.hibernate) + compileOnly(libs.slf4j) testImplementation(Modules.core) testImplementation(Modules.testFixtureIntegration) - testImplementation(Dependencies.hibernate) - testImplementation(Dependencies.h2) + testImplementation(libs.hibernate) + testImplementation(libs.h2) } diff --git a/libs.versions.toml b/libs.versions.toml new file mode 100644 index 000000000..ccf815ea7 --- /dev/null +++ b/libs.versions.toml @@ -0,0 +1,61 @@ +[versions] +kotlin = "1.7.0" +spring-core = "5.3.21" +spring-boot = "2.7.1" +spring-data-jpa = "2.7.1" +coroutine = "1.6.3" +mutiny = "1.6.0" + +[libraries] +# kotlin +koltin = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8" } +kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect" } + +# Common +java-persistence-api = { module = "javax.persistence:javax.persistence-api", version = "2.2" } +slf4j = { module = "org.slf4j:slf4j-api", version = "1.7.36" } +logback = { module = "ch.qos.logback:logback-classic", version = "1.2.11" } +hibernate = { module = "org.hibernate:hibernate-core", version = "5.6.9.Final" } +hibernate-reactive = { module = "org.hibernate.reactive:hibernate-reactive-core", version = "1.1.6.Final" } +eclipselink = { module = "org.eclipse.persistence:org.eclipse.persistence.jpa", version = "2.7.10" } +jackson-kotlin-module = { module = "com.fasterxml.jackson.module:jackson-module-kotlin" } +agroal-pool = { module = "io.agroal:agroal-pool", version = "2.0" } +vertx-jdbc-client = { module = "io.vertx:vertx-jdbc-client", version = "4.3.1" } +coroutine-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "coroutine" } +coroutine-reactor = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactor", version.ref = "coroutine" } + +# SpringBoot +spring-boot-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "spring-boot" } +spring-boot-autoconfigure = { module = "org.springframework.boot:spring-boot-autoconfigure", version.ref = "spring-boot" } +spring-boot-configuration-processor = { module = "org.springframework.boot:spring-boot-configuration-processor", version.ref = "spring-boot" } +spring-boot-bom = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "spring-boot" } +spring-boot-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "spring-boot" } +spring-boot-webflux = { module = "org.springframework.boot:spring-boot-starter-webflux", version.ref = "spring-boot" } +spring-boot-jpa = { module = "org.springframework.boot:spring-boot-starter-data-jpa", version.ref = "spring-boot" } +spring-boot-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "spring-boot" } + +# Spring +spring-core = { module = "org.springframework:spring-core", version.ref = "spring-core" } +spring-beans = { module = "org.springframework:spring-beans", version.ref = "spring-core" } +spring-jpa = { module = "org.springframework.data:spring-data-jpa", version.ref = "spring-data-jpa" } +spring-batch-infrastructure = { module = "org.springframework.batch:spring-batch-infrastructure", version = "4.3.6" } + +# Test +junit = { module = "org.junit.jupiter:junit-jupiter", version = "5.8.2" } +assertJ = { module = "org.assertj:assertj-core", version = "3.22.0" } +mockk = { module = "io.mockk:mockk", version = "1.12.4" } + +h2 = { module = "com.h2database:h2", version = "2.1.214" } + +mutiny-core = { module = "io.smallrye.reactive:mutiny", version.ref = "mutiny" } +mutiny-kotlin = { module = "io.smallrye.reactive:mutiny-kotlin", version.ref = "mutiny" } + +[bundles] +mitiny = ["mutiny-core", "mutiny-kotlin"] + +[plugins] +spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" } + +kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" } +kotlin-noarg = { id = "org.jetbrains.kotlin.plugin.noarg", version.ref = "kotlin" } +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } diff --git a/query/build.gradle.kts b/query/build.gradle.kts index d38a27f3a..b37956b10 100644 --- a/query/build.gradle.kts +++ b/query/build.gradle.kts @@ -1,13 +1,13 @@ apply() dependencies { - compileOnly(Dependencies.javaPersistenceApi) - compileOnly(Dependencies.slf4j) - compileOnly(Dependencies.hibernate) + compileOnly(libs.java.persistence.api) + compileOnly(libs.slf4j) + compileOnly(libs.hibernate) testImplementation(Modules.testFixtureCore) testImplementation(Modules.testFixtureEntity) - testImplementation(Dependencies.javaPersistenceApi) - testImplementation(Dependencies.hibernate) - testImplementation(Dependencies.h2) + testImplementation(libs.java.persistence.api) + testImplementation(libs.hibernate) + testImplementation(libs.h2) } diff --git a/reactive-core/build.gradle.kts b/reactive-core/build.gradle.kts index 063ad2e6d..a712ab40c 100644 --- a/reactive-core/build.gradle.kts +++ b/reactive-core/build.gradle.kts @@ -3,12 +3,12 @@ apply() dependencies { api(Modules.query) - compileOnly(Dependencies.javaPersistenceApi) - compileOnly(Dependencies.slf4j) + compileOnly(libs.java.persistence.api) + compileOnly(libs.slf4j) testImplementation(Modules.testFixtureCore) testImplementation(Modules.testFixtureEntity) - testImplementation(Dependencies.javaPersistenceApi) - testImplementation(Dependencies.h2) - testImplementation(Dependencies.coroutineJdk8) + testImplementation(libs.java.persistence.api) + testImplementation(libs.h2) + testImplementation(libs.coroutine.jdk8) } diff --git a/settings.gradle.kts b/settings.gradle.kts index 7f5f37dd5..b7c70a302 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -50,3 +50,11 @@ modules.forEach { include(it.name) project(it.name).projectDir = file(it.path) } + +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("libs.versions.toml")) + } + } +} diff --git a/spring/batch-infrastructure/build.gradle.kts b/spring/batch-infrastructure/build.gradle.kts index 73f06bb52..de93bd0de 100644 --- a/spring/batch-infrastructure/build.gradle.kts +++ b/spring/batch-infrastructure/build.gradle.kts @@ -3,18 +3,18 @@ apply() dependencies { compileOnly(Modules.core) compileOnly(Modules.springDataCore) - compileOnly(Dependencies.javaPersistenceApi) - compileOnly(Dependencies.springBeans) - compileOnly(Dependencies.springBatchInfrastructure) + compileOnly(libs.java.persistence.api) + compileOnly(libs.spring.beans) + compileOnly(libs.spring.batch.infrastructure) testImplementation(Modules.core) testImplementation(Modules.springDataCore) testImplementation(Modules.testFixtureCore) testImplementation(Modules.testFixtureEntity) - testImplementation(Dependencies.javaPersistenceApi) - testImplementation(Dependencies.h2) - testImplementation(Dependencies.springBeans) - testImplementation(Dependencies.springBatchInfrastructure) - testImplementation(Dependencies.springBootJpa) - testImplementation(Dependencies.springBootTest) + testImplementation(libs.java.persistence.api) + testImplementation(libs.h2) + testImplementation(libs.spring.beans) + testImplementation(libs.spring.batch.infrastructure) + testImplementation(libs.spring.boot.jpa) + testImplementation(libs.spring.boot.test) } diff --git a/spring/data-autoconfigure/build.gradle.kts b/spring/data-autoconfigure/build.gradle.kts index 6f9570bfb..654c2bf7b 100644 --- a/spring/data-autoconfigure/build.gradle.kts +++ b/spring/data-autoconfigure/build.gradle.kts @@ -3,6 +3,6 @@ apply() dependencies { compileOnly(Modules.core) compileOnly(Modules.springDataCore) - compileOnly(Dependencies.javaPersistenceApi) - compileOnly(Dependencies.springBootAutoconfigure) + compileOnly(libs.java.persistence.api) + compileOnly(libs.spring.boot.autoconfigure) } diff --git a/spring/data-core/build.gradle.kts b/spring/data-core/build.gradle.kts index b30b7652c..15c51ba65 100644 --- a/spring/data-core/build.gradle.kts +++ b/spring/data-core/build.gradle.kts @@ -2,14 +2,14 @@ apply() dependencies { compileOnly(Modules.core) - compileOnly(Dependencies.springJpa) - compileOnly(Dependencies.hibernate) + compileOnly(libs.spring.jpa) + compileOnly(libs.hibernate) testImplementation(Modules.core) testImplementation(Modules.testFixtureCore) testImplementation(Modules.testFixtureEntity) - testImplementation(Dependencies.springBootTest) - testImplementation(Dependencies.springJpa) - testImplementation(Dependencies.hibernate) - testImplementation(Dependencies.h2) + testImplementation(libs.spring.boot.test) + testImplementation(libs.spring.jpa) + testImplementation(libs.hibernate) + testImplementation(libs.h2) } diff --git a/spring/data-hibernate-reactive/build.gradle.kts b/spring/data-hibernate-reactive/build.gradle.kts index 9d66d7d8d..52d358de0 100644 --- a/spring/data-hibernate-reactive/build.gradle.kts +++ b/spring/data-hibernate-reactive/build.gradle.kts @@ -1,23 +1,23 @@ apply() dependencies { - compileOnly(Dependencies.springJpa) - compileOnly(Dependencies.hibernateReactive) - compileOnly(Dependencies.mutiny) + compileOnly(libs.spring.jpa) + compileOnly(libs.hibernate.reactive) + compileOnly(libs.bundles.mitiny) api(Modules.reactiveCore) api(Modules.hibernateReactive) api(Modules.springDataReactiveCore) - implementation(Dependencies.javaPersistenceApi) + implementation(libs.java.persistence.api) testImplementation(Modules.testFixtureCore) testImplementation(Modules.testFixtureEntity) testImplementation(Modules.testFixtureHibernateReactive) testImplementation(Modules.testFixtureIntegrationReactive) - testImplementation(Dependencies.mutiny) - testImplementation(Dependencies.springBootTest) - testImplementation(Dependencies.springJpa) - testImplementation(Dependencies.hibernateReactive) - testImplementation(Dependencies.h2) - testImplementation(Dependencies.coroutineJdk8) + testImplementation(libs.bundles.mitiny) + testImplementation(libs.spring.boot.test) + testImplementation(libs.spring.jpa) + testImplementation(libs.hibernate.reactive) + testImplementation(libs.h2) + testImplementation(libs.coroutine.jdk8) } diff --git a/spring/data-reactive-core/build.gradle.kts b/spring/data-reactive-core/build.gradle.kts index 137dc5648..14aa78183 100644 --- a/spring/data-reactive-core/build.gradle.kts +++ b/spring/data-reactive-core/build.gradle.kts @@ -1,14 +1,14 @@ apply() dependencies { - compileOnly(Dependencies.springJpa) + compileOnly(libs.spring.jpa) implementation(Modules.reactiveCore) - implementation(Dependencies.javaPersistenceApi) + implementation(libs.java.persistence.api) testImplementation(Modules.testFixtureCore) testImplementation(Modules.testFixtureEntity) - testImplementation(Dependencies.springBootTest) - testImplementation(Dependencies.springJpa) - testImplementation(Dependencies.h2) - testImplementation(Dependencies.coroutineJdk8) + testImplementation(libs.spring.boot.test) + testImplementation(libs.spring.jpa) + testImplementation(libs.h2) + testImplementation(libs.coroutine.jdk8) } diff --git a/spring/data-starter/build.gradle.kts b/spring/data-starter/build.gradle.kts index 821236776..76a7dd8f1 100644 --- a/spring/data-starter/build.gradle.kts +++ b/spring/data-starter/build.gradle.kts @@ -4,5 +4,5 @@ dependencies { api(Modules.hibernate) api(Modules.springDataCore) api(Modules.springDataAutoconfigure) - api(Dependencies.springBootStarter) + api(libs.spring.boot.starter) } diff --git a/test-fixture/core/build.gradle.kts b/test-fixture/core/build.gradle.kts index 80ff6db80..bf4f2a8cc 100644 --- a/test-fixture/core/build.gradle.kts +++ b/test-fixture/core/build.gradle.kts @@ -3,8 +3,8 @@ coverage { } dependencies { - api(Dependencies.junit) - api(Dependencies.mockk) - api(Dependencies.assertJ) - api(Dependencies.logback) + api(libs.junit) + api(libs.mockk) + api(libs.assertJ) + api(libs.logback) } diff --git a/test-fixture/entity/build.gradle.kts b/test-fixture/entity/build.gradle.kts index 637ef4e92..1fb43bcb2 100644 --- a/test-fixture/entity/build.gradle.kts +++ b/test-fixture/entity/build.gradle.kts @@ -3,5 +3,5 @@ coverage { } dependencies { - compileOnly(Dependencies.javaPersistenceApi) + compileOnly(libs.java.persistence.api) } diff --git a/test-fixture/hibernate-reactive/build.gradle.kts b/test-fixture/hibernate-reactive/build.gradle.kts index 80644e58c..9c6820dc9 100644 --- a/test-fixture/hibernate-reactive/build.gradle.kts +++ b/test-fixture/hibernate-reactive/build.gradle.kts @@ -4,12 +4,12 @@ coverage { dependencies { implementation(Modules.testFixtureEntity) - implementation(Dependencies.coroutineJdk8) - implementation(Dependencies.hibernateReactive) - implementation(Dependencies.slf4j) - implementation(Dependencies.kotlinReflect) - implementation(Dependencies.h2) - implementation(Dependencies.agroalPool) - implementation(Dependencies.vertxJdbcClient) - implementation(Dependencies.junit) + implementation(libs.coroutine.jdk8) + implementation(libs.hibernate.reactive) + implementation(libs.slf4j) + implementation(libs.kotlin.reflect) + implementation(libs.h2) + implementation(libs.agroal.pool) + implementation(libs.vertx.jdbc.client) + implementation(libs.junit) } diff --git a/test-fixture/integration-reactive/build.gradle.kts b/test-fixture/integration-reactive/build.gradle.kts index 9490b312d..d52a42a34 100644 --- a/test-fixture/integration-reactive/build.gradle.kts +++ b/test-fixture/integration-reactive/build.gradle.kts @@ -5,10 +5,10 @@ coverage { dependencies { api(Modules.testFixtureCore) api(Modules.testFixtureEntity) - api(Dependencies.javaPersistenceApi) - api(Dependencies.slf4j) + api(libs.java.persistence.api) + api(libs.slf4j) api(Modules.reactiveCore) - implementation(Dependencies.kotlinReflect) - implementation(Dependencies.coroutineJdk8) + implementation(libs.kotlin.reflect) + implementation(libs.coroutine.jdk8) } diff --git a/test-fixture/integration/build.gradle.kts b/test-fixture/integration/build.gradle.kts index 45f98a640..e3f835459 100644 --- a/test-fixture/integration/build.gradle.kts +++ b/test-fixture/integration/build.gradle.kts @@ -5,10 +5,10 @@ coverage { dependencies { api(Modules.testFixtureCore) api(Modules.testFixtureEntity) - api(Dependencies.javaPersistenceApi) - api(Dependencies.slf4j) + api(libs.java.persistence.api) + api(libs.slf4j) - implementation(Dependencies.kotlinReflect) + implementation(libs.kotlin.reflect) compileOnly(Modules.springDataCore) compileOnly(Modules.core)