Skip to content

Commit

Permalink
Merge branch 'main' into update/scala-compiler-2.12.20
Browse files Browse the repository at this point in the history
  • Loading branch information
SethTisue authored Dec 18, 2024
2 parents 46ae181 + 9088464 commit bf34859
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ licenses := Seq(
homepage := Some(url("http://github.com/lightbend/scala-sculpt"))

scalaVersion := crossScalaVersions.value.head
crossScalaVersions := Seq("2.13.14", "2.12.20")
crossScalaVersions := Seq("2.13.15", "2.12.20")

libraryDependencies ++= Seq(
"org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
"io.spray" %% "spray-json" % "1.3.6",
"org.scalameta" %% "munit" % "1.0.1" % Test,
"org.scalameta" %% "munit" % "1.0.3" % Test,
)
testFrameworks += new TestFramework("munit.Framework")

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.1
sbt.version=1.10.6
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")

0 comments on commit bf34859

Please sign in to comment.