From b0fa8f9f06b8aa8223688ce425f6a786fc7a0a81 Mon Sep 17 00:00:00 2001 From: David Barri Date: Mon, 30 Aug 2021 09:04:23 +1000 Subject: [PATCH] Auto-format imports --- .github/workflows/ci.yml | 8 +++---- .scalafix.conf | 17 ++++++++++++++ build.sbt | 22 +++++++++++++++---- scalafix.sbt | 4 ++++ .../org/scalajs/dom/ext/NamedNodeMapMap.scala | 3 +-- .../org/scalajs/dom/ext/NamedNodeMapMap.scala | 3 +-- .../org/scalajs/dom/crypto/package.scala | 5 ++--- .../dom/experimental/AbortController.scala | 1 - .../org/scalajs/dom/experimental/Fetch.scala | 1 - .../dom/experimental/FileReaderSync.scala | 1 - .../scalajs/dom/experimental/Fullscreen.scala | 3 +-- .../dom/experimental/Notification.scala | 3 +-- .../dom/experimental/PointerLock.scala | 3 +-- .../scalajs/dom/experimental/Vibration.scala | 2 +- .../dom/experimental/beacon/package.scala | 3 +-- .../cachestorage/CacheStorage.scala | 2 +- .../deviceorientation/DeviceOrientation.scala | 1 - .../experimental/domparser/DOMParser.scala | 4 +--- .../dom/experimental/gamepad/Gamepad.scala | 5 ++--- .../dom/experimental/gamepad/package.scala | 3 +-- .../scalajs/dom/experimental/intl/Intl.scala | 2 +- .../mediastream/MediaStream.scala | 4 ++-- .../scalajs/dom/experimental/package.scala | 1 - .../experimental/permissions/package.scala | 4 +--- .../dom/experimental/push/PushManager.scala | 1 - .../dom/experimental/push/package.scala | 4 +--- .../serviceworkers/ServiceWorkers.scala | 12 +++++----- .../sharedworkers/SharedWorker.scala | 5 ++--- .../SharedWorkerGlobalScope.scala | 4 +--- .../dom/experimental/storage/package.scala | 1 - .../webgl/extensions/Extensions.scala | 1 - .../dom/experimental/webrtc/WebRTC.scala | 11 +++++----- .../dom/experimental/webrtc/package.scala | 4 +--- .../org/scalajs/dom/ext/Extensions.scala | 13 +++++------ .../scala/org/scalajs/dom/ext/package.scala | 2 -- .../scala/org/scalajs/dom/raw/Audio.scala | 1 - src/main/scala/org/scalajs/dom/raw/Html.scala | 3 +-- .../dom/raw/WindowOrWorkerGlobalScope.scala | 5 ++--- .../scala/org/scalajs/dom/raw/package.scala | 3 +-- 39 files changed, 85 insertions(+), 90 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6747b78c..91cd74ca4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,16 +32,16 @@ jobs: run: ./prepareForScala210.sh - 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.scalajsversion == '1.x' && matrix.scalaversion != '2.11.12' diff --git a/.scalafix.conf b/.scalafix.conf index 492c6f237..0d0427ef9 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -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 +} diff --git a/build.sbt b/build.sbt index 5ddeaf583..bd184981f 100644 --- a/build.sbt +++ b/build.sbt @@ -23,14 +23,28 @@ lazy val root = project name := "Scala.js DOM" ThisBuild / crossScalaVersions := { - if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1") - else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1") + if (scalaJSVersion.startsWith("1.")) Seq("2.11.12", "2.12.10","2.13.1") + else Seq("2.10.7", "2.11.12", "2.12.10", "2.13.1") } -ThisBuild / scalaVersion := crossScalaVersions.value.head +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( diff --git a/scalafix.sbt b/scalafix.sbt index 94d7628fe..c14eb48d0 100644 --- a/scalafix.sbt +++ b/scalafix.sbt @@ -8,3 +8,7 @@ ThisBuild / scalacOptions ++= { else Nil } + +ThisBuild / scalafixDependencies ++= Seq( + "com.github.liancheng" %% "organize-imports" % "0.5.0" +) diff --git a/src/main/scala-new-collections/org/scalajs/dom/ext/NamedNodeMapMap.scala b/src/main/scala-new-collections/org/scalajs/dom/ext/NamedNodeMapMap.scala index 0388f6fa2..5fdcf0546 100644 --- a/src/main/scala-new-collections/org/scalajs/dom/ext/NamedNodeMapMap.scala +++ b/src/main/scala-new-collections/org/scalajs/dom/ext/NamedNodeMapMap.scala @@ -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] { diff --git a/src/main/scala-old-collections/org/scalajs/dom/ext/NamedNodeMapMap.scala b/src/main/scala-old-collections/org/scalajs/dom/ext/NamedNodeMapMap.scala index 2cb97444d..994a40571 100644 --- a/src/main/scala-old-collections/org/scalajs/dom/ext/NamedNodeMapMap.scala +++ b/src/main/scala-old-collections/org/scalajs/dom/ext/NamedNodeMapMap.scala @@ -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] { diff --git a/src/main/scala/org/scalajs/dom/crypto/package.scala b/src/main/scala/org/scalajs/dom/crypto/package.scala index a77f845ee..227fb4cfc 100644 --- a/src/main/scala/org/scalajs/dom/crypto/package.scala +++ b/src/main/scala/org/scalajs/dom/crypto/package.scala @@ -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 diff --git a/src/main/scala/org/scalajs/dom/experimental/AbortController.scala b/src/main/scala/org/scalajs/dom/experimental/AbortController.scala index a4107a261..438416e09 100644 --- a/src/main/scala/org/scalajs/dom/experimental/AbortController.scala +++ b/src/main/scala/org/scalajs/dom/experimental/AbortController.scala @@ -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 diff --git a/src/main/scala/org/scalajs/dom/experimental/Fetch.scala b/src/main/scala/org/scalajs/dom/experimental/Fetch.scala index c05457f48..1d8401f05 100644 --- a/src/main/scala/org/scalajs/dom/experimental/Fetch.scala +++ b/src/main/scala/org/scalajs/dom/experimental/Fetch.scala @@ -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} diff --git a/src/main/scala/org/scalajs/dom/experimental/FileReaderSync.scala b/src/main/scala/org/scalajs/dom/experimental/FileReaderSync.scala index 7959edde5..e3dfa829f 100644 --- a/src/main/scala/org/scalajs/dom/experimental/FileReaderSync.scala +++ b/src/main/scala/org/scalajs/dom/experimental/FileReaderSync.scala @@ -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 diff --git a/src/main/scala/org/scalajs/dom/experimental/Fullscreen.scala b/src/main/scala/org/scalajs/dom/experimental/Fullscreen.scala index 6a522329d..d5ad3d3f9 100644 --- a/src/main/scala/org/scalajs/dom/experimental/Fullscreen.scala +++ b/src/main/scala/org/scalajs/dom/experimental/Fullscreen.scala @@ -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 diff --git a/src/main/scala/org/scalajs/dom/experimental/Notification.scala b/src/main/scala/org/scalajs/dom/experimental/Notification.scala index 50bfec1e6..6d5f0c63f 100644 --- a/src/main/scala/org/scalajs/dom/experimental/Notification.scala +++ b/src/main/scala/org/scalajs/dom/experimental/Notification.scala @@ -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 { diff --git a/src/main/scala/org/scalajs/dom/experimental/PointerLock.scala b/src/main/scala/org/scalajs/dom/experimental/PointerLock.scala index 3f16ef8c9..dab86a874 100644 --- a/src/main/scala/org/scalajs/dom/experimental/PointerLock.scala +++ b/src/main/scala/org/scalajs/dom/experimental/PointerLock.scala @@ -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 diff --git a/src/main/scala/org/scalajs/dom/experimental/Vibration.scala b/src/main/scala/org/scalajs/dom/experimental/Vibration.scala index 6338939de..a288e6bc5 100644 --- a/src/main/scala/org/scalajs/dom/experimental/Vibration.scala +++ b/src/main/scala/org/scalajs/dom/experimental/Vibration.scala @@ -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. diff --git a/src/main/scala/org/scalajs/dom/experimental/beacon/package.scala b/src/main/scala/org/scalajs/dom/experimental/beacon/package.scala index dacd29d13..34a7bff34 100644 --- a/src/main/scala/org/scalajs/dom/experimental/beacon/package.scala +++ b/src/main/scala/org/scalajs/dom/experimental/beacon/package.scala @@ -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 diff --git a/src/main/scala/org/scalajs/dom/experimental/cachestorage/CacheStorage.scala b/src/main/scala/org/scalajs/dom/experimental/cachestorage/CacheStorage.scala index 7b83b790e..383cd875e 100644 --- a/src/main/scala/org/scalajs/dom/experimental/cachestorage/CacheStorage.scala +++ b/src/main/scala/org/scalajs/dom/experimental/cachestorage/CacheStorage.scala @@ -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]] diff --git a/src/main/scala/org/scalajs/dom/experimental/deviceorientation/DeviceOrientation.scala b/src/main/scala/org/scalajs/dom/experimental/deviceorientation/DeviceOrientation.scala index 0b45dc942..4d64ad7d3 100644 --- a/src/main/scala/org/scalajs/dom/experimental/deviceorientation/DeviceOrientation.scala +++ b/src/main/scala/org/scalajs/dom/experimental/deviceorientation/DeviceOrientation.scala @@ -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._ diff --git a/src/main/scala/org/scalajs/dom/experimental/domparser/DOMParser.scala b/src/main/scala/org/scalajs/dom/experimental/domparser/DOMParser.scala index 890d34f4a..81d3e11e1 100644 --- a/src/main/scala/org/scalajs/dom/experimental/domparser/DOMParser.scala +++ b/src/main/scala/org/scalajs/dom/experimental/domparser/DOMParser.scala @@ -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. diff --git a/src/main/scala/org/scalajs/dom/experimental/gamepad/Gamepad.scala b/src/main/scala/org/scalajs/dom/experimental/gamepad/Gamepad.scala index 3a4f3fd23..ac94abd05 100644 --- a/src/main/scala/org/scalajs/dom/experimental/gamepad/Gamepad.scala +++ b/src/main/scala/org/scalajs/dom/experimental/gamepad/Gamepad.scala @@ -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 diff --git a/src/main/scala/org/scalajs/dom/experimental/gamepad/package.scala b/src/main/scala/org/scalajs/dom/experimental/gamepad/package.scala index 4d05b290b..2c6a03115 100644 --- a/src/main/scala/org/scalajs/dom/experimental/gamepad/package.scala +++ b/src/main/scala/org/scalajs/dom/experimental/gamepad/package.scala @@ -1,8 +1,7 @@ package org.scalajs.dom.experimental -import language.implicitConversions - import org.scalajs.dom +import scala.language.implicitConversions /** * Implements the Gamepad API. diff --git a/src/main/scala/org/scalajs/dom/experimental/intl/Intl.scala b/src/main/scala/org/scalajs/dom/experimental/intl/Intl.scala index e80f410c8..92c54db15 100644 --- a/src/main/scala/org/scalajs/dom/experimental/intl/Intl.scala +++ b/src/main/scala/org/scalajs/dom/experimental/intl/Intl.scala @@ -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 diff --git a/src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStream.scala b/src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStream.scala index e67a40536..2e52f12f7 100644 --- a/src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStream.scala +++ b/src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStream.scala @@ -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 diff --git a/src/main/scala/org/scalajs/dom/experimental/package.scala b/src/main/scala/org/scalajs/dom/experimental/package.scala index efc8328db..7fdd2729b 100644 --- a/src/main/scala/org/scalajs/dom/experimental/package.scala +++ b/src/main/scala/org/scalajs/dom/experimental/package.scala @@ -1,7 +1,6 @@ package org.scalajs.dom import org.scalajs.dom.crypto.BufferSource - import scala.scalajs.js import scala.scalajs.js.| diff --git a/src/main/scala/org/scalajs/dom/experimental/permissions/package.scala b/src/main/scala/org/scalajs/dom/experimental/permissions/package.scala index 7353a2537..c33209e50 100644 --- a/src/main/scala/org/scalajs/dom/experimental/permissions/package.scala +++ b/src/main/scala/org/scalajs/dom/experimental/permissions/package.scala @@ -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 /** diff --git a/src/main/scala/org/scalajs/dom/experimental/push/PushManager.scala b/src/main/scala/org/scalajs/dom/experimental/push/PushManager.scala index bd9652a62..f8fb86e87 100644 --- a/src/main/scala/org/scalajs/dom/experimental/push/PushManager.scala +++ b/src/main/scala/org/scalajs/dom/experimental/push/PushManager.scala @@ -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} diff --git a/src/main/scala/org/scalajs/dom/experimental/push/package.scala b/src/main/scala/org/scalajs/dom/experimental/push/package.scala index 8be4ee537..e4b098e23 100644 --- a/src/main/scala/org/scalajs/dom/experimental/push/package.scala +++ b/src/main/scala/org/scalajs/dom/experimental/push/package.scala @@ -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 /** diff --git a/src/main/scala/org/scalajs/dom/experimental/serviceworkers/ServiceWorkers.scala b/src/main/scala/org/scalajs/dom/experimental/serviceworkers/ServiceWorkers.scala index 3e30f61b6..ce1606d76 100644 --- a/src/main/scala/org/scalajs/dom/experimental/serviceworkers/ServiceWorkers.scala +++ b/src/main/scala/org/scalajs/dom/experimental/serviceworkers/ServiceWorkers.scala @@ -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 diff --git a/src/main/scala/org/scalajs/dom/experimental/sharedworkers/SharedWorker.scala b/src/main/scala/org/scalajs/dom/experimental/sharedworkers/SharedWorker.scala index 61ece18df..af6d8cc27 100644 --- a/src/main/scala/org/scalajs/dom/experimental/sharedworkers/SharedWorker.scala +++ b/src/main/scala/org/scalajs/dom/experimental/sharedworkers/SharedWorker.scala @@ -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 diff --git a/src/main/scala/org/scalajs/dom/experimental/sharedworkers/SharedWorkerGlobalScope.scala b/src/main/scala/org/scalajs/dom/experimental/sharedworkers/SharedWorkerGlobalScope.scala index 2d919f609..711c02feb 100644 --- a/src/main/scala/org/scalajs/dom/experimental/sharedworkers/SharedWorkerGlobalScope.scala +++ b/src/main/scala/org/scalajs/dom/experimental/sharedworkers/SharedWorkerGlobalScope.scala @@ -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._ diff --git a/src/main/scala/org/scalajs/dom/experimental/storage/package.scala b/src/main/scala/org/scalajs/dom/experimental/storage/package.scala index 95e98ac6e..53bcfeb98 100644 --- a/src/main/scala/org/scalajs/dom/experimental/storage/package.scala +++ b/src/main/scala/org/scalajs/dom/experimental/storage/package.scala @@ -1,7 +1,6 @@ package org.scalajs.dom.experimental import org.scalajs.dom - import scala.language.implicitConversions import scala.scalajs.js diff --git a/src/main/scala/org/scalajs/dom/experimental/webgl/extensions/Extensions.scala b/src/main/scala/org/scalajs/dom/experimental/webgl/extensions/Extensions.scala index 7de7880ab..bbb6f0a08 100644 --- a/src/main/scala/org/scalajs/dom/experimental/webgl/extensions/Extensions.scala +++ b/src/main/scala/org/scalajs/dom/experimental/webgl/extensions/Extensions.scala @@ -1,7 +1,6 @@ package org.scalajs.dom.experimental.webgl.extensions import org.scalajs.dom.raw.WebGLShader - import scala.scalajs.js /** diff --git a/src/main/scala/org/scalajs/dom/experimental/webrtc/WebRTC.scala b/src/main/scala/org/scalajs/dom/experimental/webrtc/WebRTC.scala index 5c8db2d6c..7646a4b08 100644 --- a/src/main/scala/org/scalajs/dom/experimental/webrtc/WebRTC.scala +++ b/src/main/scala/org/scalajs/dom/experimental/webrtc/WebRTC.scala @@ -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 { diff --git a/src/main/scala/org/scalajs/dom/experimental/webrtc/package.scala b/src/main/scala/org/scalajs/dom/experimental/webrtc/package.scala index d14e75c73..c5c1dac58 100644 --- a/src/main/scala/org/scalajs/dom/experimental/webrtc/package.scala +++ b/src/main/scala/org/scalajs/dom/experimental/webrtc/package.scala @@ -1,10 +1,8 @@ package org.scalajs.dom.experimental import org.scalajs.dom.experimental.mediastream._ -import org.scalajs.dom.raw.DOMException - -import scala.scalajs.js import scala.language.implicitConversions +import scala.scalajs.js package object webrtc { implicit def toWebRTC(n: org.scalajs.dom.Navigator): NavigatorMediaStream = diff --git a/src/main/scala/org/scalajs/dom/ext/Extensions.scala b/src/main/scala/org/scalajs/dom/ext/Extensions.scala index 74a5fb255..9205ef5ff 100644 --- a/src/main/scala/org/scalajs/dom/ext/Extensions.scala +++ b/src/main/scala/org/scalajs/dom/ext/Extensions.scala @@ -1,17 +1,14 @@ package org.scalajs.dom.ext import java.nio.ByteBuffer - +import org.scalajs.dom +import org.scalajs.dom.raw.{Blob, KeyboardEvent} +import org.scalajs.dom.{FormData, html, raw} +import scala.concurrent.{Future, Promise} import scala.language.implicitConversions -import scala.concurrent.{Promise, Future} - import scala.scalajs.js -import scala.scalajs.js.typedarray._ import scala.scalajs.js.typedarray.TypedArrayBufferOps._ - -import org.scalajs.dom -import org.scalajs.dom.{FormData, html, raw} -import org.scalajs.dom.raw.{Blob, KeyboardEvent} +import scala.scalajs.js.typedarray._ /** * Used to extend out javascript *Collections to make them usable as normal diff --git a/src/main/scala/org/scalajs/dom/ext/package.scala b/src/main/scala/org/scalajs/dom/ext/package.scala index 90e848b21..c9dd77787 100644 --- a/src/main/scala/org/scalajs/dom/ext/package.scala +++ b/src/main/scala/org/scalajs/dom/ext/package.scala @@ -2,8 +2,6 @@ package org.scalajs.dom import scala.language.implicitConversions -import scala.collection.mutable - package object ext { implicit class PimpedNodeList(nodes: NodeList) diff --git a/src/main/scala/org/scalajs/dom/raw/Audio.scala b/src/main/scala/org/scalajs/dom/raw/Audio.scala index 924a0bf73..0b097811a 100644 --- a/src/main/scala/org/scalajs/dom/raw/Audio.scala +++ b/src/main/scala/org/scalajs/dom/raw/Audio.scala @@ -10,7 +10,6 @@ package org.scalajs.dom.raw import org.scalajs.dom.experimental.mediastream.MediaStream - import scala.scalajs.js import scala.scalajs.js.annotation._ diff --git a/src/main/scala/org/scalajs/dom/raw/Html.scala b/src/main/scala/org/scalajs/dom/raw/Html.scala index a1f915456..dd9b0f2a5 100644 --- a/src/main/scala/org/scalajs/dom/raw/Html.scala +++ b/src/main/scala/org/scalajs/dom/raw/Html.scala @@ -9,11 +9,10 @@ */ package org.scalajs.dom.raw +import org.scalajs.dom.experimental.mediastream.{MediaSource, MediaStream} import scala.scalajs.js import scala.scalajs.js.annotation._ import scala.scalajs.js.| -import org.scalajs.dom -import dom.experimental.mediastream.{MediaStream, MediaSource} @js.native @JSGlobal diff --git a/src/main/scala/org/scalajs/dom/raw/WindowOrWorkerGlobalScope.scala b/src/main/scala/org/scalajs/dom/raw/WindowOrWorkerGlobalScope.scala index 3584b4282..6c6dae3b5 100644 --- a/src/main/scala/org/scalajs/dom/raw/WindowOrWorkerGlobalScope.scala +++ b/src/main/scala/org/scalajs/dom/raw/WindowOrWorkerGlobalScope.scala @@ -1,10 +1,9 @@ package org.scalajs.dom.raw -import scala.scalajs.js -import scala.scalajs.js.| -import scala.scalajs.js.annotation._ import org.scalajs.dom.experimental.cachestorage.CacheStorage import org.scalajs.dom.experimental.{RequestInfo, RequestInit, Response} +import scala.scalajs.js +import scala.scalajs.js.| /** * The WindowOrWorkerGlobalScope mixin describes several features common to the diff --git a/src/main/scala/org/scalajs/dom/raw/package.scala b/src/main/scala/org/scalajs/dom/raw/package.scala index c8587b338..da62f9311 100644 --- a/src/main/scala/org/scalajs/dom/raw/package.scala +++ b/src/main/scala/org/scalajs/dom/raw/package.scala @@ -9,9 +9,8 @@ */ package org.scalajs.dom -import scala.scalajs.js -import scala.scalajs.js.| import scala.scalajs.js.typedarray.ArrayBuffer +import scala.scalajs.js.| package object raw {