Skip to content

Commit e986672

Browse files
committed
Adjustments to publish 3.3.0.0.
1 parent ac4a95d commit e986672

File tree

4 files changed

+22
-25
lines changed

4 files changed

+22
-25
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ If ScalaTest has saved you time, helped you ship better software, or become a ke
1414

1515
**Usage**
1616

17-
To use it for ScalaTest 3.2.19 and ScalaCheck 1.18.x:
17+
To use it for ScalaTest 3.3.0 and ScalaCheck 1.18.x:
1818

1919
SBT:
2020

2121
```
22-
libraryDependencies += "org.scalatestplus" %% "scalacheck-1-18" % "3.2.19.0" % "test"
22+
libraryDependencies += "org.scalatestplus" %% "scalacheck-1-18" % "3.3.0.0" % "test"
2323
```
2424

2525
Maven:
@@ -28,7 +28,7 @@ Maven:
2828
<dependency>
2929
<groupId>org.scalatestplus</groupId>
3030
<artifactId>scalacheck-1-18_3</artifactId>
31-
<version>3.2.19.0</version>
31+
<version>3.3.0.0</version>
3232
<scope>test</scope>
3333
</dependency>
3434
```
@@ -41,6 +41,7 @@ Please use the following commands to publish to Sonatype:
4141

4242
```
4343
$ sbt clean +publishSigned
44+
$ sbt sonaUpload
4445
```
4546

4647
**Creating Scaladoc**

build.sbt

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ import scala.xml.transform.{RewriteRule, RuleTransformer}
44
import java.io.PrintWriter
55
import scala.io.Source
66

7-
val defaultScalaVersion = "2.13.13"
7+
ThisBuild / organization := "org.scalatestplus.scalacheck" // For sbt sonaUpload
88

9-
scalaVersion := defaultScalaVersion
9+
ThisBuild / version := "3.3.0.0"
1010

11-
publishTo := {
12-
val nexus = "https://oss.sonatype.org/"
13-
Some("publish-releases" at nexus + "service/local/staging/deploy/maven2")
14-
}
11+
val defaultScalaVersion = "2.13.16"
12+
13+
publishTo := localStaging.value
1514

1615
publishArtifact := false
1716

@@ -47,9 +46,8 @@ def docTask(docDir: File, resDir: File, projectName: String): File = {
4746
}
4847

4948
val sharedSettings = Seq(
50-
name := "scalacheck-1.18",
5149
organization := "org.scalatestplus",
52-
version := "3.2.19.0",
50+
name := "scalacheck-1.18",
5351
homepage := Some(url("https://github.com/scalatest/scalatestplus-scalacheck")),
5452
licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
5553
developers := List(
@@ -68,11 +66,11 @@ val sharedSettings = Seq(
6866
),
6967
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
7068
libraryDependencies ++= Seq(
71-
"org.scalatest" %%% "scalatest-core" % "3.2.19",
72-
"org.scalacheck" %%% "scalacheck" % "1.18.0",
73-
"org.scalatest" %%% "scalatest-shouldmatchers" % "3.2.18" % "test",
74-
"org.scalatest" %%% "scalatest-funspec" % "3.2.18" % "test",
75-
"org.scalatest" %%% "scalatest-funsuite" % "3.2.18" % "test"
69+
"org.scalatest" %%% "scalatest-core" % "3.3.0",
70+
"org.scalacheck" %%% "scalacheck" % "1.18.1",
71+
"org.scalatest" %%% "scalatest-shouldmatchers" % "3.3.0" % "test",
72+
"org.scalatest" %%% "scalatest-funspec" % "3.3.0" % "test",
73+
"org.scalatest" %%% "scalatest-funsuite" % "3.3.0" % "test"
7674
),
7775
// skip dependency elements with a scope
7876
pomPostProcess := { (node: XmlNode) =>
@@ -96,10 +94,7 @@ val sharedSettings = Seq(
9694
GenScalaCheckGen.genTest((Test / sourceManaged).value / "org" / "scalatest" / "check", version.value, scalaVersion.value)
9795
}
9896
},
99-
publishTo := {
100-
val nexus = "https://oss.sonatype.org/"
101-
Some("publish-releases" at nexus + "service/local/staging/deploy/maven2")
102-
},
97+
publishTo := localStaging.value,
10398
publishMavenStyle := true,
10499
Test / publishArtifact := false,
105100
pomIncludeRepository := { _ => false },
@@ -140,7 +135,7 @@ lazy val scalatestPlusScalaCheck =
140135
.enablePlugins(SbtOsgi)
141136
.settings(osgiSettings: _*).settings(
142137
scalaVersion := defaultScalaVersion,
143-
crossScalaVersions := List("2.12.19", defaultScalaVersion, "3.3.3"),
138+
crossScalaVersions := List("2.12.20", defaultScalaVersion, "3.3.6"),
144139
OsgiKeys.exportPackage := Seq(
145140
"org.scalatestplus.scalacheck.*"
146141
),
@@ -179,7 +174,8 @@ lazy val scalatestPlusScalaCheck =
179174
GenResourcesJSVM.genResources((Compile / sourceManaged).value / "org" / "scalatestplus" / "scalacheck", version.value, scalaVersion.value) ++
180175
GenResourcesJSVM.genFailureMessages((Compile / sourceManaged).value / "org" / "scalatestplus" / "scalacheck", version.value, scalaVersion.value)
181176
}
182-
}
177+
},
178+
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.
183179
)
184180

185181
lazy val scalatestPlusScalaCheckJS = scalatestPlusScalaCheck.js

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.4

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
22

33
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
44

5-
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.16.0")
5+
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.19.0")
66

77
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
88

9-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")
9+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")
1010

1111
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
1212

0 commit comments

Comments
 (0)