Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ workflows:
java_version: jdk8
scala_version: 2.13.1
- scala_job:
name: dotty-0.22
name: dotty-0.23
java_version: jdk8
scala_version: 0.22.0-RC1
scala_version: 0.23.0-RC1
- scala_job:
name: jdk11_2.12
java_version: jdk11
Expand All @@ -103,7 +103,7 @@ workflows:
- scala_job:
name: jdk11_dotty
java_version: jdk11
scala_version: 0.22.0-RC1
scala_version: 0.23.0-RC1
- scala_job:
name: jdk13_2.12
java_version: jdk13
Expand All @@ -115,7 +115,7 @@ workflows:
- scala_job:
name: jdk13_dotty
java_version: jdk13
scala_version: 0.22.0-RC1
scala_version: 0.23.0-RC1
- scala_job:
name: jdk14_2.12
java_version: jdk14
Expand All @@ -127,7 +127,7 @@ workflows:
- scala_job:
name: jdk14_dotty
java_version: jdk14
scala_version: 0.22.0-RC1
scala_version: 0.23.0-RC1
- scalajs_job:
name: sjs0.6_2.12
scala_version: 2.12.10
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
language: scala

scala:
- 0.22.0-RC1
- 0.23.0-RC1
- 2.12.10
- 2.13.1

Expand All @@ -18,9 +18,9 @@ env:

matrix:
exclude:
- scala: 0.22.0-RC1
- scala: 0.23.0-RC1
env: SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8
- scala: 0.22.0-RC1
- scala: 0.23.0-RC1
env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8

install:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
)
.jsSettings(
// The config for Travis has an exclude, but sbt-travisci doesn't catch it.
crossScalaVersions -= "0.22.0-RC1",
crossScalaVersions -= "0.23.0-RC1",
// Scala.js cannot run forked tests
fork in Test := false
)
Expand Down