Skip to content

Commit 5b1db89

Browse files
committed
Upgrade to sbt 1.2.8, Scalatex 0.3.11 and scalafmt 2.0.0.
The upgrades of the two compiler plugins unfortunately had to be done in lockstep with the upgrade to sbt 1.x.
1 parent a412b9c commit 5b1db89

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

.scalafmt.conf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
version = 2.0.0-RC5
12
project.git = true
23
style = Scala.js
34
project.includeFilters = ["src/main/scala/org/scalajs/.*\\.scala"]
4-
bestEffortInDeeplyNestedCode = true
5+
maxColumn = 79
6+
docstrings = JavaDoc

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ sudo: false
22
language: scala
33
script:
44
- sbt ++$TRAVIS_SCALA_VERSION package doc example/compile
5-
- sbt scalafmtTest
5+
- sbt scalafmtCheck
66
scala:
77
- 2.10.7
88
- 2.11.12

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.17
1+
sbt.version=1.2.8

project/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ val scalaJSVersion =
33

44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
55

6-
addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.9")
6+
addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.11")
77

8-
addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.6.8")
8+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0")

src/main/scala/org/scalajs/dom/experimental/intl/Intl.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ object DateTimeFormatOptions {
195195
second: js.UndefOr[String] = js.undefined,
196196
timeZoneName: js.UndefOr[String] = js.undefined
197197
): DateTimeFormatOptions = {
198+
// format: off
198199
js.Dynamic
199200
.literal(
200201
localeMatcher = localeMatcher,
@@ -212,6 +213,7 @@ object DateTimeFormatOptions {
212213
timeZoneName = timeZoneName
213214
)
214215
.asInstanceOf[DateTimeFormatOptions]
216+
// format: on
215217
}
216218
}
217219

0 commit comments

Comments
 (0)