Skip to content

Commit

Permalink
Merge branch 'main' into 486-output-parsing
Browse files Browse the repository at this point in the history
Signed-off-by: Reid Spencer <reid-spencer@users.noreply.github.com>
  • Loading branch information
reid-spencer authored Nov 26, 2023
2 parents 7c71259 + 57acb10 commit a57138c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 3 additions & 2 deletions project/Helpers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ object V {
val config = "1.4.2"
val fastparse = "3.0.2"
val jgit = "6.5.0"
val lang3 = "3.13.0"
val lang3 = "3.14.0"
val pureconfig = "0.17.4"
val scalacheck = "1.17.0"
val scalatest = "3.2.17"
Expand Down Expand Up @@ -93,7 +93,8 @@ object C {
// "-explain",
// "-explain-types",
"-Werror",
"-pagewidth", "120"
"-pagewidth",
"120"
)

def scala_3_doc_options(version: String): Seq[String] = {
Expand Down
3 changes: 1 addition & 2 deletions project/metals.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@

// This file enables sbt-bloop to create bloop config files.

addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.11")

addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.12")

0 comments on commit a57138c

Please sign in to comment.