Skip to content

Commit 57c9064

Browse files
committed
Upgrade to Scala.js 0.6.22, drop 1.0.0-M1 and M2 in favor of M3.
1 parent 3ebfe48 commit 57c9064

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

.travis.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@ scala:
1414
jdk:
1515
- oraclejdk8
1616
env:
17-
- SCALAJS_VERSION=0.6.21
18-
- SCALAJS_VERSION=1.0.0-M1
19-
- SCALAJS_VERSION=1.0.0-M2
17+
- SCALAJS_VERSION=0.6.22
18+
- SCALAJS_VERSION=1.0.0-M3
19+
matrix:
20+
exclude:
21+
- scala: 2.10.7
22+
env: SCALAJS_VERSION=1.0.0-M3
2023

2124
cache:
2225
directories:

project/build.sbt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.21")
2+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.22")
33

44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
5-
6-
{
7-
if (scalaJSVersion != "1.0.0-M1")
8-
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.0")
9-
else
10-
Nil
11-
}
5+
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.0")
126

137
addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
\* */
88
package org.scalajs.testsuite.utils
99

10-
import scala.scalajs.runtime
10+
import scala.scalajs.js
1111

1212
object Platform {
1313
/** Returns `true` if and only if the code is executing on a JVM.
@@ -23,5 +23,5 @@ object Platform {
2323
// (i.e. do no link on the JVM).
2424

2525
def areTypedArraysSupported: Boolean =
26-
runtime.Bits.areTypedArraysSupported
26+
js.typeOf(js.constructorOf[js.typedarray.ArrayBuffer]) != "undefined"
2727
}

0 commit comments

Comments
 (0)