Skip to content

Commit fcfa6bb

Browse files
authored
Merge pull request #368 from scala-steward/update/sbt-scalajs-0.6.31
Update sbt-scalajs to 0.6.31
2 parents 03f5cbc + 59b24c1 commit fcfa6bb

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
type: string
6060
scalajs_version:
6161
description: "ScalaJS version"
62-
default: 0.6.29
62+
default: 0.6.31
6363
type: string
6464
environment:
6565
SCALAJS_VERSION: << parameters.scalajs_version >>
@@ -101,11 +101,11 @@ workflows:
101101
- scalajs_job:
102102
name: sjs0.6_2.12
103103
scala_version: 2.12.10
104-
scalajs_version: 0.6.29
104+
scalajs_version: 0.6.31
105105
- scalajs_job:
106106
name: sjs0.6_2.13
107107
scala_version: 2.13.1
108-
scalajs_version: 0.6.29
108+
scalajs_version: 0.6.31
109109
- scalajs_job:
110110
name: sjs1.0.0-M8_2.12
111111
scala_version: 2.12.10

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ scala:
77

88
env:
99
- SCALAJS_VERSION= ADOPTOPENJDK=8
10-
- SCALAJS_VERSION=0.6.29 ADOPTOPENJDK=8
10+
- SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8
1111
- SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
1212
- SCALAJS_VERSION= ADOPTOPENJDK=11
1313

1414
matrix:
1515
exclude:
1616
- scala: 0.18.1-RC1
17-
env: SCALAJS_VERSION=0.6.29 ADOPTOPENJDK=8
17+
env: SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8
1818
- scala: 0.18.1-RC1
1919
env: SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
2020

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("0.6.29")
2+
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.31")
33

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

0 commit comments

Comments
 (0)