Skip to content

Commit 48972f5

Browse files
authored
Add support back in for 2.11.12 and support 2.13.6 (#341)
We also now pull the semanticdb version directly from Scalameta to ensure it's there to not have to wait on scalafix/sbt-scalafix.
1 parent 8563d5d commit 48972f5

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
matrix:
1919
java: [ '8', '11' ]
2020
scala: [
21+
{ version: '2.11.12' },
2122
{ version: '2.12.13' },
2223
{ version: '2.12.12' },
2324
{ version: '2.12.11' },

build.sbt

+14-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,20 @@ import sbtcrossproject.CrossProject
22
import sbtcrossproject.CrossType
33

44
val scalatestVersion = "3.2.9"
5-
val defaultScala213 = "2.13.5"
5+
val scalametaVersion = "4.4.18"
6+
val defaultScala213 = "2.13.6"
7+
val bin211 = Seq("2.11.12")
68
val bin212 = Seq("2.12.13", "2.12.12", "2.12.11", "2.12.10", "2.12.9", "2.12.8")
79
val bin213 =
8-
Seq(defaultScala213, "2.13.4", "2.13.3", "2.13.2", "2.13.1", "2.13.0")
10+
Seq(
11+
defaultScala213,
12+
"2.13.5",
13+
"2.13.4",
14+
"2.13.3",
15+
"2.13.2",
16+
"2.13.1",
17+
"2.13.0"
18+
)
919

1020
inThisBuild(
1121
List(
@@ -43,7 +53,7 @@ inThisBuild(
4353
),
4454
scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.5.0",
4555
semanticdbEnabled := true,
46-
semanticdbVersion := scalafixSemanticdb.revision,
56+
semanticdbVersion := scalametaVersion,
4757
scalafixScalaBinaryVersion := scalaBinaryVersion.value
4858
)
4959
)
@@ -56,7 +66,7 @@ lazy val sharedSettings = List(
5666
scalacOptions.value
5767
}
5868
},
59-
crossScalaVersions := bin212 ++ bin213
69+
crossScalaVersions := bin211 ++ bin212 ++ bin213
6070
)
6171

6272
lazy val root = Project("scalac-scoverage", file("."))

0 commit comments

Comments
 (0)