Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup JDK
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 8
- name: Build and Test
run: sbt -v +test
- name: Checkout
uses: actions/checkout@v5
- name: Setup JDK
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 8
cache: sbt
- name: Install sbt
uses: sbt/setup-sbt@v1
- name: Build and Test
run: sbt -v +test
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ If ScalaTest has saved you time, helped you ship better software, or become a ke

**Usage**

To use it for ScalaTest 3.2.19 and JUnit 5.13:
To use it for ScalaTest 3.2.19 and JUnit 5.14:

SBT:

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

Maven:

```
<dependency>
<groupId>org.scalatestplus</groupId>
<artifactId>junit-5-13_3</artifactId>
<artifactId>junit-5-14_3</artifactId>
<version>3.2.19.0</version>
<scope>test</scope>
</dependency>
Expand All @@ -42,9 +42,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.13.1"
testRuntimeOnly "org.junit.platform:junit-platform-engine:1.13.1"
testRuntimeOnly "org.scalatestplus:junit-5-13_3:3.2.19.0"
testImplementation "org.junit.platform:junit-platform-launcher:1.14.0"
testRuntimeOnly "org.junit.platform:junit-platform-engine:1.14.0"
testRuntimeOnly "org.scalatestplus:junit-5-14_3:3.2.19.0"
}

test {
Expand All @@ -64,9 +64,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.13.1")
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.1")
testRuntimeOnly("org.scalatestplus:junit-5-13_3:3.2.19.0")
testRuntimeOnly("org.junit.platform:junit-platform-engine:1.14.0")
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.14.0")
testRuntimeOnly("org.scalatestplus:junit-5-14_3:3.2.19.0")
}

tasks {
Expand Down
16 changes: 8 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import java.io.PrintWriter
import scala.io.Source

name := "junit-5.13"
name := "junit-5.14"

organization := "org.scalatestplus"

Expand Down Expand Up @@ -32,7 +32,7 @@ crossScalaVersions := List(
"2.11.12",
"2.12.20",
"2.13.16",
"3.3.5"
"3.3.6"
)

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

val scalatestVersion = "3.2.19"
val junitVersion = "5.13.1"
val junitEngineVersion = "1.13.1"
val junitVersion = "5.14.0"
val junitEngineVersion = "1.14.0"

libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest-core" % scalatestVersion,
Expand Down Expand Up @@ -98,7 +98,7 @@ OsgiKeys.exportPackage := Seq(

OsgiKeys.importPackage := Seq(
"org.scalatest.*",
"org.scalactic.*",
"org.scalactic.*",
"scala.*;version=\"$<range;[==,=+);$<replace;"+scalaBinaryVersion.value+";-;.>>\"",
"*;resolution:=optional"
)
Expand Down Expand Up @@ -167,6 +167,6 @@ Compile / doc := docTask((Compile / doc).value,
(Compile / sourceDirectory).value,
name.value)

Compile / doc / scalacOptions := Seq("-doc-title", s"ScalaTest + JUnit5 ${version.value}",
"-sourcepath", baseDirectory.value.getAbsolutePath(),
"-doc-source-url", s"https://github.com/scalatest/releases-source/blob/main/scalatestplus-junit5/${version.value}€{FILE_PATH}.scala")
Compile / doc / scalacOptions := Seq("-doc-title", s"ScalaTest + JUnit5 ${version.value}",
"-sourcepath", baseDirectory.value.getAbsolutePath(),
"-doc-source-url", s"https://github.com/scalatest/releases-source/blob/main/scalatestplus-junit5/${version.value}€{FILE_PATH}.scala")
6 changes: 3 additions & 3 deletions examples/gradle-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1"
testRuntimeOnly "org.junit.platform:junit-platform-engine:1.13.1"
testRuntimeOnly "org.scalatestplus:junit-5-13_3:3.2.19.0"
testImplementation "org.junit.platform:junit-platform-launcher:1.14.0"
testRuntimeOnly "org.junit.platform:junit-platform-engine:1.14.0"
testRuntimeOnly "org.scalatestplus:junit-5-14_3:3.2.19.0"
}

test {
Expand Down
6 changes: 3 additions & 3 deletions examples/gradle-kotlin-dsl-example/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1")
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.1")
testRuntimeOnly("org.scalatestplus:junit-5-13_3:3.2.19.0")
testRuntimeOnly("org.junit.platform:junit-platform-engine:1.14.0")
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.14.0")
testRuntimeOnly("org.scalatestplus:junit-5-14_3:3.2.19.0")
}

tasks {
Expand Down
4 changes: 2 additions & 2 deletions examples/maven-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<properties>
<java.version>1.8</java.version>
<junit.version>1.13.1</junit.version>
<junit.version>1.14.0</junit.version>
<scalatest.version>3.2.19</scalatest.version>
<scala.compat.version>3</scala.compat.version>
<scala.version>3.3.5</scala.version>
Expand Down Expand Up @@ -62,7 +62,7 @@
</dependency>
<dependency>
<groupId>org.scalatestplus</groupId>
<artifactId>junit-5-13_${scala.compat.version}</artifactId>
<artifactId>junit-5-14_${scala.compat.version}</artifactId>
<version>${scalatest.version}.0</version>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.8
sbt.version=1.11.6
5 changes: 2 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")

addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
addSbtPlugin("com.github.sbt" % "sbt-osgi" % "0.9.11")