Merge branch 'cheeseng-3.1.0-SNAP12' into 3.1.x

scalatest · Jun 10, 2019 · d4c3f4e · d4c3f4e
2 parents ed4d89d + 143cb16
commit d4c3f4e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -145,28 +145,26 @@ Before publishing any patch release, binary compatibility with previous version
     $ sbt ++2.10.7 scalacticJS/package scalacticJS/mimaReportBinaryIssues
     $ sbt ++2.10.7 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
-    $ sbt ++2.12.6 scalactic/package scalactic/mimaReportBinaryIssues
-    $ sbt ++2.12.6 scalatest/package scalatest/mimaReportBinaryIssues
-    $ sbt ++2.12.6 scalacticJS/package scalacticJS/mimaReportBinaryIssues
-    $ sbt ++2.12.6 scalatestJS/package scalatestJS/mimaReportBinaryIssues
+    $ sbt ++2.12.8 scalactic/package scalactic/mimaReportBinaryIssues
+    $ sbt ++2.12.8 scalatest/package scalatest/mimaReportBinaryIssues
+    $ sbt ++2.12.8 scalacticJS/package scalacticJS/mimaReportBinaryIssues
+    $ sbt ++2.12.8 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
-    $ sbt ++2.13.0-RC2 scalactic/package scalactic/mimaReportBinaryIssues
-    $ sbt ++2.13.0-RC2 scalatest/package scalatest/mimaReportBinaryIssues
-    $ sbt ++2.13.0-RC2 scalacticJS/package scalacticJS/mimaReportBinaryIssues
-    $ sbt ++2.13.0-RC2 scalatestJS/package scalatestJS/mimaReportBinaryIssues
+    $ sbt ++2.13.0-RC3 scalactic/package scalactic/mimaReportBinaryIssues
+    $ sbt ++2.13.0-RC3 scalatest/package scalatest/mimaReportBinaryIssues
+    $ sbt ++2.13.0-RC3 scalacticJS/package scalacticJS/mimaReportBinaryIssues
+    $ sbt ++2.13.0-RC3 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
 To publish scalactic, scalatest and scalatest-app use the following command:
 
-    $ export SCALAJS_VERSION=0.6.27
+    $ export SCALAJS_VERSION=0.6.28
     $ sbt ++2.10.7 clean publishSigned "project scalatestAppJS" clean publishSigned
     $ sbt ++2.11.12 clean publishSigned "project scalatestAppJS" clean publishSigned
     $ sbt ++2.12.8 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned
-    $ sbt ++2.13.0-RC2 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned    
-    $ export SCALAJS_VERSION=1.0.0-M7
+    $ sbt ++2.13.0-RC3 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned    
+    $ sbt ++2.11.12 "project scalatestAppNative" clean publishSigned
+    $ export SCALAJS_VERSION=1.0.0-M3
     $ sbt ++2.11.12 "project scalatestAppJS" clean publishSigned
-    $ sbt ++2.12.8 "project scalatestAppJS" clean publishSigned
-    $ sbt ++2.13.0-RC2 "project scalatestAppJS" clean publishSigned  
-
-To publish scalactic, scalatest and scalatest-app (for Scala-native version 2.11, and make sure you're on Java 8) to Sonatype, use the following command: 
-
-  `$ sbt ++2.11.12 "project scalatestAppNative" clean publishSigned`
+    $ sbt ++2.12.6 "project scalatestAppJS" clean publishSigned
+    $ export SCALAJS_VERSION=1.0.0-M8
+    $ sbt ++2.13.0-RC3 "project scalatestAppJS" clean publishSigned  
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,7 +2,7 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")
 
-val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.27")
+val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.28")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 

diff --git a/project/scalatest.scala b/project/scalatest.scala
@@ -36,14 +36,14 @@ object ScalatestBuild {
 
   // To temporarily switch sbt to a different Scala version:
   // > ++ 2.10.5
-  lazy val supportedScalaVersions = List("2.12.8", "2.11.12", "2.10.7", "2.13.0-RC2")
+  lazy val supportedScalaVersions = List("2.12.8", "2.11.12", "2.10.7", "2.13.0-RC3")
 
-  val releaseVersion = "3.1.0-SNAP11"
+  val releaseVersion = "3.1.0-SNAP12"
 
   val previousReleaseVersion = "3.0.5"
 
-  val plusJUnitVersion = "1.0.0-SNAP7"
-  val plusTestNGVersion = "1.0.0-SNAP6"
+  val plusJUnitVersion = "1.0.0-SNAP8"
+  val plusTestNGVersion = "1.0.0-SNAP7"
   val flexmarkVersion = "0.35.10"
 
   val githubTag = "release-3.1.0" // for scaladoc source urls
@@ -233,7 +233,7 @@ object ScalatestBuild {
       "org.scalatestplus" %% "scalatestplus-junit" % plusJUnitVersion % "test"
     )
 
-  val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.27")
+  val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.28")
 
   def scalatestJSLibraryDependencies =
     Seq(