Skip to content

Commit be3cb94

Browse files
authored
Merge pull request #533 from scala-steward/update/sbt-scalajs-1.6.0
2 parents bf2a258 + 0c11f44 commit be3cb94

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ workflows:
145145
- scalajs_job:
146146
name: sjs1.0_2.12
147147
scala_version: 2.12.14
148-
scalajs_version: 1.5.1
148+
scalajs_version: 1.6.0
149149
- scalajs_job:
150150
name: sjs1.0_2.13
151151
scala_version: 2.13.6
152-
scalajs_version: 1.5.1
152+
scalajs_version: 1.6.0
153153
- scalanative_job:
154154
name: native0.4_2.12
155155
scala_version: 2.12.14

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ scala:
1212

1313
env:
1414
- SCALAJS_VERSION= ADOPTOPENJDK=8
15-
- SCALAJS_VERSION=1.5.1 ADOPTOPENJDK=8
15+
- SCALAJS_VERSION=1.6.0 ADOPTOPENJDK=8
1616
- SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
1717
- SCALAJS_VERSION= ADOPTOPENJDK=11
1818
- SCALAJS_VERSION= ADOPTOPENJDK=16

build.sbt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ ThisBuild / startYear := Some(2002)
44
ThisBuild / licenses += (("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0")))
55

66
ThisBuild / versionScheme := Some("early-semver")
7-
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
7+
ThisBuild / versionPolicyIntention := Compatibility.BinaryCompatible
8+
// because it doesn't declare it itself
9+
ThisBuild / versionPolicyDependencySchemes += "org.scala-js" %% "scalajs-library" % "semver-spec"
810

911
lazy val configSettings: Seq[Setting[_]] = Seq(
1012
unmanagedSourceDirectories ++= {

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
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)