File tree Expand file tree Collapse file tree 3 files changed +10
-13
lines changed
testSuite/js/src/test/scala/org/scalajs/testsuite/utils Expand file tree Collapse file tree 3 files changed +10
-13
lines changed Original file line number Diff line number Diff line change @@ -14,9 +14,12 @@ scala:
14
14
jdk :
15
15
- oraclejdk8
16
16
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
20
23
21
24
cache :
22
25
directories :
Original file line number Diff line number Diff line change 1
1
val scalaJSVersion =
2
- Option (System .getenv(" SCALAJS_VERSION" )).getOrElse(" 0.6.21 " )
2
+ Option (System .getenv(" SCALAJS_VERSION" )).getOrElse(" 0.6.22 " )
3
3
4
4
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" )
12
6
13
7
addSbtPlugin(" org.scalastyle" % " scalastyle-sbt-plugin" % " 0.8.0" )
Original file line number Diff line number Diff line change 7
7
\* */
8
8
package org .scalajs .testsuite .utils
9
9
10
- import scala .scalajs .runtime
10
+ import scala .scalajs .js
11
11
12
12
object Platform {
13
13
/** Returns `true` if and only if the code is executing on a JVM.
@@ -23,5 +23,5 @@ object Platform {
23
23
// (i.e. do no link on the JVM).
24
24
25
25
def areTypedArraysSupported : Boolean =
26
- runtime. Bits .areTypedArraysSupported
26
+ js.typeOf(js.constructorOf[js.typedarray. ArrayBuffer ]) != " undefined "
27
27
}
You can’t perform that action at this time.
0 commit comments