Merge branch 'main' into emojis

Author: harmw

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.7.1
+version = 3.7.2
 runner.dialect = scala213
 assumeStandardLibraryStripMargin = true
 align.openParenCallSite = false

README.md

@@ -94,6 +94,7 @@ Thanks goes to these wonderful people for contributing to Scala Steward:
 * [Don Smith III](https://github.com/cactauz)
 * [Doug Roper](https://github.com/htmldoug)
 * [Eldar Yusupov](https://github.com/eyusupov)
+* [Ender Tunç](https://github.com/endertunc)
 * [Erik Erlandson](https://github.com/erikerlandson)
 * [Erlend Hamnaberg](https://github.com/hamnis)
 * [eugeniyk](https://github.com/eugeniyk)
@@ -126,6 +127,7 @@ Thanks goes to these wonderful people for contributing to Scala Steward:
 * [Mark van der Tol](https://github.com/markvandertol)
 * [MaT1g3R](https://github.com/MaT1g3R)
 * [Mat Mannion](https://github.com/matmannion)
+* [Matthias Kurz](https://github.com/mkurz)
 * [Michael Wizner](https://github.com/mwz)
 * [Michel Daviot](https://github.com/tyrcho)
 * [miguelpuyol](https://github.com/miguelpuyol)
@@ -139,8 +141,9 @@ Thanks goes to these wonderful people for contributing to Scala Steward:
 * [Renato Cavalcanti](https://github.com/renatocaval)
 * [Rikito Taniguchi](https://github.com/tanishiking)
 * [Robert Stoll](https://github.com/robstoll)
-* [Roman Langolf](https://github.com/rolang)
 * [Robin Raju](https://github.com/robinraju)
+* [Roman Langolf](https://github.com/rolang)
+* [Ropiteaux Théo](https://github.com/ropiteaux)
 * [Scott Rice](https://github.com/scottrice10)
 * [solar](https://github.com/solar)
 * [Stanislav Chetvertkov](https://github.com/stanislav-chetvertkov)
@@ -185,6 +188,7 @@ Consider creating PR to add your company to the list and join the community.
 * [Lightbend](https://www.lightbend.com/)
 * [Mobimeo](https://www.mobimeo.com/)
 * [Ocado Technology](https://ocadotechnology.com/)
+* [Play Framework](https://www.playframework.com/)
 * [PlayQ](https://www.playq.com/)
 * [Precog](https://precog.com/)
 * [Rewards Network](https://www.rewardsnetwork.com/)

build.sbt

@@ -121,6 +121,7 @@ lazy val core = myCrossProject("core")
       Dependencies.decline,
       Dependencies.fs2Core,
       Dependencies.fs2Io,
+      Dependencies.gitignore,
       Dependencies.http4sCirce,
       Dependencies.http4sClient,
       Dependencies.http4sCore,

docs/help.md

@@ -5,7 +5,7 @@ All command line arguments for the `scala-steward` application.
 ```
 Usage:
     scala-steward validate-repo-config
-    scala-steward --workspace <file> --repos-file <file> [--git-author-name <string>] --git-author-email <string> [--git-author-signing-key <string>] --git-ask-pass <file> [--sign-commits] [--forge-type <forge-type>] [--forge-api-host <uri>] --forge-login <string> [--do-not-fork] [--add-labels] [--ignore-opts-files] [--env-var <name=value>]... [--process-timeout <duration>] [--whitelist <string>]... [--read-only <string>]... [--enable-sandbox | --disable-sandbox] [--max-buffer-size <integer>] [--repo-config <uri>]... [--disable-default-repo-config] [--scalafix-migrations <uri>]... [--disable-default-scalafix-migrations] [--artifact-migrations <uri>]... [--disable-default-artifact-migrations] [--cache-ttl <duration>] [--bitbucket-use-default-reviewers] [--bitbucket-server-use-default-reviewers] [--gitlab-merge-when-pipeline-succeeds] [--gitlab-required-reviewers <integer>] [--azure-repos-organization <string>] [--github-app-id <integer> --github-app-key-file <file>] [--url-checker-test-url <uri>]... [--default-maven-repo <string>] [--refresh-backoff-period <duration>]
+    scala-steward --workspace <file> --repos-file <file> [--git-author-name <string>] --git-author-email <string> [--git-author-signing-key <string>] --git-ask-pass <file> [--sign-commits] [--forge-type <forge-type>] [--forge-api-host <uri>] --forge-login <string> [--do-not-fork] [--add-labels] [--ignore-opts-files] [--env-var <name=value>]... [--process-timeout <duration>] [--whitelist <string>]... [--read-only <string>]... [--enable-sandbox | --disable-sandbox] [--max-buffer-size <integer>] [--repo-config <uri>]... [--disable-default-repo-config] [--scalafix-migrations <uri>]... [--disable-default-scalafix-migrations] [--artifact-migrations <uri>]... [--disable-default-artifact-migrations] [--cache-ttl <duration>] [--bitbucket-use-default-reviewers] [--bitbucket-server-use-default-reviewers] [--gitlab-merge-when-pipeline-succeeds] [--gitlab-required-reviewers <integer>] [--gitlab-remove-source-branch] [--azure-repos-organization <string>] [--github-app-id <integer> --github-app-key-file <file>] [--url-checker-test-url <uri>]... [--default-maven-repo <string>] [--refresh-backoff-period <duration>]
 
 
 
@@ -80,12 +80,14 @@ Options and flags:
         Whether to merge a gitlab merge request when the pipeline succeeds
     --gitlab-required-reviewers <integer>
         When set, the number of required reviewers for a merge request will be set to this number (non-negative integer).  Is only used in the context of gitlab-merge-when-pipeline-succeeds being enabled, and requires that the configured access token have the appropriate privileges.  Also requires a Gitlab Premium subscription.
+    --gitlab-remove-source-branch
+        Flag indicating if a merge request should remove the source branch when merging.
     --azure-repos-organization <string>
         The Azure organization (required when --forge-type is azure-repos)
     --github-app-id <integer>
-        GitHub application id
+        GitHub application id. Repos accessible by this app are added to the repos in repos.md. git-ask-pass is still required.
     --github-app-key-file <file>
-        GitHub application key file
+        GitHub application key file. Repos accessible by this app are added to the repos in repos.md. git-ask-pass is still required.
     --url-checker-test-url <uri>
         URL for testing the UrlChecker at start-up (can be used multiple times); default: https://github.com
     --default-maven-repo <string>

docs/repo-specific-configuration.md

@@ -66,7 +66,7 @@ pullRequests.grouping = [
   { name = "minor_major", "title" = "Minor/major updates", "filter" = [{"version" = "minor"}, {"version" = "major"}] },
   { name = "typelevel", "title" = "Typelevel updates", "filter" = [{"group" = "org.typelevel"}, {"group" = "org.http4s"}] },
   { name = "my_libraries", "filter" = [{"artifact" = "my-library"}, {"artifact" = "my-other-library", "group" = "my-org"}] },
-  { name = "all", title = "Dependency updates", "filter" = [{"group" = "*"}] }
+  { name = "all", "title" = "Dependency updates", "filter" = [{"group" = "*"}] }
 ]
 
 # pullRequests.includeMatchedLabels allows to control which labels are added to PRs 

modules/core/src/main/scala/org/scalasteward/core/application/Cli.scala

@@ -280,14 +280,28 @@ object Cli {
       "When set, the number of required reviewers for a merge request will be set to this number (non-negative integer).  Is only used in the context of gitlab-merge-when-pipeline-succeeds being enabled, and requires that the configured access token have the appropriate privileges.  Also requires a Gitlab Premium subscription."
     ).validate("Required reviewers must be non-negative")(_ >= 0).orNone
 
+  private val gitlabRemoveSourceBranch: Opts[Boolean] =
+    flag(
+      "gitlab-remove-source-branch",
+      "Flag indicating if a merge request should remove the source branch when merging."
+    ).orFalse
+
   private val gitLabCfg: Opts[GitLabCfg] =
-    (gitlabMergeWhenPipelineSucceeds, gitlabRequiredReviewers).mapN(GitLabCfg.apply)
+    (gitlabMergeWhenPipelineSucceeds, gitlabRequiredReviewers, gitlabRemoveSourceBranch).mapN(
+      GitLabCfg.apply
+    )
 
   private val githubAppId: Opts[Long] =
-    option[Long]("github-app-id", "GitHub application id")
+    option[Long](
+      "github-app-id",
+      "GitHub application id. Repos accessible by this app are added to the repos in repos.md. git-ask-pass is still required."
+    )
 
   private val githubAppKeyFile: Opts[File] =
-    option[File]("github-app-key-file", "GitHub application key file")
+    option[File](
+      "github-app-key-file",
+      "GitHub application key file. Repos accessible by this app are added to the repos in repos.md. git-ask-pass is still required."
+    )
 
   private val gitHubApp: Opts[Option[GitHubApp]] =
     (githubAppId, githubAppKeyFile).mapN(GitHubApp.apply).orNone

modules/core/src/main/scala/org/scalasteward/core/application/Config.scala

@@ -158,7 +158,8 @@ object Config {
 
   final case class GitLabCfg(
       mergeWhenPipelineSucceeds: Boolean,
-      requiredReviewers: Option[Int]
+      requiredReviewers: Option[Int],
+      removeSourceBranch: Boolean
   ) extends ForgeSpecificCfg
 
   final case class GiteaCfg(

modules/core/src/main/scala/org/scalasteward/core/buildtool/mill/MillAlg.scala

@@ -71,7 +71,12 @@ final class MillAlg[F[_]](implicit
   private def getMillVersion(buildRootDir: File): F[Option[Version]] =
     for {
       millVersionFileContent <- fileAlg.readFile(buildRootDir / millVersionName)
-      version = millVersionFileContent.flatMap(parser.parseMillVersion)
+      millVersionFileInConfigContent <- fileAlg.readFile(
+        buildRootDir / ".config" / millVersionNameInConfig
+      )
+      version = millVersionFileContent
+        .orElse(millVersionFileInConfigContent)
+        .flatMap(parser.parseMillVersion)
     } yield version
 
   private def getMillPluginDeps(
@@ -119,4 +124,5 @@ object MillAlg {
       update.artifactIds.exists(_.name === millMainArtifactId.name)
 
   val millVersionName = ".mill-version"
+  val millVersionNameInConfig = "mill-version"
 }

modules/core/src/main/scala/org/scalasteward/core/buildtool/sbt/SbtAlg.scala

@@ -51,12 +51,24 @@ final class SbtAlg[F[_]](config: Config)(implicit
       version = maybeProperties.flatMap(parser.parseBuildProperties)
     } yield version
 
+  private def metaBuildsCount(buildRootDir: File): F[Int] =
+    fs2.Stream
+      .iterate(buildRootDir / project)(_ / project)
+      .take(5L) // Use an upper bound for the meta-builds count to prevent DoS attacks.
+      .evalMap(fileAlg.isDirectory)
+      .takeWhile(identity)
+      .compile
+      .count
+      .map(_.toInt)
+
   override def getDependencies(buildRoot: BuildRoot): F[List[Scope.Dependencies]] =
     for {
       buildRootDir <- workspaceAlg.buildRootDir(buildRoot)
       maybeSbtVersion <- getSbtVersion(buildRootDir)
-      lines <- addStewardPluginTemporarily(buildRootDir, maybeSbtVersion).surround {
-        val commands = Nel.of(crossStewardDependencies, reloadPlugins, stewardDependencies)
+      metaBuilds <- metaBuildsCount(buildRootDir)
+      lines <- addStewardPluginTemporarily(buildRootDir, maybeSbtVersion, metaBuilds).surround {
+        val commands = Nel.of(crossStewardDependencies) ++
+          List.fill(metaBuilds)(List(reloadPlugins, stewardDependencies)).flatten
         sbt(commands, buildRootDir)
       }
       dependencies = parser.parseDependencies(lines)
@@ -65,7 +77,8 @@ final class SbtAlg[F[_]](config: Config)(implicit
 
   private def addStewardPluginTemporarily(
       buildRootDir: File,
-      maybeSbtVersion: Option[Version]
+      maybeSbtVersion: Option[Version],
+      metaBuilds: Int
   ): Resource[F, Unit] =
     for {
       _ <- Resource.unit[F]
@@ -74,8 +87,9 @@ final class SbtAlg[F[_]](config: Config)(implicit
         case _                                => "1_3_11"
       }
       plugin <- Resource.eval(stewardPlugin(pluginVersion))
-      _ <- fileAlg.createTemporarily(buildRootDir / project, plugin)
-      _ <- fileAlg.createTemporarily(buildRootDir / project / project, plugin)
+      _ <- List
+        .iterate(buildRootDir / project, metaBuilds + 1)(_ / project)
+        .collectFold(fileAlg.createTemporarily(_, plugin))
     } yield ()
 
   private def stewardPlugin(version: String): F[FileData] = {

modules/core/src/main/scala/org/scalasteward/core/buildtool/scalacli/ScalaCliAlg.scala

@@ -41,17 +41,25 @@ final class ScalaCliAlg[F[_]](implicit
 
   override def containsBuild(buildRoot: BuildRoot): F[Boolean] = {
     val buildRootPath = buildRoot.relativePath.dropWhile(Set('.', '/'))
+    val extensions = Set(".sc", ".scala")
     gitAlg
       .findFilesContaining(buildRoot.repo, "//> using lib ")
-      .map(_.exists(_.startsWith(buildRootPath)))
+      .map(_.exists(path => path.startsWith(buildRootPath) && extensions.exists(path.endsWith)))
   }
 
   override def getDependencies(buildRoot: BuildRoot): F[List[Scope.Dependencies]] =
     for {
       buildRootDir <- workspaceAlg.buildRootDir(buildRoot)
       exportDir = "tmp-sbt-build-for-scala-steward"
-      exportCmd =
-        Nel.of("scala-cli", "export", "--sbt", "--output", exportDir, buildRootDir.pathAsString)
+      exportCmd = Nel.of(
+        "scala-cli",
+        "--power",
+        "export",
+        "--sbt",
+        "--output",
+        exportDir,
+        buildRootDir.pathAsString
+      )
       slurpOptions = SlurpOptions.ignoreBufferOverflow
       _ <- processAlg.execSandboxed(exportCmd, buildRootDir, slurpOptions = slurpOptions)
       exportBuildRoot = buildRoot.copy(relativePath = buildRoot.relativePath + s"/$exportDir")