Skip to content

Commit b0fa8f9

Browse files
committed
Auto-format imports
1 parent 5172010 commit b0fa8f9

39 files changed

+85
-90
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ jobs:
3232
run: ./prepareForScala210.sh
3333

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

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

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

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

4646
- name: Validate api report
4747
if: matrix.scalajsversion == '1.x' && matrix.scalaversion != '2.11.12'

.scalafix.conf

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
11
rules = [
2+
OrganizeImports,
3+
RemoveUnused,
24
GenerateApiReport,
35
]
6+
7+
RemoveUnused {
8+
imports = false
9+
privates = true
10+
locals = true
11+
}
12+
13+
OrganizeImports {
14+
expandRelative = true
15+
groupedImports = Merge
16+
groupExplicitlyImportedImplicitsSeparately = false
17+
groups = ["*"]
18+
importSelectorsOrder = Ascii
19+
removeUnused = true
20+
}

build.sbt

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,28 @@ lazy val root = project
2323
name := "Scala.js DOM"
2424

2525
ThisBuild / crossScalaVersions := {
26-
if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1")
27-
else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
26+
if (scalaJSVersion.startsWith("1.")) Seq("2.11.12", "2.12.10","2.13.1")
27+
else Seq("2.10.7", "2.11.12", "2.12.10", "2.13.1")
2828
}
29-
ThisBuild / scalaVersion := crossScalaVersions.value.head
29+
ThisBuild / scalaVersion := crossScalaVersions.value.find(_.startsWith("2.13.")).get
30+
31+
val inCI = Option(System.getenv("CI")).exists(_.contains("1"))
3032

3133
val commonSettings = Seq(
3234
organization := "org.scala-js",
33-
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")
35+
scalacOptions ++= Seq(
36+
"-deprecation",
37+
"-feature",
38+
),
39+
scalacOptions ++= (if (!inCI) Seq.empty else Seq(
40+
"-Xfatal-warnings",
41+
)),
42+
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
43+
case Some((2, 11)) => "-Ywarn-unused-import" :: Nil
44+
case Some((2, 12)) => "-Ywarn-unused:imports,patvars,locals,implicits" :: Nil
45+
case Some((2, 13)) => "-Wunused:imports,patvars,locals,implicits" :: Nil
46+
case _ => Nil
47+
}),
3448
)
3549

3650
val noPublishSettings = Seq(

scalafix.sbt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ ThisBuild / scalacOptions ++= {
88
else
99
Nil
1010
}
11+
12+
ThisBuild / scalafixDependencies ++= Seq(
13+
"com.github.liancheng" %% "organize-imports" % "0.5.0"
14+
)

src/main/scala-new-collections/org/scalajs/dom/ext/NamedNodeMapMap.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package org.scalajs.dom.ext
22

3-
import scala.collection.mutable
4-
53
import org.scalajs.dom._
4+
import scala.collection.mutable
65

76
class NamedNodeMapMap private[ext] (namedNodeMap: NamedNodeMap)
87
extends mutable.Map[String, Attr] {

src/main/scala-old-collections/org/scalajs/dom/ext/NamedNodeMapMap.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package org.scalajs.dom.ext
22

3-
import scala.collection.mutable
4-
53
import org.scalajs.dom._
4+
import scala.collection.mutable
65

76
class NamedNodeMapMap private[ext] (namedNodeMap: NamedNodeMap)
87
extends mutable.Map[String, Attr] {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package org.scalajs.dom
22

3+
import scala.language.implicitConversions
34
import scala.scalajs.js
4-
import scala.scalajs.js.typedarray.{ArrayBufferView, ArrayBuffer, Uint8Array}
5+
import scala.scalajs.js.typedarray.{ArrayBuffer, ArrayBufferView, Uint8Array}
56
import scala.scalajs.js.|
67

7-
import scala.language.implicitConversions
8-
98
package object crypto {
109
@inline def crypto = GlobalCrypto.crypto
1110

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.scalajs.dom.experimental
22

33
import org.scalajs.dom.raw.EventTarget
4-
54
import scala.scalajs.js
65
import scala.scalajs.js.annotation.JSGlobal
76

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package org.scalajs.dom.experimental
22

33
import org.scalajs.dom.Blob
44
import org.scalajs.dom.raw.FormData
5-
65
import scala.scalajs.js
76
import scala.scalajs.js.annotation._
87
import scala.scalajs.js.typedarray.{ArrayBuffer, Uint8Array}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.scalajs.dom.experimental
22

33
import org.scalajs.dom.raw.Blob
4-
54
import scala.scalajs.js
65
import scala.scalajs.js.annotation._
76
import scala.scalajs.js.typedarray.ArrayBuffer

0 commit comments

Comments
 (0)