diff --git a/.scalafmt.conf b/.scalafmt.conf index 84b1633e8..213dea496 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -3,6 +3,7 @@ edition = 2019-10 maxColumn = 100 project.git = true project.excludeFilters = [ "\\Wsbt-test\\W", "\\Winput_sources\\W", "\\Wcontraband-scala\\W" ] +lineEndings = preserve # https://docs.scala-lang.org/style/scaladoc.html recommends the JavaDoc style. # scala/scala is written that way too https://github.com/scala/scala/blob/v2.12.2/src/library/scala/Predef.scala diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 126caab7e..028368816 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -92,7 +92,7 @@ object Dependencies { val scalaVerify = "com.eed3si9n.verify" %% "verify" % "0.2.0" val templateResolverApi = "org.scala-sbt" % "template-resolver" % "0.1" - val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "1.2.0" + val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "1.3.0" val scalaParsers = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2" val scalaReflect = Def.setting("org.scala-lang" % "scala-reflect" % scalaVersion.value)