Skip to content

Commit a76c2e9

Browse files
authored
Merge pull request #410 from ashawley/scalajs-1.0
Update to Scala.js 1.0.0
2 parents d76d65d + 08e4b96 commit a76c2e9

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@ workflows:
137137
scala_version: 2.13.1
138138
scalajs_version: 0.6.32
139139
- scalajs_job:
140-
name: sjs1.0.0-RC2_2.12
140+
name: sjs1.0_2.12
141141
scala_version: 2.12.10
142-
scalajs_version: 1.0.0-RC2
142+
scalajs_version: 1.0.0
143143
- scalajs_job:
144-
name: sjs1.0.0-RC2_2.13
144+
name: sjs1.0_2.13
145145
scala_version: 2.13.1
146-
scalajs_version: 1.0.0-RC2
146+
scalajs_version: 1.0.0

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ scala:
1212
env:
1313
- SCALAJS_VERSION= ADOPTOPENJDK=8
1414
- SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8
15-
- SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8
15+
- SCALAJS_VERSION=1.0.0 ADOPTOPENJDK=8
1616
- SCALAJS_VERSION= ADOPTOPENJDK=11
1717
- SCALAJS_VERSION= ADOPTOPENJDK=13
1818

@@ -21,7 +21,7 @@ matrix:
2121
- scala: 0.22.0-RC1
2222
env: SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8
2323
- scala: 0.22.0-RC1
24-
env: SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8
24+
env: SCALAJS_VERSION=1.0.0 ADOPTOPENJDK=8
2525

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

build.sbt

Lines changed: 1 addition & 1 deletion
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-RC2") None // No such release yet
46+
if (System.getenv("SCALAJS_VERSION") == "1.0.0") None // No such release yet
4747
else Some("1.2.0")
4848
},
4949
mimaBinaryIssueFilters ++= {

0 commit comments

Comments
 (0)