Skip to content

Commit 45e3005

Browse files
authored
Merge pull request #456 from sjrd/drop-sjs-0.6.x
Drop support for Scala.js 0.6.x.
2 parents e695bca + c61b7ec commit 45e3005

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
scalaversion: ["2.11.12", "2.12.10", "2.13.1"]
16-
scalajsversion: ["1.x", "0.6.x"]
17-
include:
18-
- scalaversion: "2.10.7"
19-
scalajsversion: "0.6.x"
20-
- scalaversion: "3.0.1"
21-
scalajsversion: "1.x"
22-
env:
23-
SCALAJS_VERSION: "${{ matrix.scalajsversion == '0.6.x' && '0.6.28' || '' }}"
15+
scalaversion: ["2.11.12", "2.12.10", "2.13.1", "3.0.1"]
2416
steps:
2517
- uses: actions/checkout@v2
2618
- uses: olafurpg/setup-scala@v10

build.sbt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ lazy val root = project.in(file(".")).
55

66
name := "Scala.js DOM"
77

8-
ThisBuild / crossScalaVersions := {
9-
if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1", "3.0.1")
10-
else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
11-
}
8+
ThisBuild / crossScalaVersions := Seq("2.12.10", "2.11.12", "2.13.1", "3.0.1")
129
ThisBuild / scalaVersion := crossScalaVersions.value.head
1310

1411
val commonSettings = Seq(
@@ -36,7 +33,6 @@ scalacOptions ++= {
3633
}
3734

3835
def hasNewCollections(version: String): Boolean = {
39-
!version.startsWith("2.10.") &&
4036
!version.startsWith("2.11.") &&
4137
!version.startsWith("2.12.")
4238
}

0 commit comments

Comments
 (0)