Skip to content

Commit f77a666

Browse files
committed
Compile against junit 5 14.
1 parent 790660e commit f77a666

File tree

7 files changed

+28
-29
lines changed

7 files changed

+28
-29
lines changed

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ ScalaTest + JUnit provides integration support between ScalaTest and JUnit 5.
33

44
**Usage**
55

6-
To use it for ScalaTest 3.2.19 and JUnit 5.13:
6+
To use it for ScalaTest 3.2.19 and JUnit 5.14:
77

88
SBT:
99

1010
```
11-
libraryDependencies += "org.scalatestplus" %% "junit-5-13" % "3.2.19.0" % Test
11+
libraryDependencies += "org.scalatestplus" %% "junit-5-14" % "3.2.19.0" % Test
1212
```
1313

1414
Maven:
1515

1616
```
1717
<dependency>
1818
<groupId>org.scalatestplus</groupId>
19-
<artifactId>junit-5-13_3</artifactId>
19+
<artifactId>junit-5-14_3</artifactId>
2020
<version>3.2.19.0</version>
2121
<scope>test</scope>
2222
</dependency>
@@ -29,9 +29,9 @@ dependencies {
2929
implementation "org.scala-lang:scala3-library:3.3.5"
3030
3131
testImplementation "org.scalatest:scalatest_3:3.2.19"
32-
testImplementation "org.junit.platform:junit-platform-launcher:1.13.1"
33-
testRuntimeOnly "org.junit.platform:junit-platform-engine:1.13.1"
34-
testRuntimeOnly "org.scalatestplus:junit-5-13_3:3.2.19.0"
32+
testImplementation "org.junit.platform:junit-platform-launcher:1.14.0"
33+
testRuntimeOnly "org.junit.platform:junit-platform-engine:1.14.0"
34+
testRuntimeOnly "org.scalatestplus:junit-5-14_3:3.2.19.0"
3535
}
3636
3737
test {
@@ -51,9 +51,9 @@ dependencies {
5151
implementation("org.scala-lang:scala3-library:3.3.5")
5252
5353
testImplementation("org.scalatest:scalatest_3:3.2.19")
54-
testRuntimeOnly("org.junit.platform:junit-platform-engine:1.13.1")
55-
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.1")
56-
testRuntimeOnly("org.scalatestplus:junit-5-13_3:3.2.19.0")
54+
testRuntimeOnly("org.junit.platform:junit-platform-engine:1.14.0")
55+
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.14.0")
56+
testRuntimeOnly("org.scalatestplus:junit-5-14_3:3.2.19.0")
5757
}
5858
5959
tasks {

build.sbt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import java.io.PrintWriter
22
import scala.io.Source
33

4-
name := "junit-5.13"
4+
name := "junit-5.14"
55

66
organization := "org.scalatestplus"
77

@@ -32,7 +32,7 @@ crossScalaVersions := List(
3232
"2.11.12",
3333
"2.12.20",
3434
"2.13.16",
35-
"3.3.5"
35+
"3.3.6"
3636
)
3737

3838
scalacOptions ++= Seq("-target:jvm-1.8")
@@ -47,8 +47,8 @@ Compile / unmanagedSourceDirectories ++= {
4747
}
4848

4949
val scalatestVersion = "3.2.19"
50-
val junitVersion = "5.13.1"
51-
val junitEngineVersion = "1.13.1"
50+
val junitVersion = "5.14.0"
51+
val junitEngineVersion = "1.14.0"
5252

5353
libraryDependencies ++= Seq(
5454
"org.scalatest" %% "scalatest-core" % scalatestVersion,
@@ -98,7 +98,7 @@ OsgiKeys.exportPackage := Seq(
9898

9999
OsgiKeys.importPackage := Seq(
100100
"org.scalatest.*",
101-
"org.scalactic.*",
101+
"org.scalactic.*",
102102
"scala.*;version=\"$<range;[==,=+);$<replace;"+scalaBinaryVersion.value+";-;.>>\"",
103103
"*;resolution:=optional"
104104
)
@@ -167,6 +167,6 @@ Compile / doc := docTask((Compile / doc).value,
167167
(Compile / sourceDirectory).value,
168168
name.value)
169169

170-
Compile / doc / scalacOptions := Seq("-doc-title", s"ScalaTest + JUnit5 ${version.value}",
171-
"-sourcepath", baseDirectory.value.getAbsolutePath(),
172-
"-doc-source-url", s"https://github.com/scalatest/releases-source/blob/main/scalatestplus-junit5/${version.value}€{FILE_PATH}.scala")
170+
Compile / doc / scalacOptions := Seq("-doc-title", s"ScalaTest + JUnit5 ${version.value}",
171+
"-sourcepath", baseDirectory.value.getAbsolutePath(),
172+
"-doc-source-url", s"https://github.com/scalatest/releases-source/blob/main/scalatestplus-junit5/${version.value}€{FILE_PATH}.scala")

examples/gradle-example/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ dependencies {
1111
implementation "org.scala-lang:scala3-library_3:3.3.5"
1212

1313
testImplementation "org.scalatest:scalatest_3:3.2.19"
14-
testImplementation "org.junit.platform:junit-platform-launcher:1.13.1"
15-
testRuntimeOnly "org.junit.platform:junit-platform-engine:1.13.1"
16-
testRuntimeOnly "org.scalatestplus:junit-5-13_3:3.2.19.0"
14+
testImplementation "org.junit.platform:junit-platform-launcher:1.12.0"
15+
testRuntimeOnly "org.junit.platform:junit-platform-engine:1.12.0"
16+
testRuntimeOnly "org.scalatestplus:junit-5-12_3:3.2.19.0"
1717
}
1818

1919
test {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ dependencies {
1212
implementation("org.scala-lang:scala3-library_3:3.3.5")
1313

1414
testImplementation("org.scalatest:scalatest_3:3.2.19")
15-
testRuntimeOnly("org.junit.platform:junit-platform-engine:1.13.1")
16-
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.1")
17-
testRuntimeOnly("org.scalatestplus:junit-5-13_3:3.2.19.0")
15+
testRuntimeOnly("org.junit.platform:junit-platform-engine:1.12.0")
16+
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.0")
17+
testRuntimeOnly("org.scalatestplus:junit-5-12_3:3.2.19.0")
1818
}
1919

2020
tasks {

examples/maven-example/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<properties>
1313
<java.version>1.8</java.version>
14-
<junit.version>1.13.1</junit.version>
14+
<junit.version>1.12.0</junit.version>
1515
<scalatest.version>3.2.19</scalatest.version>
1616
<scala.compat.version>3</scala.compat.version>
1717
<scala.version>3.3.5</scala.version>
@@ -62,7 +62,7 @@
6262
</dependency>
6363
<dependency>
6464
<groupId>org.scalatestplus</groupId>
65-
<artifactId>junit-5-13_${scala.compat.version}</artifactId>
65+
<artifactId>junit-5-12_${scala.compat.version}</artifactId>
6666
<version>${scalatest.version}.0</version>
6767
<scope>test</scope>
6868
</dependency>

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.8
1+
sbt.version=1.11.6

project/plugins.sbt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
2-
3-
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
1+
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
2+
addSbtPlugin("com.github.sbt" % "sbt-osgi" % "0.9.11")

0 commit comments

Comments
 (0)