unfork scalafmt

Author: SethTisue

core/scalafmt.conf

@@ -1,11 +1,8 @@
-// https://github.com/kitbellew/scalafmt.git#4849  # was scalameta, main
-
-// once https://github.com/scalameta/scalafmt/pull/4849 is merged
-// we can unfork
+// https://github.com/scalameta/scalafmt.git#main
 
 vars.proj.scalafmt: ${vars.base} {
   name: "scalafmt"
-  uri: "https://github.com/kitbellew/scalafmt.git#d79cd37ea170f1dde3abf2849ca9fd9ce8abb8e1"
+  uri: "https://github.com/scalameta/scalafmt.git#0aa493606c8263f644c3658f39471be4a03c51c0"
 
   extra.projects: ["coreJVM", "cli", "tests", "dynamic"]
   extra.commands: ${vars.default-commands} [

proj/scastie.conf

@@ -5,7 +5,7 @@
 
 vars.proj.scastie: ${vars.base} {
   name: "scastie"
-  uri: "https://github.com/scalacommunitybuild/scastie.git#58c3943d8364709d676f87e073a940064ff5ea05"
+  uri: "https://github.com/scalacommunitybuild/scastie.git#14391080c41cf0369ab894b8a6d2a19a19e754c8"
 
   extra.exclude: [
     "*2_10", "*2_11", "*2_12", "*3", "*JS", "client", "sbtScastie"