Merge pull request scala-js#288 from sjrd/support-scalajs-1.x

Add cross-building support with Scala.js 1.0.0-M1.

Author: gzm0

.travis.yml

@@ -11,3 +11,6 @@ scala:
  - 2.13.0-M1
 jdk:
  - oraclejdk8
+env:
+ - SCALAJS_VERSION=0.6.18
+ - SCALAJS_VERSION=1.0.0-M1

build.sbt

@@ -32,6 +32,11 @@ scalacOptions ++= {
  }
 }
 
+scalacOptions ++= {
+ if (scalaJSVersion.startsWith("0.6.")) Seq("-P:scalajs:sjsDefinedByDefault")
+ else Nil
+}
+
 scmInfo := Some(ScmInfo(
  url("https://github.com/scala-js/scala-js-dom"),
  "scm:git:git@github.com:scala-js/scala-js-dom.git",

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.13
+sbt.version=0.13.15

project/build.sbt

@@ -1,4 +1,7 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.16")
+val scalaJSVersion =
+ Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.18")
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 
 addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.2.1")
 

src/main/scala/org/scalajs/dom/experimental/Fetch.scala

@@ -5,7 +5,6 @@ import org.scalajs.dom.raw.FormData
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
-import scala.scalajs.js.dom.experimental.JSIterable
 import scala.scalajs.js.typedarray.{ArrayBuffer, Uint8Array}
 
 @js.native
@@ -129,7 +128,6 @@ object RequestInit {
  * The underlying object is a dictionary. This trait is here to help encode
  * the types.
  */
-@ScalaJSDefined
 trait RequestInit extends js.Object {
  var method: js.UndefOr[HttpMethod]
 
@@ -225,7 +223,6 @@ object Response extends js.Object {
  * definition in whatwg Fetch spec.
  *
  */
-@ScalaJSDefined
 trait ResponseInit extends js.Object {
  var status: Int
  var statusText: ByteString
@@ -315,7 +312,10 @@ trait Body extends js.Object {
 @js.native
 @JSGlobal
 class Headers(map: HeadersInit = js.Array[js.Array[String]]())
- extends JSIterable[js.Array[ByteString]] {
+ extends js.Iterable[js.Array[ByteString]] {
+
+ @JSName(js.Symbol.iterator)
+ def jsIterator(): js.Iterator[js.Array[ByteString]] = js.native
 
  /**
  * The append() method of the Headers interface appends a new value onto an

src/main/scala/org/scalajs/dom/experimental/JSIterable.scala

@@ -29,7 +29,6 @@ class DeviceOrientationEvent(
  val absolute: Boolean = js.native
 }
 
-@ScalaJSDefined
 trait DeviceOrientationEventInit extends js.Object {
 
  /** Z-Axis rotation in degrees. */
@@ -58,7 +57,6 @@ object DeviceOrientationEventInit {
  }
 }
 
-@ScalaJSDefined
 trait DeviceAcceleration extends js.Any {
 
  /** The acceleration in x. In m/s<sup>2</sup>. */
@@ -71,7 +69,6 @@ trait DeviceAcceleration extends js.Any {
  val z: Double
 }
 
-@ScalaJSDefined
 trait DeviceRotationRate extends js.Any {
 
  /** The z axis rotation in degrees per second. */
@@ -101,7 +98,6 @@ class DeviceMotionEvent extends dom.Event {
  val interval: Double = js.native
 }
 
-@ScalaJSDefined
 trait DeviceMotionEventInit extends js.Any {
 
  /** Device acceleration with gravity removed. */

src/main/scala/org/scalajs/dom/experimental/deviceorientation/DeviceOrientation.scala

@@ -17,7 +17,6 @@ trait GamepadMappingType extends js.Any
 /**
  * Represents the state of a button.
  */
-@ScalaJSDefined
 trait GamepadButton extends js.Any {
 
  /**
@@ -35,7 +34,6 @@ trait GamepadButton extends js.Any {
 /**
  * Represents the state of a connected gamepad device.
  */
-@ScalaJSDefined
 trait Gamepad extends js.Any {
 
  /** The identification string for the gamepad. */
@@ -67,7 +65,6 @@ trait Gamepad extends js.Any {
  val mapping: GamepadMappingType
 }
 
-@ScalaJSDefined
 trait GamepadEventInit extends js.Any {
  val gamepad: Gamepad
 }

src/main/scala/org/scalajs/dom/experimental/gamepad/Gamepad.scala

@@ -326,7 +326,6 @@ trait MediaStreamTrack extends EventTarget {
  def stop(): Unit = js.native
 }
 
-@ScalaJSDefined
 trait MediaTrackSettings extends js.Object {
  var width: js.UndefOr[Double] = js.undefined
  var height: js.UndefOr[Double] = js.undefined
@@ -633,7 +632,6 @@ trait MediaDevices extends EventTarget {
  *
  * MDN
  */
-@ScalaJSDefined
 trait MediaTrackSupportedConstraints extends js.Object {
  var width: js.UndefOr[Boolean] = js.undefined
  var height: js.UndefOr[Boolean] = js.undefined

src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStream.scala

@@ -232,7 +232,7 @@ package object dom {
  lazy val XPathResult: raw.XPathResult.type = raw.XPathResult
  type XPathNSResolver = raw.XPathNSResolver
 
- lazy val window: Window = js.Dynamic.global.asInstanceOf[Window]
+ lazy val window: Window = js.Dynamic.global.window.asInstanceOf[Window]
  lazy val document: html.Document = window.document
 
  lazy val console: Console = window.console