Release 3.2.7.0.

scalatest · Apr 1, 2021 · c9d4fae · c9d4fae
1 parent 8efccca
commit c9d4fae
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -3,12 +3,12 @@ ScalaTest + ScalaCheck provides integration support between ScalaTest and ScalaC
 
 **Usage**
 
-To use it for ScalaTest 3.2.6 and ScalaCheck 1.15.x: 
+To use it for ScalaTest 3.2.7 and ScalaCheck 1.15.x: 
 
 SBT: 
 
 ```
-libraryDependencies += "org.scalatestplus" %% "scalacheck-1-15" % "3.2.6.0" % "test"
+libraryDependencies += "org.scalatestplus" %% "scalacheck-1-15" % "3.2.7.0" % "test"
 ```
 
 Maven: 
@@ -17,7 +17,7 @@ Maven:
 <dependency>
   <groupId>org.scalatestplus</groupId>
   <artifactId>scalacheck-1-15_2.13</artifactId>
-  <version>3.2.6.0</version>
+  <version>3.2.7.0</version>
   <scope>test</scope>
 </dependency>
 ```

diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
 import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
 import scala.xml.transform.{RewriteRule, RuleTransformer}
 
-val defaultScalaVersion = "2.13.4"
+val defaultScalaVersion = "2.13.5"
 
 scalaVersion := defaultScalaVersion
 
@@ -20,7 +20,7 @@ publishLocal := {}
 val sharedSettings = Seq(
   name := "scalacheck-1.15",
   organization := "org.scalatestplus",
-  version := "3.2.6.0",
+  version := "3.2.7.0",
   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(
@@ -39,11 +39,11 @@ val sharedSettings = Seq(
   ),
   resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
   libraryDependencies ++= Seq(
-    "org.scalatest" %%% "scalatest-core" % "3.2.6",
+    "org.scalatest" %%% "scalatest-core" % "3.2.7",
     "org.scalacheck" %%% "scalacheck" % "1.15.3",
-    "org.scalatest" %%% "scalatest-shouldmatchers" % "3.2.6" % "test",
-    "org.scalatest" %%% "scalatest-funspec" % "3.2.6" % "test",
-    "org.scalatest" %%% "scalatest-funsuite" % "3.2.6" % "test"
+    "org.scalatest" %%% "scalatest-shouldmatchers" % "3.2.7" % "test",
+    "org.scalatest" %%% "scalatest-funspec" % "3.2.7" % "test",
+    "org.scalatest" %%% "scalatest-funsuite" % "3.2.7" % "test"
   ),
   // skip dependency elements with a scope
   pomPostProcess := { (node: XmlNode) =>
@@ -123,7 +123,7 @@ lazy val scalatestPlusScalaCheck =
       )
     )
     .jsSettings(
-      crossScalaVersions := List("2.12.13", defaultScalaVersion),
+      crossScalaVersions := List("2.12.13", defaultScalaVersion, "3.0.0-RC2"),
       sourceGenerators in Compile += {
         Def.task {
           GenResourcesJSVM.genResources((sourceManaged in Compile).value / "org" / "scalatestplus" / "scalacheck", version.value, scalaVersion.value) ++
@@ -132,7 +132,7 @@ lazy val scalatestPlusScalaCheck =
       }
     )
     .jvmSettings(
-      crossScalaVersions := List("2.12.13", defaultScalaVersion, "3.0.0-RC1"),
+      crossScalaVersions := List("2.12.13", defaultScalaVersion, "3.0.0-RC2"),
       Test / scalacOptions ++= (if (isDotty.value) Seq("-language:implicitConversions") else Nil),
       sourceGenerators in Compile += {
         Def.task {

diff --git a/project/GenResources.scala b/project/GenResources.scala
@@ -180,7 +180,7 @@ object GenResourcesJSVM extends GenResources {
         |
         |def formatString(rawString: String, args: Array[Any]): String = {
         |  args.zipWithIndex.foldLeft(rawString) { case (result, (arg, idx)) =>
-        |    result.replaceAllLiterally("{" + idx + "}", arg + "")
+        |    result.replaceAllLiterally("{" + idx + "}", arg.toString())
         |  }
         |}
         |
@@ -212,7 +212,7 @@ object GenResourcesJSVM extends GenResources {
         "final def " + kv.key + "() = raw" + kv.key.capitalize
       else
         "def " + kv.key + "(" + (for (i <- 0 until paramCount) yield s"param$i: Any").mkString(", ") + "): String = \n" +
-        "  raw" + kv.key.capitalize + (for (i <- 0 until paramCount) yield ".replaceAllLiterally(\"{" + i + "}\", param" + i + " + \"\")").mkString + "\n"
+        "  raw" + kv.key.capitalize + (for (i <- 0 until paramCount) yield ".replaceAllLiterally(\"{" + i + "}\", param" + i + ".toString())").mkString + "\n"
         /*"object " + kv.key + " { \ndef apply(" + (for (i <- 0 until paramCount) yield s"param$i: Any").mkString(", ") + "): String = \n" +
         "  raw" + kv.key.capitalize + (for (i <- 0 until paramCount) yield ".replaceAllLiterally(\"{" + i + "}\", param" + i + " + \"\")").mkString + "\n" +
         "}"*/
@@ -223,7 +223,7 @@ object GenResourcesJSVM extends GenResources {
 
   def failureMessagesKeyValueTemplate(kv: KeyValue, paramCount: Int): String =
     if (paramCount == 0)
-      "final def " + kv.key + "() = Resources." + kv.key
+      "final def " + kv.key + "() = Resources." + kv.key + "()"
     else
       "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" +
       "  Resources." + kv.key + "(" + (for (i <- 0 until paramCount) yield s"decorateToStringValue(prettifier, param$i)").mkString(", ") + ")" + "\n" +

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.4.6
+sbt.version=1.4.9
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -12,4 +12,4 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
 
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.1")
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.4")