Skip to content

Commit 8f1a541

Browse files
authored
Merge pull request #405 from ashawley/dotty-0.22
Update dotty 0.22.0-RC1
2 parents f3da16a + a78dc66 commit 8f1a541

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.circleci/config.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ workflows:
9191
- scala_job:
9292
name: dotty-0.21
9393
java_version: jdk8
94-
scala_version: 0.21.0-RC1
94+
scala_version: 0.22.0-RC1
9595
- scala_job:
9696
name: jdk11_2.12
9797
java_version: jdk11
@@ -103,7 +103,7 @@ workflows:
103103
- scala_job:
104104
name: jdk11_dotty
105105
java_version: jdk11
106-
scala_version: 0.21.0-RC1
106+
scala_version: 0.22.0-RC1
107107
- scala_job:
108108
name: jdk13_2.12
109109
java_version: jdk13
@@ -115,7 +115,7 @@ workflows:
115115
- scala_job:
116116
name: jdk13_dotty
117117
java_version: jdk13
118-
scala_version: 0.21.0-RC1
118+
scala_version: 0.22.0-RC1
119119
- scala_job:
120120
name: jdk14_2.12
121121
java_version: jdk14
@@ -127,7 +127,7 @@ workflows:
127127
- scala_job:
128128
name: jdk14_dotty
129129
java_version: jdk14
130-
scala_version: 0.21.0-RC1
130+
scala_version: 0.22.0-RC1
131131
- scalajs_job:
132132
name: sjs0.6_2.12
133133
scala_version: 2.12.10

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
55
language: scala
66

77
scala:
8-
- 0.21.0-RC1
8+
- 0.22.0-RC1
99
- 2.12.10
1010
- 2.13.1
1111

@@ -18,9 +18,9 @@ env:
1818

1919
matrix:
2020
exclude:
21-
- scala: 0.21.0-RC1
21+
- scala: 0.22.0-RC1
2222
env: SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8
23-
- scala: 0.21.0-RC1
23+
- scala: 0.22.0-RC1
2424
env: SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8
2525

2626
install:

build.sbt

+2
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
161161
}
162162
)
163163
.jsSettings(
164+
// The config for Travis has an exclude, but sbt-travisci doesn't catch it.
165+
crossScalaVersions -= "0.22.0-RC1",
164166
// Scala.js cannot run forked tests
165167
fork in Test := false
166168
)

0 commit comments

Comments
 (0)