Skip to content

Commit c9d4fae

Browse files
committed
Release 3.2.7.0.
1 parent 8efccca commit c9d4fae

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ ScalaTest + ScalaCheck provides integration support between ScalaTest and ScalaC
33

44
**Usage**
55

6-
To use it for ScalaTest 3.2.6 and ScalaCheck 1.15.x:
6+
To use it for ScalaTest 3.2.7 and ScalaCheck 1.15.x:
77

88
SBT:
99

1010
```
11-
libraryDependencies += "org.scalatestplus" %% "scalacheck-1-15" % "3.2.6.0" % "test"
11+
libraryDependencies += "org.scalatestplus" %% "scalacheck-1-15" % "3.2.7.0" % "test"
1212
```
1313

1414
Maven:
@@ -17,7 +17,7 @@ Maven:
1717
<dependency>
1818
<groupId>org.scalatestplus</groupId>
1919
<artifactId>scalacheck-1-15_2.13</artifactId>
20-
<version>3.2.6.0</version>
20+
<version>3.2.7.0</version>
2121
<scope>test</scope>
2222
</dependency>
2323
```

build.sbt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
22
import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
33
import scala.xml.transform.{RewriteRule, RuleTransformer}
44

5-
val defaultScalaVersion = "2.13.4"
5+
val defaultScalaVersion = "2.13.5"
66

77
scalaVersion := defaultScalaVersion
88

@@ -20,7 +20,7 @@ publishLocal := {}
2020
val sharedSettings = Seq(
2121
name := "scalacheck-1.15",
2222
organization := "org.scalatestplus",
23-
version := "3.2.6.0",
23+
version := "3.2.7.0",
2424
homepage := Some(url("https://github.com/scalatest/scalatestplus-scalacheck")),
2525
licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
2626
developers := List(
@@ -39,11 +39,11 @@ val sharedSettings = Seq(
3939
),
4040
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
4141
libraryDependencies ++= Seq(
42-
"org.scalatest" %%% "scalatest-core" % "3.2.6",
42+
"org.scalatest" %%% "scalatest-core" % "3.2.7",
4343
"org.scalacheck" %%% "scalacheck" % "1.15.3",
44-
"org.scalatest" %%% "scalatest-shouldmatchers" % "3.2.6" % "test",
45-
"org.scalatest" %%% "scalatest-funspec" % "3.2.6" % "test",
46-
"org.scalatest" %%% "scalatest-funsuite" % "3.2.6" % "test"
44+
"org.scalatest" %%% "scalatest-shouldmatchers" % "3.2.7" % "test",
45+
"org.scalatest" %%% "scalatest-funspec" % "3.2.7" % "test",
46+
"org.scalatest" %%% "scalatest-funsuite" % "3.2.7" % "test"
4747
),
4848
// skip dependency elements with a scope
4949
pomPostProcess := { (node: XmlNode) =>
@@ -123,7 +123,7 @@ lazy val scalatestPlusScalaCheck =
123123
)
124124
)
125125
.jsSettings(
126-
crossScalaVersions := List("2.12.13", defaultScalaVersion),
126+
crossScalaVersions := List("2.12.13", defaultScalaVersion, "3.0.0-RC2"),
127127
sourceGenerators in Compile += {
128128
Def.task {
129129
GenResourcesJSVM.genResources((sourceManaged in Compile).value / "org" / "scalatestplus" / "scalacheck", version.value, scalaVersion.value) ++
@@ -132,7 +132,7 @@ lazy val scalatestPlusScalaCheck =
132132
}
133133
)
134134
.jvmSettings(
135-
crossScalaVersions := List("2.12.13", defaultScalaVersion, "3.0.0-RC1"),
135+
crossScalaVersions := List("2.12.13", defaultScalaVersion, "3.0.0-RC2"),
136136
Test / scalacOptions ++= (if (isDotty.value) Seq("-language:implicitConversions") else Nil),
137137
sourceGenerators in Compile += {
138138
Def.task {

project/GenResources.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ object GenResourcesJSVM extends GenResources {
180180
|
181181
|def formatString(rawString: String, args: Array[Any]): String = {
182182
| args.zipWithIndex.foldLeft(rawString) { case (result, (arg, idx)) =>
183-
| result.replaceAllLiterally("{" + idx + "}", arg + "")
183+
| result.replaceAllLiterally("{" + idx + "}", arg.toString())
184184
| }
185185
|}
186186
|
@@ -212,7 +212,7 @@ object GenResourcesJSVM extends GenResources {
212212
"final def " + kv.key + "() = raw" + kv.key.capitalize
213213
else
214214
"def " + kv.key + "(" + (for (i <- 0 until paramCount) yield s"param$i: Any").mkString(", ") + "): String = \n" +
215-
" raw" + kv.key.capitalize + (for (i <- 0 until paramCount) yield ".replaceAllLiterally(\"{" + i + "}\", param" + i + " + \"\")").mkString + "\n"
215+
" raw" + kv.key.capitalize + (for (i <- 0 until paramCount) yield ".replaceAllLiterally(\"{" + i + "}\", param" + i + ".toString())").mkString + "\n"
216216
/*"object " + kv.key + " { \ndef apply(" + (for (i <- 0 until paramCount) yield s"param$i: Any").mkString(", ") + "): String = \n" +
217217
" raw" + kv.key.capitalize + (for (i <- 0 until paramCount) yield ".replaceAllLiterally(\"{" + i + "}\", param" + i + " + \"\")").mkString + "\n" +
218218
"}"*/
@@ -223,7 +223,7 @@ object GenResourcesJSVM extends GenResources {
223223

224224
def failureMessagesKeyValueTemplate(kv: KeyValue, paramCount: Int): String =
225225
if (paramCount == 0)
226-
"final def " + kv.key + "() = Resources." + kv.key
226+
"final def " + kv.key + "() = Resources." + kv.key + "()"
227227
else
228228
"object " + kv.key + " { \ndef apply(" + (if (paramCount == 0) "" else "prettifier: org.scalactic.Prettifier, ") + (for (i <- 0 until paramCount) yield s"param$i: Any").mkString(", ") + "): String = \n" +
229229
" Resources." + kv.key + "(" + (for (i <- 0 until paramCount) yield s"decorateToStringValue(prettifier, param$i)").mkString(", ") + ")" + "\n" +

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.4.6
1+
sbt.version=1.4.9

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
1212

1313
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
1414

15-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.1")
15+
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.4")

0 commit comments

Comments
 (0)