Skip to content

Commit f76a1fa

Browse files
authored
Merge pull request #293 from scala-steward/update/sbt-scalajs-1.2.0
Update sbt-scalajs, scalajs-compiler to 1.2.0
2 parents 35e44a6 + ab84615 commit f76a1fa

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ scala:
1212

1313
env:
1414
- ADOPTOPENJDK=8 SCALAJS_VERSION=
15-
- ADOPTOPENJDK=8 SCALAJS_VERSION=1.1.1
15+
- ADOPTOPENJDK=8 SCALAJS_VERSION=1.2.0
1616
- ADOPTOPENJDK=11 SCALAJS_VERSION=
1717

1818
matrix:
1919
exclude:
2020
- scala: 0.26.0-RC1
21-
env: ADOPTOPENJDK=8 SCALAJS_VERSION=1.1.1
21+
env: ADOPTOPENJDK=8 SCALAJS_VERSION=1.2.0
2222
include:
2323
- scala: 2.11.12
2424
env: ADOPTOPENJDK=8 SCALANATIVE_VERSION=0.3.9

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
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
val scalaNativeVersion =
55
Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.3.9")

0 commit comments

Comments
 (0)