Renaming

Author: alexarchambault

modules/build/src/main/scala/scala/build/Artifacts.scala

@@ -22,7 +22,7 @@ final case class Artifacts(
   compilerPlugins: Seq[(AnyDependency, String, Path)],
   dependencies: Seq[AnyDependency],
   detailedArtifacts: Seq[(CsDependency, csCore.Publication, csUtil.Artifact, Path)],
-  extraJars: Seq[Path],
+  extraClassPath: Seq[Path],
   extraCompileOnlyJars: Seq[Path],
   extraSourceJars: Seq[Path],
   params: ScalaParameters
@@ -46,9 +46,9 @@ final case class Artifacts(
   lazy val compilerClassPath: Seq[Path] =
     compilerArtifacts.map(_._2)
   lazy val classPath: Seq[Path] =
-    artifacts.map(_._2) ++ extraJars
+    artifacts.map(_._2) ++ extraClassPath
   lazy val compileClassPath: Seq[Path] =
-    artifacts.map(_._2) ++ extraJars ++ extraCompileOnlyJars
+    artifacts.map(_._2) ++ extraClassPath ++ extraCompileOnlyJars
   lazy val sourcePath: Seq[Path] =
     sourceArtifacts.map(_._2) ++ extraSourceJars
 }
@@ -59,7 +59,7 @@ object Artifacts {
     params: ScalaParameters,
     compilerPlugins: Seq[AnyDependency],
     dependencies: Seq[AnyDependency],
-    extraJars: Seq[Path],
+    extraClassPath: Seq[Path],
     extraCompileOnlyJars: Seq[Path],
     extraSourceJars: Seq[Path],
     fetchSources: Boolean,
@@ -166,7 +166,7 @@ object Artifacts {
       compilerPlugins0,
       updatedDependencies,
       fetchRes.fullDetailedArtifacts.collect { case (d, p, a, Some(f)) => (d, p, a, f.toPath) },
-      extraJars ++ extraStubsJars,
+      extraClassPath ++ extraStubsJars,
       extraCompileOnlyJars,
       extraSourceJars,
       params

modules/build/src/main/scala/scala/build/ReplArtifacts.scala

@@ -9,17 +9,17 @@ import scala.build.errors.BuildException
 
 final case class ReplArtifacts(
   replArtifacts: Seq[(String, Path)],
-  extraJars: Seq[Path],
+  extraClassPath: Seq[Path],
   extraSourceJars: Seq[Path],
   replMainClass: String,
   replJavaOpts: Seq[String],
   addSourceJars: Boolean
 ) {
   lazy val replClassPath: Seq[Path] =
     if (addSourceJars)
-      extraJars ++ extraSourceJars ++ replArtifacts.map(_._2)
+      extraClassPath ++ extraSourceJars ++ replArtifacts.map(_._2)
     else
-      extraJars ++ replArtifacts.map(_._2)
+      extraClassPath ++ replArtifacts.map(_._2)
 }
 
 object ReplArtifacts {
@@ -36,7 +36,7 @@ object ReplArtifacts {
     scalaParams: ScalaParameters,
     ammoniteVersion: String,
     dependencies: Seq[AnyDependency],
-    extraJars: Seq[Path],
+    extraClassPath: Seq[Path],
     extraSourceJars: Seq[Path],
     logger: Logger,
     directories: Directories
@@ -53,7 +53,7 @@ object ReplArtifacts {
     )
     ReplArtifacts(
       value(replArtifacts) ++ value(replSourceArtifacts),
-      extraJars,
+      extraClassPath,
       extraSourceJars,
       "ammonite.Main",
       Nil,
@@ -64,7 +64,7 @@ object ReplArtifacts {
   def default(
     scalaParams: ScalaParameters,
     dependencies: Seq[AnyDependency],
-    extraJars: Seq[Path],
+    extraClassPath: Seq[Path],
     logger: Logger,
     directories: Directories
   ): Either[BuildException, ReplArtifacts] = either {
@@ -80,7 +80,7 @@ object ReplArtifacts {
       else "dotty.tools.repl.Main"
     ReplArtifacts(
       value(replArtifacts),
-      extraJars,
+      extraClassPath,
       Nil,
       mainClass,
       Seq("-Dscala.usejavacp=true"),

modules/build/src/main/scala/scala/build/options/BuildOptions.scala

@@ -78,7 +78,7 @@ final case class BuildOptions(
       scalaOptions.compilerPlugins
 
   def allExtraJars: Seq[Path] =
-    classPathOptions.extraJars.map(_.toNIO)
+    classPathOptions.extraClassPath.map(_.toNIO)
   def allExtraCompileOnlyJars: Seq[Path] =
     classPathOptions.extraCompileOnlyJars.map(_.toNIO)
   def allExtraSourceJars: Seq[Path] =
@@ -201,7 +201,7 @@ final case class BuildOptions(
       params = scalaParams,
       compilerPlugins = compilerPlugins,
       dependencies = dependencies,
-      extraJars = allExtraJars,
+      extraClassPath = allExtraJars,
       extraCompileOnlyJars = allExtraCompileOnlyJars,
       extraSourceJars = allExtraSourceJars,
       fetchSources = classPathOptions.fetchSources.getOrElse(false),

modules/build/src/main/scala/scala/build/options/ClassPathOptions.scala

@@ -4,7 +4,7 @@ import dependency._
 
 final case class ClassPathOptions(
   extraRepositories: Seq[String] = Nil,
-  extraJars: Seq[os.Path] = Nil,
+  extraClassPath: Seq[os.Path] = Nil,
   extraCompileOnlyJars: Seq[os.Path] = Nil,
   extraSourceJars: Seq[os.Path] = Nil,
   fetchSources: Option[Boolean] = None,

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingCustomJarDirectiveHandler.scala

@@ -19,7 +19,7 @@ case object UsingCustomJarDirectiveHandler extends UsingDirectiveHandler {
         val paths0 = paths.map(os.Path(_, Os.pwd))
         val options = BuildOptions(
           classPathOptions = ClassPathOptions(
-            extraJars = paths0
+            extraClassPath = paths0
           )
         )
         Some(Right(options))

modules/cli/src/main/scala/scala/cli/commands/Repl.scala

@@ -118,7 +118,7 @@ object Repl extends ScalaCommand[ReplOptions] {
           artifacts.params,
           options.replOptions.ammoniteVersion,
           artifacts.dependencies,
-          artifacts.extraJars,
+          artifacts.extraClassPath,
           artifacts.extraSourceJars,
           logger,
           directories
@@ -127,7 +127,7 @@ object Repl extends ScalaCommand[ReplOptions] {
         ReplArtifacts.default(
           artifacts.params,
           artifacts.dependencies,
-          artifacts.extraJars,
+          artifacts.extraClassPath,
           logger,
           directories
         )

modules/cli/src/main/scala/scala/cli/commands/SharedOptions.scala

@@ -153,7 +153,7 @@ final case class SharedOptions(
         runJmh = if (enableJmh) Some(true) else None
       ),
       classPathOptions = ClassPathOptions(
-        extraJars = extraJars
+        extraClassPath = extraJars
           .flatMap(_.split(File.pathSeparator).toSeq)
           .filter(_.nonEmpty)
           .map(os.Path(_, os.pwd)),

modules/cli/src/main/scala/scala/cli/export/Mill.scala

@@ -97,9 +97,9 @@ final case class Mill(
       }
 
     val customJarsDecls =
-      if (options.classPathOptions.extraJars.isEmpty) Nil
+      if (options.classPathOptions.extraClassPath.isEmpty) Nil
       else {
-        val jars = options.classPathOptions.extraJars.map(p => s"""PathRef(os.Path("$p"))""")
+        val jars = options.classPathOptions.extraClassPath.map(p => s"""PathRef(os.Path("$p"))""")
         Seq(
           s"""def unmanagedClasspath = super.unmanagedClasspath() ++ Seq(${jars.mkString(", ")})"""
         )

modules/cli/src/main/scala/scala/cli/export/Sbt.scala

@@ -163,9 +163,9 @@ final case class Sbt(
       }
 
     val customJarsSettings =
-      if (options.classPathOptions.extraJars.isEmpty) Nil
+      if (options.classPathOptions.extraClassPath.isEmpty) Nil
       else {
-        val jars = options.classPathOptions.extraJars.map(p => s"""file("$p")""")
+        val jars = options.classPathOptions.extraClassPath.map(p => s"""file("$p")""")
         Seq(
           s"""Compile / unmanagedClasspath ++= Seq(${jars.mkString(", ")})""",
           s"""Runtime / unmanagedClasspath ++= Seq(${jars.mkString(", ")})"""