Skip to content

Commit

Permalink
Merge pull request #4 from tpolecat/update-deps
Browse files Browse the repository at this point in the history
update deps
  • Loading branch information
tpolecat authored Apr 20, 2021
2 parents ab14161 + 545f67a commit df9eb2c
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 19 deletions.
20 changes: 10 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

// Our Scala versions.
lazy val `scala-3.0` = "3.0.0-RC2"
lazy val `scala-3.0-prev` = "3.0.0-RC1"
lazy val `scala-3.0` = "3.0.0-RC3"
lazy val `scala-3.0-prev` = "3.0.0-RC2"
lazy val `scala-2.12` = "2.12.12"
lazy val `scala-2.13` = "2.13.5"

Expand Down Expand Up @@ -30,20 +30,20 @@ crossScalaVersions := Seq(`scala-2.12`, `scala-2.13`, `scala-3.0-prev`, `scala-3
Compile / doc / scalacOptions --= Seq("-Xfatal-warnings")
Compile / doc / scalacOptions ++= Seq(
"-groups",
"-sourcepath", (baseDirectory in LocalRootProject).value.getAbsolutePath,
"-sourcepath", (LocalRootProject / baseDirectory).value.getAbsolutePath,
"-doc-source-url", "https://github.com/tpolecat/sourcepos/blob/v" + version.value + "€{FILE_PATH}.scala",
)

// MUnit
libraryDependencies += "org.scalameta" %% "munit" % "0.7.23" % Test
libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test
testFrameworks += new TestFramework("munit.Framework")

// Scala 2 needs scala-reflect
libraryDependencies ++= Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value).filterNot(_ => isDotty.value)
libraryDependencies ++= Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value).filterNot(_ => scalaVersion.value.startsWith("3."))

// Add some more source directories
unmanagedSourceDirectories in Compile ++= {
val sourceDir = (sourceDirectory in Compile).value
(Compile / unmanagedSourceDirectories) ++= {
val sourceDir = (Compile / sourceDirectory).value
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) => Seq(sourceDir / "scala-3")
case Some((2, _)) => Seq(sourceDir / "scala-2")
Expand All @@ -52,8 +52,8 @@ unmanagedSourceDirectories in Compile ++= {
}

// Also for test
unmanagedSourceDirectories in Test ++= {
val sourceDir = (sourceDirectory in Test).value
(Test / unmanagedSourceDirectories) ++= {
val sourceDir = (Test / sourceDirectory).value
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) => Seq(sourceDir / "scala-3")
case Some((2, _)) => Seq(sourceDir / "scala-2")
Expand All @@ -64,7 +64,7 @@ unmanagedSourceDirectories in Test ++= {
// dottydoc really doesn't work at all right now
Compile / doc / sources := {
val old = (Compile / doc / sources).value
if (isDotty.value)
if (scalaVersion.value.startsWith("3."))
Seq()
else
old
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.4.6
sbt.version=1.5.0
8 changes: 1 addition & 7 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.9.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.2")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.3")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.17")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.19")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.4")
2 changes: 1 addition & 1 deletion project/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.2")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.3")

0 comments on commit df9eb2c

Please sign in to comment.