Skip to content

Commit 96b491a

Browse files
tgodzikkeynmol
andauthored
Update SBT, Scala.js, Scala Native, and plugins (#726)
* Update SBT, Scala.js, Scala Native, and plugins * Hack cross versions and allow unsafe scala upgrade * bugfix: Ignore SIP-51 in build.sbt * chore: Further adjsutments to sbt build * chore: Drop versions before 2.13.16 --------- Co-authored-by: Anton Sviridov <[email protected]>
1 parent 793a10e commit 96b491a

File tree

5 files changed

+23
-19
lines changed

5 files changed

+23
-19
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ jobs:
2323
{ version: '2.12.19' },
2424
{ version: '2.12.18' },
2525
{ version: '2.13.16' },
26-
{ version: '2.13.15' },
27-
{ version: '2.13.14' }
2826
]
2927
steps:
3028
- name: checkout the repo

build.sbt

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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"
66
lazy val defaultScala212 = "2.12.20"
77
lazy val defaultScala213 = "2.13.16"
8-
lazy val defaultScala3 = "3.3.0"
8+
lazy val defaultScala3 = "3.3.6"
99
lazy val bin212 =
1010
Seq(
1111
defaultScala212,
@@ -16,12 +16,7 @@ lazy val bin212 =
1616
)
1717
lazy val bin213 =
1818
Seq(
19-
defaultScala213,
20-
"2.13.15",
21-
"2.13.14",
22-
"2.13.13",
23-
"2.13.12",
24-
"2.13.11"
19+
defaultScala213
2520
)
2621

2722
inThisBuild(
@@ -78,7 +73,13 @@ lazy val sharedSettings = List(
7873
scalacOptions.value
7974
}
8075
},
81-
libraryDependencies += "org.scalameta" %%% "munit" % munitVersion % Test
76+
libraryDependencies += {
77+
val munitVersion = scalaVersion.value match {
78+
case "2.13.16" => "1.2.0"
79+
case _ => latestMunitVersion
80+
}
81+
"org.scalameta" %%% "munit" % munitVersion % Test
82+
}
8283
)
8384

8485
lazy val root = Project("scalac-scoverage", file("."))
@@ -107,9 +108,12 @@ lazy val runtime = CrossProject(
107108
.withoutSuffixFor(JVMPlatform)
108109
.settings(
109110
name := "scalac-scoverage-runtime",
110-
crossScalaVersions := Seq(defaultScala212, defaultScala213),
111+
crossScalaVersions := bin212 ++ bin213,
111112
crossTarget := target.value / s"scala-${scalaVersion.value}",
112-
sharedSettings
113+
sharedSettings,
114+
publish / skip := !List(defaultScala212, defaultScala213)
115+
.contains(scalaVersion.value),
116+
publishLocal / skip := (publish / skip).value
113117
)
114118
.jvmSettings(
115119
Test / fork := true
@@ -139,7 +143,9 @@ lazy val plugin =
139143
crossScalaVersions := bin212 ++ bin213,
140144
crossVersion := CrossVersion.full,
141145
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided,
142-
sharedSettings
146+
sharedSettings,
147+
buildInfoPackage := "scoverage",
148+
buildInfoKeys := Seq[BuildInfoKey](scalaVersion)
143149
)
144150
.settings(
145151
Test / unmanagedSourceDirectories += (Test / sourceDirectory).value / "scala-2.12+",

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

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.6.2
1+
sbt.version=1.11.6

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
22
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
33

4-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.7")
4+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")
55
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
66

7-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3")
7+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
88

99
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
1010

0 commit comments

Comments
 (0)