cleanup

jayo-projects · Feb 2, 2025 · e3a4b2a · e3a4b2a
1 parent bb84e55
commit e3a4b2a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/benchmarks/src/jmh/kotlin/jayo/benchmarks/SlowReaderBenchmark.kt b/benchmarks/src/jmh/kotlin/jayo/benchmarks/SlowReaderBenchmark.kt
@@ -32,7 +32,7 @@ open class SlowReaderBenchmark {
         private val ARRAY = ByteArray(CHUNKS_BYTE_SIZE) { 0x61 }
     }
 
-    @Setup(Level.Trial)
+    @Setup
     fun setup() {
         val delayedInputStream = object : InputStream() {
             override fun read(): Int {
@@ -60,7 +60,7 @@ open class SlowReaderBenchmark {
         }
     }
 
-    @TearDown(Level.Trial)
+    @TearDown
     fun tearDown() {
         when (type) {
             "jayo" -> jayoReader.close()

diff --git a/benchmarks/src/jmh/kotlin/jayo/benchmarks/SlowWriterBenchmark.kt b/benchmarks/src/jmh/kotlin/jayo/benchmarks/SlowWriterBenchmark.kt
@@ -38,7 +38,7 @@ open class SlowWriterBenchmark {
         private val OKIO_ARRAY = ByteArray(OKIO_EXPECTED_SIZE) { 0x61 }
     }
 
-    @Setup(Level.Trial)
+    @Setup
     fun setup() {
         val delayedOutputStreamJayo = object : OutputStream() {
             val bytes = ByteArray(JAYO_EXPECTED_SIZE)
@@ -89,7 +89,7 @@ open class SlowWriterBenchmark {
         }
     }
 
-    @TearDown(Level.Trial)
+    @TearDown
     fun tearDown() {
         when (type) {
             "jayo" -> jayoWriter.close()

diff --git a/benchmarks/src/jmh/kotlin/jayo/benchmarks/SocketReaderBenchmark.kt b/benchmarks/src/jmh/kotlin/jayo/benchmarks/SocketReaderBenchmark.kt
@@ -38,7 +38,7 @@ open class SocketReaderBenchmark {
         private val array = ByteArray(BYTE_COUNT) { 0x61 }
     }
 
-    @Setup(Level.Trial)
+    @Setup
     fun setup() {
         serverSocket = ServerSocket(0)
         // start sender server
@@ -92,7 +92,7 @@ open class SocketReaderBenchmark {
         }
     }
 
-    @TearDown(Level.Trial)
+    @TearDown
     fun tearDown() {
         clientOutputStream.close()
         clientSocket.close()

diff --git a/build-logic/src/main/kotlin/jayo-commons.gradle.kts b/build-logic/src/main/kotlin/jayo-commons.gradle.kts
@@ -44,13 +44,10 @@ repositories {
 dependencies {
     api("org.jspecify:jspecify:${catalogVersion("jspecify")}")
 
-    testImplementation(platform("org.junit:junit-bom:${catalogVersion("junit")}"))
+    testImplementation("org.junit.jupiter:junit-jupiter:${catalogVersion("junit")}")
     testImplementation("org.assertj:assertj-core:${catalogVersion("assertj")}")
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testImplementation("org.junit.jupiter:junit-jupiter-params")
     testImplementation(kotlin("test"))
 
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     testRuntimeOnly("org.slf4j:slf4j-jdk-platform-logging:${catalogVersion("slf4j")}")
     testRuntimeOnly("ch.qos.logback:logback-classic:${catalogVersion("logback")}")
 }

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -45,19 +45,17 @@ dependencies {
     compileOnly("org.bouncycastle:bctls-jdk18on:${catalogVersion("bouncycastle")}")
     compileOnly("org.conscrypt:conscrypt-openjdk-uber:${catalogVersion("conscrypt")}")
 
-    testFixturesImplementation(platform("org.junit:junit-bom:${catalogVersion("junit")}"))
-    testFixturesImplementation("org.assertj:assertj-core:${catalogVersion("assertj")}")
-    testFixturesImplementation("ch.qos.logback:logback-classic:${catalogVersion("logback")}")
-
-    testFixturesApi("org.junit.jupiter:junit-jupiter-api")
-    testFixturesApi("org.junit.jupiter:junit-jupiter-params")
+    testFixturesApi("org.junit.jupiter:junit-jupiter:${catalogVersion("junit")}")
     testFixturesApi("org.hamcrest:hamcrest:${catalogVersion("hamcrest")}")
     testFixturesApi("org.bouncycastle:bcprov-jdk18on:${catalogVersion("bouncycastle")}")
     testFixturesApi("org.conscrypt:conscrypt-openjdk-uber:${catalogVersion("conscrypt")}")
+
     // classifier for AmazonCorrettoCryptoProvider = linux-x86_64
     testFixturesApi("software.amazon.cryptools:AmazonCorrettoCryptoProvider:${catalogVersion("amazonCorretto")}:linux-x86_64")
     testFixturesImplementation("org.bouncycastle:bcpkix-jdk18on:${catalogVersion("bouncycastle")}")
     testFixturesImplementation("org.bouncycastle:bctls-jdk18on:${catalogVersion("bouncycastle")}")
+    testFixturesImplementation("org.assertj:assertj-core:${catalogVersion("assertj")}")
+    testFixturesImplementation("ch.qos.logback:logback-classic:${catalogVersion("logback")}")
 }
 
 tasks {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,4 @@
 [versions]
-
 # plugins
 # https://github.com/JetBrains/kotlin/releases
 kotlin = "2.1.0"