temp

zero88 · Apr 20, 2024 · 9c9211c · 9c9211c
1 parent 4183bb4
commit 9c9211c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -64,7 +64,11 @@ subprojects {
         testImplementation(TestLibs.junit5Api)
         testImplementation(TestLibs.junit5Engine)
         testImplementation(TestLibs.junit5Vintage)
-        testImplementation(TestLibs.junitPioneer)
+        testImplementation(TestLibs.junitPioneer) {
+            version {
+                prefer(if (jvmRuntime == "8") TestLibs.Version.pioneer_jdk8 else TestLibs.Version.pioneer_jdk11)
+            }
+        }
         testCompileOnly(UtilLibs.jetbrainsAnnotations)
     }
 

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -39,17 +39,16 @@ object TestLibs {
     object Version {
 
         const val junit5 = "5.10.2"
-
-        //        const val pioneer = "2.2.0" // java > 11
-        const val pioneer = "1.9.1" // java 8
+        const val pioneer_jdk11 = "2.2.0" // java > 11
+        const val pioneer_jdk8 = "1.9.1" // java 8
         const val testContainer = "1.19.7"
     }
 
     const val junit5Api = "org.junit.jupiter:junit-jupiter-api:${Version.junit5}"
     const val junit5Engine = "org.junit.jupiter:junit-jupiter-engine:${Version.junit5}"
     const val junit5Vintage = "org.junit.vintage:junit-vintage-engine:${Version.junit5}"
     const val junit5Params = "org.junit.jupiter:junit-jupiter-params:${Version.junit5}"
-    const val junitPioneer = "org.junit-pioneer:junit-pioneer:${Version.pioneer}"
+    const val junitPioneer = "org.junit-pioneer:junit-pioneer"
     const val testContainer = "org.testcontainers:junit-jupiter:${Version.testContainer}"
     const val pgsqlTestContainer = "org.testcontainers:postgresql:${Version.testContainer}"
     const val mysqlTestContainer = "org.testcontainers:mysql:${Version.testContainer}"
@@ -148,15 +147,19 @@ object DatabaseLibs {
         const val sqlite = "3.45.2.0"
         const val hsqldb = "2.7.2"
         const val derby = "10.17.1.0"
-        const val agroal = "1.18"
+        const val agroal_jdk8 = "1.18"
+        const val agroal_jdk11 = "2.3"
         const val c3p0 = "0.10.0"
-        const val hikari = "4.0.3"
+        const val hikari_jdk8 = "4.0.3"
+        const val hikari_jdk11 = "5.1.0"
     }
 
-    const val agroalApi = "io.agroal:agroal-api:${Version.agroal}"
-    const val agroalPool = "io.agroal:agroal-pool:${Version.agroal}"
+    const val agroalApi_jdk8 = "io.agroal:agroal-api:${Version.agroal_jdk8}"
+    const val agroalPool_jdk8 = "io.agroal:agroal-pool:${Version.agroal_jdk8}"
+    const val agroalPool_jdk11 = "io.agroal:agroal-pool:${Version.agroal_jdk11}"
     const val c3p0 = "com.mchange:c3p0:${Version.c3p0}"
-    const val hikari = "com.zaxxer:HikariCP:${Version.hikari}"
+    const val hikari_jdk8 = "com.zaxxer:HikariCP:${Version.hikari_jdk8}"
+    const val hikari_jdk11 = "com.zaxxer:HikariCP:${Version.hikari_jdk11}"
     const val h2 = "com.h2database:h2:${Version.h2}"
     const val pgsql = "org.postgresql:postgresql:${Version.pgsql}"
     const val mysql = "mysql:mysql-connector-java:${Version.mysql}"

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -54,8 +54,8 @@ dependencies {
     testFixturesImplementation(DatabaseLibs.mysql)
     testFixturesImplementation(TestLibs.mysqlTestContainer)
 
-    testFixturesImplementation(DatabaseLibs.agroalApi)
-    testFixturesImplementation(DatabaseLibs.hikari)
+    testFixturesImplementation(DatabaseLibs.agroalApi_jdk8)
+    testFixturesImplementation(DatabaseLibs.hikari_jdk8)
 }
 
 tasks {

diff --git a/integtest/build.gradle.kts b/integtest/build.gradle.kts
@@ -45,9 +45,9 @@ subprojects {
     dependencies {
         implementation(JooqLibs.jooqMetaExt) // For generate model
         testImplementation(testFixtures(project(":jooqx")))
-        testImplementation(DatabaseLibs.agroalApi)
-        testImplementation(DatabaseLibs.agroalPool)
-        testImplementation(DatabaseLibs.hikari)
+        testImplementation(DatabaseLibs.agroalApi_jdk8)
+        testImplementation(DatabaseLibs.agroalPool_jdk8)
+        testImplementation(DatabaseLibs.hikari_jdk8)
         testImplementation(JooqLibs.jooqMeta)
 
         testImplementation(VertxLibs.rx2)