From 34843f8d65fa0120b2d2f42e6c66c0bea0a74e36 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 30 Aug 2021 02:30:01 +0000 Subject: [PATCH 1/6] Restore scalafix task to prePR --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index e1cf099de..98c12dd39 100644 --- a/build.sbt +++ b/build.sbt @@ -145,5 +145,6 @@ ThisBuild / prePR_nonCross := Def.sequential( root / clean, root / Compile / scalafmt, root / Compile / compile, + (root / Compile / scalafix).toTask(""), example / Compile / compile, ).value From 044010559a44801e98a77842d1ebb710a52c8cac Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 30 Aug 2021 02:48:09 +0000 Subject: [PATCH 2/6] Disable scalafix in prePR for Scala 3 --- build.sbt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 98c12dd39..b4c517df1 100644 --- a/build.sbt +++ b/build.sbt @@ -144,7 +144,11 @@ val prePR_nonCross = taskKey[Unit]("Performs all necessary work required before ThisBuild / prePR_nonCross := Def.sequential( root / clean, root / Compile / scalafmt, - root / Compile / compile, - (root / Compile / scalafix).toTask(""), + Def.taskDyn { + if (scalaVersion.value.startsWith("2.")) + (root / Compile / scalafix).toTask("") + else + Def.task(()) + }, example / Compile / compile, ).value From 7be84768eae52f5c4d67d387fc6d370cd1133c8d Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 30 Aug 2021 02:52:31 +0000 Subject: [PATCH 3/6] Formatting --- build.sbt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index b4c517df1..6171f6163 100644 --- a/build.sbt +++ b/build.sbt @@ -145,10 +145,10 @@ ThisBuild / prePR_nonCross := Def.sequential( root / clean, root / Compile / scalafmt, Def.taskDyn { - if (scalaVersion.value.startsWith("2.")) - (root / Compile / scalafix).toTask("") - else - Def.task(()) + if (scalaVersion.value.startsWith("2.")) + (root / Compile / scalafix).toTask("") + else + Def.task(()) }, example / Compile / compile, ).value From e4b76ba80a7466f763443786d14bc03c2c5898f2 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 30 Aug 2021 02:54:55 +0000 Subject: [PATCH 4/6] Scala 3 compile after scalafmt --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6171f6163..21df79667 100644 --- a/build.sbt +++ b/build.sbt @@ -148,7 +148,7 @@ ThisBuild / prePR_nonCross := Def.sequential( if (scalaVersion.value.startsWith("2.")) (root / Compile / scalafix).toTask("") else - Def.task(()) + (root / Compile / scalafix).toTask("") }, example / Compile / compile, ).value From 49869ae5d05df7b3846e62cce796a81132184bb2 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 30 Aug 2021 02:56:18 +0000 Subject: [PATCH 5/6] Fix mistake --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 21df79667..eabf371a0 100644 --- a/build.sbt +++ b/build.sbt @@ -148,7 +148,7 @@ ThisBuild / prePR_nonCross := Def.sequential( if (scalaVersion.value.startsWith("2.")) (root / Compile / scalafix).toTask("") else - (root / Compile / scalafix).toTask("") + (root / Compile / compile).toTask("") }, example / Compile / compile, ).value From d94c3fc569f3019e4c7e4c9d66f41add136601fe Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 30 Aug 2021 03:25:28 +0000 Subject: [PATCH 6/6] Fix build --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index eabf371a0..aab03ad0f 100644 --- a/build.sbt +++ b/build.sbt @@ -148,7 +148,7 @@ ThisBuild / prePR_nonCross := Def.sequential( if (scalaVersion.value.startsWith("2.")) (root / Compile / scalafix).toTask("") else - (root / Compile / compile).toTask("") + Def.task[Unit]((root / Compile / compile).value) }, example / Compile / compile, ).value