@@ -58,13 +58,7 @@ final class MillAlg[F[_]](defaultResolver: Resolver)(implicit
5858 for {
5959 buildRootDir <- workspaceAlg.buildRootDir(buildRoot)
6060 millBuildVersion <- getMillVersion(buildRootDir)
61- extracted <-
62- if (isMillVersionGreaterOrEqual011(millBuildVersion)) runMill(buildRootDir)
63- else runMillUnder011(buildRootDir, millBuildVersion)
64- parsed <- F .fromEither(
65- parser.parseModules(extracted.dropWhile(! _.startsWith(" {" )).mkString(" \n " ))
66- )
67- dependencies = parsed.map(module => Scope (module.dependencies, module.repositories))
61+ dependencies <- getProjectDependencies(buildRootDir, millBuildVersion)
6862 millBuildDeps = millBuildVersion.toSeq.map(version =>
6963 Scope (List (millMainArtifact(version)), List (defaultResolver))
7064 )
@@ -74,6 +68,20 @@ final class MillAlg[F[_]](defaultResolver: Resolver)(implicit
7468 }
7569 } yield dependencies ++ millBuildDeps ++ millPluginDeps
7670
71+ private def getProjectDependencies (
72+ buildRootDir : File ,
73+ millBuildVersion : Option [Version ]
74+ ): F [List [Scope .Dependencies ]] =
75+ for {
76+ extracted <-
77+ if (isMillVersionGreaterOrEqual011(millBuildVersion)) runMill(buildRootDir)
78+ else runMillUnder011(buildRootDir, millBuildVersion)
79+ parsed <- F .fromEither(
80+ parser.parseModules(extracted.dropWhile(! _.startsWith(" {" )).mkString(" \n " ))
81+ )
82+ dependencies = parsed.map(module => Scope (module.dependencies, module.repositories))
83+ } yield dependencies
84+
7785 override def runMigration (buildRoot : BuildRoot , migration : ScalafixMigration ): F [Unit ] =
7886 logger.warn(
7987 s " Scalafix migrations are currently not supported in $name projects, see https://github.com/scala-steward-org/scala-steward/issues/2838 for details "
0 commit comments