Skip to content

Commit 5d71be8

Browse files
committed
keep using old Scala.js version on Scala 2.11
1 parent 536a55a commit 5d71be8

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,18 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
java: [8, 25]
14-
scala: [2.11.x, 2.12.x, 2.13.x, 3.x]
14+
scala: [2.12.x, 2.13.x, 3.x]
15+
scala-js: [""]
1516
platform: [JVM, JS, Native]
1617
mode: [normal]
17-
exclude:
18-
- scala: 2.11.x
19-
platform: Native
2018
include:
19+
- java: 8
20+
scala: 2.11.x
21+
platform: JVM
22+
- java: 8
23+
scala: 2.11.x
24+
platform: JS
25+
scala-js: 1.12.0
2126
- java: 8
2227
scala: 2.12.x
2328
mode: testScalafix
@@ -38,6 +43,7 @@ jobs:
3843
env:
3944
CI_JDK: ${{matrix.java}}
4045
CI_SCALA_VERSION: ${{matrix.scala}}
46+
CI_SCALA_JS_VERSION: ${{matrix.scala-js}}
4147
CI_MODE: ${{matrix.mode}}
4248
CI_PLATFORM: ${{matrix.platform}}
4349
steps:

project/plugins.sbt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
1+
val scalaJSVersion =
2+
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.20.1")
3+
4+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
25
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
36
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")
47
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")

0 commit comments

Comments
 (0)