Skip to content

Commit 61ff159

Browse files
committed
on JS and Native, drop Scala 2.11
1 parent d631ea0 commit 61ff159

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ jobs:
1515
platform: [JVM, JS, Native]
1616
mode: [normal]
1717
exclude:
18+
- scala: 2.11.x
19+
platform: JS
20+
- scala: 2.11.x
21+
platform: Native
1822
- java: 11
1923
platform: JS
2024
- java: 11

build.sbt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ lazy val root = project
2222
)
2323
.aggregate(
2424
compat211JVM,
25-
compat211JS,
26-
compat211Native,
2725
compat212JVM,
2826
compat212JS,
2927
compat212Native,
@@ -126,7 +124,7 @@ lazy val compat = new MultiScalaCrossProject(
126124
case Some((3, _) | (2, 13)) =>
127125
jsAndNativeSourcesParent / "scala-2.13"
128126
case _ =>
129-
jsAndNativeSourcesParent / "scala-2.11_2.12"
127+
jsAndNativeSourcesParent / "scala-2.12"
130128
}
131129
},
132130
Test / fork := false // Scala.js cannot run forked tests
@@ -143,22 +141,20 @@ lazy val compat = new MultiScalaCrossProject(
143141
case Some((3, _) | (2, 13)) =>
144142
jsAndNativeSourcesParent / "scala-2.13"
145143
case _ =>
146-
jsAndNativeSourcesParent / "scala-2.11_2.12"
144+
jsAndNativeSourcesParent / "scala-2.12"
147145
}
148146
},
149147
versionPolicyIntention := Compatibility.None,
150148
Test / fork := false // Scala Native cannot run forked tests
151149
).nativeEnablePlugins(ScalaNativeJUnitPlugin)
152150
)
153151

154-
val compat211 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala211)
152+
val compat211 = compat(Seq( JVMPlatform ), scala211)
155153
val compat212 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala212)
156154
val compat213 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala213)
157155
val compat3 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala3)
158156

159157
lazy val compat211JVM = compat211.jvm
160-
lazy val compat211JS = compat211.js
161-
lazy val compat211Native = compat211.native
162158
lazy val compat212JVM = compat212.jvm
163159
lazy val compat212JS = compat212.js
164160
lazy val compat212Native = compat212.native

0 commit comments

Comments
 (0)