Merge pull request #211 from scala-steward/update/scalafmt-core-3.0.8

Update scalafmt-core to 3.0.8

.scalafmt.conf

@@ -1,2 +1,2 @@
-version = "2.7.5"
+version = "3.0.8"
 maxColumn = 120

detect-license/src/main/scala/com/thoughtworks/sbtBestPractice/detectLicense/ApacheLicense.scala

@@ -3,8 +3,7 @@ package com.thoughtworks.sbtBestPractice.detectLicense
 import sbt.Keys._
 import sbt._
 
-/**
-  * Determine if this project is licensed under Apache License 2.0
+/** Determine if this project is licensed under Apache License 2.0
   */
 object ApacheLicense extends AutoPlugin {
 

detect-license/src/main/scala/com/thoughtworks/sbtBestPractice/detectLicense/MitLicense.scala

@@ -3,8 +3,8 @@ package com.thoughtworks.sbtBestPractice.detectLicense
 import sbt.Keys._
 import sbt._
 
-/**
-  * @author 杨博 (Yang Bo) <[email protected]>
+/** @author
+  *   杨博 (Yang Bo) <[email protected]>
   */
 object MitLicense extends AutoPlugin {
 

git/src/main/scala/com/thoughtworks/sbtBestPractice/git/Git.scala

@@ -7,8 +7,7 @@ import sbt.plugins.CorePlugin
 
 import scala.collection.JavaConverters._
 
-/**
-  * Detect GIT directories from git log
+/** Detect GIT directories from git log
   */
 object Git extends AutoPlugin {
 

git/src/main/scala/com/thoughtworks/sbtBestPractice/git/GitDevelopers.scala

@@ -4,8 +4,7 @@ import sbt.Keys._
 import sbt._
 import scala.collection.JavaConverters._
 
-/**
-  * Fill developers from git log
+/** Fill developers from git log
   */
 object GitDevelopers extends AutoPlugin {
 
@@ -26,10 +25,12 @@ object GitDevelopers extends AutoPlugin {
               commit <- git.log().call().asScala
             } yield {
               val author = commit.getAuthorIdent
-              Developer("",
-                        author.getName,
-                        author.getEmailAddress,
-                        new java.net.URL("mailto", null, author.getEmailAddress))
+              Developer(
+                "",
+                author.getName,
+                author.getEmailAddress,
+                new java.net.URL("mailto", null, author.getEmailAddress)
+              )
             }).toSet
           } finally {
             git.close()

github-actions/src/main/scala/com/thoughtworks/sbtBestPractice/githubActions/GithubActionsDocTitle.scala

@@ -4,8 +4,8 @@ import sbt.plugins.JvmPlugin
 import sbt._
 import Keys._
 
-/**
-  * @author 杨博 (Yang Bo) <[email protected]>
+/** @author
+  *   杨博 (Yang Bo) <[email protected]>
   */
 object GithubActionsDocTitle extends AutoPlugin {
   override def requires: Plugins = GithubActionsEnvironmentVariables && JvmPlugin

github-actions/src/main/scala/com/thoughtworks/sbtBestPractice/githubActions/GithubActionsEnvironmentVariables.scala

@@ -3,12 +3,13 @@ package com.thoughtworks.sbtBestPractice.githubActions
 import sbt._
 import com.thoughtworks.dsl.keywords.Yield
 
-/**
-  * Configure sbt settings of environment variables from Github Actions
+/** Configure sbt settings of environment variables from Github Actions
   *
-  * @note This plugin should only be enabled when sbt is running on Github Actions
+  * @note
+  *   This plugin should only be enabled when sbt is running on Github Actions
   *
-  * @author 杨博 (Yang Bo) <[email protected]>
+  * @author
+  *   杨博 (Yang Bo) <[email protected]>
   */
 object GithubActionsEnvironmentVariables extends AutoPlugin {
 

github-actions/src/main/scala/com/thoughtworks/sbtBestPractice/githubActions/GithubActionsHomepage.scala

@@ -3,8 +3,7 @@ package com.thoughtworks.sbtBestPractice.githubActions
 import sbt.Keys._
 import sbt._
 
-/**
-  * Fill project information from Github Actions environment variables
+/** Fill project information from Github Actions environment variables
   */
 object GithubActionsHomepage extends AutoPlugin {
 

github-actions/src/main/scala/com/thoughtworks/sbtBestPractice/githubActions/GithubActionsScalaJs.scala

@@ -4,8 +4,8 @@ import sbt._
 import org.scalajs.sbtplugin.ScalaJSPlugin
 import scala.language.reflectiveCalls
 
-/**
-  * @author 杨博 (Yang Bo)
+/** @author
+  *   杨博 (Yang Bo)
   */
 object GithubActionsScalaJs extends AutoPlugin {
   private def reflectiveLinkerSetting[

github-actions/src/main/scala/com/thoughtworks/sbtBestPractice/githubActions/GithubActionsScalaVersions.scala

@@ -15,8 +15,8 @@ import sbt.{Node => _, _}
 import sbt.nio.file.FileTreeView
 import com.thoughtworks.Extractor._
 
-/**
-  * @author 杨博 (Yang Bo)
+/** @author
+  *   杨博 (Yang Bo)
   */
 object GithubActionsScalaVersions extends AutoPlugin {
   override def requires = JvmPlugin && Git
@@ -27,9 +27,8 @@ object GithubActionsScalaVersions extends AutoPlugin {
   )
 
   private implicit final class YamlPathOps(private val nodes: Seq[Node]) extends AnyVal {
-    private def keyValue: PartialFunction[NodeTuple, (Node, Node)] = {
-      case tuple =>
-        (tuple.getKeyNode(), tuple.getValueNode())
+    private def keyValue: PartialFunction[NodeTuple, (Node, Node)] = { case tuple =>
+      (tuple.getKeyNode(), tuple.getValueNode())
     }
 
     def childNodes(key: String): Seq[Node] = {
@@ -47,9 +46,8 @@ object GithubActionsScalaVersions extends AutoPlugin {
     def childNodes: Seq[Node] = {
       nodes.flatMap {
         case mappingNode: MappingNode =>
-          mappingNode.getValue().asScala.collect {
-            case keyValue.extract(_, value) =>
-              value
+          mappingNode.getValue().asScala.collect { case keyValue.extract(_, value) =>
+            value
           }
         case sequence: SequenceNode =>
           sequence.getValue().asScala
@@ -82,9 +80,8 @@ object GithubActionsScalaVersions extends AutoPlugin {
                     .childNodes("matrix")
                     .childNodes("scala")
                     .childNodes
-                    .collect {
-                      case scalarNode: ScalarNode =>
-                        scalarNode.getValue()
+                    .collect { case scalarNode: ScalarNode =>
+                      scalarNode.getValue()
                     }
                 } finally {
                   reader.close()

github-actions/src/main/scala/com/thoughtworks/sbtBestPractice/githubActions/GithubActionsScaladocSourceUrl.scala

@@ -5,8 +5,8 @@ import org.eclipse.jgit.lib.Constants
 import sbt.Keys._
 import sbt._
 
-/**
-  * @author 杨博 (Yang Bo) <[email protected]>
+/** @author
+  *   杨博 (Yang Bo) <[email protected]>
   */
 object GithubActionsScaladocSourceUrl extends AutoPlugin {
   override def requires: Plugins = GithubActionsEnvironmentVariables && GitPlugin

mima/src/main/scala/com/thoughtworks/sbtBestPractice/mima/MimaPreviousVersion.scala

@@ -5,8 +5,8 @@ import sbt.Keys.projectID
 import sbt.{AutoPlugin, Def, ModuleID}
 import sbtdynver.DynVerPlugin
 
-/**
-  * @author 杨博 (Yang Bo)
+/** @author
+  *   杨博 (Yang Bo)
   */
 object MimaPreviousVersion extends AutoPlugin {
 
@@ -22,7 +22,7 @@ object MimaPreviousVersion extends AutoPlugin {
       mimaPreviousArtifacts ++= {
         val currentModuleID = projectID.value.withExplicitArtifacts(Vector.empty)
         previousStableVersion.value.map(currentModuleID.withRevision).toSet: Set[ModuleID]
-      },
+      }
     )
 
 }

mima/src/main/scala/com/thoughtworks/sbtBestPractice/mima/MimaSkip.scala

@@ -4,8 +4,8 @@ import com.typesafe.tools.mima.plugin.MimaPlugin
 import sbt.Keys._
 import sbt._
 
-/**
-  * @author 杨博 (Yang Bo)
+/** @author
+  *   杨博 (Yang Bo)
   */
 object MimaSkip extends AutoPlugin {
 
@@ -25,7 +25,7 @@ object MimaSkip extends AutoPlugin {
         } else {
           Def.task(default.value)
         }
-      }.value,
+      }.value
     )
 
 }

mima/src/main/scala/com/thoughtworks/sbtBestPractice/mima/MimaTest.scala

@@ -4,8 +4,8 @@ import com.typesafe.tools.mima.plugin.MimaPlugin
 import sbt._
 import sbt.Keys._
 
-/**
-  * @author 杨博 (Yang Bo)
+/** @author
+  *   杨博 (Yang Bo)
   */
 object MimaTest extends AutoPlugin {
 
@@ -19,7 +19,7 @@ object MimaTest extends AutoPlugin {
     Test / test := {
       mimaReportBinaryIssues.value
       (Test / test).value
-    },
+    }
   )
 
 }

project/mavenResolvers.sbt

@@ -1,2 +1 @@
 resolvers += Resolver.sonatypeRepo("staging")
-

publish-unidoc/src/main/scala/com/thoughtworks/sbtBestPractice/publishUnidoc/PackageUnidoc.scala

@@ -6,8 +6,8 @@ import sbt.Defaults.{packageDocMappings, packageTaskSettings}
 import sbt.plugins.JvmPlugin
 import sbtunidoc.UnidocKeys
 
-/**
-  * @author 杨博 (Yang Bo) <[email protected]>
+/** @author
+  *   杨博 (Yang Bo) <[email protected]>
   */
 object PackageUnidoc extends AutoPlugin with UnidocKeys {
 
@@ -17,7 +17,8 @@ object PackageUnidoc extends AutoPlugin with UnidocKeys {
 
   object autoImport {
     val unidocProject = settingKey[Option[ProjectRef]](
-      "The project that defines a unidoc task. If this `unidocProject` setting is not None, packageDoc will use files generated from unidoc instead of per project doc")
+      "The project that defines a unidoc task. If this `unidocProject` setting is not None, packageDoc will use files generated from unidoc instead of per project doc"
+    )
   }
   import autoImport._
 
@@ -35,7 +36,8 @@ object PackageUnidoc extends AutoPlugin with UnidocKeys {
             case Some(p) => (unidoc in Compile in p).map(_.flatMap(Path.allSubpaths))
           }
         }
-      ))
+      )
+    )
   }
 
 }

publish-unidoc/src/main/scala/com/thoughtworks/sbtBestPractice/publishUnidoc/UnidocProject.scala

@@ -11,7 +11,7 @@ object UnidocProject extends AutoPlugin {
   override def requires: Plugins = BaseUnidocPlugin
 
   override def projectSettings = Seq(
-    PackageUnidoc.autoImport.unidocProject in ThisBuild := Some(thisProjectRef.value),
+    PackageUnidoc.autoImport.unidocProject in ThisBuild := Some(thisProjectRef.value)
   )
 
 }

scalac-options/src/main/scala/com/thoughtworks/sbtBestPractice/scalacOptions/CheckInit.scala

@@ -4,8 +4,8 @@ import sbt.Keys.scalacOptions
 import sbt._
 import sbt.plugins.JvmPlugin
 
-/**
-  * @author 杨博 (Yang Bo)
+/** @author
+  *   杨博 (Yang Bo)
   */
 object CheckInit extends AutoPlugin {
 

scalac-options/src/main/scala/com/thoughtworks/sbtBestPractice/scalacOptions/ClasspathCache.scala

@@ -4,8 +4,8 @@ import sbt._
 import Keys._
 import sbt.plugins.JvmPlugin
 
-/**
-  * @author 杨博 (Yang Bo)
+/** @author
+  *   杨博 (Yang Bo)
   */
 object ClasspathCache extends AutoPlugin {
   override def trigger = allRequirements

scalac-options/src/main/scala/com/thoughtworks/sbtBestPractice/scalacOptions/Optimization.scala

@@ -5,8 +5,8 @@ import sbt.{Def, _}
 import sbt.Keys._
 import sbt.plugins.JvmPlugin
 
-/**
-  * @author 杨博 (Yang Bo)
+/** @author
+  *   杨博 (Yang Bo)
   */
 object Optimization extends AutoPlugin {
 

scalac-options/src/main/scala/com/thoughtworks/sbtBestPractice/scalacOptions/ScalacWarnings.scala

@@ -4,8 +4,7 @@ import sbt.Keys._
 import sbt._
 import sbt.plugins.JvmPlugin
 
-/**
-  * Enable scalac warnings
+/** Enable scalac warnings
   */
 object ScalacWarnings extends AutoPlugin {
 

scalac-options/src/main/scala/com/thoughtworks/sbtBestPractice/scalacOptions/ScaladocFeatures.scala

@@ -4,8 +4,8 @@ import sbt._
 import sbt.Keys._
 import sbt.plugins.JvmPlugin
 
-/**
-  * @author 杨博 (Yang Bo) <[email protected]>
+/** @author
+  *   杨博 (Yang Bo) <[email protected]>
   */
 object ScaladocFeatures extends AutoPlugin {
 

scalac-options/src/main/scala/com/thoughtworks/sbtBestPractice/scalacOptions/ScaladocTitle.scala

@@ -4,8 +4,8 @@ import sbt._
 import sbt.Keys._
 import sbt.plugins.JvmPlugin
 
-/**
-  * @author 杨博 (Yang Bo) <[email protected]>
+/** @author
+  *   杨博 (Yang Bo) <[email protected]>
   */
 object ScaladocTitle extends AutoPlugin {
 

skip-duplicate-java-publish/src/main/scala/com/thoughtworks/sbtBestPractice/skipDuplicateJavaPublish/SkipDuplicateJavaPublish.scala

@@ -5,10 +5,11 @@ import sbt.{AutoPlugin, Def}
 
 /** Skip duplicate publish.
   *
-  * If cross paths are disabled, then publish will be skipped,
-  * unless current scala version is the same as the first cross scala version.
+  * If cross paths are disabled, then publish will be skipped, unless current scala version is the same as the first
+  * cross scala version.
   *
-  * @author 杨博 (Yang Bo)
+  * @author
+  *   杨博 (Yang Bo)
   */
 object SkipDuplicateJavaPublish extends AutoPlugin {
   override def trigger = allRequirements

subdirectory-organization/build.sbt

@@ -0,0 +1 @@
+

subdirectory-organization/src/main/scala/com/thoughtworks/sbtBestPractice/subdirectoryOrganization/SubdirectoryOrganization.scala

@@ -4,8 +4,8 @@ import sbt.Keys._
 import sbt._
 import scala.collection.JavaConverters._
 
-/**
-  * @author 杨博 (Yang Bo)
+/** @author
+  *   杨博 (Yang Bo)
   */
 object SubdirectoryOrganization extends AutoPlugin {
 

travis/src/main/scala/com/thoughtworks/sbtBestPractice/travis/DetectHomepageFromTravisEnvironmentVariables.scala

@@ -3,8 +3,7 @@ package com.thoughtworks.sbtBestPractice.travis
 import sbt.Keys._
 import sbt._
 
-/**
-  * Fill project informations from Travis environment variables
+/** Fill project informations from Travis environment variables
   */
 object DetectHomepageFromTravisEnvironmentVariables extends AutoPlugin {
 

travis/src/main/scala/com/thoughtworks/sbtBestPractice/travis/DetectScalaVersionsFromTravisYml.scala

@@ -12,8 +12,8 @@ import sbt.Keys.crossScalaVersions
 import sbt.plugins.JvmPlugin
 import sbt.{Node => _, _}
 
-/**
-  * @author 杨博 (Yang Bo)
+/** @author
+  *   杨博 (Yang Bo)
   */
 object DetectScalaVersionsFromTravisYml extends AutoPlugin {
   override def requires = JvmPlugin && Git

travis/src/main/scala/com/thoughtworks/sbtBestPractice/travis/ScaladocSourceUrl.scala

@@ -5,8 +5,8 @@ import org.eclipse.jgit.lib.Constants
 import sbt.Keys._
 import sbt._
 
-/**
-  * @author 杨博 (Yang Bo) <[email protected]>
+/** @author
+  *   杨博 (Yang Bo) <[email protected]>
   */
 object ScaladocSourceUrl extends AutoPlugin {
   override def requires: Plugins = Travis && GitPlugin