Skip to content

add Scala 3.0.0-M3 to crossbuild #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 19, 2020
Merged

add Scala 3.0.0-M3 to crossbuild #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ workflows:
name: 2.13.4
java_version: jdk8
scala_version: 2.13.4
- scala_job:
name: 3.0.0-M3
java_version: jdk8
scala_version: 3.0.0-M3
- scala_job:
name: 3.0.0-M2
java_version: jdk8
Expand All @@ -103,7 +107,7 @@ workflows:
- scala_job:
name: jdk11_3.0
java_version: jdk11
scala_version: 3.0.0-M2
scala_version: 3.0.0-M3
- scala_job:
name: jdk15_2.12
java_version: jdk15
Expand All @@ -115,7 +119,7 @@ workflows:
- scala_job:
name: jdk15_3.0
java_version: jdk15
scala_version: 3.0.0-M2
scala_version: 3.0.0-M3
- scala_job:
name: jdk16_2.12
java_version: jdk16
Expand All @@ -127,7 +131,7 @@ workflows:
- scala_job:
name: jdk16_3.0
java_version: jdk16
scala_version: 3.0.0-M2
scala_version: 3.0.0-M3
- scalajs_job:
name: sjs1.0_2.12
scala_version: 2.12.12
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import: scala/scala-dev:travis/default.yml
language: scala

scala:
- 3.0.0-M3
- 3.0.0-M2
- 2.12.12
- 2.13.4
Expand Down
6 changes: 2 additions & 4 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
opts.split("\\s+").to[Seq]
},

scalacOptions in Test += "-Xxml:coalescing",
Test / scalacOptions += "-Xxml:coalescing",

// don't run Dottydoc, it errors and isn't needed anyway.
// but we leave `publishArtifact` set to true, otherwise Sonatype won't let us publish
Expand Down Expand Up @@ -159,9 +159,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
}
)
.jsSettings(
// The config for Travis has an exclude, but sbt-travisci doesn't catch it.
crossScalaVersions -= "3.0.0-M2",
// Scala.js cannot run forked tests
fork in Test := false
Test / fork := false
)
.jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))