luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into wip-sbt-instant-startup

This commit is contained in:
Ethan Atkins 2020-06-29 16:44:24 -07:00
parent f9d5fbf29b 6dff457aad
commit 7dc4f7ce2d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.scalafmt.conf
View File

@ -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

2
project/Dependencies.scala
View File

@ -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)