Merge pull request #258 from sjrd/upgrade-dependencies

Upgrade to sbt 0.13.13, Scala.js 0.6.14 and Scala 2.12.1.

Author: sjrd

.travis.yml

@@ -6,6 +6,6 @@ script:
 scala:
   - 2.10.6
   - 2.11.8
-  - 2.12.0-M4
+  - 2.12.1
 jdk:
   - oraclejdk8

build.sbt

@@ -5,7 +5,7 @@ lazy val root = project.in(file(".")).
 
 name := "Scala.js DOM"
 
-crossScalaVersions in ThisBuild := Seq("2.11.8", "2.10.6", "2.12.0-M4")
+crossScalaVersions in ThisBuild := Seq("2.11.8", "2.10.6", "2.12.1")
 scalaVersion in ThisBuild := crossScalaVersions.value.head
 
 val commonSettings = Seq(

project/build.properties

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

project/build.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.8")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.14")
 
 addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.2.1")

src/main/scala/org/scalajs/dom/crypto/Crypto.scala

@@ -1,10 +1,12 @@
 package org.scalajs.dom.crypto
 
 import scala.scalajs.js
+import scala.scalajs.js.annotation._
 import scala.scalajs.js.typedarray.ArrayBufferView
 
 @js.native
-object GlobalCrypto extends js.GlobalScope {
+@JSGlobalScope
+object GlobalCrypto extends js.Object {
   val crypto: Crypto = js.native
 }
 

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

@@ -4,12 +4,13 @@ import org.scalajs.dom.Blob
 import org.scalajs.dom.raw.FormData
 
 import scala.scalajs.js
-import scala.scalajs.js.annotation.{JSName, ScalaJSDefined}
+import scala.scalajs.js.annotation._
 import scala.scalajs.js.dom.experimental.JSIterable
 import scala.scalajs.js.typedarray.{ArrayBuffer, Uint8Array}
 
 @js.native
-object Fetch extends js.GlobalScope {
+@JSGlobalScope
+object Fetch extends js.Object {
 
   /**
    * [[https://fetch.spec.whatwg.org/#fetch-method ¶6.0 Fetch method]] defined in WhatWG spec

src/main/scala/org/scalajs/dom/experimental/serviceworkers/ServiceWorkers.scala

@@ -1,11 +1,13 @@
 package org.scalajs.dom.experimental.serviceworkers
 
+import scala.scalajs.js
+import scala.scalajs.js.annotation._
+import scala.scalajs.js.|
+
 import org.scalajs.dom.experimental.{Request, RequestInfo, Response, Sequence}
 import org.scalajs.dom.raw.{WorkerGlobalScope, ErrorEvent}
 import org.scalajs.dom.webgl.RenderingContext
 import org.scalajs.dom.{Event, EventTarget, MessagePort}
-import scala.scalajs.js
-import scala.scalajs.js.|
 
 @js.native
 sealed trait FrameType extends js.Any
@@ -741,6 +743,7 @@ trait ServiceWorkerGlobalScope extends WorkerGlobalScope {
 }
 
 @js.native
-object ServiceWorkerGlobalScope extends js.GlobalScope {
+@JSGlobalScope
+object ServiceWorkerGlobalScope extends js.Object {
   def self: ServiceWorkerGlobalScope = js.native
 }

src/main/scala/org/scalajs/dom/experimental/sharedworkers/SharedWorkerGlobalScope.scala

@@ -5,6 +5,7 @@ import org.scalajs.dom.raw.ApplicationCache
 import org.scalajs.dom.raw.WorkerGlobalScope
 
 import scala.scalajs.js
+import scala.scalajs.js.annotation._
 
 /**
  * The SharedWorkerGlobalScope object (the SharedWorker global scope) is
@@ -47,6 +48,7 @@ trait SharedWorkerGlobalScope extends WorkerGlobalScope {
 }
 
 @js.native
-object SharedWorkerGlobalScope extends js.GlobalScope {
+@JSGlobalScope
+object SharedWorkerGlobalScope extends js.Object {
   def self: SharedWorkerGlobalScope = js.native
 }

src/main/scala/org/scalajs/dom/raw/WebWorkers.scala

@@ -1,6 +1,7 @@
 package org.scalajs.dom.raw
 
 import scala.scalajs.js
+import scala.scalajs.js.annotation._
 
 /**
  * The AbstractWorker interface abstracts properties and methods common to all
@@ -253,7 +254,8 @@ trait DedicatedWorkerGlobalScope extends WorkerGlobalScope {
 }
 
 @js.native
-object DedicatedWorkerGlobalScope extends js.GlobalScope {
+@JSGlobalScope
+object DedicatedWorkerGlobalScope extends js.Object {
 
   /**
    * Returns an object reference to the DedicatedWorkerGlobalScope object itself.