From e08e1cb975b77e6b8d432211902471aa11349f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CRazvan?= <razvan.vacaru@tmnl.nl>
Date: Fri, 5 Aug 2022 16:13:09 +0200
Subject: [PATCH] Squashed commits: scalafix-testkit3 cross compiled for scala3

This is the commit message #2:

build sbt changes for test modules

This is the commit message #3:

test modules: scalatest3V definition
---
 build.sbt                                     | 19 +++++++++++--------
 project/Dependencies.scala                    |  1 +
 project/ScalafixBuild.scala                   |  3 ++-
 .../scalafix/testkit/SemanticRuleSuite.scala  |  1 +
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/build.sbt b/build.sbt
index fe02a8dad..8df68bb99 100644
--- a/build.sbt
+++ b/build.sbt
@@ -173,7 +173,7 @@ lazy val testsShared = projectMatrix
     coverageEnabled := false
   )
   .defaultAxes(VirtualAxis.jvm)
-  .jvmPlatform(testTargetScalaVersions)
+  .jvmPlatform(buildScalaVersions :+ scala3)
   .disablePlugins(ScalafixPlugin)
 
 lazy val testsInput = projectMatrix
@@ -189,7 +189,7 @@ lazy val testsInput = projectMatrix
     coverageEnabled := false
   )
   .defaultAxes(VirtualAxis.jvm)
-  .jvmPlatform(testTargetScalaVersions)
+  .jvmPlatform(buildScalaVersions :+ scala3)
   .disablePlugins(ScalafixPlugin)
 
 lazy val testsOutput = projectMatrix
@@ -201,7 +201,7 @@ lazy val testsOutput = projectMatrix
     coverageEnabled := false
   )
   .defaultAxes(VirtualAxis.jvm)
-  .jvmPlatform(testTargetScalaVersions)
+  .jvmPlatform(buildScalaVersions :+ scala3)
   .disablePlugins(ScalafixPlugin)
 
 lazy val testkit = projectMatrix
@@ -209,13 +209,16 @@ lazy val testkit = projectMatrix
   .settings(
     moduleName := "scalafix-testkit",
     isFullCrossVersion,
-    libraryDependencies ++= Seq(
-      googleDiff,
-      scalatest
-    )
+    libraryDependencies += googleDiff,
+    libraryDependencies ++= {
+      if (!isScala3.value)
+        Seq(scalatest)
+      else
+        Seq("org.scalatest" %% "scalatest" % scalatest3V)
+    }
   )
   .defaultAxes(VirtualAxis.jvm)
-  .jvmPlatform(buildScalaVersions)
+  .jvmPlatform(buildScalaVersions :+ scala3)
   .dependsOn(cli)
 
 lazy val unit = projectMatrix
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index bab1f92e0..94de9091f 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -35,6 +35,7 @@ object Dependencies {
   val scalaXml211V = "1.3.0" // scala-xml stops publishing for scala 2.11
   val scalametaV = "4.5.13"
   val scalatestV = "3.0.8" // don't bump, to avoid forcing breaking changes on clients via eviction
+  val scalatest3V = "3.2.13"
 
   val bijectionCore = "com.twitter" %% "bijection-core" % bijectionCoreV
   val collectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % collectionCompatV
diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala
index 3d908aa37..b043778f3 100644
--- a/project/ScalafixBuild.scala
+++ b/project/ScalafixBuild.scala
@@ -143,7 +143,8 @@ 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
+        "cli3/compile" ::
+        "testkit3/compile" :: // TODO replace core rules and reflect with unit3 in the end
         s
     },
     commands += Command.command("ci-213") { s =>
diff --git a/scalafix-testkit/src/main/scala/scalafix/testkit/SemanticRuleSuite.scala b/scalafix-testkit/src/main/scala/scalafix/testkit/SemanticRuleSuite.scala
index 0f3069650..04644da4a 100644
--- a/scalafix-testkit/src/main/scala/scalafix/testkit/SemanticRuleSuite.scala
+++ b/scalafix-testkit/src/main/scala/scalafix/testkit/SemanticRuleSuite.scala
@@ -1,6 +1,7 @@
 package scalafix.testkit
 
 import scala.meta._
+import scala.meta.internal.inputs.XtensionInputSyntaxStructure
 
 import scalafix.internal.reflect.RuleCompilerClasspath
 import scalafix.internal.testkit.EndOfLineAssertExtractor