Skip to content

Commit 239065d

Browse files
committed
Make scala-js tests to run, and bump up to scala 2.12.0-M5 in README.md.
1 parent 5959191 commit 239065d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,4 @@ To publish scalactic, scalatest and scalatest-app (for Scala and Scala-js, versi
122122

123123
To publish scalactic, scalatest and scalatest-app (for Scala and Scala-js, version 2.12, and make sure you're on Java 8) to Sonatype, use the following command:
124124

125-
`$ sbt ++2.12.0-M4 clean publishSigned "project scalatestAppJS" clean publishSigned`
125+
`$ sbt ++2.12.0-M5 clean publishSigned "project scalatestAppJS" clean publishSigned`

project/scalatest.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object ScalatestBuild extends Build {
2121
// > ++ 2.10.5
2222
val buildScalaVersion = "2.11.8"
2323

24-
val releaseVersion = "3.0.0-RC3"
24+
val releaseVersion = "3.0.0-RC4"
2525

2626
val scalacheckVersion = "1.13.1"
2727

@@ -611,7 +611,7 @@ object ScalatestBuild extends Build {
611611
libraryDependencies ++= crossBuildLibraryDependencies(scalaVersion.value),
612612
libraryDependencies += "org.scalacheck" %%% "scalacheck" % scalacheckVersion % "test",
613613
//jsDependencies += RuntimeDOM % "test",
614-
//scalaJSOptimizerOptions ~= { _.withDisableOptimizer(true) },
614+
scalaJSOptimizerOptions ~= { _.withDisableOptimizer(true) },
615615
//jsEnv := NodeJSEnv(executable = "node").value,
616616
//jsEnv := PhantomJSEnv().value,
617617
scalaJSStage in Global := FastOptStage,
@@ -624,9 +624,9 @@ object ScalatestBuild extends Build {
624624
Def.task {
625625
GenScalaTestJS.genTest((sourceManaged in Test).value / "scala", version.value, scalaVersion.value)
626626
}.taskValue
627-
},
627+
}/*,
628628
sourceGenerators in Test <+=
629-
(baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("gengen", "GenGen.scala")(GenGen.genTest)/*,
629+
(baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("gengen", "GenGen.scala")(GenGen.genTest),
630630
sourceGenerators in Test <+=
631631
(baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("genmatchers", "GenMustMatchersTests.scala")(GenMustMatchersTests.genTestForScalaJS)*/
632632
).dependsOn(scalatestJS % "test", commonTestJS % "test").enablePlugins(ScalaJSPlugin)

0 commit comments

Comments
 (0)