Preparing 2.0 (#124)

* Making Container a receiver of some of the lifecycle hooks * 2.0 snapshot ready
kotest · Jun 1, 2024 · aa95141 · aa95141
1 parent 6cf34d0
commit aa95141
Show file tree

Hide file tree

Showing 31 changed files with 42 additions and 1,276 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -42,9 +42,11 @@ dependencies {
    api(libs.kafka.client)
    api(libs.hikari)
 
+   testImplementation(libs.logback)
    testImplementation(libs.kotest.assertions.core)
    testImplementation(libs.kotest.runner.junit5)
    testImplementation(libs.jedis)
    testImplementation(libs.testcontainers.mysql)
+   testImplementation(libs.testcontainers.redis)
    testImplementation(libs.mysql.connector.java)
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,7 +1,14 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
    `kotlin-dsl`
 }
 
+kotlin {
+   jvmToolchain(11)
+   compilerOptions.jvmTarget.set(JvmTarget.JVM_11)
+}
+
 repositories {
    mavenCentral()
 }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name="buildSrc"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,12 +9,14 @@ jedis = { module = "redis.clients:jedis", version = "4.3.1" }
 mysql-connector-java = { module = "mysql:mysql-connector-java", version = "8.0.33" }
 kafka-client = { module = "org.apache.kafka:kafka-clients", version = "3.5.1" }
 elastic-client = { module = "co.elastic.clients:elasticsearch-java", version = "7.17.21" }
+logback = { module = "ch.qos.logback:logback-classic", version = "1.5.6" }
 
 testcontainers-elastic = { module = "org.testcontainers:elasticsearch", version.ref = "testcontainers" }
 testcontainers-mysql = { module = "org.testcontainers:mysql", version.ref = "testcontainers" }
 testcontainers-kafka = { module = "org.testcontainers:kafka", version.ref = "testcontainers" }
 testcontainers-jdbc = { module = "org.testcontainers:jdbc", version.ref = "testcontainers" }
 testcontainers-core = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
+testcontainers-redis = { module = "com.redis:testcontainers-redis", version = "1.7.0" }
 
 kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
 kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/java/io/kotest/extensions/testcontainers/RuntimeSqlException.java b/src/main/java/io/kotest/extensions/testcontainers/RuntimeSqlException.java
diff --git a/src/main/java/io/kotest/extensions/testcontainers/ScriptRunner.java b/src/main/java/io/kotest/extensions/testcontainers/ScriptRunner.java