From e986672c756e92baf8cc13a3d7e1b9a817f3a0a7 Mon Sep 17 00:00:00 2001 From: Chua Chee Seng Date: Thu, 14 Aug 2025 22:01:25 +0800 Subject: [PATCH 1/2] Adjustments to publish 3.3.0.0. --- README.md | 7 ++++--- build.sbt | 34 +++++++++++++++------------------- project/build.properties | 2 +- project/plugins.sbt | 4 ++-- 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 8825e92..62a912e 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 ScalaCheck 1.18.x: +To use it for ScalaTest 3.3.0 and ScalaCheck 1.18.x: SBT: ``` -libraryDependencies += "org.scalatestplus" %% "scalacheck-1-18" % "3.2.19.0" % "test" +libraryDependencies += "org.scalatestplus" %% "scalacheck-1-18" % "3.3.0.0" % "test" ``` Maven: @@ -28,7 +28,7 @@ Maven: org.scalatestplus scalacheck-1-18_3 - 3.2.19.0 + 3.3.0.0 test ``` @@ -41,6 +41,7 @@ Please use the following commands to publish to Sonatype: ``` $ sbt clean +publishSigned +$ sbt sonaUpload ``` **Creating Scaladoc** diff --git a/build.sbt b/build.sbt index 5e86211..43edee6 100644 --- a/build.sbt +++ b/build.sbt @@ -4,14 +4,13 @@ import scala.xml.transform.{RewriteRule, RuleTransformer} import java.io.PrintWriter import scala.io.Source -val defaultScalaVersion = "2.13.13" +ThisBuild / organization := "org.scalatestplus.scalacheck" // For sbt sonaUpload -scalaVersion := defaultScalaVersion +ThisBuild / version := "3.3.0.0" -publishTo := { - val nexus = "https://oss.sonatype.org/" - Some("publish-releases" at nexus + "service/local/staging/deploy/maven2") -} +val defaultScalaVersion = "2.13.16" + +publishTo := localStaging.value publishArtifact := false @@ -47,9 +46,8 @@ def docTask(docDir: File, resDir: File, projectName: String): File = { } val sharedSettings = Seq( - name := "scalacheck-1.18", organization := "org.scalatestplus", - version := "3.2.19.0", + name := "scalacheck-1.18", homepage := Some(url("https://github.com/scalatest/scalatestplus-scalacheck")), licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), developers := List( @@ -68,11 +66,11 @@ val sharedSettings = Seq( ), resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots", libraryDependencies ++= Seq( - "org.scalatest" %%% "scalatest-core" % "3.2.19", - "org.scalacheck" %%% "scalacheck" % "1.18.0", - "org.scalatest" %%% "scalatest-shouldmatchers" % "3.2.18" % "test", - "org.scalatest" %%% "scalatest-funspec" % "3.2.18" % "test", - "org.scalatest" %%% "scalatest-funsuite" % "3.2.18" % "test" + "org.scalatest" %%% "scalatest-core" % "3.3.0", + "org.scalacheck" %%% "scalacheck" % "1.18.1", + "org.scalatest" %%% "scalatest-shouldmatchers" % "3.3.0" % "test", + "org.scalatest" %%% "scalatest-funspec" % "3.3.0" % "test", + "org.scalatest" %%% "scalatest-funsuite" % "3.3.0" % "test" ), // skip dependency elements with a scope pomPostProcess := { (node: XmlNode) => @@ -96,10 +94,7 @@ val sharedSettings = Seq( GenScalaCheckGen.genTest((Test / sourceManaged).value / "org" / "scalatest" / "check", version.value, scalaVersion.value) } }, - publishTo := { - val nexus = "https://oss.sonatype.org/" - Some("publish-releases" at nexus + "service/local/staging/deploy/maven2") - }, + publishTo := localStaging.value, publishMavenStyle := true, Test / publishArtifact := false, pomIncludeRepository := { _ => false }, @@ -140,7 +135,7 @@ lazy val scalatestPlusScalaCheck = .enablePlugins(SbtOsgi) .settings(osgiSettings: _*).settings( scalaVersion := defaultScalaVersion, - crossScalaVersions := List("2.12.19", defaultScalaVersion, "3.3.3"), + crossScalaVersions := List("2.12.20", defaultScalaVersion, "3.3.6"), OsgiKeys.exportPackage := Seq( "org.scalatestplus.scalacheck.*" ), @@ -179,7 +174,8 @@ lazy val scalatestPlusScalaCheck = GenResourcesJSVM.genResources((Compile / sourceManaged).value / "org" / "scalatestplus" / "scalacheck", version.value, scalaVersion.value) ++ GenResourcesJSVM.genFailureMessages((Compile / sourceManaged).value / "org" / "scalatestplus" / "scalacheck", version.value, scalaVersion.value) } - } + }, + evictionErrorLevel := Level.Warn // Workaround as scalacheck 1.18.1 is using test-interface native 0.5.5, when newer scalacheck version available we may try remove this. ) lazy val scalatestPlusScalaCheckJS = scalatestPlusScalaCheck.js 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/project/plugins.sbt b/project/plugins.sbt index ce42127..fa14839 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,11 +2,11 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0") -val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.16.0") +val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.19.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1") From ddb3ef89ad4efd8b876ac22ee563f403507dadb4 Mon Sep 17 00:00:00 2001 From: Chua Chee Seng Date: Fri, 15 Aug 2025 20:31:55 +0800 Subject: [PATCH 2/2] Updated release version to 3.3.0.0-RC1. --- README.md | 6 +++--- build.sbt | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 62a912e..62afde0 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.3.0 and ScalaCheck 1.18.x: +To use it for ScalaTest 3.3.0-RC1 and ScalaCheck 1.18.x: SBT: ``` -libraryDependencies += "org.scalatestplus" %% "scalacheck-1-18" % "3.3.0.0" % "test" +libraryDependencies += "org.scalatestplus" %% "scalacheck-1-18" % "3.3.0.0-RC1" % "test" ``` Maven: @@ -28,7 +28,7 @@ Maven: org.scalatestplus scalacheck-1-18_3 - 3.3.0.0 + 3.3.0.0-RC1 test ``` diff --git a/build.sbt b/build.sbt index 43edee6..bdc9d34 100644 --- a/build.sbt +++ b/build.sbt @@ -4,9 +4,9 @@ import scala.xml.transform.{RewriteRule, RuleTransformer} import java.io.PrintWriter import scala.io.Source -ThisBuild / organization := "org.scalatestplus.scalacheck" // For sbt sonaUpload +ThisBuild / organization := "org.scalatestplus" -ThisBuild / version := "3.3.0.0" +ThisBuild / version := "3.3.0.0-RC1" val defaultScalaVersion = "2.13.16" @@ -46,7 +46,6 @@ def docTask(docDir: File, resDir: File, projectName: String): File = { } val sharedSettings = Seq( - organization := "org.scalatestplus", name := "scalacheck-1.18", homepage := Some(url("https://github.com/scalatest/scalatestplus-scalacheck")), licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),