From 3f9bcf70fc4a6dc4a46f0830c328f910ea20f1ef Mon Sep 17 00:00:00 2001 From: Chua Chee Seng Date: Sat, 16 Aug 2025 15:34:27 +0800 Subject: [PATCH] Adjusted for 3.3.0.0-RC1 release. --- README.md | 7 ++++--- build.sbt | 19 ++++++++----------- project/build.properties | 2 +- .../org/scalatestplus/junit/JUnitRunner.scala | 3 +-- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 795213b..7050110 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,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 4.13: +To use it for ScalaTest 3.3.0-RC1 and JUnit 4.13: SBT: ``` -libraryDependencies += "org.scalatestplus" %% "junit-4-13" % "3.2.19.1" % "test" +libraryDependencies += "org.scalatestplus" %% "junit-4-13" % "3.3.0.0-RC1" % "test" ``` Maven: @@ -28,7 +28,7 @@ Maven: org.scalatestplus junit-4-13_3 - 3.2.19.1 + 3.3.0.0-RC1 test ``` @@ -39,4 +39,5 @@ Please use the following commands to publish to Sonatype: ``` $ sbt +publishSigned +$ sbt sonaUpload ``` \ No newline at end of file diff --git a/build.sbt b/build.sbt index 83e91d2..fe539c0 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ name := "junit-4.13" organization := "org.scalatestplus" -version := "3.2.19.1" +version := "3.3.0.0-RC1" homepage := Some(url("https://github.com/scalatest/scalatestplus-junit")) @@ -32,7 +32,7 @@ crossScalaVersions := List( "2.11.12", "2.12.20", "2.13.16", - "3.3.5" + "3.3.6" ) /** Add src/main/scala-{2|3} to Compile / unmanagedSourceDirectories */ @@ -45,12 +45,12 @@ Compile / unmanagedSourceDirectories ++= { } libraryDependencies ++= Seq( - "org.scalatest" %% "scalatest-core" % "3.2.19", + "org.scalatest" %% "scalatest-core" % "3.3.0-RC1", "junit" % "junit" % "4.13.2", - "org.scalatest" %% "scalatest-wordspec" % "3.2.19" % "test", - "org.scalatest" %% "scalatest-funspec" % "3.2.19" % "test", - "org.scalatest" %% "scalatest-funsuite" % "3.2.19" % "test", - "org.scalatest" %% "scalatest-shouldmatchers" % "3.2.19" % "test" + "org.scalatest" %% "scalatest-wordspec" % "3.3.0-RC1" % "test", + "org.scalatest" %% "scalatest-funspec" % "3.3.0-RC1" % "test", + "org.scalatest" %% "scalatest-funsuite" % "3.3.0-RC1" % "test", + "org.scalatest" %% "scalatest-shouldmatchers" % "3.3.0-RC1" % "test" ) import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _} @@ -97,10 +97,7 @@ OsgiKeys.additionalHeaders:= Map( "Bundle-Vendor" -> "Artima, Inc." ) -publishTo := { - val nexus = "https://oss.sonatype.org/" - Some("publish-releases" at nexus + "service/local/staging/deploy/maven2") -} +publishTo := localStaging.value publishMavenStyle := true diff --git a/project/build.properties b/project/build.properties index e64c208..489e0a7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.8 +sbt.version=1.11.4 diff --git a/src/main/scala/org/scalatestplus/junit/JUnitRunner.scala b/src/main/scala/org/scalatestplus/junit/JUnitRunner.scala index da3738e..5d2e9a1 100644 --- a/src/main/scala/org/scalatestplus/junit/JUnitRunner.scala +++ b/src/main/scala/org/scalatestplus/junit/JUnitRunner.scala @@ -120,8 +120,7 @@ final class JUnitRunner(suiteClass: java.lang.Class[_ <: Suite]) extends org.jun filter, ConfigMap.empty, None, - new Tracker, - Set.empty + new Tracker ) ) } catch {