chore: clean up dependencies in toml

line · Sep 18, 2023 · f2a266d · f2a266d
1 parent 51636f4
commit f2a266d
Show file tree

Hide file tree

Showing 14 changed files with 93 additions and 174 deletions.
diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
@@ -1,14 +1,14 @@
 plugins {
-    alias(libs.plugins.kotlin.benchmark)
-    alias(libs.plugins.kotlin.allopen)
-    alias(libs.plugins.kotlin.spring)
-    alias(libs.plugins.kotlin.jpa)
+    alias(exampleLibs.plugins.kotlin.benchmark)
+    alias(exampleLibs.plugins.kotlin.allopen)
+    alias(exampleLibs.plugins.kotlin.spring)
+    alias(exampleLibs.plugins.kotlin.jpa)
 }
 
 dependencies {
-    implementation(libs.kotlin.benchmark)
-    implementation(libs.jakarta.persistence.api)
-    implementation(libs.logback)
+    implementation(exampleLibs.kotlin.benchmark)
+    implementation(exampleLibs.jakarta.persistence.api)
+    implementation(exampleLibs.logback)
     implementation(projects.jpqlDsl)
     implementation(projects.jpqlRender)
 }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -31,13 +31,13 @@ allprojects {
     dependencies {
         implementation(rootProject.libs.kotlin)
 
-        testImplementation(rootProject.libs.test.junit)
-        testImplementation(rootProject.libs.test.mockk)
-        testImplementation(rootProject.libs.test.assertJ)
+        testImplementation(rootProject.libs.junit)
+        testImplementation(rootProject.libs.mockk)
+        testImplementation(rootProject.libs.assertJ)
 
-        testFixturesImplementation(rootProject.libs.test.junit)
-        testFixturesImplementation(rootProject.libs.test.mockk)
-        testFixturesImplementation(rootProject.libs.test.assertJ)
+        testFixturesImplementation(rootProject.libs.junit)
+        testFixturesImplementation(rootProject.libs.mockk)
+        testFixturesImplementation(rootProject.libs.assertJ)
     }
 
     kotlin {

diff --git a/example/eclipselink-javax/build.gradle.kts b/example/eclipselink-javax/build.gradle.kts
@@ -5,16 +5,16 @@ plugins {
 }
 
 dependencies {
-    implementation(exampleLibs.test.eclipselink2)
+    implementation(exampleLibs.eclipselink2)
     implementation(exampleLibs.logback)
     implementation(projects.example)
     implementation(projects.jpqlDsl)
     implementation(projects.jpqlRender)
     implementation(projects.eclipselinkJavaxSupport)
 
-    runtimeOnly(exampleLibs.test.h2)
+    runtimeOnly(exampleLibs.h2)
 
-    testFixturesImplementation(exampleLibs.test.eclipselink2)
+    testFixturesImplementation(exampleLibs.eclipselink2)
     testFixturesImplementation(projects.jpqlRender)
 }
 

diff --git a/example/eclipselink/build.gradle.kts b/example/eclipselink/build.gradle.kts
@@ -5,16 +5,16 @@ plugins {
 }
 
 dependencies {
-    implementation(exampleLibs.test.eclipselink4)
+    implementation(exampleLibs.eclipselink4)
     implementation(exampleLibs.logback)
     implementation(projects.example)
     implementation(projects.jpqlDsl)
     implementation(projects.jpqlRender)
     implementation(projects.eclipselinkSupport)
 
-    runtimeOnly(exampleLibs.test.h2)
+    runtimeOnly(exampleLibs.h2)
 
-    testFixturesImplementation(exampleLibs.test.eclipselink4)
+    testFixturesImplementation(exampleLibs.eclipselink4)
     testFixturesImplementation(projects.jpqlRender)
 }
 

diff --git a/example/hibernate-javax/build.gradle.kts b/example/hibernate-javax/build.gradle.kts
@@ -5,16 +5,16 @@ plugins {
 }
 
 dependencies {
-    implementation(exampleLibs.test.hibernate5.core)
+    implementation(exampleLibs.hibernate5.core)
     implementation(exampleLibs.logback)
     implementation(projects.example)
     implementation(projects.jpqlDsl)
     implementation(projects.jpqlRender)
     implementation(projects.hibernateJavaxSupport)
 
-    runtimeOnly(exampleLibs.test.h2)
+    runtimeOnly(exampleLibs.h2)
 
-    testFixturesImplementation(exampleLibs.test.hibernate5.core)
+    testFixturesImplementation(exampleLibs.hibernate5.core)
     testFixturesImplementation(projects.jpqlRender)
 }
 

diff --git a/example/hibernate-reactive-javax/build.gradle.kts b/example/hibernate-reactive-javax/build.gradle.kts
@@ -5,18 +5,18 @@ plugins {
 }
 
 dependencies {
-    implementation(exampleLibs.test.hibernate.reactive1.core)
-    implementation(exampleLibs.test.vertx.jdbc.client)
-    implementation(exampleLibs.test.agroal.pool)
+    implementation(exampleLibs.hibernate.reactive1.core)
+    implementation(exampleLibs.vertx.jdbc.client)
+    implementation(exampleLibs.agroal.pool)
     implementation(exampleLibs.logback)
     implementation(projects.example)
     implementation(projects.jpqlDsl)
     implementation(projects.jpqlRender)
     implementation(projects.hibernateReactiveJavaxSupport)
 
-    runtimeOnly(exampleLibs.test.h2)
+    runtimeOnly(exampleLibs.h2)
 
-    testFixturesImplementation(exampleLibs.test.hibernate.reactive1.core)
+    testFixturesImplementation(exampleLibs.hibernate.reactive1.core)
     testFixturesImplementation(projects.jpqlRender)
 }
 

diff --git a/example/hibernate-reactive/build.gradle.kts b/example/hibernate-reactive/build.gradle.kts
@@ -5,18 +5,18 @@ plugins {
 }
 
 dependencies {
-    implementation(exampleLibs.test.hibernate.reactive2.core)
-    implementation(exampleLibs.test.vertx.jdbc.client)
-    implementation(exampleLibs.test.agroal.pool)
+    implementation(exampleLibs.hibernate.reactive2.core)
+    implementation(exampleLibs.vertx.jdbc.client)
+    implementation(exampleLibs.agroal.pool)
     implementation(exampleLibs.logback)
     implementation(projects.example)
     implementation(projects.jpqlDsl)
     implementation(projects.jpqlRender)
     implementation(projects.hibernateReactiveSupport)
 
-    runtimeOnly(exampleLibs.test.h2)
+    runtimeOnly(exampleLibs.h2)
 
-    testFixturesImplementation(exampleLibs.test.hibernate.reactive2.core)
+    testFixturesImplementation(exampleLibs.hibernate.reactive2.core)
     testFixturesImplementation(projects.jpqlRender)
 }
 

diff --git a/example/hibernate/build.gradle.kts b/example/hibernate/build.gradle.kts
@@ -5,16 +5,16 @@ plugins {
 }
 
 dependencies {
-    implementation(exampleLibs.test.hibernate6.core)
+    implementation(exampleLibs.hibernate6.core)
     implementation(exampleLibs.logback)
     implementation(projects.example)
     implementation(projects.jpqlDsl)
     implementation(projects.jpqlRender)
     implementation(projects.hibernateSupport)
 
-    runtimeOnly(exampleLibs.test.h2)
+    runtimeOnly(exampleLibs.h2)
 
-    testFixturesImplementation(exampleLibs.test.hibernate6.core)
+    testFixturesImplementation(exampleLibs.hibernate6.core)
     testFixturesImplementation(projects.jpqlRender)
 }
 

diff --git a/example/spring-batch-javax/build.gradle.kts b/example/spring-batch-javax/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    alias(exampleLibs.plugins.test.spring.boot2)
+    alias(exampleLibs.plugins.spring.boot2)
     alias(exampleLibs.plugins.kotlin.noarg)
     alias(exampleLibs.plugins.kotlin.allopen)
     alias(exampleLibs.plugins.kotlin.spring)
@@ -8,18 +8,18 @@ plugins {
 
 dependencies {
     @Suppress("VulnerableLibrariesLocal", "RedundantSuppression")
-    implementation(exampleLibs.test.spring.boot2.batch)
-    implementation(exampleLibs.test.spring.boot2.jpa)
-    implementation(exampleLibs.test.spring.boot2.p6spy)
+    implementation(exampleLibs.spring.boot2.batch)
+    implementation(exampleLibs.spring.boot2.jpa)
+    implementation(exampleLibs.spring.boot2.p6spy)
     implementation(projects.example)
     implementation(projects.jpqlDsl)
     implementation(projects.jpqlRender)
     implementation(projects.springBatchJavaxSupport)
 
-    runtimeOnly(exampleLibs.test.h2)
+    runtimeOnly(exampleLibs.h2)
 
-    testImplementation(exampleLibs.test.spring.boot2.test)
-    testImplementation(exampleLibs.test.spring.batch4.test)
+    testImplementation(exampleLibs.spring.boot2.test)
+    testImplementation(exampleLibs.spring.batch4.test)
 }
 
 kotlin {

diff --git a/example/spring-batch/build.gradle.kts b/example/spring-batch/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    alias(exampleLibs.plugins.test.spring.boot3)
+    alias(exampleLibs.plugins.spring.boot3)
     alias(exampleLibs.plugins.kotlin.noarg)
     alias(exampleLibs.plugins.kotlin.allopen)
     alias(exampleLibs.plugins.kotlin.spring)
@@ -8,18 +8,18 @@ plugins {
 
 dependencies {
     @Suppress("VulnerableLibrariesLocal", "RedundantSuppression")
-    implementation(exampleLibs.test.spring.boot3.batch)
-    implementation(exampleLibs.test.spring.boot3.jpa)
-    implementation(exampleLibs.test.spring.boot3.p6spy)
+    implementation(exampleLibs.spring.boot3.batch)
+    implementation(exampleLibs.spring.boot3.jpa)
+    implementation(exampleLibs.spring.boot3.p6spy)
     implementation(projects.example)
     implementation(projects.jpqlDsl)
     implementation(projects.jpqlRender)
     implementation(projects.springBatchSupport)
 
-    runtimeOnly(exampleLibs.test.h2)
+    runtimeOnly(exampleLibs.h2)
 
-    testImplementation(exampleLibs.test.spring.boot3.test)
-    testImplementation(exampleLibs.test.spring.batch5.test)
+    testImplementation(exampleLibs.spring.boot3.test)
+    testImplementation(exampleLibs.spring.batch5.test)
 }
 
 kotlin {

diff --git a/example/spring-data-jpa-javax/build.gradle.kts b/example/spring-data-jpa-javax/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    alias(exampleLibs.plugins.test.spring.boot2)
+    alias(exampleLibs.plugins.spring.boot2)
     alias(exampleLibs.plugins.kotlin.noarg)
     alias(exampleLibs.plugins.kotlin.allopen)
     alias(exampleLibs.plugins.kotlin.spring)
@@ -8,16 +8,16 @@ plugins {
 
 dependencies {
     @Suppress("VulnerableLibrariesLocal", "RedundantSuppression")
-    implementation(exampleLibs.test.spring.boot2.jpa)
-    implementation(exampleLibs.test.spring.boot2.p6spy)
+    implementation(exampleLibs.spring.boot2.jpa)
+    implementation(exampleLibs.spring.boot2.p6spy)
     implementation(projects.example)
     implementation(projects.jpqlDsl)
     implementation(projects.jpqlRender)
     implementation(projects.springDataJpaJavaxSupport)
 
-    runtimeOnly(exampleLibs.test.h2)
+    runtimeOnly(exampleLibs.h2)
 
-    testImplementation(exampleLibs.test.spring.boot2.test)
+    testImplementation(exampleLibs.spring.boot2.test)
 }
 
 kotlin {

diff --git a/example/spring-data-jpa/build.gradle.kts b/example/spring-data-jpa/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    alias(exampleLibs.plugins.test.spring.boot3)
+    alias(exampleLibs.plugins.spring.boot3)
     alias(exampleLibs.plugins.kotlin.noarg)
     alias(exampleLibs.plugins.kotlin.allopen)
     alias(exampleLibs.plugins.kotlin.spring)
@@ -8,16 +8,16 @@ plugins {
 
 dependencies {
     @Suppress("VulnerableLibrariesLocal", "RedundantSuppression")
-    implementation(exampleLibs.test.spring.boot3.jpa)
-    implementation(exampleLibs.test.spring.boot3.p6spy)
+    implementation(exampleLibs.spring.boot3.jpa)
+    implementation(exampleLibs.spring.boot3.p6spy)
     implementation(projects.example)
     implementation(projects.jpqlDsl)
     implementation(projects.jpqlRender)
     implementation(projects.springDataJpaSupport)
 
-    runtimeOnly(exampleLibs.test.h2)
+    runtimeOnly(exampleLibs.h2)
 
-    testImplementation(exampleLibs.test.spring.boot3.test)
+    testImplementation(exampleLibs.spring.boot3.test)
 }
 
 kotlin {