Skip to content

Commit 91927cb

Browse files
committed
chore: Further adjsutments to sbt build
1 parent 1bbf83f commit 91927cb

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

build.sbt

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import sbtcrossproject.CrossProject
22
import sbtcrossproject.CrossType
33

4-
lazy val munitVersion = "1.1.1"
4+
lazy val latestMunitVersion = "1.2.1"
55
lazy val scalametaVersion = "4.9.9"
6-
lazy val defaultScala212 = "2.12.20"
7-
lazy val defaultScala213 = "2.13.16"
6+
lazy val defaultScala212 = "2.12.16"
7+
lazy val defaultScala213 = "2.13.11"
88
lazy val defaultScala3 = "3.3.6"
99
lazy val bin212 =
1010
Seq(
@@ -78,7 +78,18 @@ lazy val sharedSettings = List(
7878
scalacOptions.value
7979
}
8080
},
81-
libraryDependencies += "org.scalameta" %%% "munit" % munitVersion % Test
81+
libraryDependencies += {
82+
val munitVersion = scalaVersion.value match {
83+
case "2.13.11" => "1.0.0-M10"
84+
case "2.13.12" => "1.0.0-M11"
85+
case "2.13.13" => "1.0.0"
86+
case "2.13.14" => "1.0.2"
87+
case "2.13.15" => "1.0.4"
88+
case "2.13.16" => "1.2.0"
89+
case _ => latestMunitVersion
90+
}
91+
"org.scalameta" %%% "munit" % munitVersion % Test
92+
}
8293
)
8394

8495
lazy val root = Project("scalac-scoverage", file("."))
@@ -144,6 +155,8 @@ lazy val plugin =
144155
crossVersion := CrossVersion.full,
145156
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided,
146157
sharedSettings,
158+
buildInfoPackage := "scoverage",
159+
buildInfoKeys := Seq[BuildInfoKey](scalaVersion),
147160
allowUnsafeScalaLibUpgrade := true
148161
)
149162
.settings(
@@ -162,7 +175,11 @@ lazy val reporter =
162175
project
163176
.settings(
164177
name := "scalac-scoverage-reporter",
165-
libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.3.0",
178+
libraryDependencies += {
179+
if (scalaVersion.value == "2.13.11" || scalaVersion.value == "2.13.12")
180+
"org.scala-lang.modules" %% "scala-xml" % "2.2.0"
181+
else "org.scala-lang.modules" %% "scala-xml" % "2.3.0"
182+
},
166183
sharedSettings,
167184
crossScalaVersions := Seq(defaultScala212, defaultScala213, defaultScala3)
168185
)

plugin/src/test/scala/scoverage/ScoverageCompiler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import scoverage.reporter.IOUtils
1616

1717
private[scoverage] object ScoverageCompiler {
1818

19-
val ScalaVersion: String = scala.util.Properties.versionNumberString
19+
val ScalaVersion: String = BuildInfo.scalaVersion
2020
val ShortScalaVersion: String = (ScalaVersion split "[.]").toList match {
2121
case init :+ last if last forall (_.isDigit) => init mkString "."
2222
case _ => ScalaVersion

0 commit comments

Comments
 (0)