Move compiler plugins into common settings

danslapman · Sep 22, 2024 · 9377a4b · 9377a4b
1 parent bee9044
commit 9377a4b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 59 deletions.
diff --git a/build.sbt b/build.sbt
@@ -9,8 +9,6 @@ val versions = Map(
   "scalacheck"               -> "1.15.3",
   "scalatest"                -> "3.2.11",
   "simulacrum"               -> "1.1.0",
-  "paradise"                 -> "2.1.1",
-  "bm4"                      -> "0.3.1",
   "scalatestplus-scalacheck" -> "3.2.11.0",
   "glass"                    -> "0.3.0"
 )
@@ -37,12 +35,7 @@ lazy val morphling = (projectMatrix in file("core"))
           Seq("com.chuusai" %% "shapeless" % "2.3.3")
         case Some((3, _)) => Seq.empty[ModuleID]
       }
-    },
-    libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, y)) if y < 13 =>
-        Seq(compilerPlugin("org.scalamacros" % "paradise" % versions("paradise") cross CrossVersion.full))
-      case _ => Seq.empty[ModuleID]
-    })
+    }
   )
 
 lazy val `morphling-scalacheck` = (projectMatrix in file("scalacheck"))
@@ -60,11 +53,6 @@ lazy val `morphling-scalacheck` = (projectMatrix in file("scalacheck"))
       case Some((2, _)) =>
         Seq("io.github.leviysoft" %% "simulacrum" % versions("simulacrum"))
       case _ => Seq.empty[ModuleID]
-    }),
-    libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, y)) if y < 13 =>
-        Seq(compilerPlugin("org.scalamacros" % "paradise" % versions("paradise") cross CrossVersion.full))
-      case _ => Seq.empty[ModuleID]
     })
   )
 
@@ -92,20 +80,7 @@ lazy val `morphling-circe` = (projectMatrix in file("circe"))
         case Some((2, _)) => "com.ironcorelabs" %% "cats-scalatest" % "3.1.1" % Test
         case Some((3, _)) => "com.ironcorelabs" %% "cats-scalatest" % "4.0.0" % Test
       }
-    },
-    libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, y)) if y < 13 =>
-        Seq(
-          compilerPlugin("org.scalamacros" % "paradise"           % versions("paradise") cross CrossVersion.full),
-          compilerPlugin("com.olegpy"     %% "better-monadic-for" % versions("bm4"))
-        )
-      case Some((2, _)) =>
-        Seq(
-          compilerPlugin("com.olegpy" %% "better-monadic-for" % versions("bm4"))
-        )
-      case _ =>
-        Seq.empty[ModuleID]
-    })
+    }
   )
 
 lazy val `morphling-reactivemongo` = (projectMatrix in file("reactivemongo"))
@@ -138,20 +113,7 @@ lazy val `morphling-reactivemongo` = (projectMatrix in file("reactivemongo"))
             "org.reactivemongo" %% "reactivemongo-bson-api" % "1.1.0-RC6"
           )
       }
-    },
-    libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, y)) if y < 13 =>
-        Seq(
-          compilerPlugin("org.scalamacros" % "paradise"           % versions("paradise") cross CrossVersion.full),
-          compilerPlugin("com.olegpy"     %% "better-monadic-for" % versions("bm4"))
-        )
-      case Some((2, _)) =>
-        Seq(
-          compilerPlugin("com.olegpy" %% "better-monadic-for" % versions("bm4"))
-        )
-      case _ =>
-        Seq.empty[ModuleID]
-    })
+    }
   )
 
 lazy val `morphling-typed-schema` = (projectMatrix in file("typedschema"))
@@ -173,12 +135,6 @@ lazy val `morphling-typed-schema` = (projectMatrix in file("typedschema"))
         Seq("io.github.leviysoft" %% "simulacrum" % versions("simulacrum"))
       case _ =>
         Seq.empty[ModuleID]
-    }),
-    libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, y)) if y < 13 =>
-        Seq(compilerPlugin("org.scalamacros" % "paradise" % versions("paradise") cross CrossVersion.full))
-      case _ =>
-        Seq.empty[ModuleID]
     })
   )
 
@@ -203,12 +159,6 @@ lazy val `morphling-tapir` = (projectMatrix in file("tapir"))
       case Some((2, _)) =>
         Seq("io.github.leviysoft" %% "simulacrum" % versions("simulacrum"))
       case _ => Seq.empty[ModuleID]
-    }),
-    libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, y)) if y < 13 =>
-        Seq(compilerPlugin("org.scalamacros" % "paradise" % versions("paradise") cross CrossVersion.full))
-      case _ =>
-        Seq.empty[ModuleID]
     })
   )
 

diff --git a/project/Settings.scala b/project/Settings.scala
@@ -18,7 +18,8 @@ object Settings {
             "-deprecation",
             "-Ypartial-unification",
             "-Xsource:3",
-            "-P:kind-projector:underscore-placeholders"
+            "-P:kind-projector:underscore-placeholders",
+            "-Yrangepos"
           )
         case Some((2, 13)) =>
           Seq(
@@ -27,12 +28,14 @@ object Settings {
             "-deprecation",
             "-Ymacro-annotations",
             "-Xsource:3",
-            "-P:kind-projector:underscore-placeholders"
+            "-P:kind-projector:underscore-placeholders",
+            "-Yrangepos"
           )
         case Some((3, _)) =>
           Seq(
             "-Ykind-projector:underscores",
-            "-source:future"
+            "-source:future",
+            "-Yrangepos"
           )
       }
     },
@@ -44,15 +47,20 @@ object Settings {
         case Some((3, _)) => Some(projectMatrixBaseDirectory.value.getParentFile / ".scalafix3.conf")
       }
     },
+    libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, y)) if y < 13 =>
+        Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full))
+      case _ => Seq.empty[ModuleID]
+    }),
     libraryDependencies ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, _)) =>
           Seq(
             compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.3" cross CrossVersion.full),
-            compilerPlugin(scalafixSemanticdb)
+            compilerPlugin(scalafixSemanticdb),
+            compilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1")
           )
-        case _ =>
-          Seq.empty[ModuleID]
+        case _ => Seq.empty[ModuleID]
       }
     },
     scmInfo := Some(