Fix scala-js#1937: Change 2.12.0-M2 to 2.12.0-M3.

* Changed all refrences of 2.12.0-M2 to 2.12.0-M3.
* Updated partest whitelist and blacklist.
* Fix scala-js#1893: Remove ScalaRunTime override in 2.12.

(cherry picked from commit 75ee1ba)

Conflicts:

	ci/checksizes.sh
	project/Build.scala
	scripts/build-all-js.sh
	scripts/publish.sh

Author: nicolasstucki

ci/checksizes.sh

@@ -11,8 +11,8 @@ case $FULLVER in
   2.11.7)
     VER=2.11
     ;;
-  2.12.0-M2)
-    VER=2.12.0-M2
+  2.12.0-M3)
+    VER=2.12.0-M3
     ;;
   2.10.3|2.10.4|2.10.5|2.11.0|2.11.1|2.11.2|2.11.4|2.11.5|2.11.6)
     echo "Ignoring checksizes for Scala $FULLVER"
@@ -45,7 +45,7 @@ case $FULLVER in
     REVERSI_PREOPT_GZ_EXPECTEDSIZE=87000
     REVERSI_OPT_GZ_EXPECTEDSIZE=40000
     ;;
-  2.12.0-M2)
+  2.12.0-M3)
     REVERSI_PREOPT_EXPECTEDSIZE=618000
     REVERSI_OPT_EXPECTEDSIZE=146000
     REVERSI_PREOPT_GZ_EXPECTEDSIZE=86000

ci/matrix.xml

@@ -310,7 +310,7 @@
       <v n="java">1.8</v>
     </run>
     <run task="main">
-      <v n="scala">2.12.0-M2</v>
+      <v n="scala">2.12.0-M3</v>
       <v n="java">1.8</v>
     </run>
 
@@ -337,7 +337,7 @@
       <v n="java">1.8</v>
     </run>
     <run task="bootstrap">
-      <v n="scala">2.12.0-M2</v>
+      <v n="scala">2.12.0-M3</v>
       <v n="java">1.8</v>
     </run>
 
@@ -522,15 +522,15 @@
       <v n="java">1.7</v>
     </run>
     <run task="partest-noopt">
-      <v n="scala">2.12.0-M2</v>
+      <v n="scala">2.12.0-M3</v>
       <v n="java">1.8</v>
     </run>
     <run task="partest-fastopt">
-      <v n="scala">2.12.0-M2</v>
+      <v n="scala">2.12.0-M3</v>
       <v n="java">1.8</v>
     </run>
     <run task="partest-fullopt">
-      <v n="scala">2.12.0-M2</v>
+      <v n="scala">2.12.0-M3</v>
       <v n="java">1.8</v>
     </run>
   </matrix>

partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.0-M2/BlacklistedTests.txt renamed to partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.0-M3/BlacklistedTests.txt

@@ -160,6 +160,9 @@ run/t6988.scala
 # Object{Output|Input}Streams
 run/t6935.scala
 run/t8188.scala
+run/t9375.scala
+run/t9365.scala
+run/inlineAddDeserializeLambda.scala
 
 # Using System.getProperties
 
@@ -491,14 +494,17 @@ run/t8549b.scala
 run/t8574.scala
 run/t8549.scala
 run/t8637.scala
-run/t8346.scala
 run/t8253.scala
 run/t9027.scala
 run/t6622.scala
+run/toolbox_expand_macro.scala
 run/toolbox-varargs
 run/t9252.scala
 run/t9182.scala
 run/t9102.scala
+run/t720.scala
+run/t9408.scala
+run/trait-default-specialize.scala
 
 run/reify_newimpl_29.scala
 run/reify_magicsymbols.scala
@@ -661,6 +667,7 @@ run/exceptions-2.scala
 run/exceptions-nest.scala
 run/t8601c.scala
 run/t8601b.scala
+run/inlineHandlers.scala
 
 # Expecting unsupported exceptions (e.g. ArrayIndexOutOfBounds)
 run/optimizer-array-load.scala
