Merge pull request scala-js#42 from sjrd/upgrades

Upgrades

Author: sjrd

.travis.yml

@@ -9,14 +9,17 @@ script:
 scala:
   - 2.10.7
   - 2.11.12
-  - 2.12.4
-  - 2.13.0-M2
+  - 2.12.5
+  - 2.13.0-M3
 jdk:
   - oraclejdk8
 env:
-  - SCALAJS_VERSION=0.6.21
-  - SCALAJS_VERSION=1.0.0-M1
-  - SCALAJS_VERSION=1.0.0-M2
+  - SCALAJS_VERSION=0.6.22
+  - SCALAJS_VERSION=1.0.0-M3
+matrix:
+  exclude:
+    - scala: 2.10.7
+      env: SCALAJS_VERSION=1.0.0-M3
 
 cache:
   directories:

build.sbt

@@ -1,6 +1,6 @@
 import sbtcrossproject.crossProject
 
-crossScalaVersions in ThisBuild := Seq("2.12.4", "2.11.12", "2.10.7", "2.13.0-M2")
+crossScalaVersions in ThisBuild := Seq("2.12.5", "2.11.12", "2.10.7", "2.13.0-M3")
 scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild).value.head
 
 val commonSettings: Seq[Setting[_]] = Seq(

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=0.13.17

project/build.sbt

@@ -1,13 +1,7 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.21")
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.22")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
-
-{
-  if (scalaJSVersion != "1.0.0-M1")
-    addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.0")
-  else
-    Nil
-}
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.0")
 
 addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")

testSuite/js/src/test/scala/org/scalajs/testsuite/utils/Platform.scala

@@ -7,7 +7,7 @@
 \*                                                                      */
 package org.scalajs.testsuite.utils
 
-import scala.scalajs.runtime
+import scala.scalajs.js
 
 object Platform {
   /** Returns `true` if and only if the code is executing on a JVM.
@@ -23,5 +23,5 @@ object Platform {
   // (i.e. do no link on the JVM).
 
   def areTypedArraysSupported: Boolean =
-    runtime.Bits.areTypedArraysSupported
+    js.typeOf(js.constructorOf[js.typedarray.ArrayBuffer]) != "undefined"
 }