From 62c41d1003589545edfebbb2cfa4145d1ee564eb Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 8 Jun 2021 19:20:27 +0200 Subject: [PATCH 1/3] Update sbt-scalajs, ... to 1.6.0 --- .circleci/config.yml | 4 ++-- .travis.yml | 2 +- project/plugins.sbt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac1f1d08..538a62ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,11 +145,11 @@ workflows: - scalajs_job: name: sjs1.0_2.12 scala_version: 2.12.13 - scalajs_version: 1.5.1 + scalajs_version: 1.6.0 - scalajs_job: name: sjs1.0_2.13 scala_version: 2.13.6 - scalajs_version: 1.5.1 + scalajs_version: 1.6.0 - scalanative_job: name: native0.4_2.12 scala_version: 2.12.13 diff --git a/.travis.yml b/.travis.yml index acd6ffc1..170cb7f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ scala: env: - SCALAJS_VERSION= ADOPTOPENJDK=8 - - SCALAJS_VERSION=1.5.1 ADOPTOPENJDK=8 + - SCALAJS_VERSION=1.6.0 ADOPTOPENJDK=8 - SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8 - SCALAJS_VERSION= ADOPTOPENJDK=11 - SCALAJS_VERSION= ADOPTOPENJDK=16 diff --git a/project/plugins.sbt b/project/plugins.sbt index 6b10d076..ae66d2c6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") From 1459cb44567832914830a7076b69668d1e94c799 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 9 Jun 2021 08:51:54 +0200 Subject: [PATCH 2/3] Update sbt-scalajs, scalajs-compiler, ... to 1.6.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 196b263f..cbb8974a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,7 +145,7 @@ workflows: - scalajs_job: name: sjs1.0_2.12 scala_version: 2.12.14 - scalajs_version: 1.5.1 + scalajs_version: 1.6.0 - scalajs_job: name: sjs1.0_2.13 scala_version: 2.13.6 From 0c11f44c2029fd6d2c47c7d92c4c160cc3adc228 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 24 Jun 2021 10:06:27 -0700 Subject: [PATCH 3/3] relax version policy to allow Scala.js 1.6 upgrade --- build.sbt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 52982f8f..38f6b146 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,9 @@ ThisBuild / startYear := Some(2002) ThisBuild / licenses += (("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))) 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 configSettings: Seq[Setting[_]] = Seq( unmanagedSourceDirectories ++= {