Skip to content

Merge branch 'series/1.x' into master #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 30, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -22,16 +22,16 @@ jobs:
uses: japgolly/[email protected]

- name: Build
run: sbt "++${{ matrix.scalaversion }}" package
run: sbt -DCI=1 "++${{ matrix.scalaversion }}" package

- name: Test generate documentation
run: sbt "++${{ matrix.scalaversion }}" doc
run: sbt -DCI=1 "++${{ matrix.scalaversion }}" doc

- name: Build examples
run: sbt "++${{ matrix.scalaversion }}" example/compile
run: sbt -DCI=1 "++${{ matrix.scalaversion }}" example/compile

- name: Validate formatting
run: sbt "++${{ matrix.scalaversion }}" scalafmtCheck
run: sbt -DCI=1 "++${{ matrix.scalaversion }}" scalafmtCheck

- name: Validate api report
if: matrix.scalaversion != '2.11.12' && matrix.scalaversion != '3.0.1'
17 changes: 17 additions & 0 deletions .scalafix.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
rules = [
OrganizeImports,
RemoveUnused,
GenerateApiReport,
]

RemoveUnused {
imports = false
privates = true
locals = true
}

OrganizeImports {
expandRelative = true
groupedImports = Merge
groupExplicitlyImportedImplicitsSeparately = false
groups = ["*"]
importSelectorsOrder = Ascii
removeUnused = true
}
20 changes: 17 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -34,12 +34,26 @@ lazy val root = project

name := "Scala.js DOM"

ThisBuild / crossScalaVersions := Seq("2.12.10", "2.11.12", "2.13.1", "3.0.1")
ThisBuild / scalaVersion := crossScalaVersions.value.head
ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.12", "2.13.4", "3.0.1")
ThisBuild / scalaVersion := crossScalaVersions.value.find(_.startsWith("2.13.")).get

val inCI = Option(System.getenv("CI")).exists(_.contains("1"))

val commonSettings = Seq(
organization := "org.scala-js",
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")
scalacOptions ++= Seq(
"-deprecation",
"-feature",
),
scalacOptions ++= (if (!inCI) Seq.empty else Seq(
"-Xfatal-warnings",
)),
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 11)) => "-Ywarn-unused-import" :: Nil
case Some((2, 12)) => "-Ywarn-unused:imports,patvars,locals,implicits" :: Nil
case Some((2, 13)) => "-Wunused:imports,patvars,locals,implicits" :: Nil
case _ => Nil
}),
)

