Update scalafmt-core to 3.11.0

.git-blame-ignore-revs

@@ -1,2 +1,5 @@
 # initial format for 3.10.7
 bee6f0547cf036a8007becefd500328e38b5d5e7
+
+# Scala Steward: Reformat with scalafmt 3.11.0
+c6688cd06ea7f8e0f2277caca234ad46aebf6571

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.10.7
+version = 3.11.0
 align {
   preset = none
 }

build.sbt

@@ -1,4 +1,3 @@
-
 import Settings._
 
 def dataclassScalafixV = "0.2.0"
@@ -50,7 +49,7 @@ def lmIvy = Def.setting {
     scalaBinaryVersion.value match {
       case "2.12" => "1.3.4"
       case "2.13" => "1.7.0"
-      case _      => "2.0.0-alpha2"
+      case _ => "2.0.0-alpha2"
     }
   }
 }
@@ -206,10 +205,10 @@ lazy val `sbt-lm-coursier` = project
 
       // TODO Get those automatically
       // (but shouldn't scripted itself handle that…?)
-       (`lm-coursier-shaded` / publishLocal).value
-       (`sbt-coursier-shared-shaded` / publishLocal).value
-     }
-   )
+      (`lm-coursier-shaded` / publishLocal).value
+      (`sbt-coursier-shared-shaded` / publishLocal).value
+    }
+  )
 
 lazy val `sbt-coursier` = project
   .in(file("modules/sbt-coursier"))

modules/lm-coursier/src/main/scala/lmcoursier/internal/Resolvers.scala

