From 6d1d7d2a2403e719f73596f81f9e24c8d01e68b2 Mon Sep 17 00:00:00 2001 From: Adam Warski Date: Wed, 24 Jun 2026 14:57:10 +0000 Subject: [PATCH 1/3] Add sbt-salad-days plugin to sbt-softwaremill-common Adds com.eed3si9n:sbt-salad-days:0.2.0 to the common module so that all projects using sbt-softwaremill pick it up transitively. The plugin reduces Scaladoc JAR file size by stripping bundled fonts. Co-Authored-By: Claude Opus 4.8 (1M context) --- README.md | 1 + build.sbt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9283b9d..e66ffbc 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ browserGeckoTestSettings `sbt-softwaremill-common` comes with: - [sbt-scalafmt](https://scalameta.org/scalafmt/docs/installation.html) - [sbt-tpolecat](https://github.com/DavidGregory084/sbt-tpolecat) +- [sbt-salad-days](https://github.com/sbt/sbt-salad-days) `sbt-softwaremill-publish` comes with: - [sbt-ci-release](https://github.com/olafurpg/sbt-ci-release) diff --git a/build.sbt b/build.sbt index 4fed434..30c0665 100644 --- a/build.sbt +++ b/build.sbt @@ -38,7 +38,8 @@ lazy val common = project addSbtPlugin( "org.scalameta" % "sbt-scalafmt" % BuildInfo.sbtScalafmtVersion ), - addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2") + addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2"), + addSbtPlugin("com.eed3si9n" % "sbt-salad-days" % "0.2.0") ) lazy val publish = project From a1f8c5a7b90e8396c4c3b4483b75e72555599cd4 Mon Sep 17 00:00:00 2001 From: Adam Warski Date: Wed, 24 Jun 2026 15:05:55 +0000 Subject: [PATCH 2/3] Apply sbt-salad-days to sbt-softwaremill's own build Add the plugin to the meta-build (project/build.sbt) so sbt-softwaremill slims its own Scaladoc JARs too, not just downstream consumers'. Co-Authored-By: Claude Opus 4.8 (1M context) --- project/build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/project/build.sbt b/project/build.sbt index 8b687c7..3472b62 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -7,6 +7,7 @@ lazy val root = project .settings( addSbtPlugin("com.github.sbt" % "sbt-ci-release" % sbtCiReleaseVersion), addSbtPlugin("org.scalameta" % "sbt-scalafmt" % sbtScalafmtVersion), + addSbtPlugin("com.eed3si9n" % "sbt-salad-days" % "0.2.0"), buildInfoKeys := Seq[BuildInfoKey]( "sbtCiReleaseVersion" -> sbtCiReleaseVersion, "sbtScalafmtVersion" -> sbtScalafmtVersion From bdc77a510e75095e5a0a1cfc82ef0f7503d774b5 Mon Sep 17 00:00:00 2001 From: Adam Warski Date: Wed, 24 Jun 2026 15:07:22 +0000 Subject: [PATCH 3/3] Centralise sbt-salad-days version via BuildInfo Define sbtSaladDaysVersion once in project/build.sbt and export it through BuildInfo, so the meta-build and the common module share a single source of truth (matching how sbt-scalafmt's version is handled). Co-Authored-By: Claude Opus 4.8 (1M context) --- build.sbt | 2 +- project/build.sbt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 30c0665..0090605 100644 --- a/build.sbt +++ b/build.sbt @@ -39,7 +39,7 @@ lazy val common = project "org.scalameta" % "sbt-scalafmt" % BuildInfo.sbtScalafmtVersion ), addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2"), - addSbtPlugin("com.eed3si9n" % "sbt-salad-days" % "0.2.0") + addSbtPlugin("com.eed3si9n" % "sbt-salad-days" % BuildInfo.sbtSaladDaysVersion) ) lazy val publish = project diff --git a/project/build.sbt b/project/build.sbt index 3472b62..c99822d 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,5 +1,6 @@ val sbtCiReleaseVersion = "1.11.2" val sbtScalafmtVersion = "2.5.6" +val sbtSaladDaysVersion = "0.2.0" lazy val root = project .in(file(".")) @@ -7,10 +8,11 @@ lazy val root = project .settings( addSbtPlugin("com.github.sbt" % "sbt-ci-release" % sbtCiReleaseVersion), addSbtPlugin("org.scalameta" % "sbt-scalafmt" % sbtScalafmtVersion), - addSbtPlugin("com.eed3si9n" % "sbt-salad-days" % "0.2.0"), + addSbtPlugin("com.eed3si9n" % "sbt-salad-days" % sbtSaladDaysVersion), buildInfoKeys := Seq[BuildInfoKey]( "sbtCiReleaseVersion" -> sbtCiReleaseVersion, - "sbtScalafmtVersion" -> sbtScalafmtVersion + "sbtScalafmtVersion" -> sbtScalafmtVersion, + "sbtSaladDaysVersion" -> sbtSaladDaysVersion ), buildInfoPackage := "sbtsoftwaremill" )