Skip to content

Commit 7e92797

Browse files
authored
Merge pull request #395 from scala-steward/update/sbt-scalajs-1.6.0
Update sbt-scalajs, ... to 1.6.0
2 parents e4e74c9 + 884cbad commit 7e92797

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Diff for: .travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ scala:
1313

1414
env:
1515
- ADOPTOPENJDK=8 SCALAJS_VERSION= CACHE_WORKAROUND=see-PR-335
16-
- ADOPTOPENJDK=8 SCALAJS_VERSION=1.5.1 CACHE_WORKAROUND=see-PR-335
16+
- ADOPTOPENJDK=8 SCALAJS_VERSION=1.6.0 CACHE_WORKAROUND=see-PR-335
1717
- ADOPTOPENJDK=11 SCALAJS_VERSION= CACHE_WORKAROUND=see-PR-335
1818

1919
matrix:

Diff for: build.sbt

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ lazy val root = project.in(file("."))
33
.settings(
44
publish / skip := true,
55
ThisBuild / versionScheme := Some("early-semver"),
6-
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
6+
ThisBuild / versionPolicyIntention := Compatibility.BinaryCompatible,
7+
// because it doesn't declare it itself
8+
ThisBuild / versionPolicyDependencySchemes += "org.scala-js" %% "scalajs-library" % "semver-spec"
79
)
810

911
lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatform)

Diff for: project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.5.1")
2+
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.6.0")
33

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

0 commit comments

Comments
 (0)