Merge remote-tracking branch 'origin/main' into dfrancoeur/2979-gitignored

Author: daddykotex

README.md

@@ -126,6 +126,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)
@@ -185,6 +186,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/)

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")

modules/core/src/main/scala/org/scalasteward/core/git/FileGitAlg.scala

@@ -55,7 +55,9 @@ final class FileGitAlg[F[_]](config: GitCfg)(implicit
   override def clone(repo: File, url: Uri): F[Unit] =
     for {
       rootDir <- workspaceAlg.rootDir
-      _ <- git_("clone", url.toString, repo.pathAsString)(rootDir)
+      _ <- git_("clone", "-c", "clone.defaultRemoteName=origin", url.toString, repo.pathAsString)(
+        rootDir
+      )
     } yield ()
 
   override def cloneExists(repo: File): F[Boolean] =

modules/core/src/test/scala/org/scalasteward/core/buildtool/scalacli/ScalaCliAlgTest.scala

@@ -5,12 +5,25 @@ import org.scalasteward.core.buildtool.BuildRoot
 import org.scalasteward.core.buildtool.sbt.command._
 import org.scalasteward.core.data.{GroupId, Repo, Version}
 import org.scalasteward.core.edit.scalafix.ScalafixMigration
+import org.scalasteward.core.git.FileGitAlg
 import org.scalasteward.core.mock.MockContext.context._
 import org.scalasteward.core.mock.MockState
 import org.scalasteward.core.mock.MockState.TraceEntry.{Cmd, Log}
 import org.scalasteward.core.util.Nel
 
 class ScalaCliAlgTest extends CatsEffectSuite {
+  test("containsBuild: directive in non-source file") {
+    val repo = Repo("user", "repo")
+    val buildRoot = BuildRoot(repo, ".")
+    val fileWithUsingLib = "test.md" // this test fails if the extension is .scala or .sc
+    val grepCmd = FileGitAlg.gitCmd.toList ++
+      List("grep", "-I", "--fixed-strings", "--files-with-matches", "//> using lib ")
+    val initial =
+      MockState.empty.copy(commandOutputs = Map(grepCmd -> Right(List(fileWithUsingLib))))
+    val obtained = scalaCliAlg.containsBuild(buildRoot).runA(initial)
+    assertIO(obtained, false)
+  }
+
   test("getDependencies") {
     val repo = Repo("user", "repo")
     val buildRoot = BuildRoot(repo, ".")
@@ -28,6 +41,7 @@ class ScalaCliAlgTest extends CatsEffectSuite {
           "--env=VAR1=val1",
           "--env=VAR2=val2",
           "scala-cli",
+          "--power",
           "export",
           "--sbt",
           "--output",

modules/core/src/test/scala/org/scalasteward/core/forge/ForgeRepoAlgTest.scala

@@ -37,7 +37,14 @@ class ForgeRepoAlgTest extends CatsEffectSuite {
     val expected = MockState.empty.copy(
       trace = Vector(
         Log("Clone scala-steward/datapackage"),
-        Cmd(gitCmd(config.workspace), "clone", forkUrl, repoDir.toString),
+        Cmd(
+          gitCmd(config.workspace),
+          "clone",
+          "-c",
+          "clone.defaultRemoteName=origin",
+          forkUrl,
+          repoDir.toString
+        ),
         Cmd(gitCmd(repoDir), "config", "user.email", "[email protected]"),
         Cmd(gitCmd(repoDir), "config", "user.name", "Bot Doe"),
         Log("Synchronize with fthomas/datapackage"),
@@ -64,7 +71,14 @@ class ForgeRepoAlgTest extends CatsEffectSuite {
     val expected = MockState.empty.copy(
       trace = Vector(
         Log("Clone fthomas/datapackage"),
-        Cmd(gitCmd(config.workspace), "clone", parentUrl, repoDir.toString),
+        Cmd(
+          gitCmd(config.workspace),
+          "clone",
+          "-c",
+          "clone.defaultRemoteName=origin",
+          parentUrl,
+          repoDir.toString
+        ),
         Cmd(gitCmd(repoDir), "config", "user.email", "[email protected]"),
         Cmd(gitCmd(repoDir), "config", "user.name", "Bot Doe"),
         Cmd(gitCmd(repoDir), "submodule", "update", "--init", "--recursive")