Refactor fetch method name

VirtusLab · Jul 17, 2023 · 8f8e269 · 8f8e269
1 parent 43df233
commit 8f8e269
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 18 deletions.
diff --git a/modules/cli/src/main/scala/scala/cli/commands/ScalaCommand.scala b/modules/cli/src/main/scala/scala/cli/commands/ScalaCommand.scala
@@ -216,7 +216,7 @@ abstract class ScalaCommand[T <: HasGlobalOptions](implicit myParser: Parser[T],
         val (classPath: Seq[os.Path], mainClass: String) =
           if (shared.helpGroups.helpScaladoc) {
             val docArtifacts = value {
-              Artifacts.fetch(
+              Artifacts.fetchAnyDependencies(
                 Seq(Positioned.none(dep"org.scala-lang::scaladoc:${scalaParams.scalaVersion}")),
                 value(buildOptions.finalRepositories),
                 Some(scalaParams),
@@ -245,7 +245,7 @@ abstract class ScalaCommand[T <: HasGlobalOptions](implicit myParser: Parser[T],
           }
           else {
             val fmtArtifacts = value {
-              Artifacts.fetch(
+              Artifacts.fetchAnyDependencies(
                 Seq(Positioned.none(
                   dep"${Constants.scalafmtOrganization}:${Constants.scalafmtName}:${Constants.defaultScalafmtVersion}"
                 )),

diff --git a/modules/cli/src/main/scala/scala/cli/commands/doc/Doc.scala b/modules/cli/src/main/scala/scala/cli/commands/doc/Doc.scala
@@ -141,7 +141,7 @@ object Doc extends ScalaCommand[DocOptions] {
         build.project.scaladocDir
       case Some(scalaParams) =>
         val res = value {
-          Artifacts.fetch(
+          Artifacts.fetchAnyDependencies(
             Seq(Positioned.none(dep"org.scala-lang::scaladoc:${scalaParams.scalaVersion}")),
             value(build.options.finalRepositories),
             Some(scalaParams),

diff --git a/modules/cli/src/main/scala/scala/cli/commands/new/New.scala b/modules/cli/src/main/scala/scala/cli/commands/new/New.scala
@@ -19,7 +19,7 @@ object New extends ScalaCommand[NewOptions] {
 
   override def runCommand(options: NewOptions, remainingArgs: RemainingArgs, logger: Logger): Unit =
     val scalaParameters = ScalaParameters(Constants.defaultScala213Version)
-    val fetchedGiter8 = Artifacts.fetch(
+    val fetchedGiter8 = Artifacts.fetchAnyDependencies(
       giter8Dependency.map(Positioned.none),
       Seq.empty,
       Some(scalaParameters),

diff --git a/modules/cli/src/main/scala/scala/cli/commands/package0/Package.scala b/modules/cli/src/main/scala/scala/cli/commands/package0/Package.scala
@@ -756,7 +756,7 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
     val params =
       if (build.options.notForBloopOptions.doSetupPython.getOrElse(false)) {
         val res = value {
-          Artifacts.fetch(
+          Artifacts.fetchAnyDependencies(
             Seq(Positioned.none(
               dep"${Constants.pythonInterfaceOrg}:${Constants.pythonInterfaceName}:${Constants.pythonInterfaceVersion}"
             )),

diff --git a/modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala b/modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala
@@ -193,7 +193,7 @@ object PgpExternalCommand {
           Nil
 
       val (_, signingRes) = value {
-        scala.build.Artifacts.fetch0(
+        scala.build.Artifacts.fetchCsDependencies(
           Seq(Positioned.none(jvmSigningDep.toCs)),
           extraRepos,
           None,

diff --git a/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala b/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala
@@ -53,7 +53,7 @@ object ScalaJsLinker {
         options.finalUseJvm match {
           case Right(()) =>
             val (_, linkerRes) = value {
-              scala.build.Artifacts.fetch0(
+              scala.build.Artifacts.fetchCsDependencies(
                 Seq(Positioned.none(scalaJsCliDep.toCs)),
                 extraRepos,
                 None,

diff --git a/modules/cli/src/main/scala/scala/cli/launcher/LauncherCli.scala b/modules/cli/src/main/scala/scala/cli/launcher/LauncherCli.scala
@@ -31,7 +31,7 @@ object LauncherCli {
     val scalaCliDependency = Seq(dep"org.virtuslab.scala-cli::cli:$cliVersion")
 
     val fetchedScalaCli =
-      Artifacts.fetch(
+      Artifacts.fetchAnyDependencies(
         scalaCliDependency.map(Positioned.none),
         snapshotsRepo,
         Some(scalaParameters),

diff --git a/modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala
@@ -302,7 +302,7 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
       expect(output == "Hello from test")
     }
   }
-  
+
   // TODO Adapt this test to Scala 3
   if (actualScalaVersion.startsWith("2."))
     test("Compile-time only JARs") {

diff --git a/modules/options/src/main/scala/scala/build/Artifacts.scala b/modules/options/src/main/scala/scala/build/Artifacts.scala
@@ -197,7 +197,7 @@ object Artifacts {
             )
             Some {
               val (_, res) = value {
-                fetch0(
+                fetchCsDependencies(
                   dependency.map(Positioned.none),
                   allExtraRepositories,
                   None,
@@ -225,7 +225,7 @@ object Artifacts {
           case Some(dependency) =>
             Some {
               val (_, res) = value {
-                fetch0(
+                fetchCsDependencies(
                   dependency.map(Positioned.none),
                   allExtraRepositories,
                   None,
@@ -314,7 +314,7 @@ object Artifacts {
     }
 
     val (fetcher, fetchRes) = value {
-      fetchKeepFetcher(
+      fetchAnyDependenciesWithResult(
         allUpdatedDependencies,
         allExtraRepositories,
         scalaArtifactsParamsOpt.map(_.params),
@@ -436,7 +436,14 @@ object Artifacts {
     classifiersOpt: Option[Set[String]] = None
   ): Either[BuildException, Seq[(String, os.Path)]] = either {
     val res =
-      value(fetch(dependencies, extraRepositories, paramsOpt, logger, cache, classifiersOpt))
+      value(fetchAnyDependencies(
+        dependencies,
+        extraRepositories,
+        paramsOpt,
+        logger,
+        cache,
+        classifiersOpt
+      ))
     val result = res
       .artifacts
       .iterator
@@ -481,7 +488,7 @@ object Artifacts {
         }
       )
 
-  def fetch(
+  def fetchAnyDependencies(
     dependencies: Seq[Positioned[AnyDependency]],
     extraRepositories: Seq[Repository],
     paramsOpt: Option[ScalaParameters],
@@ -491,7 +498,7 @@ object Artifacts {
     maybeRecoverOnError: BuildException => Option[BuildException] = e => Some(e)
   ): Either[BuildException, Fetch.Result] = either {
     val (_, res) = value {
-      fetchKeepFetcher(
+      fetchAnyDependenciesWithResult(
         dependencies,
         extraRepositories,
         paramsOpt,
@@ -504,7 +511,7 @@ object Artifacts {
     res
   }
 
-  private def fetchKeepFetcher(
+  private def fetchAnyDependenciesWithResult(
     dependencies: Seq[Positioned[AnyDependency]],
     extraRepositories: Seq[Repository],
     paramsOpt: Option[ScalaParameters],
@@ -525,7 +532,7 @@ object Artifacts {
         .toMap
 
     value {
-      fetch0(
+      fetchCsDependencies(
         coursierDependencies,
         extraRepositories,
         paramsOpt.map(_.scalaVersion),
@@ -603,7 +610,7 @@ object Artifacts {
     fetcher
   }
 
-  def fetch0(
+  def fetchCsDependencies(
     dependencies: Seq[Positioned[coursier.Dependency]],
     extraRepositories: Seq[Repository],
     forceScalaVersionOpt: Option[String],