Skip to content

Commit 742fe3c

Browse files
authored
Merge pull request #444 from scala-steward/update/sbt-scalajs-1.2.0
Update sbt-scalajs, scalajs-compiler to 1.2.0
2 parents 38d47af + feaeaa9 commit 742fe3c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Diff for: .circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ workflows:
131131
- scalajs_job:
132132
name: sjs1.0_2.12
133133
scala_version: 2.12.10
134-
scalajs_version: 1.1.1
134+
scalajs_version: 1.2.0
135135
- scalajs_job:
136136
name: sjs1.0_2.13
137137
scala_version: 2.13.1
138-
scalajs_version: 1.1.1
138+
scalajs_version: 1.2.0

Diff for: .travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ scala:
1111

1212
env:
1313
- SCALAJS_VERSION= ADOPTOPENJDK=8
14-
- SCALAJS_VERSION=1.1.1 ADOPTOPENJDK=8
14+
- SCALAJS_VERSION=1.2.0 ADOPTOPENJDK=8
1515
- SCALAJS_VERSION= ADOPTOPENJDK=11
1616
- SCALAJS_VERSION= ADOPTOPENJDK=13
1717

1818
matrix:
1919
exclude:
2020
- scala: 0.27.0-RC1
21-
env: SCALAJS_VERSION=1.1.1 ADOPTOPENJDK=8
21+
env: SCALAJS_VERSION=1.2.0 ADOPTOPENJDK=8
2222

2323
install:
2424
- git fetch --tags # get all tags for sbt-dynver

Diff for: project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.1.1")
2+
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.2.0")
33

44
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.1")
55
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")

0 commit comments

Comments
 (0)