@@ -83,7 +83,7 @@ object Resolvers {
 
       case r: FileRepository
           if r.patterns.ivyPatterns.lengthCompare(1) == 0 &&
-            r.patterns.artifactPatterns.lengthCompare(1) == 0 =>
+          r.patterns.artifactPatterns.lengthCompare(1) == 0 =>
 
         val mavenCompatibleBaseOpt0 = mavenCompatibleBaseOpt(r.patterns)
 
@@ -159,7 +159,7 @@ object Resolvers {
 
   private def patternMatchGuard(patterns: Patterns): Boolean =
     patterns.ivyPatterns.lengthCompare(1) == 0 &&
-      patterns.artifactPatterns.lengthCompare(1) == 0
+    patterns.artifactPatterns.lengthCompare(1) == 0
 
   private def parseMavenCompatResolver(
     log: Logger,

modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/build.sbt

@@ -19,10 +19,10 @@ check := {
   // Sanity check to ensure SBT is loading the resolvers properly
   assert(sbtResolvers.exists(_.name == "Private S3 Snapshots"))
   assert(sbtResolvers.exists(_.name == "Private S3 Releases"))
-  
+
   // Have Coursier SBT Plugin Parse the SBT Resolvers
   val parsedCoursierResolvers: Seq[coursier.core.Repository] =
-    sbtResolvers.flatMap{ sbtResolver: sbt.librarymanagement.Resolver =>
+    sbtResolvers.flatMap { sbtResolver: sbt.librarymanagement.Resolver =>
       lmcoursier.internal.Resolvers.repository(
         resolver = sbtResolver,
         ivyProperties = lmcoursier.internal.ResolutionParams.defaultIvyProperties(
@@ -49,8 +49,12 @@ check := {
     }
   }
 
-  assert(containsRepo("s3://s3-us-west-2.amazonaws.com/bucket-name/snapshots/"),
-    "Didn't have snapshots s3 repo")
-  assert(containsRepo("s3://s3-us-west-2.amazonaws.com/bucket-name/releases/"),
-    "Didn't have releases s3 repo")
-}
+  assert(
+    containsRepo("s3://s3-us-west-2.amazonaws.com/bucket-name/snapshots/"),
+    "Didn't have snapshots s3 repo"
+  )
+  assert(
+    containsRepo("s3://s3-us-west-2.amazonaws.com/bucket-name/releases/"),
+    "Didn't have releases s3 repo"
+  )
+}

modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/extra.sbt

@@ -1 +1 @@
-addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.18.0")
+addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.18.0")

modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/src/main/scala/Foo.scala

@@ -1 +1 @@
-object Foo
+object Foo

modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/build.sbt

@@ -1,4 +1,4 @@
 scalaVersion := "2.13.1"
 
 libraryDependencies += "com.typesafe.play" %% "play-test" % "2.8.0-RC1" % Test // worked around in 2.8.0
-libraryDependencies += "org.scalatest"     %% "scalatest" % "3.0.8"     % Test
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % Test

modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/src/test/scala/t/UnitSpec.scala

@@ -1,7 +1,7 @@
 package t
 
 import com.typesafe.config.ConfigFactory
-import org.scalatest.{ MustMatchers, WordSpec }
+import org.scalatest.{MustMatchers, WordSpec}
 
 class UnitSpec extends WordSpec with MustMatchers {
   def conf = ConfigFactory.defaultReference()

modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/build.sbt

@@ -1,4 +1,3 @@
-
 // examples adapted from https://github.com/coursier/sbt-coursier/pull/75#issuecomment-497128870
 
 lazy val a = project
@@ -8,26 +7,26 @@ lazy val a = project
       "org.typelevel" %% "cats-effect" % "1.3.1",
       "org.typelevel" %% "cats-core" % "1.5.0"
     )
-)
+  )
 
 lazy val b = project
   .settings(
     scalaVersion := "2.12.8",
     libraryDependencies ++= Seq(
-      "org.slf4s" %% "slf4s-api" % "1.7.25",         // depends on org.slf4j:slf4j-api:1.7.25
+      "org.slf4s" %% "slf4s-api" % "1.7.25", // depends on org.slf4j:slf4j-api:1.7.25
       "ch.qos.logback" % "logback-classic" % "1.1.2" // depends on org.slf4j:slf4j-api:1.7.6
     )
-)
+  )
 
 lazy val c = project
   .settings(
     scalaVersion := "2.12.8",
     libraryDependencies ++= Seq(
-      "org.slf4s" %% "slf4s-api" % "1.7.25",         // depends on org.slf4j:slf4j-api:1.7.25
+      "org.slf4s" %% "slf4s-api" % "1.7.25", // depends on org.slf4j:slf4j-api:1.7.25
       "ch.qos.logback" % "logback-classic" % "1.1.2" // depends on org.slf4j:slf4j-api:1.7.6
     ),
     dependencyOverrides += "org.slf4j" % "slf4j-api" % "1.7.30"
-)
+  )
 
 lazy val check = taskKey[Unit]("")
 

modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/neo-sbt-scalafmt/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/build.sbt

@@ -1,4 +1,3 @@
-
 scalaVersion := "2.12.2-bin-typelevel-4"
 scalaOrganization := "org.typelevel"
 scalacOptions += "-Yinduction-heuristics"

modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/scala-211/typelevel/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/build.sbt

@@ -1,4 +1,3 @@
-
 scalaVersion := "2.12.8"
 
 organization := "io.get-coursier.test"

modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/api-url/build.sbt

@@ -1,4 +1,3 @@
-
 lazy val b = project
   .settings(
     apiURL := Some(url(s"http://example.org/b")),

modules/sbt-coursier/src/sbt-test/shared-1/api-url/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/auto-scala-library/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/cache-local/changes/resolver.sbt

@@ -1,5 +1,3 @@
-
-publishTo := baseDirectory(base => Some(Resolver.file("filesys-publish", base / "repo")) ).value
+publishTo := baseDirectory(base => Some(Resolver.file("filesys-publish", base / "repo"))).value
 
 resolvers += baseDirectory(base => "filesys" at (base / "repo").toURI.toString).value
-

modules/sbt-coursier/src/sbt-test/shared-1/cache-local/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/caller/build.sbt

@@ -15,15 +15,19 @@ lazy val app = (project in file("app"))
       val coreReport = cr.modules.find(m =>
         m.module.name == "core_2.12"
       ).getOrElse(sys.error("report for core is missing"))
-      assert(coreReport.callers.exists(c => c.caller.name == "util_2.12"),
-        s"caller on core is missing util: ${coreReport.callers}")
+      assert(
+        coreReport.callers.exists(c => c.caller.name == "util_2.12"),
+        s"caller on core is missing util: ${coreReport.callers}"
+      )
 
       // configuration report must include a module report for library dependency
       val shapelessReport = cr.modules.find(m =>
         m.module.name == "shapeless_2.12"
       ).getOrElse(sys.error("report for shapeless is missing"))
-      assert(shapelessReport.callers.exists(c => c.caller.name == "app_2.12"),
-        s"caller on shapeless is missing self module (app): ${shapelessReport.callers}")
+      assert(
+        shapelessReport.callers.exists(c => c.caller.name == "app_2.12"),
+        s"caller on shapeless is missing self module (app): ${shapelessReport.callers}"
+      )
     }
   )
 

modules/sbt-coursier/src/sbt-test/shared-1/classifiers/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/clean/build.sbt

@@ -10,4 +10,4 @@ val checkNotEmpty = TaskKey[Unit]("checkNotEmpty")
 
 checkNotEmpty := {
   assert(!coursier.Helper.checkEmpty)
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/clean/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/src/main/scala/Main.scala

@@ -1 +1 @@
-object Main extends App
+object Main extends App

modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/src/main/scala/Main.scala

@@ -1 +1 @@
-object Main extends App
+object Main extends App

modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/plugins/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/src/main/scala/Main.scala

@@ -1 +1 @@
-object Main extends App
+object Main extends App

modules/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/src/main/scala/Main.scala

@@ -1 +1 @@
-object Main extends App
+object Main extends App

modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/plugins/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/src/main/scala/Main.scala

@@ -1 +1 @@
-object Main extends App
+object Main extends App

modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/src/main/scala/Main.scala

@@ -1 +1 @@
-object Main extends App
+object Main extends App

modules/sbt-coursier/src/sbt-test/shared-1/credentials/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin {
   )
 
   "io.get-coursier" % name % version
-}
+}

modules/sbt-coursier/src/sbt-test/shared-1/credentials/src/main/scala/Main.scala

@@ -1 +1 @@
-object Main extends App
+object Main extends App