diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e24adcf..dcbc10d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/README.md b/README.md index 545a7cf..2ac6fed 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,12 @@ 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: @@ -29,7 +29,7 @@ Maven: ``` org.scalatestplus - junit-5-13_3 + junit-5-14_3 3.2.19.0 test @@ -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 { @@ -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 { diff --git a/build.sbt b/build.sbt index 695d9a2..76bfec5 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import java.io.PrintWriter import scala.io.Source -name := "junit-5.13" +name := "junit-5.14" organization := "org.scalatestplus" @@ -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") @@ -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, @@ -98,7 +98,7 @@ OsgiKeys.exportPackage := Seq( OsgiKeys.importPackage := Seq( "org.scalatest.*", - "org.scalactic.*", + "org.scalactic.*", "scala.*;version=\"$>\"", "*;resolution:=optional" ) @@ -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") \ No newline at end of file +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") diff --git a/examples/gradle-example/build.gradle b/examples/gradle-example/build.gradle index 3a90309..5f800ad 100644 --- a/examples/gradle-example/build.gradle +++ b/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.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 { diff --git a/examples/gradle-kotlin-dsl-example/build.gradle.kts b/examples/gradle-kotlin-dsl-example/build.gradle.kts index 5241de1..e222cab 100644 --- a/examples/gradle-kotlin-dsl-example/build.gradle.kts +++ b/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.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 { diff --git a/examples/maven-example/pom.xml b/examples/maven-example/pom.xml index 6f26539..17d0b83 100644 --- a/examples/maven-example/pom.xml +++ b/examples/maven-example/pom.xml @@ -11,7 +11,7 @@ 1.8 - 1.13.1 + 1.14.0 3.2.19 3 3.3.5 @@ -62,7 +62,7 @@ org.scalatestplus - junit-5-13_${scala.compat.version} + junit-5-14_${scala.compat.version} ${scalatest.version}.0 test diff --git a/project/build.properties b/project/build.properties index e64c208..5e6884d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.8 +sbt.version=1.11.6 diff --git a/project/plugins.sbt b/project/plugins.sbt index 89f0c20..75d473a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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")