Skip to content

Commit 5ae0c21

Browse files
committed
chore: Drop versions before 2.13.16
1 parent 91927cb commit 5ae0c21

File tree

2 files changed

+10
-28
lines changed

2 files changed

+10
-28
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: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import sbtcrossproject.CrossType
33

44
lazy val latestMunitVersion = "1.2.1"
55
lazy val scalametaVersion = "4.9.9"
6-
lazy val defaultScala212 = "2.12.16"
7-
lazy val defaultScala213 = "2.13.11"
6+
lazy val defaultScala212 = "2.12.20"
7+
lazy val defaultScala213 = "2.13.16"
88
lazy val defaultScala3 = "3.3.6"
99
lazy val bin212 =
1010
Seq(
@@ -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(
@@ -79,16 +74,11 @@ lazy val sharedSettings = List(
7974
}
8075
},
8176
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
77+
val munitVersion = scalaVersion.value match {
78+
case "2.13.16" => "1.2.0"
79+
case _ => latestMunitVersion
80+
}
81+
"org.scalameta" %%% "munit" % munitVersion % Test
9282
}
9383
)
9484

@@ -119,7 +109,6 @@ lazy val runtime = CrossProject(
119109
.settings(
120110
name := "scalac-scoverage-runtime",
121111
crossScalaVersions := bin212 ++ bin213,
122-
allowUnsafeScalaLibUpgrade := true,
123112
crossTarget := target.value / s"scala-${scalaVersion.value}",
124113
sharedSettings,
125114
publish / skip := !List(defaultScala212, defaultScala213)
@@ -156,8 +145,7 @@ lazy val plugin =
156145
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided,
157146
sharedSettings,
158147
buildInfoPackage := "scoverage",
159-
buildInfoKeys := Seq[BuildInfoKey](scalaVersion),
160-
allowUnsafeScalaLibUpgrade := true
148+
buildInfoKeys := Seq[BuildInfoKey](scalaVersion)
161149
)
162150
.settings(
163151
Test / unmanagedSourceDirectories += (Test / sourceDirectory).value / "scala-2.12+",
@@ -175,11 +163,7 @@ lazy val reporter =
175163
project
176164
.settings(
177165
name := "scalac-scoverage-reporter",
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-
},
166+
libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.3.0",
183167
sharedSettings,
184168
crossScalaVersions := Seq(defaultScala212, defaultScala213, defaultScala3)
185169
)

0 commit comments

Comments
 (0)