Preliminary refactoring: include source dir scala-2.12+ for scala3 as well, remove duplications

rvacaru · rvacaru · commit c21e4f319e5e · 2022-08-25T11:26:06.000+02:00
This is the commit message scalacenter#2: build sbt refactor for core and rules, preliminary
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
@@ -203,8 +203,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

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ lazy val core = projectMatrix`
`84`	`84`	`}`
`85`	`85`	`)`
`86`	`86`	`.defaultAxes(VirtualAxis.jvm)`
`87`		`- .jvmPlatform(buildScalaVersions :+ scala3, Seq(), p => p)`
	`87`	`+ .jvmPlatform(buildScalaVersions :+ scala3)`
`88`	`88`	`.enablePlugins(BuildInfoPlugin)`
`89`	`89`
`90`	`90`	`lazy val rules = projectMatrix`
`@@ -105,7 +105,7 @@ lazy val rules = projectMatrix`
`105`	`105`	`}`
`106`	`106`	`)`
`107`	`107`	`.defaultAxes(VirtualAxis.jvm)`
`108`		`- .jvmPlatform(buildScalaVersions :+ scala3, Seq(), p => p)`
	`108`	`+ .jvmPlatform(buildScalaVersions :+ scala3)`
`109`	`109`	`.dependsOn(core)`
`110`	`110`	`.enablePlugins(BuildInfoPlugin)`
`111`	`111`