Squashed commits: scalafix-cli3 cross compiled for scala3

This is the commit message scalacenter#2: build dbt cli This is the commit message scalacenter#2: removed cli3 duplicate entry for TPrintImplicits
rvacaru · Aug 12, 2022 · 27c2f2b · 27c2f2b
1 parent b32bb67
commit 27c2f2b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -137,13 +137,18 @@ lazy val cli = projectMatrix
     moduleName := "scalafix-cli",
     isFullCrossVersion,
     libraryDependencies ++= Seq(
-      java8Compat,
       nailgunServer,
       jgit,
       commonText
     ),
     libraryDependencies ++= {
-      if (isScala211.value) Seq()
+      if (!isScala3.value)
+        Seq(java8Compat)
+      else
+        Seq()
+    },
+    libraryDependencies ++= {
+      if (isScala211.value || isScala3.value) Seq()
       else
         Seq(
           // metaconfig 0.10.0 shaded pprint but rules built with an old
@@ -158,7 +163,7 @@ lazy val cli = projectMatrix
     }.value
   )
   .defaultAxes(VirtualAxis.jvm)
-  .jvmPlatform(buildScalaVersions)
+  .jvmPlatform(buildScalaVersions :+ scala3)
   .dependsOn(reflect, interfaces, rules)
 
 lazy val testsShared = projectMatrix

diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala
@@ -146,6 +146,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
         "core3/compile" ::
         "rules3/compile" ::
         "reflect3/compile" ::
+        "cli3/compile" :: // TODO replace core rules and reflect with unit3 in the end
         s
     },
     commands += Command.command("ci-213") { s =>

diff --git a/scalafix-cli/src/main/scala/scalafix/internal/interfaces/ScalafixFileEvaluationImpl.scala b/scalafix-cli/src/main/scala/scalafix/internal/interfaces/ScalafixFileEvaluationImpl.scala
@@ -143,7 +143,7 @@ object ScalafixFileEvaluationImpl {
       ctx: RuleCtx,
       index: Option[v0.SemanticdbIndex]
   ): ScalafixFileEvaluationImpl = {
-    val scalafixPatches = patches.map(ScalafixPatchImpl)
+    val scalafixPatches = patches.map(ScalafixPatchImpl.apply)
     ScalafixFileEvaluationImpl(
       originalPath = originalPath,
       fixedOpt = fixed,

diff --git a/scalafix-cli/src/main/scala/scalafix/internal/interfaces/ScalafixInputImpl.scala b/scalafix-cli/src/main/scala/scalafix/internal/interfaces/ScalafixInputImpl.scala
@@ -7,6 +7,7 @@ import java.util.Optional
 import scala.{meta => m}
 
 import scala.meta.inputs.Input
+import scala.meta.internal.inputs.XtensionInputSyntaxStructure
 
 import scalafix.interfaces.ScalafixInput
 

diff --git a/scalafix-cli/src/main/scala/scalafix/internal/v1/MainOps.scala b/scalafix-cli/src/main/scala/scalafix/internal/v1/MainOps.scala
@@ -19,6 +19,7 @@ import scala.util.control.NoStackTrace
 import scala.util.control.NonFatal
 
 import scala.meta.inputs.Input
+import scala.meta.internal.inputs.XtensionInputSyntaxStructure
 import scala.meta.internal.semanticdb.TextDocument
 import scala.meta.io.AbsolutePath
 import scala.meta.parsers.ParseException

diff --git a/scalafix-cli/src/main/scala/scalafix/internal/v1/ValidatedArgs.scala b/scalafix-cli/src/main/scala/scalafix/internal/v1/ValidatedArgs.scala
@@ -3,6 +3,7 @@ package scalafix.internal.v1
 import scala.meta.AbsolutePath
 import scala.meta.Input
 import scala.meta.Source
+import scala.meta.internal.inputs.XtensionInputSyntaxStructure
 import scala.meta.internal.io.FileIO
 import scala.meta.internal.symtab.SymbolTable
 import scala.meta.io.RelativePath