Skip to content

Commit 1b6abf9

Browse files
committed
for Scala 3 users, require Scala 3.1+
as per scala/scala-lang#1387, there's no longer any need to keep supporting Scala 3.0.x. it's fine to expect people to upgrade to 3.1 or higher
1 parent d77167d commit 1b6abf9

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
java: [8, 11, 17]
14-
scala: [2.11.x, 2.12.x, 2.13.x, 3.0.x]
14+
scala: [2.11.x, 2.12.x, 2.13.x, 3.x]
1515
platform: [jvm, js, native]
1616
mode: [normal]
1717
exclude:
18-
- scala: 3.0.x
19-
platform: native
2018
- java: 11
2119
platform: js
2220
- java: 11

build.sbt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ lazy val root = project
3030
compat213JVM,
3131
compat213JS,
3232
compat213Native,
33-
compat30JVM,
34-
compat30JS,
33+
compat31JVM,
34+
compat31JS,
3535
compat31Native,
3636
scalafixData211,
3737
scalafixData212,
@@ -53,8 +53,7 @@ lazy val junit = libraryDependencies += "com.github.sbt" % "junit-interface" % "
5353
lazy val scala211 = "2.11.12"
5454
lazy val scala212 = "2.12.15"
5555
lazy val scala213 = "2.13.8"
56-
lazy val scala30 = "3.0.2"
57-
lazy val scala31 = "3.1.3"
56+
lazy val scala3 = "3.1.3"
5857

5958
lazy val compat = new MultiScalaCrossProject(
6059
"compat",
@@ -158,8 +157,7 @@ lazy val compat = new MultiScalaCrossProject(
158157
val compat211 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala211)
159158
val compat212 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala212)
160159
val compat213 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala213)
161-
val compat30 = compat(Seq(JSPlatform, JVMPlatform), scala30)
162-
val compat31 = compat(Seq(JVMPlatform, NativePlatform), scala31)
160+
val compat31 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala3)
163161

164162
lazy val compat211JVM = compat211.jvm
165163
lazy val compat211JS = compat211.js
@@ -170,8 +168,8 @@ lazy val compat212Native = compat212.native
170168
lazy val compat213JVM = compat213.jvm
171169
lazy val compat213JS = compat213.js
172170
lazy val compat213Native = compat213.native
173-
lazy val compat30JVM = compat30.jvm
174-
lazy val compat30JS = compat30.js
171+
lazy val compat31JVM = compat31.jvm
172+
lazy val compat31JS = compat31.js
175173
lazy val compat31Native = compat31.native
176174

177175
lazy val binaryCompatOld = project

0 commit comments

Comments
 (0)