SBT: cosmetic, refactor scalameta dependencies

scalameta · Feb 8, 2025 · 51da9ed · 51da9ed
1 parent b6a26c2
commit 51da9ed
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 22 deletions.
diff --git a/build.sbt b/build.sbt
@@ -127,9 +127,9 @@ lazy val config = crossProject(JVMPlatform, NativePlatform)
     moduleName := "scalafmt-config",
     description := "Scalafmt config parsing",
     scalacOptions ++= scalacJvmOptions.value,
-    libraryDependencies ++= Seq(metaconfig.value),
-  ).jvmSettings(libraryDependencies ++= Seq(metaconfigTypesafe.value))
-  .nativeSettings(libraryDependencies ++= Seq(metaconfigSconfig.value))
+    libraryDependencies += metaconfigCore.value,
+  ).jvmSettings(libraryDependencies += metaconfigTypesafe.value)
+  .nativeSettings(libraryDependencies += metaconfigSconfig.value)
 // .jsSettings(
 //   libraryDependencies ++= Seq(
 //     metaconfigHocon.value,
@@ -164,10 +164,9 @@ lazy val macros = crossProject(JVMPlatform, NativePlatform)
   .in(file("scalafmt-macros")).settings(
     moduleName := "scalafmt-macros",
     scalacOptions ++= scalacJvmOptions.value,
-    libraryDependencies ++= Seq(
-      scalameta.value,
+    libraryDependencies += scalameta.value,
+    libraryDependencies +=
       "org.scala-lang" % "scala-reflect" % scalaVersion.value,
-    ),
   )
 
 import sbtassembly.AssemblyPlugin.defaultUniversalScript

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -4,7 +4,7 @@ import sbt._
 import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
 import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 
-// scalafmt: { maxColumn = 100, align.preset = more, align.allowOverflow = true }
+// scalafmt: { maxColumn = 120, align.preset = more, align.allowOverflow = true }
 
 object Dependencies {
   val metaconfigV = "0.14.0"
@@ -14,22 +14,18 @@ object Dependencies {
   val munitV      = "1.1.0"
   val mdocV       = mdoc.BuildInfo.version
 
-  val scalapb = Def.setting(ExclusionRule(
-    organization = "com.thesamet.scalapb",
-    name = s"scalapb-runtime_${scalaBinaryVersion.value}",
-  ))
+  private def smorg(pkg: => String, v: String) = Def.setting("org.scalameta" %%% pkg % v)
 
-  val scalametaTestkit = Def.setting("org.scalameta" %%% "testkit" % scalametaV)
+  val munit = smorg("munit", munitV)
+  val scalameta = Def.setting(
+    smorg("scalameta", scalametaV).value
+      .excludeAll("com.thesamet.scalapb" % s"scalapb-runtime_${scalaBinaryVersion.value}"),
+  )
+  val scalametaTestkit = smorg("testkit", scalametaV)
 
-  val scalacheck = "org.scalacheck" %% "scalacheck" % scalacheckV
-  val munit      = Def.setting("org.scalameta" %%% "munit" % munitV)
-  val scalameta = Def
-    .setting(("org.scalameta" %%% "scalameta" % scalametaV).excludeAll(scalapb.value))
-
-  val metaconfig = Def.setting("org.scalameta" %%% "metaconfig-core" % metaconfigV)
-  val metaconfigTypesafe = Def
-    .setting("org.scalameta" %%% "metaconfig-typesafe-config" % metaconfigV)
-  val metaconfigHocon   = Def.setting("com.geirsson" %%% "metaconfig-hocon" % metaconfigV)
-  val metaconfigSconfig = Def.setting("org.scalameta" %%% "metaconfig-sconfig" % metaconfigV)
+  private def metaconfig(pkg: String) = smorg(s"metaconfig-$pkg", metaconfigV)
+  val metaconfigCore                  = metaconfig("core")
+  val metaconfigTypesafe              = metaconfig("typesafe-config")
+  val metaconfigSconfig               = metaconfig("sconfig")
 
 }