This is an automated email from the ASF dual-hosted git repository. lresende pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-toree.git
commit 47ff62e69a07f3f0cb47c050daf1a9bdb5550b00 Author: Luciano Resende <[email protected]> AuthorDate: Sat May 3 08:47:54 2025 -0700 Update sbt-assembly and sbt-buildinfo plugins --- build.sbt | 10 +++++++--- project/plugins.sbt | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index d3232e8a..8127fcee 100644 --- a/build.sbt +++ b/build.sbt @@ -16,6 +16,7 @@ */ import scala.util.Properties +import sbtassembly.AssemblyOption // Version settings ThisBuild / version := Properties.envOrElse("VERSION", "0.0.0-dev") + @@ -54,8 +55,8 @@ ThisBuild / scalacOptions ++= Seq( ThisBuild / javacOptions ++= Seq( "-Xlint:all", // Enable all Java-based warnings "-Xlint:-path", // Suppress path warnings since we get tons of them - "-Xlint:-options", - "-Xlint:-processing", + "-Xlint:-options", // Suppress "options" warnings + "-Xlint:-processing", // Suppress annotation processing warnings "-Werror", // Treat warnings as errors "-source", "1.8", "-target", "1.8" @@ -219,11 +220,14 @@ assembly / assemblyShadeRules := Seq( assembly / assemblyMergeStrategy := { case "module-info.class" => MergeStrategy.discard + case PathList("META-INF", "versions", "9", "module-info.class") => MergeStrategy.discard case x => val oldStrategy = (assembly / assemblyMergeStrategy).value oldStrategy(x) } assembly / test := {} -assembly / assemblyOption := (assembly / assemblyOption).value.copy(includeScala = false) +assembly / assemblyOption ~= { + _.withIncludeScala(false) +} assembly / aggregate := false diff --git a/project/plugins.sbt b/project/plugins.sbt index eb746b2a..44754e6e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -21,10 +21,10 @@ logLevel := Level.Warn addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3") // Provides abilit to create an uber-jar -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1") // Provides a generated build info object to sync between build and application -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") // Used for signing jars published via `sbt publish-signed` addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
