From a8d98c57a4b2b1928e868a5525d5ec9983fdce2a Mon Sep 17 00:00:00 2001 From: Brice Jaglin Date: Wed, 24 Apr 2024 18:45:25 +0200 Subject: [PATCH] parallelize scripted scriptedBatchExecution effectively ignores custom build.properties, so this takes a different approach, running one sbt version per execution, spread over JDK versions for simplicity. --- .github/workflows/ci.yml | 14 +++++++++++--- build.sbt | 9 ++++----- .../cross-build-scala3/project/build.properties | 1 - src/sbt-test/sbt-1.5/scala-3/build.sbt | 1 - .../sbt-1.5/scala-3/project/build.properties | 1 - .../scalafixEnable/project/build.properties | 1 - .../sbt-1.5/testkit/project/build.properties | 1 - .../scalafixResolvers/.env | 0 .../scalafixResolvers/build.sbt | 0 .../scalafixResolvers/project/plugins.sbt | 0 .../scalafixResolvers/test | 0 .../cross-build-scala3/.scalafix-2.conf | 0 .../cross-build-scala3/.scalafix-3.conf | 0 .../cross-build-scala3/build.sbt | 0 .../cross-build-scala3/project/plugins.sbt | 0 .../cross-build-scala3/src/main/scala-2/Main.scala | 0 .../src/main/scala-2/Main.scala.expected | 0 .../cross-build-scala3/src/main/scala-3/Main.scala | 0 .../src/main/scala-3/Main.scala.expected | 0 .../cross-build-scala3/test | 0 src/sbt-test/skip-sbt1.4/scala-3/build.sbt | 1 + .../scala-3/project/plugins.sbt | 0 .../src/main/scala/SignificantIndentation.scala | 0 src/sbt-test/{sbt-1.5 => skip-sbt1.4}/scala-3/test | 0 .../scalafixEnable/build.sbt | 2 +- .../scalafixEnable/project/plugins.sbt | 0 .../scala210/src/main/scala/Main.scala | 0 .../scala211/src/main/scala/Main.scala | 0 .../scala212/src/main/scala/Main.scala | 0 .../src/main/scala/SignificantIndentation.scala | 0 .../{sbt-1.5 => skip-sbt1.4}/scalafixEnable/test | 0 .../{sbt-1.5 => skip-sbt1.4}/testkit/build.sbt | 2 +- .../input/src/main/scala-2.13/fix/Source3.scala | 0 .../input/src/main/scala/fix/SemanticBasic.scala | 0 .../output/src/main/scala-2.13/fix/Source3.scala | 0 .../output/src/main/scala/fix/SemanticBasic.scala | 0 .../testkit/project/TargetAxis.scala | 0 .../testkit/project/plugins.sbt | 0 .../resources/META-INF/services/scalafix.v1.Rule | 0 .../rules/src/main/scala/fix/Semantic.scala | 0 src/sbt-test/{sbt-1.5 => skip-sbt1.4}/testkit/test | 0 .../src/test/scala/fix/InputOutputSuite.scala | 0 42 files changed, 18 insertions(+), 15 deletions(-) delete mode 100644 src/sbt-test/sbt-1.5/cross-build-scala3/project/build.properties delete mode 100644 src/sbt-test/sbt-1.5/scala-3/build.sbt delete mode 100644 src/sbt-test/sbt-1.5/scala-3/project/build.properties delete mode 100644 src/sbt-test/sbt-1.5/scalafixEnable/project/build.properties delete mode 100644 src/sbt-test/sbt-1.5/testkit/project/build.properties rename src/sbt-test/{skip-java17 => skip-java17+}/scalafixResolvers/.env (100%) rename src/sbt-test/{skip-java17 => skip-java17+}/scalafixResolvers/build.sbt (100%) rename src/sbt-test/{skip-java17 => skip-java17+}/scalafixResolvers/project/plugins.sbt (100%) rename src/sbt-test/{skip-java17 => skip-java17+}/scalafixResolvers/test (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/cross-build-scala3/.scalafix-2.conf (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/cross-build-scala3/.scalafix-3.conf (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/cross-build-scala3/build.sbt (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/cross-build-scala3/project/plugins.sbt (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/cross-build-scala3/src/main/scala-2/Main.scala (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/cross-build-scala3/src/main/scala-2/Main.scala.expected (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/cross-build-scala3/src/main/scala-3/Main.scala (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/cross-build-scala3/src/main/scala-3/Main.scala.expected (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/cross-build-scala3/test (100%) create mode 100644 src/sbt-test/skip-sbt1.4/scala-3/build.sbt rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/scala-3/project/plugins.sbt (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/scala-3/src/main/scala/SignificantIndentation.scala (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/scala-3/test (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/scalafixEnable/build.sbt (89%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/scalafixEnable/project/plugins.sbt (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/scalafixEnable/scala210/src/main/scala/Main.scala (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/scalafixEnable/scala211/src/main/scala/Main.scala (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/scalafixEnable/scala212/src/main/scala/Main.scala (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/scalafixEnable/scala3/src/main/scala/SignificantIndentation.scala (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/scalafixEnable/test (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/testkit/build.sbt (98%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/testkit/input/src/main/scala-2.13/fix/Source3.scala (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/testkit/input/src/main/scala/fix/SemanticBasic.scala (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/testkit/output/src/main/scala-2.13/fix/Source3.scala (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/testkit/output/src/main/scala/fix/SemanticBasic.scala (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/testkit/project/TargetAxis.scala (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/testkit/project/plugins.sbt (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/testkit/rules/src/main/resources/META-INF/services/scalafix.v1.Rule (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/testkit/rules/src/main/scala/fix/Semantic.scala (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/testkit/test (100%) rename src/sbt-test/{sbt-1.5 => skip-sbt1.4}/testkit/tests/src/test/scala/fix/InputOutputSuite.scala (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f4218b9..ffade04d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,7 @@ jobs: - uses: coursier/setup-action@v1 with: jvm: temurin:8 + - run: rm -rf src/sbt-test/skip-sbt1.4 - run: sbt test scripted jdk11: name: JDK11 tests @@ -22,6 +23,7 @@ jobs: - uses: coursier/setup-action@v1 with: jvm: temurin:11 + - run: rm -rf src/sbt-test/skip-sbt1.4 - run: sbt test scripted jdk17: name: JDK17 tests @@ -31,7 +33,10 @@ jobs: - uses: coursier/setup-action@v1 with: jvm: temurin:17 - - run: sbt "test; scripted sbt-*/* skip-windows/*" + - run: rm -rf src/sbt-test/skip-java17+ + - run: rm -rf src/sbt-test/skip-sbt1.4 + - run: sbt test scripted + jdk21: name: JDK21 tests runs-on: ubuntu-latest @@ -40,14 +45,17 @@ jobs: - uses: coursier/setup-action@v1 with: jvm: temurin:21 - - run: sbt "test; scripted sbt-scalafix/* skip-windows/*" + - run: rm -rf src/sbt-test/skip-java17+ + - run: sbt test scripted windows: name: Windows tests runs-on: windows-latest steps: - uses: actions/checkout@v4 - uses: coursier/setup-action@v1 - - run: sbt ci-windows + - run: rm -r -fo src\sbt-test\skip-sbt1.4 + - run: rm -r -fo src\sbt-test\skip-windows + - run: sbt test-skip-windows scripted shell: bash checks: name: Scalafmt diff --git a/build.sbt b/build.sbt index 14182989..5af724d0 100644 --- a/build.sbt +++ b/build.sbt @@ -31,9 +31,8 @@ developers := List( ) ) -commands += Command.command("ci-windows") { s => +commands += Command.command("test-skip-windows") { s => "testOnly -- -l SkipWindows" :: - "scripted sbt-*/*" :: s } @@ -56,9 +55,7 @@ scriptedSbt := { if (jdk >= 21) "1.9.0" // first release that supports JDK21 else - // https://github.com/sbt/sbt/commit/3b9b200 - // 1.4.[0-2] force batch mode which is not compatible with custom build.properties - "1.4.3" + (pluginCrossBuild / sbtVersion).value } libraryDependencies += compilerPlugin(scalafixSemanticdb) @@ -75,6 +72,8 @@ scalacOptions ++= List( enablePlugins(ScriptedPlugin) sbtPlugin := true scriptedBufferLog := false +scriptedBatchExecution := true +scriptedParallelInstances := 2 scriptedLaunchOpts ++= Seq( "-Xmx2048M", s"-Dplugin.version=${version.value}", diff --git a/src/sbt-test/sbt-1.5/cross-build-scala3/project/build.properties b/src/sbt-test/sbt-1.5/cross-build-scala3/project/build.properties deleted file mode 100644 index e64c208f..00000000 --- a/src/sbt-test/sbt-1.5/cross-build-scala3/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.5.8 diff --git a/src/sbt-test/sbt-1.5/scala-3/build.sbt b/src/sbt-test/sbt-1.5/scala-3/build.sbt deleted file mode 100644 index f34bf3c7..00000000 --- a/src/sbt-test/sbt-1.5/scala-3/build.sbt +++ /dev/null @@ -1 +0,0 @@ -scalaVersion := "3.0.0-RC3" diff --git a/src/sbt-test/sbt-1.5/scala-3/project/build.properties b/src/sbt-test/sbt-1.5/scala-3/project/build.properties deleted file mode 100644 index e64c208f..00000000 --- a/src/sbt-test/sbt-1.5/scala-3/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.5.8 diff --git a/src/sbt-test/sbt-1.5/scalafixEnable/project/build.properties b/src/sbt-test/sbt-1.5/scalafixEnable/project/build.properties deleted file mode 100644 index e64c208f..00000000 --- a/src/sbt-test/sbt-1.5/scalafixEnable/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.5.8 diff --git a/src/sbt-test/sbt-1.5/testkit/project/build.properties b/src/sbt-test/sbt-1.5/testkit/project/build.properties deleted file mode 100644 index e64c208f..00000000 --- a/src/sbt-test/sbt-1.5/testkit/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.5.8 diff --git a/src/sbt-test/skip-java17/scalafixResolvers/.env b/src/sbt-test/skip-java17+/scalafixResolvers/.env similarity index 100% rename from src/sbt-test/skip-java17/scalafixResolvers/.env rename to src/sbt-test/skip-java17+/scalafixResolvers/.env diff --git a/src/sbt-test/skip-java17/scalafixResolvers/build.sbt b/src/sbt-test/skip-java17+/scalafixResolvers/build.sbt similarity index 100% rename from src/sbt-test/skip-java17/scalafixResolvers/build.sbt rename to src/sbt-test/skip-java17+/scalafixResolvers/build.sbt diff --git a/src/sbt-test/skip-java17/scalafixResolvers/project/plugins.sbt b/src/sbt-test/skip-java17+/scalafixResolvers/project/plugins.sbt similarity index 100% rename from src/sbt-test/skip-java17/scalafixResolvers/project/plugins.sbt rename to src/sbt-test/skip-java17+/scalafixResolvers/project/plugins.sbt diff --git a/src/sbt-test/skip-java17/scalafixResolvers/test b/src/sbt-test/skip-java17+/scalafixResolvers/test similarity index 100% rename from src/sbt-test/skip-java17/scalafixResolvers/test rename to src/sbt-test/skip-java17+/scalafixResolvers/test diff --git a/src/sbt-test/sbt-1.5/cross-build-scala3/.scalafix-2.conf b/src/sbt-test/skip-sbt1.4/cross-build-scala3/.scalafix-2.conf similarity index 100% rename from src/sbt-test/sbt-1.5/cross-build-scala3/.scalafix-2.conf rename to src/sbt-test/skip-sbt1.4/cross-build-scala3/.scalafix-2.conf diff --git a/src/sbt-test/sbt-1.5/cross-build-scala3/.scalafix-3.conf b/src/sbt-test/skip-sbt1.4/cross-build-scala3/.scalafix-3.conf similarity index 100% rename from src/sbt-test/sbt-1.5/cross-build-scala3/.scalafix-3.conf rename to src/sbt-test/skip-sbt1.4/cross-build-scala3/.scalafix-3.conf diff --git a/src/sbt-test/sbt-1.5/cross-build-scala3/build.sbt b/src/sbt-test/skip-sbt1.4/cross-build-scala3/build.sbt similarity index 100% rename from src/sbt-test/sbt-1.5/cross-build-scala3/build.sbt rename to src/sbt-test/skip-sbt1.4/cross-build-scala3/build.sbt diff --git a/src/sbt-test/sbt-1.5/cross-build-scala3/project/plugins.sbt b/src/sbt-test/skip-sbt1.4/cross-build-scala3/project/plugins.sbt similarity index 100% rename from src/sbt-test/sbt-1.5/cross-build-scala3/project/plugins.sbt rename to src/sbt-test/skip-sbt1.4/cross-build-scala3/project/plugins.sbt diff --git a/src/sbt-test/sbt-1.5/cross-build-scala3/src/main/scala-2/Main.scala b/src/sbt-test/skip-sbt1.4/cross-build-scala3/src/main/scala-2/Main.scala similarity index 100% rename from src/sbt-test/sbt-1.5/cross-build-scala3/src/main/scala-2/Main.scala rename to src/sbt-test/skip-sbt1.4/cross-build-scala3/src/main/scala-2/Main.scala diff --git a/src/sbt-test/sbt-1.5/cross-build-scala3/src/main/scala-2/Main.scala.expected b/src/sbt-test/skip-sbt1.4/cross-build-scala3/src/main/scala-2/Main.scala.expected similarity index 100% rename from src/sbt-test/sbt-1.5/cross-build-scala3/src/main/scala-2/Main.scala.expected rename to src/sbt-test/skip-sbt1.4/cross-build-scala3/src/main/scala-2/Main.scala.expected diff --git a/src/sbt-test/sbt-1.5/cross-build-scala3/src/main/scala-3/Main.scala b/src/sbt-test/skip-sbt1.4/cross-build-scala3/src/main/scala-3/Main.scala similarity index 100% rename from src/sbt-test/sbt-1.5/cross-build-scala3/src/main/scala-3/Main.scala rename to src/sbt-test/skip-sbt1.4/cross-build-scala3/src/main/scala-3/Main.scala diff --git a/src/sbt-test/sbt-1.5/cross-build-scala3/src/main/scala-3/Main.scala.expected b/src/sbt-test/skip-sbt1.4/cross-build-scala3/src/main/scala-3/Main.scala.expected similarity index 100% rename from src/sbt-test/sbt-1.5/cross-build-scala3/src/main/scala-3/Main.scala.expected rename to src/sbt-test/skip-sbt1.4/cross-build-scala3/src/main/scala-3/Main.scala.expected diff --git a/src/sbt-test/sbt-1.5/cross-build-scala3/test b/src/sbt-test/skip-sbt1.4/cross-build-scala3/test similarity index 100% rename from src/sbt-test/sbt-1.5/cross-build-scala3/test rename to src/sbt-test/skip-sbt1.4/cross-build-scala3/test diff --git a/src/sbt-test/skip-sbt1.4/scala-3/build.sbt b/src/sbt-test/skip-sbt1.4/scala-3/build.sbt new file mode 100644 index 00000000..5d620df2 --- /dev/null +++ b/src/sbt-test/skip-sbt1.4/scala-3/build.sbt @@ -0,0 +1 @@ +scalaVersion := "3.3.1" diff --git a/src/sbt-test/sbt-1.5/scala-3/project/plugins.sbt b/src/sbt-test/skip-sbt1.4/scala-3/project/plugins.sbt similarity index 100% rename from src/sbt-test/sbt-1.5/scala-3/project/plugins.sbt rename to src/sbt-test/skip-sbt1.4/scala-3/project/plugins.sbt diff --git a/src/sbt-test/sbt-1.5/scala-3/src/main/scala/SignificantIndentation.scala b/src/sbt-test/skip-sbt1.4/scala-3/src/main/scala/SignificantIndentation.scala similarity index 100% rename from src/sbt-test/sbt-1.5/scala-3/src/main/scala/SignificantIndentation.scala rename to src/sbt-test/skip-sbt1.4/scala-3/src/main/scala/SignificantIndentation.scala diff --git a/src/sbt-test/sbt-1.5/scala-3/test b/src/sbt-test/skip-sbt1.4/scala-3/test similarity index 100% rename from src/sbt-test/sbt-1.5/scala-3/test rename to src/sbt-test/skip-sbt1.4/scala-3/test diff --git a/src/sbt-test/sbt-1.5/scalafixEnable/build.sbt b/src/sbt-test/skip-sbt1.4/scalafixEnable/build.sbt similarity index 89% rename from src/sbt-test/sbt-1.5/scalafixEnable/build.sbt rename to src/sbt-test/skip-sbt1.4/scalafixEnable/build.sbt index 86c4551d..b85f037e 100644 --- a/src/sbt-test/sbt-1.5/scalafixEnable/build.sbt +++ b/src/sbt-test/skip-sbt1.4/scalafixEnable/build.sbt @@ -21,5 +21,5 @@ lazy val scala212 = project lazy val scala3 = project .in(file("scala3")) .settings( - scalaVersion := "3.0.0-RC3" // built-in support for semanticdb + scalaVersion := "3.3.1" // built-in support for semanticdb ) diff --git a/src/sbt-test/sbt-1.5/scalafixEnable/project/plugins.sbt b/src/sbt-test/skip-sbt1.4/scalafixEnable/project/plugins.sbt similarity index 100% rename from src/sbt-test/sbt-1.5/scalafixEnable/project/plugins.sbt rename to src/sbt-test/skip-sbt1.4/scalafixEnable/project/plugins.sbt diff --git a/src/sbt-test/sbt-1.5/scalafixEnable/scala210/src/main/scala/Main.scala b/src/sbt-test/skip-sbt1.4/scalafixEnable/scala210/src/main/scala/Main.scala similarity index 100% rename from src/sbt-test/sbt-1.5/scalafixEnable/scala210/src/main/scala/Main.scala rename to src/sbt-test/skip-sbt1.4/scalafixEnable/scala210/src/main/scala/Main.scala diff --git a/src/sbt-test/sbt-1.5/scalafixEnable/scala211/src/main/scala/Main.scala b/src/sbt-test/skip-sbt1.4/scalafixEnable/scala211/src/main/scala/Main.scala similarity index 100% rename from src/sbt-test/sbt-1.5/scalafixEnable/scala211/src/main/scala/Main.scala rename to src/sbt-test/skip-sbt1.4/scalafixEnable/scala211/src/main/scala/Main.scala diff --git a/src/sbt-test/sbt-1.5/scalafixEnable/scala212/src/main/scala/Main.scala b/src/sbt-test/skip-sbt1.4/scalafixEnable/scala212/src/main/scala/Main.scala similarity index 100% rename from src/sbt-test/sbt-1.5/scalafixEnable/scala212/src/main/scala/Main.scala rename to src/sbt-test/skip-sbt1.4/scalafixEnable/scala212/src/main/scala/Main.scala diff --git a/src/sbt-test/sbt-1.5/scalafixEnable/scala3/src/main/scala/SignificantIndentation.scala b/src/sbt-test/skip-sbt1.4/scalafixEnable/scala3/src/main/scala/SignificantIndentation.scala similarity index 100% rename from src/sbt-test/sbt-1.5/scalafixEnable/scala3/src/main/scala/SignificantIndentation.scala rename to src/sbt-test/skip-sbt1.4/scalafixEnable/scala3/src/main/scala/SignificantIndentation.scala diff --git a/src/sbt-test/sbt-1.5/scalafixEnable/test b/src/sbt-test/skip-sbt1.4/scalafixEnable/test similarity index 100% rename from src/sbt-test/sbt-1.5/scalafixEnable/test rename to src/sbt-test/skip-sbt1.4/scalafixEnable/test diff --git a/src/sbt-test/sbt-1.5/testkit/build.sbt b/src/sbt-test/skip-sbt1.4/testkit/build.sbt similarity index 98% rename from src/sbt-test/sbt-1.5/testkit/build.sbt rename to src/sbt-test/skip-sbt1.4/testkit/build.sbt index 0b242a25..e080f726 100644 --- a/src/sbt-test/sbt-1.5/testkit/build.sbt +++ b/src/sbt-test/skip-sbt1.4/testkit/build.sbt @@ -1,7 +1,7 @@ lazy val V = _root_.scalafix.sbt.BuildInfo lazy val rulesCrossVersions = Seq(V.scala213, V.scala212) -lazy val scala3Version = "3.0.0" +lazy val scala3Version = "3.3.1" inThisBuild( List( diff --git a/src/sbt-test/sbt-1.5/testkit/input/src/main/scala-2.13/fix/Source3.scala b/src/sbt-test/skip-sbt1.4/testkit/input/src/main/scala-2.13/fix/Source3.scala similarity index 100% rename from src/sbt-test/sbt-1.5/testkit/input/src/main/scala-2.13/fix/Source3.scala rename to src/sbt-test/skip-sbt1.4/testkit/input/src/main/scala-2.13/fix/Source3.scala diff --git a/src/sbt-test/sbt-1.5/testkit/input/src/main/scala/fix/SemanticBasic.scala b/src/sbt-test/skip-sbt1.4/testkit/input/src/main/scala/fix/SemanticBasic.scala similarity index 100% rename from src/sbt-test/sbt-1.5/testkit/input/src/main/scala/fix/SemanticBasic.scala rename to src/sbt-test/skip-sbt1.4/testkit/input/src/main/scala/fix/SemanticBasic.scala diff --git a/src/sbt-test/sbt-1.5/testkit/output/src/main/scala-2.13/fix/Source3.scala b/src/sbt-test/skip-sbt1.4/testkit/output/src/main/scala-2.13/fix/Source3.scala similarity index 100% rename from src/sbt-test/sbt-1.5/testkit/output/src/main/scala-2.13/fix/Source3.scala rename to src/sbt-test/skip-sbt1.4/testkit/output/src/main/scala-2.13/fix/Source3.scala diff --git a/src/sbt-test/sbt-1.5/testkit/output/src/main/scala/fix/SemanticBasic.scala b/src/sbt-test/skip-sbt1.4/testkit/output/src/main/scala/fix/SemanticBasic.scala similarity index 100% rename from src/sbt-test/sbt-1.5/testkit/output/src/main/scala/fix/SemanticBasic.scala rename to src/sbt-test/skip-sbt1.4/testkit/output/src/main/scala/fix/SemanticBasic.scala diff --git a/src/sbt-test/sbt-1.5/testkit/project/TargetAxis.scala b/src/sbt-test/skip-sbt1.4/testkit/project/TargetAxis.scala similarity index 100% rename from src/sbt-test/sbt-1.5/testkit/project/TargetAxis.scala rename to src/sbt-test/skip-sbt1.4/testkit/project/TargetAxis.scala diff --git a/src/sbt-test/sbt-1.5/testkit/project/plugins.sbt b/src/sbt-test/skip-sbt1.4/testkit/project/plugins.sbt similarity index 100% rename from src/sbt-test/sbt-1.5/testkit/project/plugins.sbt rename to src/sbt-test/skip-sbt1.4/testkit/project/plugins.sbt diff --git a/src/sbt-test/sbt-1.5/testkit/rules/src/main/resources/META-INF/services/scalafix.v1.Rule b/src/sbt-test/skip-sbt1.4/testkit/rules/src/main/resources/META-INF/services/scalafix.v1.Rule similarity index 100% rename from src/sbt-test/sbt-1.5/testkit/rules/src/main/resources/META-INF/services/scalafix.v1.Rule rename to src/sbt-test/skip-sbt1.4/testkit/rules/src/main/resources/META-INF/services/scalafix.v1.Rule diff --git a/src/sbt-test/sbt-1.5/testkit/rules/src/main/scala/fix/Semantic.scala b/src/sbt-test/skip-sbt1.4/testkit/rules/src/main/scala/fix/Semantic.scala similarity index 100% rename from src/sbt-test/sbt-1.5/testkit/rules/src/main/scala/fix/Semantic.scala rename to src/sbt-test/skip-sbt1.4/testkit/rules/src/main/scala/fix/Semantic.scala diff --git a/src/sbt-test/sbt-1.5/testkit/test b/src/sbt-test/skip-sbt1.4/testkit/test similarity index 100% rename from src/sbt-test/sbt-1.5/testkit/test rename to src/sbt-test/skip-sbt1.4/testkit/test diff --git a/src/sbt-test/sbt-1.5/testkit/tests/src/test/scala/fix/InputOutputSuite.scala b/src/sbt-test/skip-sbt1.4/testkit/tests/src/test/scala/fix/InputOutputSuite.scala similarity index 100% rename from src/sbt-test/sbt-1.5/testkit/tests/src/test/scala/fix/InputOutputSuite.scala rename to src/sbt-test/skip-sbt1.4/testkit/tests/src/test/scala/fix/InputOutputSuite.scala