summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2019-06-13 16:13:24 +0200
committerLi Haoyi <haoyi.sg@gmail.com>2019-06-13 16:13:24 +0200
commit67a3685e4a14e20c3593cc3054dcdd95168cf941 (patch)
tree686f898780bb3d0f0693f9cd1fd3caacfc8076af
parent0da4b9a210bdf8b1679548cf7651eb3bf8b10976 (diff)
downloadmill-jsenv-1.0.0-m8.tar.gz
mill-jsenv-1.0.0-m8.tar.bz2
mill-jsenv-1.0.0-m8.zip
-rwxr-xr-xbuild.sc10
-rw-r--r--scalajslib/test/src/HelloJSWorldTests.scala24
-rw-r--r--scalalib/test/src/dependency/updates/UpdatesFinderTests.scala6
3 files changed, 20 insertions, 20 deletions
diff --git a/build.sc b/build.sc
index 54c916a3..0f3e473e 100755
--- a/build.sc
+++ b/build.sc
@@ -228,11 +228,11 @@ object scalajslib extends MillModule {
)
case "1.0" =>
Agg(
- ivy"org.scala-js::scalajs-tools:1.0.0-M2",
- ivy"org.scala-js::scalajs-sbt-test-adapter:1.0.0-M2",
- ivy"org.scala-js::scalajs-env-nodejs:1.0.0-M2",
- ivy"org.scala-js::scalajs-env-jsdom-nodejs:1.0.0-M2",
- ivy"org.scala-js::scalajs-env-phantomjs:1.0.0-M2"
+ ivy"org.scala-js::scalajs-tools:1.0.0-M8",
+ ivy"org.scala-js::scalajs-sbt-test-adapter:1.0.0-M8",
+ ivy"org.scala-js::scalajs-env-nodejs:1.0.0-M8",
+ ivy"org.scala-js::scalajs-env-jsdom-nodejs:1.0.0-M8",
+ ivy"org.scala-js::scalajs-env-phantomjs:1.0.0-M8"
)
}
}
diff --git a/scalajslib/test/src/HelloJSWorldTests.scala b/scalajslib/test/src/HelloJSWorldTests.scala
index 1b3e9bb3..aacd4a39 100644
--- a/scalajslib/test/src/HelloJSWorldTests.scala
+++ b/scalajslib/test/src/HelloJSWorldTests.scala
@@ -25,7 +25,7 @@ object HelloJSWorldTests extends TestSuite {
object HelloJSWorld extends TestUtil.BaseModule {
val matrix = for {
scala <- Seq("2.11.8", "2.12.3", "2.12.4")
- scalaJS <- Seq("0.6.22", "1.0.0-M2")
+ scalaJS <- Seq("0.6.22", "1.0.0-M8")
} yield (scala, scalaJS)
object helloJsWorld extends Cross[BuildModule](matrix:_*)
@@ -101,7 +101,7 @@ object HelloJSWorldTests extends TestSuite {
'fromScratch_2124_0622 - testCompileFromScratch("2.12.4", "0.6.22")
'fromScratch_2123_0622 - testCompileFromScratch("2.12.3", "0.6.22")
'fromScratch_2118_0622 - TestUtil.disableInJava9OrAbove(testCompileFromScratch("2.11.8", "0.6.22"))
- 'fromScratch_2124_100M2 - testCompileFromScratch("2.12.4", "1.0.0-M2")
+ 'fromScratch_2124_100M2 - testCompileFromScratch("2.12.4", "1.0.0-M8")
}
def testRun(scalaVersion: String,
@@ -120,13 +120,13 @@ object HelloJSWorldTests extends TestSuite {
'run_2124_0622 - TestUtil.disableInJava9OrAbove(testRun("2.12.4", "0.6.22", FullOpt))
'run_2123_0622 - TestUtil.disableInJava9OrAbove(testRun("2.12.3", "0.6.22", FullOpt))
'run_2118_0622 - TestUtil.disableInJava9OrAbove(testRun("2.11.8", "0.6.22", FullOpt))
- 'run_2124_100M2 - TestUtil.disableInJava9OrAbove(testRun("2.12.4", "1.0.0-M2", FullOpt))
+ 'run_2124_100M2 - TestUtil.disableInJava9OrAbove(testRun("2.12.4", "1.0.0-M8", FullOpt))
}
'fastOpt - {
'run_2124_0622 - TestUtil.disableInJava9OrAbove(testRun("2.12.4", "0.6.22", FastOpt))
'run_2123_0622 - TestUtil.disableInJava9OrAbove(testRun("2.12.3", "0.6.22", FastOpt))
'run_2118_0622 - TestUtil.disableInJava9OrAbove(testRun("2.11.8", "0.6.22", FastOpt))
- 'run_2124_100M2 - TestUtil.disableInJava9OrAbove(testRun("2.12.4", "1.0.0-M2", FastOpt))
+ 'run_2124_100M2 - TestUtil.disableInJava9OrAbove(testRun("2.12.4", "1.0.0-M8", FastOpt))
}
'jar - {
'containsSJSIRs - {
@@ -144,7 +144,7 @@ object HelloJSWorldTests extends TestSuite {
assert(result.id == artifactId)
}
'artifactId_0622 - testArtifactId("2.12.4", "0.6.22", "hello-js-world_sjs0.6_2.12")
- 'artifactId_100M2 - testArtifactId("2.12.4", "1.0.0-M2", "hello-js-world_sjs1.0.0-M2_2.12")
+ 'artifactId_100M2 - testArtifactId("2.12.4", "1.0.0-M8", "hello-js-world_sjs1.0.0-M8_2.12")
}
'test - {
def runTests(testTask: define.Command[(String, Seq[TestRunner.Result])]): Map[String, Map[String, TestRunner.Result]] = {
@@ -192,14 +192,14 @@ object HelloJSWorldTests extends TestSuite {
'utest_2118_0622 - TestUtil.disableInJava9OrAbove(checkUtest("2.11.8", "0.6.22"))
'utest_2124_0622 - checkUtest("2.12.4", "0.6.22")
- 'utest_2118_100M2 - TestUtil.disableInJava9OrAbove(checkUtest("2.11.8", "1.0.0-M2"))
- 'utest_2124_100M2 - checkUtest("2.12.4", "1.0.0-M2")
+ 'utest_2118_100M2 - TestUtil.disableInJava9OrAbove(checkUtest("2.11.8", "1.0.0-M8"))
+ 'utest_2124_100M2 - checkUtest("2.12.4", "1.0.0-M8")
'scalaTest_2118_0622 - TestUtil.disableInJava9OrAbove(checkScalaTest("2.11.8", "0.6.22"))
'scalaTest_2124_0622 - checkScalaTest("2.12.4", "0.6.22")
-// No scalatest artifact for scala.js 1.0.0-M2 published yet
-// 'scalaTest_2118_100M2 - checkScalaTest("2.11.8", "1.0.0-M2")
-// 'scalaTest_2124_100M2 - checkScalaTest("2.12.4", "1.0.0-M2")
+// No scalatest artifact for scala.js 1.0.0-M8 published yet
+// 'scalaTest_2118_100M2 - checkScalaTest("2.11.8", "1.0.0-M8")
+// 'scalaTest_2124_100M2 - checkScalaTest("2.12.4", "1.0.0-M8")
}
def checkRun(scalaVersion: String, scalaJSVersion: String): Unit = {
@@ -222,8 +222,8 @@ object HelloJSWorldTests extends TestSuite {
'run - {
'run_2118_0622 - TestUtil.disableInJava9OrAbove(checkRun("2.11.8", "0.6.22"))
'run_2124_0622 - checkRun("2.12.4", "0.6.22")
- 'run_2118_100M2 - TestUtil.disableInJava9OrAbove(checkRun("2.11.8", "1.0.0-M2"))
- 'run_2124_100M2 - checkRun("2.12.4", "1.0.0-M2")
+ 'run_2118_100M2 - TestUtil.disableInJava9OrAbove(checkRun("2.11.8", "1.0.0-M8"))
+ 'run_2124_100M2 - checkRun("2.12.4", "1.0.0-M8")
}
}
diff --git a/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala b/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala
index 3b613bcb..e92b1971 100644
--- a/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala
+++ b/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala
@@ -57,7 +57,7 @@ object UpdatesFinderTests extends TestSuite {
"0.9.9-M3",
"0.9.9",
"1.0.0-SNAPSHOT",
- "1.0.0-M2",
+ "1.0.0-M8",
"1.0.0-M3",
"1.0.0",
"1.0.1-SNAPSHOT",
@@ -101,8 +101,8 @@ object UpdatesFinderTests extends TestSuite {
}
'milestoneArtifacts - {
- val u = updates("1.0.0-M2", available, allowPreRelease = false)
- val pu = updates("1.0.0-M2", available, allowPreRelease = true)
+ val u = updates("1.0.0-M8", available, allowPreRelease = false)
+ val pu = updates("1.0.0-M8", available, allowPreRelease = true)
'noOldStableVersions - {
assert(!u.contains("0.9.9"))