Skip to content

Upgrade Scala.js to 1.0.0-RC1 #585

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

Closed
wants to merge 1 commit into from
Closed

Upgrade Scala.js to 1.0.0-RC1 #585

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
16 changes: 8 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ env:
matrix:
- PLATFORM=jvm SBT_PARALLEL=true WORKERS=4 DEPLOY=false
- PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=false
- PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=false SCALAJS_VERSION=1.0.0-M8
- PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=false SCALAJS_VERSION=1.0.0-RC1
- PLATFORM=jvm SBT_PARALLEL=true WORKERS=4 DEPLOY=true
- PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true
- PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M8
- PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-RC1
sudo: false

before_cache:
Expand Down Expand Up @@ -68,24 +68,24 @@ matrix:
- jdk: openjdk8
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=false
- jdk: openjdk8
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=false SCALAJS_VERSION=1.0.0-M8
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=false SCALAJS_VERSION=1.0.0-RC1
- jdk: openjdk11
env: PLATFORM=jvm SBT_PARALLEL=true WORKERS=4 DEPLOY=true
- jdk: openjdk11
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true
- jdk: openjdk11
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M8
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-RC1
- scala: 2.11.12
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=false SCALAJS_VERSION=1.0.0-M8
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=false SCALAJS_VERSION=1.0.0-RC1
- scala: 2.11.12
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M8
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-RC1
- jdk: openjdk11
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=false
- jdk: openjdk11
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true
- jdk: openjdk11
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=false SCALAJS_VERSION=1.0.0-M8
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=false SCALAJS_VERSION=1.0.0-RC1
- jdk: openjdk11
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M8
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-RC1
- jdk: openjdk11
scala: 2.11.12
5 changes: 2 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,9 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
scalacOptions in Test ~= (_ filterNot (_ == "-Xfatal-warnings")),

mimaPreviousArtifacts := {
val isScalaJSMilestone: Boolean =
scalaJSVersion.startsWith("1.0.0-M")
val isScalaJSReleaseCandidate: Boolean = scalaJSVersion.startsWith("1.0.0-RC")
// TODO: re-enable MiMa for 2.14 once there is a final version
if (scalaMajorVersion.value == 14 || isScalaJSMilestone || isDotty.value) Set()
if (scalaMajorVersion.value == 14 || isScalaJSReleaseCandidate || isDotty.value) Set()
else Set("org.scalacheck" %%% "scalacheck" % "1.14.2")
},

Expand Down
2 changes: 1 addition & 1 deletion project/plugin.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def printAndDie(msg: String): Nothing = {
// Update SCALAJS_VERSION in release.sh, as well
val scalaJSVersion = env("SCALAJS_VERSION") match {
case Some("0.6.31") | None => "0.6.31"
case Some("1.0.0-M8") => "1.0.0-M8"
case Some("1.0.0-RC1") => "1.0.0-RC1"
case Some(v) => printAndDie(s"unsupported scala.js version: $v")
}

Expand Down
2 changes: 1 addition & 1 deletion release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ runsbt "+ jvm/$CMD"
# step 4b: js releases (clean versions)
SCALAJS_VERSION="0.6.31" runsbt "+ js/$CMD"
runsbt "+ js/clean"
SCALAJS_VERSION="1.0.0-M8" runsbt "+ js/$CMD"
SCALAJS_VERSION="1.0.0-RC1" runsbt "+ js/$CMD"

# step 4c: native releases (clean versions)
SCALANATIVE_VERSION="0.3.9" runsbt "+ native/$CMD"
Expand Down