From bf4179a2b1357164d3b7e8f2573897479e717967 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 3 Aug 2021 23:23:19 +0200 Subject: [PATCH 1/3] Update sbt-scala-module to 2.4.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 11ce096..5338878 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.6.0") -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.1") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) From 2ab24d450946bac5f9da8f080d02163dffe6bcc7 Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Wed, 4 Aug 2021 09:41:06 +0200 Subject: [PATCH 2/3] Adjust build definition - add setting `versionPolicyIntention` - remove setting `scalaModuleMimaPreviousVersion` (already set by sbt-version-policy) --- build.sbt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index b8f0fe7..178432e 100644 --- a/build.sbt +++ b/build.sbt @@ -13,6 +13,7 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform) .settings(ScalaModulePlugin.scalaModuleSettings) .settings( name := "scala-collection-contrib", + versionPolicyIntention := Compatibility.BinaryCompatible, scalaModuleAutomaticModuleName := Some("scala.collection.contrib"), scalacOptions ++= Seq("-opt-warnings", "-language:higherKinds", "-deprecation", "-feature", "-Xfatal-warnings"), scalacOptions in (Compile, doc) ++= Seq("-implicits", "-groups"), @@ -23,9 +24,6 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform) "com.novocode" % "junit-interface" % "0.11" % Test, ), ) - .jvmSettings( - scalaModuleMimaPreviousVersion := Some("0.1.0") - ) .jsEnablePlugins(ScalaJSJUnitPlugin) .jsSettings( // Scala.js cannot run forked tests From a37ba92c2d24440bcb18e359024273b99a7956b7 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 30 Sep 2021 19:56:53 -0600 Subject: [PATCH 3/3] Scala.js 1.7.0 (was 1.6.0) this fixes versionPolicyCheck --- .travis.yml | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 11d4992..73ceb47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ scala: env: - ADOPTOPENJDK=8 SCALAJS_VERSION= - - ADOPTOPENJDK=8 SCALAJS_VERSION=1.6.0 + - ADOPTOPENJDK=8 SCALAJS_VERSION=1.7.0 - ADOPTOPENJDK=11 SCALAJS_VERSION= - ADOPTOPENJDK=17 SCALAJS_VERSION= diff --git a/project/plugins.sbt b/project/plugins.sbt index 5338878..be182be 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.6.0") + Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.7.0") addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0")