diff --git a/.scalafmt.conf b/.scalafmt.conf index d0c719d6c..b3f01dadf 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,6 @@ +version = 2.0.0-RC5 project.git = true style = Scala.js project.includeFilters = ["src/main/scala/org/scalajs/.*\\.scala"] -bestEffortInDeeplyNestedCode = true +maxColumn = 79 +docstrings = JavaDoc diff --git a/.travis.yml b/.travis.yml index fdaf17a80..5101714e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,7 @@ sudo: false language: scala script: - sbt ++$TRAVIS_SCALA_VERSION package doc example/compile - - sbt scalafmtTest - - sbt ++2.11.12 readme/run + - sbt ++$TRAVIS_SCALA_VERSION scalafmtCheck scala: - 2.10.7 - 2.11.12 @@ -18,6 +17,11 @@ matrix: exclude: - scala: 2.10.7 env: SCALAJS_VERSION=1.0.0-M7 + include: + - scala: 2.12.8 + env: SCALAJS_VERSION=0.6.27 + script: + - sbt readme/run cache: directories: diff --git a/build.sbt b/build.sbt index 131d8badd..e651740d0 100644 --- a/build.sbt +++ b/build.sbt @@ -105,13 +105,14 @@ pomExtra := ( pomIncludeRepository := { _ => false } lazy val readme = ScalatexReadme( - folder = "readme", + projectId = "readme", + wd = file(""), url = "https://github.com/scala-js/scala-js-dom/tree/master", source = "Index", - targetFolder = "target/site", autoResources = Seq("example-opt.js") ).settings( - scalaVersion := "2.11.12", + scalaVersion := "2.12.8", + scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"), (resources in Compile) += (fullOptJS in (example, Compile)).value.data ) diff --git a/project/build.properties b/project/build.properties index 133a8f197..c0bab0494 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.17 +sbt.version=1.2.8 diff --git a/project/build.sbt b/project/build.sbt index f3ebfa698..a8e63782e 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -3,6 +3,6 @@ val scalaJSVersion = addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) -addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.2.1") +addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.11") -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.5.1") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0") diff --git a/readme/Index.scalatex b/readme/Index.scalatex index 67f68aa10..b0bb9c509 100644 --- a/readme/Index.scalatex +++ b/readme/Index.scalatex @@ -17,7 +17,7 @@ div( div(width:="50%", float.left)( hl.ref( - cwd/'example/'src/'main/'scala/'example/"Example.scala", + pwd/'example/'src/'main/'scala/'example/"Example.scala", Seq(s"object $example", "main") ) ), 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 98b14a28b..99d13fd69 100644 --- a/src/main/scala/org/scalajs/dom/experimental/intl/Intl.scala +++ b/src/main/scala/org/scalajs/dom/experimental/intl/Intl.scala @@ -195,6 +195,7 @@ object DateTimeFormatOptions { second: js.UndefOr[String] = js.undefined, timeZoneName: js.UndefOr[String] = js.undefined ): DateTimeFormatOptions = { + // format: off js.Dynamic .literal( localeMatcher = localeMatcher, @@ -212,6 +213,7 @@ object DateTimeFormatOptions { timeZoneName = timeZoneName ) .asInstanceOf[DateTimeFormatOptions] + // format: on } }