Preliminary refactoring: include source dir scala-2.12+ for scala3 as…

… well, remove duplications This is the commit message scalacenter#2: build sbt refactor for core and rules, preliminary
rvacaru · Aug 26, 2022 · 53f2cf0 · 53f2cf0
1 parent f7944df
commit 53f2cf0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/build.sbt b/build.sbt
@@ -84,7 +84,7 @@ lazy val core = projectMatrix
     }
   )
   .defaultAxes(VirtualAxis.jvm)
-  .jvmPlatform(buildScalaVersions :+ scala3, Seq(), p => p)
+  .jvmPlatform(buildScalaVersions :+ scala3)
   .enablePlugins(BuildInfoPlugin)
 
 lazy val rules = projectMatrix
@@ -105,7 +105,7 @@ lazy val rules = projectMatrix
     }
   )
   .defaultAxes(VirtualAxis.jvm)
-  .jvmPlatform(buildScalaVersions :+ scala3, Seq(), p => p)
+  .jvmPlatform(buildScalaVersions :+ scala3)
   .dependsOn(core)
   .enablePlugins(BuildInfoPlugin)
 

diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala
@@ -204,8 +204,10 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
     Compile / doc / scalacOptions ++= scaladocOptions,
     Compile / unmanagedSourceDirectories ++= {
       val sourceDir = (Compile / sourceDirectory).value
+      val scala212PlusSourceDir = "scala-2.12+"
       CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((2, n)) if n >= 12 => Seq(sourceDir / "scala-2.12+")
+        case Some((2, n)) if n >= 12 => Seq(sourceDir / scala212PlusSourceDir)
+        case Some((3, _)) => Seq(sourceDir / scala212PlusSourceDir)
         case _ => Seq()
       }
     },

diff --git a/scalafix-rules/src/main/scala-3/scalafix/internal/rule/TPrintImplicits.scala b/scalafix-rules/src/main/scala-3/scalafix/internal/rule/TPrintImplicits.scala