Skip to content

Commit 8bf5f52

Browse files
authored
Merge pull request #378 from ashawley/sjs-1.0.0-RC2
Update Scala.js to 1.0.0-RC2
2 parents 0507fbf + 908e0a0 commit 8bf5f52

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.circleci/config.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ workflows:
107107
scala_version: 2.13.1
108108
scalajs_version: 0.6.31
109109
- scalajs_job:
110-
name: sjs1.0.0-RC1_2.12
110+
name: sjs1.0.0-RC2_2.12
111111
scala_version: 2.12.10
112-
scalajs_version: 1.0.0-RC1
112+
scalajs_version: 1.0.0-RC2
113113
- scalajs_job:
114-
name: sjs1.0.0-RC1_2.13
114+
name: sjs1.0.0-RC2_2.13
115115
scala_version: 2.13.1
116-
scalajs_version: 1.0.0-RC1
116+
scalajs_version: 1.0.0-RC2

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ scala:
1212
env:
1313
- SCALAJS_VERSION= ADOPTOPENJDK=8
1414
- SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8
15-
- SCALAJS_VERSION=1.0.0-RC1 ADOPTOPENJDK=8
15+
- SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8
1616
- SCALAJS_VERSION= ADOPTOPENJDK=11
1717

1818
matrix:
1919
exclude:
2020
- scala: 0.20.0-RC1
2121
env: SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8
2222
- scala: 0.20.0-RC1
23-
env: SCALAJS_VERSION=1.0.0-RC1 ADOPTOPENJDK=8
23+
env: SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8
2424

2525
install:
2626
- git fetch --tags # get all tags for sbt-dynver

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
4343
scalacOptions in Test += "-Xxml:coalescing",
4444

4545
scalaModuleMimaPreviousVersion := {
46-
if (System.getenv("SCALAJS_VERSION") == "1.0.0-RC1") None // No such release yet
46+
if (System.getenv("SCALAJS_VERSION") == "1.0.0-RC2") None // No such release yet
4747
else Some("1.2.0")
4848
},
4949
mimaBinaryIssueFilters ++= {

0 commit comments

Comments
 (0)