Skip to content

Update For Scala 3.0.0-M2 #470

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 4 commits into from
Nov 26, 2020
Merged

Update For Scala 3.0.0-M2 #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70efc91
Update For Scala 3.0.0-M2
isomarcte Sep 6, 2020
72e77d0
Scala 2.13.4 (was 2.13.3)
SethTisue Nov 26, 2020
285327c
build cleanup: drop old Scala.js cruft
SethTisue Nov 26, 2020
5733660
CI: drop JDK 13 and 14, add 15
SethTisue Nov 26, 2020
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
51 changes: 18 additions & 33 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@ executors:
scala_jdk11_executor:
docker:
- image: circleci/openjdk:11-jdk
scala_jdk13_executor:
scala_jdk15_executor:
docker:
- image: circleci/openjdk:13.0.1-jdk-buster
scala_jdk14_executor:
docker:
- image: circleci/openjdk:14-ea-26-jdk-buster
- image: circleci/openjdk:15-buster

commands:
sbt_cmd:
Expand Down Expand Up @@ -85,54 +82,42 @@ workflows:
java_version: jdk8
scala_version: 2.12.12
- scala_job:
name: 2.13.3
name: 2.13.4
java_version: jdk8
scala_version: 2.13.3
scala_version: 2.13.4
- scala_job:
name: dotty-0.27.0-RC1
name: 3.0.0-M2
java_version: jdk8
scala_version: 0.27.0-RC1
scala_version: 3.0.0-M2
- scala_job:
name: jdk11_2.12
java_version: jdk11
scala_version: 2.12.12
- scala_job:
name: jdk11_2.13
java_version: jdk11
scala_version: 2.13.3
scala_version: 2.13.4
- scala_job:
name: jdk11_dotty
name: jdk11_3.0
java_version: jdk11
scala_version: 0.27.0-RC1
- scala_job:
name: jdk13_2.12
java_version: jdk13
scala_version: 2.12.12
- scala_job:
name: jdk13_2.13
java_version: jdk13
scala_version: 2.13.3
- scala_job:
name: jdk13_dotty
java_version: jdk13
scala_version: 0.27.0-RC1
scala_version: 3.0.0-M2
- scala_job:
name: jdk14_2.12
java_version: jdk14
name: jdk15_2.12
java_version: jdk15
scala_version: 2.12.12
- scala_job:
name: jdk14_2.13
java_version: jdk14
scala_version: 2.13.3
name: jdk15_2.13
java_version: jdk15
scala_version: 2.13.4
- scala_job:
name: jdk14_dotty
java_version: jdk14
scala_version: 0.27.0-RC1
name: jdk15_3.0
java_version: jdk15
scala_version: 3.0.0-M2
- scalajs_job:
name: sjs1.0_2.12
scala_version: 2.12.12
scalajs_version: 1.3.1
- scalajs_job:
name: sjs1.0_2.13
scala_version: 2.13.3
scala_version: 2.13.4
scalajs_version: 1.3.1
11 changes: 3 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,15 @@ import: scala/scala-dev:travis/default.yml
language: scala

scala:
- 0.27.0-RC1
- 3.0.0-M2
- 2.12.12
- 2.13.3
- 2.13.4

env:
- SCALAJS_VERSION= ADOPTOPENJDK=8
- SCALAJS_VERSION=1.3.1 ADOPTOPENJDK=8
- SCALAJS_VERSION= ADOPTOPENJDK=11
- SCALAJS_VERSION= ADOPTOPENJDK=13

matrix:
exclude:
- scala: 0.27.0-RC1
env: SCALAJS_VERSION=1.3.1 ADOPTOPENJDK=8
- SCALAJS_VERSION= ADOPTOPENJDK=15

install:
- git fetch --tags # get all tags for sbt-dynver
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 @@ -6,8 +6,7 @@ lazy val configSettings: Seq[Setting[_]] = Seq(
val sv = scalaVersion.value
Seq(
CrossVersion.partialVersion(sv) match {
case Some((2, 13)) => file(dir.getPath ++ "-2.13+")
case Some((0, _)) => file(dir.getPath ++ "-2.13+")
case Some((major, minor)) if major > 2 || (major == 2 && minor >= 13) => file(dir.getPath ++ "-2.13+")
case _ => file(dir.getPath ++ "-2.13-")
},
CrossVersion.partialVersion(sv) match {
Expand Down Expand Up @@ -46,7 +45,6 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)

scalaModuleMimaPreviousVersion := {
if (isDotty.value) None // No such release yet
// else if (System.getenv("SCALAJS_VERSION") == "1.0.1") None
else Some("1.3.0")
},
mimaBinaryIssueFilters ++= {
Expand Down Expand Up @@ -165,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.27.0-RC1",
crossScalaVersions -= "3.0.0-M2",
// Scala.js cannot run forked tests
fork in Test := false
)
Expand Down