From 73b0c91dfc781d8e086f78225c769dd297803252 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 27 Jun 2020 01:14:35 -0400 Subject: [PATCH 1/2] scala-xml 1.3.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2709e8030..3bfcf83e3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -91,7 +91,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) From 46c7df50f79f419e88e44a7b6fe7403a6978967c Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Mon, 29 Jun 2020 08:02:38 -0700 Subject: [PATCH 2/2] Set `lineEndings = preserve` in .scalafmt.conf On windows, scalafmt was rewriting '\n' with '\r\n'. --- .scalafmt.conf | 1 + 1 file changed, 1 insertion(+) 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