Merge remote-tracking branch 'organize-imports/master' into organize-…

…imports
liancheng · May 23, 2023 · b10f4f2 · b10f4f2
2 parents afb12ac + 596459a
commit b10f4f2
Show file tree

Hide file tree

Showing 138 changed files with 4,184 additions and 2 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -63,6 +63,7 @@ scalafix-tests
 |
 ├── integration   # Integration test suites
 |
+├── shared        # Code that is shared between input and unit projects
 ├── input         # Source files to be analyzed and fixed by rules
 ├── output        # Expected output from running rewrite rules
 └── expect        # Verify expectations defined in input/output using testkit

diff --git a/build.sbt b/build.sbt
@@ -174,6 +174,16 @@ lazy val testkit = projectMatrix
   .jvmPlatform(buildScalaVersions)
   .dependsOn(cli)
 
+lazy val shared = projectMatrix
+  .in(file("scalafix-tests/shared"))
+  .settings(
+    noPublishAndNoMima,
+    coverageEnabled := false
+  )
+  .defaultAxes(VirtualAxis.jvm)
+  .jvmPlatformFull(buildWithTargetVersions.map(_._2))
+  .disablePlugins(ScalafixPlugin)
+
 lazy val input = projectMatrix
   .in(file("scalafix-tests/input"))
   .settings(
@@ -189,6 +199,7 @@ lazy val input = projectMatrix
   .defaultAxes(VirtualAxis.jvm)
   .jvmPlatformFull(buildWithTargetVersions.map(_._2))
   .disablePlugins(ScalafixPlugin)
+  .dependsOn(shared)
 
 lazy val output = projectMatrix
   .in(file("scalafix-tests/output"))
@@ -201,6 +212,7 @@ lazy val output = projectMatrix
   .defaultAxes(VirtualAxis.jvm)
   .jvmPlatform(buildScalaVersions)
   .disablePlugins(ScalafixPlugin)
+  .dependsOn(shared)
 
 lazy val unit = projectMatrix
   .in(file("scalafix-tests/unit"))