From 7d0a3f1f3ba4f2eefba18b90d1e853b4560a30c9 Mon Sep 17 00:00:00 2001 From: Anton Sviridov Date: Sat, 4 Oct 2025 11:29:28 +0100 Subject: [PATCH 1/2] Update SBT, Scala.js, Scala Native, and plugins --- build.sbt | 2 +- project/build.properties | 2 +- project/plugins.sbt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 114d51a0..b7292bac 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ lazy val munitVersion = "1.1.1" lazy val scalametaVersion = "4.9.9" lazy val defaultScala212 = "2.12.20" lazy val defaultScala213 = "2.13.16" -lazy val defaultScala3 = "3.3.0" +lazy val defaultScala3 = "3.3.6" lazy val bin212 = Seq( defaultScala212, diff --git a/project/build.properties b/project/build.properties index c8fcab54..5e6884d3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.11.6 diff --git a/project/plugins.sbt b/project/plugins.sbt index f7c4b4b7..e44ed774 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,10 +1,10 @@ -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.7") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") From fb8c35c63dc07637ed0758f3f050fd41c6925b11 Mon Sep 17 00:00:00 2001 From: Anton Sviridov Date: Sun, 5 Oct 2025 11:15:48 +0100 Subject: [PATCH 2/2] Hack cross versions and allow unsafe scala upgrade --- build.sbt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index b7292bac..470c9d18 100644 --- a/build.sbt +++ b/build.sbt @@ -107,9 +107,12 @@ lazy val runtime = CrossProject( .withoutSuffixFor(JVMPlatform) .settings( name := "scalac-scoverage-runtime", - crossScalaVersions := Seq(defaultScala212, defaultScala213), + crossScalaVersions := bin212 ++ bin213, crossTarget := target.value / s"scala-${scalaVersion.value}", - sharedSettings + sharedSettings, + publish / skip := !List(defaultScala212, defaultScala213) + .contains(scalaVersion.value), + publishLocal / skip := (publish / skip).value ) .jvmSettings( Test / fork := true @@ -139,7 +142,8 @@ lazy val plugin = crossScalaVersions := bin212 ++ bin213, crossVersion := CrossVersion.full, libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided, - sharedSettings + sharedSettings, + allowUnsafeScalaLibUpgrade := true ) .settings( Test / unmanagedSourceDirectories += (Test / sourceDirectory).value / "scala-2.12+",