@@ -892,10 +899,14 @@ run/t8907.scala
 run/t9097.scala
 run/macroPlugins-enterStats.scala
 run/sbt-icode-interface.scala
+run/t8502b.scala
 
 # partest.CompilerTest
 run/t8852a.scala
 
+# partest.ASMConverters
+run/t9403
+
 # partest.BytecodeTest
 run/t6546
 run/t7106
@@ -909,6 +920,7 @@ run/t8843-repl-xlat.scala
 run/t9206.scala
 run/t9170.scala
 run/t8918-unary-ids.scala
+run/t1931.scala
 
 # partest.JavapTest
 run/t8608-no-format.scala

partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.0-M2/BuglistedTests.txt renamed to partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.0-M3/BuglistedTests.txt

@@ -1005,7 +1005,6 @@ neg/t910.scala
 neg/parstar.scala
 neg/t4568.scala
 neg/newpat_unreachable.scala
-neg/warn-unused-imports.scala
 neg/t1181.scala
 neg/t5903c
 neg/t7294.scala
@@ -2012,7 +2011,6 @@ neg/t3987.scala
 neg/t877.scala
 neg/t0117.scala
 neg/t692.scala
-neg/t6666d.scala
 neg/t5702-neg-ugly-xbrace.scala
 neg/t7752.scala
 neg/case-collision2.scala
@@ -2847,7 +2845,6 @@ pos/macro-bundle-disambiguate-nonbundle.scala
 pos/package-ob-case
 pos/t1786-counter.scala
 pos/reflection-compat-api-universe.scala
-pos/list-optim-check.scala
 pos/existential-java-case-class
 pos/t1786-cycle.scala
 pos/reflection-compat-c.scala
@@ -3081,6 +3078,30 @@ neg/t6895b.scala
 neg/t8892.scala
 neg/t8849.scala
 neg/inlineIndyLambdaPrivate
+run/t9029.scala
+run/t7850c.scala
+run/t7850d.scala
+run/t8334.scala
+run/t9029c.scala
+run/t9029b.scala
+run/t9422.scala
+run/t9425.scala
+pos/t9475.scala
+pos/t9498.scala
+pos/t9479.scala
+pos/t9479b.scala
+pos/t9442.scala
+pos/t9369.scala
+pos/t6666d.scala
+pos/t9370
+neg/t6810.scala
+neg/t8127a.scala
+neg/t8989.scala
+neg/t9401.scala
+neg/implicit-ambiguous.scala
+neg/implicit-ambiguous-2.scala
+neg/implicit-ambiguous-invalid.scala
+neg/warn-unused-imports
 
 # Adapt checkfiles for (1.0).toString == "1"
 run/Course-2002-01.scala

partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.0-M2/WhitelistedTests.txt renamed to partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.0-M3/WhitelistedTests.txt

@@ -52,7 +52,7 @@ object Build extends sbt.Build {
     CrossVersion.binaryMapped(v => s"sjs${previousSJSBinaryVersion}_$v")
 
   val scalaVersionsUsedForPublishing: Set[String] =
-    Set("2.10.5", "2.11.7", "2.12.0-M2")
+    Set("2.10.5", "2.11.7", "2.12.0-M3")
   val newScalaBinaryVersionsInThisRelease: Set[String] =
     Set()
 
@@ -66,8 +66,8 @@ object Build extends sbt.Build {
       } else if (newScalaBinaryVersionsInThisRelease.contains(scalaBinaryV)) {
         // New in this release, no binary compatibility to comply to
         None
-      } else if (scalaBinaryV == "2.12.0-M2") {
-        // See #1865: MiMa is much too noisy with 2.12.0-M2 to be useful
+      } else if (scalaBinaryV == "2.12.0-M3") {
+        // See #1865: MiMa is much too noisy with 2.12.0-M3 to be useful
         None
       } else {
         val thisProjectID = projectID.value
@@ -222,7 +222,7 @@ object Build extends sbt.Build {
         "2.11.5",
         "2.11.6",
         "2.11.7",
-        "2.12.0-M2"
+        "2.12.0-M3"
       ),
       // Default stage
       scalaJSStage in Global := PreLinkStage