Skip to content

Update sbt-scalajs, ... to 1.6.0 #395

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 2 commits into from
Jun 25, 2021
Merged

Update sbt-scalajs, ... to 1.6.0 #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccbf3cb
Update sbt-scalajs, ... to 1.6.0
scala-steward Jun 8, 2021
884cbad
Relax version policy to allow Scala.js 1.6 upgrade
Philippus Jun 25, 2021
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ scala:

env:
- ADOPTOPENJDK=8 SCALAJS_VERSION= CACHE_WORKAROUND=see-PR-335
- ADOPTOPENJDK=8 SCALAJS_VERSION=1.5.1 CACHE_WORKAROUND=see-PR-335
- ADOPTOPENJDK=8 SCALAJS_VERSION=1.6.0 CACHE_WORKAROUND=see-PR-335
- ADOPTOPENJDK=11 SCALAJS_VERSION= CACHE_WORKAROUND=see-PR-335

matrix:
Expand Down
4 changes: 3 additions & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ lazy val root = project.in(file("."))
.settings(
publish / skip := true,
ThisBuild / versionScheme := Some("early-semver"),
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
ThisBuild / versionPolicyIntention := Compatibility.BinaryCompatible,
// because it doesn't declare it itself
ThisBuild / versionPolicyDependencySchemes += "org.scala-js" %% "scalajs-library" % "semver-spec"
)

lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatform)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
val scalaJSVersion =
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.5.1")
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.6.0")

val scalaNativeVersion =
Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.4.0")
Expand Down