val noPublishSettings = Seq(
4 changes: 4 additions & 0 deletions scalafix.sbt
Original file line number Diff line number Diff line change
@@ -8,3 +8,7 @@ ThisBuild / scalacOptions ++= {
else
Nil
}

ThisBuild / scalafixDependencies ++= Seq(
"com.github.liancheng" %% "organize-imports" % "0.5.0"
)
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package org.scalajs.dom.ext

import scala.collection.mutable

import org.scalajs.dom._
import scala.collection.mutable

class NamedNodeMapMap private[ext] (namedNodeMap: NamedNodeMap)
extends mutable.Map[String, Attr] {
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package org.scalajs.dom.ext

import scala.collection.mutable

import org.scalajs.dom._
import scala.collection.mutable

class NamedNodeMapMap private[ext] (namedNodeMap: NamedNodeMap)
extends mutable.Map[String, Attr] {
5 changes: 2 additions & 3 deletions src/main/scala/org/scalajs/dom/crypto/package.scala
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package org.scalajs.dom

import scala.language.implicitConversions
import scala.scalajs.js
import scala.scalajs.js.typedarray.{ArrayBufferView, ArrayBuffer, Uint8Array}
import scala.scalajs.js.typedarray.{ArrayBuffer, ArrayBufferView, Uint8Array}
import scala.scalajs.js.|

import scala.language.implicitConversions

package object crypto {
@inline def crypto = GlobalCrypto.crypto

Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.scalajs.dom.experimental

import org.scalajs.dom.raw.EventTarget

import scala.scalajs.js
import scala.scalajs.js.annotation.JSGlobal

1 change: 0 additions & 1 deletion src/main/scala/org/scalajs/dom/experimental/Fetch.scala
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@ package org.scalajs.dom.experimental

import org.scalajs.dom.Blob
import org.scalajs.dom.raw.FormData

import scala.scalajs.js
import scala.scalajs.js.annotation._
import scala.scalajs.js.typedarray.{ArrayBuffer, Uint8Array}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.scalajs.dom.experimental

import org.scalajs.dom.raw.Blob

import scala.scalajs.js
import scala.scalajs.js.annotation._
import scala.scalajs.js.typedarray.ArrayBuffer
3 changes: 1 addition & 2 deletions src/main/scala/org/scalajs/dom/experimental/Fullscreen.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.scalajs.dom.experimental

import org.scalajs.dom.raw.{Event, Element, Document}

import org.scalajs.dom.raw.{Document, Element, Event}
import scala.language.implicitConversions
import scala.scalajs.js

Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package org.scalajs.dom.experimental

import org.scalajs.dom.raw.EventTarget
import scala.scalajs.js
import scala.scalajs.js.annotation._

import org.scalajs.dom.raw.EventTarget

@js.native
trait NotificationOptions extends js.Object {

Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.scalajs.dom.experimental

import org.scalajs.dom.raw.{Event, MouseEvent, Element, Document}

import org.scalajs.dom.raw.{Document, Element, Event, MouseEvent}
import scala.language.implicitConversions
import scala.scalajs.js

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.scalajs.dom.experimental

import scala.language.implicitConversions
import scalajs.js
import scala.scalajs.js

/**
* Implicit imports for the vibration api.
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package org.scalajs.dom.experimental

import org.scalajs.dom.raw.{Navigator, WorkerNavigator}

import scala.scalajs.js
import scala.language.implicitConversions
import scala.scalajs.js

/**
* The Beacon interface is used to schedule an asynchronous and non-blocking
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.scalajs.dom.experimental.cachestorage

import org.scalajs.dom.experimental._
import scala.scalajs.js
import scala.scalajs.js.annotation._
import org.scalajs.dom.experimental._

/**
* See [[https://slightlyoff.github.io/ServiceWorker/spec/service_worker_1/#cache ¶5.4 cache]]
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@ package org.scalajs.dom.experimental.deviceorientation

import org.scalajs.dom
import org.scalajs.dom.raw.EventInit

import scala.scalajs.js
import scala.scalajs.js.annotation._

Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package org.scalajs.dom.experimental.domparser

import org.scalajs.dom.raw.Document
import scala.scalajs.js
import scala.scalajs.js.annotation._
import scala.scalajs.js.|

import org.scalajs.dom.raw.{Document, HTMLDocument}

/**
* DOMParser can parse XML or HTML source stored in a string into a DOM Document.
Original file line number Diff line number Diff line change
@@ -6,11 +6,10 @@

package org.scalajs.dom.experimental.gamepad

import scala.scalajs.js
import scala.scalajs.js.annotation._

import org.scalajs.dom
import org.scalajs.dom.raw.EventInit
import scala.scalajs.js
import scala.scalajs.js.annotation._

@js.native
trait GamepadMappingType extends js.Any
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package org.scalajs.dom.experimental

import language.implicitConversions

import org.scalajs.dom
import scala.language.implicitConversions

/**
* Implements the Gamepad API.
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@
package org.scalajs.dom.experimental.intl

import scala.scalajs.js
import scala.scalajs.js.|
import scala.scalajs.js.annotation._
import scala.scalajs.js.|

/**
* The Intl.Collator object is a constructor for collators, objects that enable language
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@
*/
package org.scalajs.dom.experimental.mediastream

import org.scalajs.dom.raw.{Event, EventInit, EventTarget, TimeRanges}
import scala.scalajs.js
import scala.scalajs.js.|
import scala.scalajs.js.annotation._
import org.scalajs.dom.raw.{Event, EventInit, EventTarget, TimeRanges}
import scala.scalajs.js.|

/**
* The MediaStream
1 change: 0 additions & 1 deletion src/main/scala/org/scalajs/dom/experimental/package.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.scalajs.dom

import org.scalajs.dom.crypto.BufferSource

import scala.scalajs.js
import scala.scalajs.js.|

Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package org.scalajs.dom.experimental

import scala.language.implicitConversions

import org.scalajs.dom

import scala.language.implicitConversions
import scala.scalajs.js

/**
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@ package org.scalajs.dom.experimental.push

import org.scalajs.dom.experimental.serviceworkers.ExtendableEvent
import org.scalajs.dom.raw.Blob

import scala.scalajs.js
import scala.scalajs.js.typedarray.{ArrayBuffer, Uint8Array}

Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package org.scalajs.dom.experimental

import scala.language.implicitConversions

import org.scalajs.dom.experimental.serviceworkers.{
ServiceWorkerGlobalScope, ServiceWorkerRegistration
}

import scala.language.implicitConversions
import scala.scalajs.js

/**
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package org.scalajs.dom.experimental.serviceworkers

import scala.scalajs.js
import scala.scalajs.js.annotation._
import scala.scalajs.js.|

import org.scalajs.dom.experimental.{
Notification, NotificationOptions, Request, RequestInfo, Response, Sequence
Notification, NotificationOptions, Request, Response, Sequence
}
import org.scalajs.dom.experimental.cachestorage._
import org.scalajs.dom.raw.{ErrorEvent, EventInit, WorkerGlobalScope}
import org.scalajs.dom.raw.{EventInit, WorkerGlobalScope}
import org.scalajs.dom.webgl.RenderingContext
import org.scalajs.dom.{Event, EventTarget, MessageEvent, MessagePort}
import scala.scalajs.js
import scala.scalajs.js.annotation._
import scala.scalajs.js.|

@js.native
sealed trait FrameType extends js.Any
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package org.scalajs.dom.experimental.sharedworkers

import scala.scalajs.js
import scala.scalajs.js.annotation._

import org.scalajs.dom.raw.MessagePort
import org.scalajs.dom.webworkers
import scala.scalajs.js
import scala.scalajs.js.annotation._

/**
* The SharedWorker interface represents a specific kind of worker that can be
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package org.scalajs.dom.experimental.sharedworkers

import org.scalajs.dom.experimental.serviceworkers.ExtendableMessageEvent
import org.scalajs.dom.raw.ApplicationCache
import org.scalajs.dom.raw.WorkerGlobalScope

import org.scalajs.dom.raw.{ApplicationCache, WorkerGlobalScope}
import scala.scalajs.js
import scala.scalajs.js.annotation._

Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.scalajs.dom.experimental

import org.scalajs.dom

import scala.language.implicitConversions
import scala.scalajs.js

Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.scalajs.dom.experimental.webgl.extensions

import org.scalajs.dom.raw.WebGLShader

import scala.scalajs.js

/**
11 changes: 5 additions & 6 deletions src/main/scala/org/scalajs/dom/experimental/webrtc/WebRTC.scala
Original file line number Diff line number Diff line change
@@ -3,16 +3,15 @@
*/
package org.scalajs.dom.experimental.webrtc

import scala.scalajs.js
import scala.scalajs.js.annotation._
import scala.scalajs.js.typedarray.{ArrayBufferView, ArrayBuffer}
import scala.scalajs.js.|

import org.scalajs.dom.Blob
import org.scalajs.dom.experimental.mediastream._
import org.scalajs.dom.raw.{
DOMException, Event, EventInit, EventTarget, MessageEvent
}
import org.scalajs.dom.experimental.mediastream._
import scala.scalajs.js
import scala.scalajs.js.annotation._
import scala.scalajs.js.typedarray.{ArrayBuffer, ArrayBufferView}
import scala.scalajs.js.|

@js.native
trait RTCIdentityAssertion extends js.Object {
Loading