fix: Fix MillAlg and MillAlgTest

Author: lolgab

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

@@ -39,7 +39,7 @@ final class MillAlg[F[_]](defaultResolvers: List[Resolver])(implicit
     workspaceAlg.buildRootDir(buildRoot).flatMap(findBuildFile).map(_.nonEmpty)
 
   private def findBuildFile(buildRootDir: File): F[Option[File]] =
-    List("build.sc", "build.mill", "build.mill.scala")
+    List("build.mill", "build.mill.scala", "build.sc")
       .map(buildRootDir / _)
       .findM(fileAlg.isRegularFile)
 
@@ -95,16 +95,17 @@ final class MillAlg[F[_]](defaultResolvers: List[Resolver])(implicit
       List(
         buildRootDir / s".$millVersionName",
         buildRootDir / ".config" / millVersionName
-      ).collectFirstSomeM(fileAlg.readFile).map(_.flatMap(parser.parseMillVersion))
+      ).collectFirstSomeM(fileAlg.readFile(_).map(_.flatMap(parser.parseMillVersion)))
     val fromBuildFile = List(
       buildRootDir / "build.mill",
       buildRootDir / "build.mill.scala",
       buildRootDir / "build.sc"
-    )
-      .collectFirstSomeM(fileAlg.readFile)
-      .map(_.flatMap(parser.parseBuildFileMillVersion))
+    ).collectFirstSomeM(fileAlg.readFile(_).map(_.flatMap(parser.parseBuildFileMillVersion)))
 
-    fromBuildFile.orElse(fromConfigFile)
+    fromBuildFile.flatMap {
+      case None => fromConfigFile
+      case some => F.pure(some)
+    }
   }
 
   private def getMillPluginDeps(

modules/core/src/test/scala/org/scalasteward/core/buildtool/mill/MillAlgTest.scala

@@ -22,6 +22,9 @@ class MillAlgTest extends FunSuite {
     val state = millAlg.getDependencies(buildRoot).runS(initial).unsafeRunSync()
     val expected = initial.copy(
       trace = Vector(
+        Cmd("read", s"$buildRootDir/build.mill"),
+        Cmd("read", s"$buildRootDir/build.mill.scala"),
+        Cmd("read", s"$buildRootDir/build.sc"),
         Cmd("read", s"$buildRootDir/.mill-version"),
         Cmd("read", s"$buildRootDir/.config/mill-version"),
         Cmd("write", predef),
@@ -53,8 +56,13 @@ class MillAlgTest extends FunSuite {
     val state = millAlg.getDependencies(buildRoot).runS(initial).unsafeRunSync()
     val expected = initial.copy(
       trace = Vector(
+        Cmd("read", s"$buildRootDir/build.mill"),
+        Cmd("read", s"$buildRootDir/build.mill.scala"),
+        Cmd("read", s"$buildRootDir/build.sc"),
         Cmd("read", s"$buildRootDir/.mill-version"),
         millCmd,
+        Cmd("test", "-f", s"$buildRootDir/build.mill"),
+        Cmd("test", "-f", s"$buildRootDir/build.mill.scala"),
         Cmd("test", "-f", s"$buildRootDir/build.sc"),
         Cmd("read", s"$buildRootDir/build.sc")
       )
@@ -84,15 +92,51 @@ class MillAlgTest extends FunSuite {
     val state = millAlg.getDependencies(buildRoot).runS(initial).unsafeRunSync()
     val expected = initial.copy(
       trace = Vector(
+        Cmd("read", s"$buildRootDir/build.mill"),
+        Cmd("read", s"$buildRootDir/build.mill.scala"),
+        Cmd("read", s"$buildRootDir/build.sc"),
         Cmd("read", s"$buildRootDir/.mill-version"),
         millCmd,
+        Cmd("test", "-f", s"$buildRootDir/build.mill"),
+        Cmd("test", "-f", s"$buildRootDir/build.mill.scala"),
         Cmd("test", "-f", s"$buildRootDir/build.sc"),
         Cmd("read", s"$buildRootDir/build.sc")
       )
     )
     assertEquals(state, expected)
   }
 
+  test("getDependencies, 1 <= version") {
+    val repo = Repo("mill-alg", "test-3")
+    val buildRoot = BuildRoot(repo, ".")
+    val buildRootDir = workspaceAlg.buildRootDir(buildRoot).unsafeRunSync()
+    val millCmd = Cmd.execSandboxed(
+      buildRootDir,
+      "mill",
+      "--no-server",
+      "--ticker",
+      "false",
+      "--import",
+      s"ivy:org.scala-steward::${BuildInfo.millPluginArtifactName}::${BuildInfo.millPluginVersion}",
+      "show",
+      extractDeps
+    )
+    val initial = MockState.empty
+      .copy(commandOutputs = Map(millCmd -> Right(List("""{"modules":[]}"""))))
+      .addFiles(buildRootDir / "build.mill" -> "//| mill-version: 1.0.6")
+      .unsafeRunSync()
+    val state = millAlg.getDependencies(buildRoot).runS(initial).unsafeRunSync()
+    val expected = initial.copy(
+      trace = Vector(
+        Cmd("read", s"$buildRootDir/build.mill"),
+        millCmd,
+        Cmd("test", "-f", s"$buildRootDir/build.mill"),
+        Cmd("read", s"$buildRootDir/build.mill")
+      )
+    )
+    assertEquals(state, expected)
+  }
+
   test("predef-content") {
     assert(MillAlg.content(None).contains("_mill$MILL_BIN_PLATFORM"))
     assert(MillAlg.content(Some(Version("0.6.1"))).contains("_mill0.6"))