SBT: build core and reflect for scala3

Use scala3 versions of metaconfig, scalameta, semanticdbShared.

Author: kitbellew

build.sbt

@@ -63,18 +63,6 @@ lazy val interfaces = project
   )
   .disablePlugins(ScalafixPlugin)
 
-// Scala 3 macros vendored separately (i.e. without runtime classes), to
-// shadow Scala 2.13 macros in the Scala 3 compiler classpath, while producing
-// code valid against Scala 2.13 bytecode
-// TODO: after replacing with metaconfig_3, remove -Wconf filter in ScalafixBuild
-lazy val `compat-metaconfig-macros` = projectMatrix
-  .settings(
-    libraryDependencies += metaconfig cross CrossVersion.for3Use2_13
-  )
-  .defaultAxes(VirtualAxis.jvm)
-  .jvmPlatform(cliScalaVersions)
-  .disablePlugins(ScalafixPlugin)
-
 lazy val core = projectMatrix
   .in(file("scalafix-core"))
   .settings(
@@ -83,33 +71,13 @@ lazy val core = projectMatrix
     libraryDependencies ++= Seq(
       googleDiff,
       metaconfig,
-      scalametaFor3Use2_13,
-      semanticdbSharedFor3Use2_13,
+      scalameta,
+      semanticdbShared,
       collectionCompat
     )
   )
   .defaultAxes(VirtualAxis.jvm)
-  .jvmPlatform(coreScalaVersions)
-  .enablePlugins(BuildInfoPlugin)
-
-// keep compiling core3 without exposing it to matrix projects, just
-// to make https://github.com/scalacenter/scalafix/issues/2041 easier
-lazy val core3 = project
-  .in(file("scalafix-core"))
-  .settings(
-    noPublishAndNoMima,
-    buildInfoSettingsForCore,
-    scalaVersion := scala3LTS,
-    libraryDependencies ++= Seq(
-      googleDiff,
-      metaconfig
-    ) ++ Seq(
-      scalametaFor3Use2_13,
-      semanticdbSharedFor3Use2_13
-    ).map { mod =>
-      mod.exclude213((orgLiHaoYi, "sourcecode"), collectionCompat)
-    }
-  )
+  .jvmPlatform(cliScalaVersions)
   .enablePlugins(BuildInfoPlugin)
 
 lazy val rules = projectMatrix
@@ -119,24 +87,11 @@ lazy val rules = projectMatrix
     description := "Built-in Scalafix rules",
     isFullCrossVersion,
     buildInfoSettingsForRules,
-    libraryDependencies ++= {
-      if (!isScala3.value)
-        Seq(
-          orgScalaLang % "scala-compiler" % scalaVersion.value,
-          orgScalaLang % "scala-reflect" % scalaVersion.value,
-          semanticdbScalacCore,
-          collectionCompat
-        )
-      else
-        Seq(
-          orgScalaLang %% "scala3-presentation-compiler" % scalaVersion.value,
-          coursierInterfaces
-        )
-    }
+    libraryDependencies += metaconfig,
+    settingsForSemanticdbScalac
   )
   .defaultAxes(VirtualAxis.jvm)
   .jvmPlatform(CrossVersion.full, cliScalaVersions)
-  .dependsOn(`compat-metaconfig-macros` % "provided")
   .dependsOn(core)
   .enablePlugins(BuildInfoPlugin)
 
@@ -145,35 +100,13 @@ lazy val reflect = projectMatrix
   .settings(
     moduleName := "scalafix-reflect",
     isFullCrossVersion,
-    libraryDependencies ++= Seq(
-      coursierInterfaces,
-      semanticdbScalacCore,
-      orgScalaLang % "scala-compiler" % scalaVersion.value,
-      orgScalaLang % "scala-reflect" % scalaVersion.value
-    )
+    libraryDependencies += coursierInterfaces,
+    settingsForSemanticdbScalac
   )
   .defaultAxes(VirtualAxis.jvm)
-  .jvmPlatform(coreScalaVersions)
+  .jvmPlatform(cliScalaVersions)
   .dependsOn(core)
 
