Merge branch 'master' into HEAD

Author: armanbilge

api-reports/2_12.txt

@@ -14,7 +14,7 @@ object Lib {
  "-deprecation",
  "-feature",
  ),
- scalacOptions ++= (if (!inCI) Seq.empty else Seq(
+ scalacOptions ++= (if (!inCI || CrossVersion.partialVersion(scalaVersion.value).contains(2, 11)) Seq.empty else Seq(
  "-Xfatal-warnings",
  )),
  scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {

api-reports/2_13.txt

@@ -3,7 +3,7 @@ libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1"
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.9")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
 addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.11")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")

project/Lib.scala

@@ -0,0 +1,11 @@
+package org.scalajs.dom
+
+import scala.scalajs.js
+
+@js.native
+sealed trait AppendMode extends js.Any
+
+object AppendMode {
+ val segments: AppendMode = "segments".asInstanceOf[AppendMode]
+ val sequence: AppendMode = "sequence".asInstanceOf[AppendMode]
+}

project/plugins.sbt

@@ -1,4 +1,4 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
 import scala.scalajs.js
 

src/main/scala-2/org/scalajs/dom/AppendMode.scala

@@ -0,0 +1,11 @@
+package org.scalajs.dom
+
+import scala.scalajs.js
+
+@js.native
+sealed trait EndOfStreamError extends js.Any
+
+object EndOfStreamError {
+ val decode: EndOfStreamError = "decode".asInstanceOf[EndOfStreamError]
+ val network: EndOfStreamError = "network".asInstanceOf[EndOfStreamError]
+}

src/main/scala/org/scalajs/dom/experimental/serviceworkers/ClientType.scala renamed to src/main/scala-2/org/scalajs/dom/ClientType.scala

@@ -1,4 +1,4 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
 import scala.scalajs.js
 

src/main/scala-2/org/scalajs/dom/EndOfStreamError.scala

@@ -16,20 +16,20 @@ object IDBCursorDirection {
  /** The cursor shows all records, including duplicates. It starts at the upper bound of the key range and moves
  * downwards (monotonically decreasing in the order of keys).
  */
- @inline def prev: IDBCursorDirection = "prev".asInstanceOf[IDBCursorDirection]
+ val prev: IDBCursorDirection = "prev".asInstanceOf[IDBCursorDirection]
 
  /** The cursor shows all records, excluding duplicates. If multiple records exist with the same key, only the first
  * one iterated is retrieved. It starts at the upper bound of the key range and moves downwards.
  */
- @inline def prevunique: IDBCursorDirection = "prevunique".asInstanceOf[IDBCursorDirection]
+ val prevunique: IDBCursorDirection = "prevunique".asInstanceOf[IDBCursorDirection]
 
  /** The cursor shows all records, including duplicates. It starts at the lower bound of the key range and moves
  * upwards (monotonically increasing in the order of keys).
  */
- @inline def next: IDBCursorDirection = "next".asInstanceOf[IDBCursorDirection]
+ val next: IDBCursorDirection = "next".asInstanceOf[IDBCursorDirection]
 
  /** The cursor shows all records, excluding duplicates. If multiple records exist with the same key, only the first
  * one iterated is retrieved. It starts at the lower bound of the key range and moves upwards.
  */
- @inline def nextunique: IDBCursorDirection = "nextunique".asInstanceOf[IDBCursorDirection]
+ val nextunique: IDBCursorDirection = "nextunique".asInstanceOf[IDBCursorDirection]
 }

src/main/scala/org/scalajs/dom/experimental/serviceworkers/FrameType.scala renamed to src/main/scala-2/org/scalajs/dom/FrameType.scala

@@ -12,7 +12,7 @@ import scala.scalajs.js
 sealed trait IDBTransactionDurability extends js.Any
 
 object IDBTransactionDurability {
- @inline def default: IDBTransactionDurability = "default".asInstanceOf[IDBTransactionDurability]
- @inline def strict: IDBTransactionDurability = "strict".asInstanceOf[IDBTransactionDurability]
- @inline def relaxed: IDBTransactionDurability = "relaxed".asInstanceOf[IDBTransactionDurability]
+ val default: IDBTransactionDurability = "default".asInstanceOf[IDBTransactionDurability]
+ val strict: IDBTransactionDurability = "strict".asInstanceOf[IDBTransactionDurability]
+ val relaxed: IDBTransactionDurability = "relaxed".asInstanceOf[IDBTransactionDurability]
 }