Skip to content

Update sbt-scalajs to 1.0.1 #419

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 3 commits into from
Mar 17, 2020
Merged

Update sbt-scalajs to 1.0.1 #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5927db3
Update sbt-scalajs to 1.0.1
scala-steward Mar 6, 2020
07d067d
Exclude version 1.0.1 for mima
Philippus Mar 8, 2020
a412cfc
Add artifact to Mima for Scala.js
ashawley Mar 17, 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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ workflows:
- scalajs_job:
name: sjs1.0_2.12
scala_version: 2.12.10
scalajs_version: 1.0.0
scalajs_version: 1.0.1
- scalajs_job:
name: sjs1.0_2.13
scala_version: 2.13.1
scalajs_version: 1.0.0
scalajs_version: 1.0.1
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ scala:
env:
- SCALAJS_VERSION= ADOPTOPENJDK=8
- SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8
- SCALAJS_VERSION=1.0.0 ADOPTOPENJDK=8
- SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8
- SCALAJS_VERSION= ADOPTOPENJDK=11
- SCALAJS_VERSION= ADOPTOPENJDK=13

Expand All @@ -21,7 +21,7 @@ matrix:
- scala: 0.22.0-RC1
env: SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8
- scala: 0.22.0-RC1
env: SCALAJS_VERSION=1.0.0 ADOPTOPENJDK=8
env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8

install:
- git fetch --tags # get all tags for sbt-dynver
Expand Down
7 changes: 5 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
scalacOptions in Test += "-Xxml:coalescing",

scalaModuleMimaPreviousVersion := {
if (System.getenv("SCALAJS_VERSION") == "1.0.0") None // No such release yet
else Some("1.2.0")
if (isDotty.value) None // No such release yet
// else if (System.getenv("SCALAJS_VERSION") == "1.0.0") None
else Some("1.3.0")
},
mimaBinaryIssueFilters ++= {
import com.typesafe.tools.mima.core._
Expand Down Expand Up @@ -161,6 +162,8 @@ 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",
// Scala.js cannot run forked tests
fork in Test := false
)
Expand Down