-// keep compiling reflect3 without exposing it to matrix projects, just
-// to make https://github.com/scalacenter/scalafix/issues/2041 easier
-lazy val reflect3 = project
-  .in(file("scalafix-reflect"))
-  .settings(
-    isFullCrossVersion,
-    noPublishAndNoMima,
-    scalaVersion := scala3LTS,
-    libraryDependencies ++= Seq(
-      // CrossVersion.for3Use2_13 would only lookup a binary version artifact, but this is published with full version
-      semanticdbScalacCore
-        .cross(CrossVersion.constant(scala213))
-        .exclude213((orgLiHaoYi, "sourcecode"), collectionCompat),
-      orgScalaLang %% "scala3-compiler" % scalaVersion.value
-    )
-  )
-  .dependsOn(core3)
-
 lazy val cli = projectMatrix
   .in(file("scalafix-cli"))
   .settings(
@@ -182,6 +115,7 @@ lazy val cli = projectMatrix
     libraryDependencies ++= Seq(
       nailgunServer,
       jgit,
+      metaconfig,
       commonText
     ),
     libraryDependencies ++= {
@@ -212,7 +146,6 @@ lazy val cli = projectMatrix
   .defaultAxes(VirtualAxis.jvm)
   .jvmPlatform(CrossVersion.full, cliScalaVersions)
   .dependsOn(interfaces)
-  .dependsOn(`compat-metaconfig-macros` % "provided")
   .dependsOn(reflect, rules)
 
 lazy val testkit = projectMatrix
@@ -298,16 +231,9 @@ lazy val unit = projectMatrix
     libraryDependencies ++= Seq(
       jgit,
       munit,
+      scalametaTestkit,
       scalatest
     ),
-    libraryDependencies += {
-      if (!isScala3.value) {
-        scalametaTeskitFor3Use2_13
-      } else {
-        // exclude _2.13 artifacts that have their _3 counterpart in the classpath
-        scalametaTeskitFor3Use2_13.exclude213(munit)
-      }
-    },
     buildInfoPackage := "scalafix.tests",
     buildInfoKeys := Seq[BuildInfoKey](
       "scalaVersion" -> scalaVersion.value
@@ -465,7 +391,7 @@ lazy val docs = projectMatrix
       Dependencies.runtimeDepsForBackwardCompatibility
         .map(_.withRevision(VersionScheme.Always)),
     // force eviction of mdoc transitive dependency
-    dependencyOverrides += scalametaFor3Use2_13
+    dependencyOverrides += scalameta
   )
   .defaultAxes(VirtualAxis.jvm)
   .jvmPlatform(scalaVersions = Seq(scala213))

project/Dependencies.scala

@@ -51,14 +51,14 @@ object Dependencies {
   val metacp = orgScalameta %% "metacp" % scalametaV
   val nailgunServer = "com.martiansoftware" % "nailgun-server" % nailgunV
   val scalaXml = orgScalaLangMod %% "scala-xml" % scalaXmlV
-  val scalametaFor3Use2_13 = orgScalameta %% "scalameta" % scalametaV cross CrossVersion.for3Use2_13
-  val scalametaTeskitFor3Use2_13 = orgScalameta %% "testkit" % scalametaV cross CrossVersion.for3Use2_13
+  val scalameta = orgScalameta %% "scalameta" % scalametaV
+  val scalametaTestkit = orgScalameta %% "testkit" % scalametaV
   val scalatags = orgLiHaoYi %% "scalatags" % scalatagsV
   val scalatest = "org.scalatest" %% "scalatest" % scalatestV
   val munit = orgScalameta %% "munit" % munitV
   val semanticdbScalac = orgScalameta % "semanticdb-scalac" % scalametaV cross CrossVersion.full
   val semanticdbScalacCore = orgScalameta % "semanticdb-scalac-core" % scalametaV cross CrossVersion.full
-  val semanticdbSharedFor3Use2_13 = orgScalameta % "semanticdb-shared" % scalametaV cross CrossVersion.for3Use2_13
+  val semanticdbShared = orgScalameta %% "semanticdb-shared" % scalametaV
 
   // scala-steward:off
 

project/ScalafixBuild.scala

@@ -29,14 +29,12 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
       publish / skip := true
     )
 
-    // https://github.com/scalameta/scalameta/issues/2485
-    lazy val coreScalaVersions = scala2Versions
-    lazy val cliScalaVersions = {
+    lazy val cliScalaVersions: Seq[String] = {
       val unsupportedVersions: Set[String] =
         if (Properties.isJavaAtLeast("25")) Set(scala212, scala35, scala36)
         else if (!Properties.isJavaAtLeast("17")) Set(scala38)
         else Set.empty
-      (coreScalaVersions ++ scala3Versions).filterNot(unsupportedVersions)
+      (scala2Versions ++ scala3Versions).filterNot(unsupportedVersions)
     }
     lazy val cliScalaVersionsWithTargets: Seq[(String, TargetAxis)] =
       cliScalaVersions.map(sv => (sv, TargetAxis(sv))) ++
@@ -137,6 +135,26 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
       else Nil
     )
 
+    def settingsForSemanticdbScalac: Seq[Def.Setting[?]] = Def.settings(
+      libraryDependencies ++= {
+        if (isScala3.value)
+          Seq(
+            // CrossVersion.for3Use2_13 would only lookup a binary version artifact, but this is published with full version
+            semanticdbScalacCore
+              .cross(CrossVersion.constant(scala213))
+              .exclude213(semanticdbShared),
+            orgScalaLang %% "scala3-presentation-compiler" % scalaVersion.value,
+            orgScalaLang %% "scala3-compiler" % scalaVersion.value
+          )
+        else
+          Seq(
+            semanticdbScalacCore,
+            orgScalaLang % "scala-compiler" % scalaVersion.value,
+            orgScalaLang % "scala-reflect" % scalaVersion.value
+          )
+      }
+    )
+
     lazy val buildInfoSettingsForCore: Seq[Def.Setting[_]] = Seq(
       buildInfoKeys := Seq[BuildInfoKey](
         name,
@@ -286,9 +304,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
     scalacOptions ++= Seq( // exclusions
       "-Wconf:cat=deprecation&msg=Rule:s",
       "-Wconf:cat=deprecation&msg=JavaConverters:s",
-      "-Wconf:cat=deprecation&msg=AssociatedComments:s",
-      // TODO: remove after replacing compat-metaconfig-macros with proper metaconfig
-      "-Wconf:msg=.*Toplevel definition .* is defined in.*:s"
+      "-Wconf:cat=deprecation&msg=AssociatedComments:s"
     ),
     scalacOptions += "-Wconf:origin=scala.collection.compat.*:s",
     scalacOptions ++= compilerOptions.value,