Merge branch 'SimY4-main'

Author: cheeseng

README.md

@@ -3,20 +3,20 @@ ScalaTest + JUnit provides integration support between ScalaTest and JUnit 5.
 
 **Usage**
 
-To use it for ScalaTest 3.2.19 and JUnit 5.12:
+To use it for ScalaTest 3.2.19 and JUnit 5.13:
 
 SBT:
 
 ```
-libraryDependencies += "org.scalatestplus" %% "junit-5-12" % "3.2.19.0" % Test
+libraryDependencies += "org.scalatestplus" %% "junit-5-13" % "3.2.19.0" % Test
 ```
 
 Maven:
 
 ```
 <dependency>
   <groupId>org.scalatestplus</groupId>
-  <artifactId>junit-5-12_3</artifactId>
+  <artifactId>junit-5-13_3</artifactId>
   <version>3.2.19.0</version>
   <scope>test</scope>
 </dependency>
@@ -29,9 +29,9 @@ dependencies {
     implementation "org.scala-lang:scala3-library:3.3.5"
 
     testImplementation "org.scalatest:scalatest_3:3.2.19"
-    testImplementation "org.junit.platform:junit-platform-launcher:1.12.0"
-    testRuntimeOnly "org.junit.platform:junit-platform-engine:1.12.0"
-    testRuntimeOnly "org.scalatestplus:junit-5-12_3:3.2.19.0"
+    testImplementation "org.junit.platform:junit-platform-launcher:1.13.1"
+    testRuntimeOnly "org.junit.platform:junit-platform-engine:1.13.1"
+    testRuntimeOnly "org.scalatestplus:junit-5-13_3:3.2.19.0"
 }
 
 test {
@@ -51,9 +51,9 @@ dependencies {
     implementation("org.scala-lang:scala3-library:3.3.5")
 
     testImplementation("org.scalatest:scalatest_3:3.2.19")
-    testRuntimeOnly("org.junit.platform:junit-platform-engine:1.12.0")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.0")
-    testRuntimeOnly("org.scalatestplus:junit-5-12_3:3.2.19.0")
+    testRuntimeOnly("org.junit.platform:junit-platform-engine:1.13.1")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.1")
+    testRuntimeOnly("org.scalatestplus:junit-5-13_3:3.2.19.0")
 }
 
 tasks {

build.sbt

@@ -1,7 +1,7 @@
 import java.io.PrintWriter
 import scala.io.Source
 
-name := "junit-5.12"
+name := "junit-5.13"
 
 organization := "org.scalatestplus"
 
@@ -47,8 +47,8 @@ Compile / unmanagedSourceDirectories ++= {
 }
 
 val scalatestVersion = "3.2.19"
-val junitVersion = "5.12.0"
-val junitEngineVersion = "1.12.0"
+val junitVersion = "5.13.1"
+val junitEngineVersion = "1.13.1"
 
 libraryDependencies ++= Seq(
   "org.scalatest" %% "scalatest-core" % scalatestVersion,

examples/gradle-example/build.gradle

@@ -11,9 +11,9 @@ dependencies {
     implementation "org.scala-lang:scala3-library_3:3.3.5"
 
     testImplementation "org.scalatest:scalatest_3:3.2.19"
-    testImplementation "org.junit.platform:junit-platform-launcher:1.12.0"
-    testRuntimeOnly "org.junit.platform:junit-platform-engine:1.12.0"
-    testRuntimeOnly "org.scalatestplus:junit-5-12_3:3.2.19.0"
+    testImplementation "org.junit.platform:junit-platform-launcher:1.13.1"
+    testRuntimeOnly "org.junit.platform:junit-platform-engine:1.13.1"
+    testRuntimeOnly "org.scalatestplus:junit-5-13_3:3.2.19.0"
 }
 
 test {

examples/gradle-kotlin-dsl-example/build.gradle.kts

@@ -12,9 +12,9 @@ dependencies {
     implementation("org.scala-lang:scala3-library_3:3.3.5")
 
     testImplementation("org.scalatest:scalatest_3:3.2.19")
-    testRuntimeOnly("org.junit.platform:junit-platform-engine:1.12.0")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.0")
-    testRuntimeOnly("org.scalatestplus:junit-5-12_3:3.2.19.0")
+    testRuntimeOnly("org.junit.platform:junit-platform-engine:1.13.1")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.1")
+    testRuntimeOnly("org.scalatestplus:junit-5-13_3:3.2.19.0")
 }
 
 tasks {

examples/maven-example/pom.xml

@@ -11,7 +11,7 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <junit.version>1.12.0</junit.version>
+        <junit.version>1.13.1</junit.version>
         <scalatest.version>3.2.19</scalatest.version>
         <scala.compat.version>3</scala.compat.version>
         <scala.version>3.3.5</scala.version>
@@ -62,7 +62,7 @@
         </dependency>
         <dependency>
             <groupId>org.scalatestplus</groupId>
-            <artifactId>junit-5-12_${scala.compat.version}</artifactId>
+            <artifactId>junit-5-13_${scala.compat.version}</artifactId>
             <version>${scalatest.version}.0</version>
             <scope>test</scope>
         </dependency>

src/main/scala/org/scalatestplus/junit5/JUnitSuite.scala

@@ -30,30 +30,30 @@ package org.scalatestplus.junit5;
  *
  *   var sb: StringBuilder = _
  *   var lb: ListBuffer[String] = _
- *  
+ *
  *   @BeforeEach def initialize() {
  *     sb = new StringBuilder("ScalaTest is ")
  *     lb = new ListBuffer[String]
  *   }
- *  
+ *
  *   @Test def verifyEasy() {
  *     sb.append("easy!")
  *     assert(sb.toString === "ScalaTest is easy!")
  *     assert(lb.isEmpty)
  *     lb += "sweet"
  *   }
- *   
+ *
  *   @Test def verifyFun() {
  *     sb.append("fun!")
  *     assert(sb.toString === "ScalaTest is fun!")
  *     assert(lb.isEmpty)
  *   }
- * 
+ *
  * }
  * </pre>
  *
  * <p>
- * This version of <code>JUnitSuite</code> was tested with JUnit version 5.12.
+ * This version of <code>JUnitSuite</code> was tested with JUnit version 5.13.
  * </p>
  *
  * <p>