diff --git a/.travis.yml b/.travis.yml index 897b4aa2..b837bf8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/build.sbt b/build.sbt index 2709b03f..4a0c15fe 100644 --- a/build.sbt +++ b/build.sbt @@ -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) diff --git a/project/plugins.sbt b/project/plugins.sbt index e0f9a304..c70d8fc7 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")