Skip to content

Commit f802926

Browse files
Remove unnecessary param
1 parent c6d241e commit f802926

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

modules/build/src/main/scala/scala/build/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ object Build {
301301

302302
val classesDir0 = classesDir(inputs.workspace, inputs.projectName)
303303

304-
val artifacts = options.artifacts(params, logger)
304+
val artifacts = options.artifacts(logger)
305305

306306
val pluginScalacOptions = artifacts.compilerPlugins.map {
307307
case (_, _, path) =>

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,34 +34,34 @@ final case class BuildOptions(
3434
internalDependencies.addRunnerDependencyOpt
3535
.orElse(if (scalaJsOptions.enable || scalaNativeOptions.enable) Some(false) else None)
3636

37-
private def scalaLibraryDependencies(params: ScalaParameters): Seq[AnyDependency] =
37+
private def scalaLibraryDependencies: Seq[AnyDependency] =
3838
if (scalaOptions.addScalaLibrary.getOrElse(true)) {
3939
val lib =
40-
if (params.scalaVersion.startsWith("3."))
41-
dep"org.scala-lang::scala3-library::${params.scalaVersion}"
40+
if (scalaParams.scalaVersion.startsWith("3."))
41+
dep"org.scala-lang::scala3-library::${scalaParams.scalaVersion}"
4242
else
43-
dep"org.scala-lang:scala-library:${params.scalaVersion}"
43+
dep"org.scala-lang:scala-library:${scalaParams.scalaVersion}"
4444
Seq(lib)
4545
}
4646
else Nil
4747

48-
def dependencies(params: ScalaParameters): Seq[AnyDependency] =
49-
scalaJsOptions.jsDependencies(params.scalaVersion) ++
48+
private def dependencies: Seq[AnyDependency] =
49+
scalaJsOptions.jsDependencies(scalaParams.scalaVersion) ++
5050
scalaNativeOptions.nativeDependencies ++
51-
scalaLibraryDependencies(params) ++
51+
scalaLibraryDependencies ++
5252
classPathOptions.extraDependencies
5353

54-
private def semanticDbPlugins(params: ScalaParameters): Seq[AnyDependency] =
55-
if (scalaOptions.generateSemanticDbs.getOrElse(false) && params.scalaVersion.startsWith("2."))
54+
private def semanticDbPlugins: Seq[AnyDependency] =
55+
if (scalaOptions.generateSemanticDbs.getOrElse(false) && scalaParams.scalaVersion.startsWith("2."))
5656
Seq(
5757
dep"$semanticDbPluginOrganization:::$semanticDbPluginModuleName:$semanticDbPluginVersion"
5858
)
5959
else Nil
6060

61-
def compilerPlugins(params: ScalaParameters): Seq[AnyDependency] =
62-
scalaJsOptions.compilerPlugins(params.scalaVersion) ++
61+
def compilerPlugins: Seq[AnyDependency] =
62+
scalaJsOptions.compilerPlugins(scalaParams.scalaVersion) ++
6363
scalaNativeOptions.compilerPlugins ++
64-
semanticDbPlugins(params)
64+
semanticDbPlugins
6565

6666
def allExtraJars: Seq[Path] =
6767
classPathOptions.extraJars.map(_.toNIO)
@@ -163,19 +163,19 @@ final case class BuildOptions(
163163
(sv, sbv)
164164
}
165165

166-
def scalaParams: ScalaParameters = {
166+
lazy val scalaParams: ScalaParameters = {
167167
val (scalaVersion, scalaBinaryVersion) = computeScalaVersions(scalaOptions.scalaVersion, scalaOptions.scalaBinaryVersion)
168168
val maybePlatformSuffix =
169169
scalaJsOptions.platformSuffix
170170
.orElse(scalaNativeOptions.platformSuffix)
171171
ScalaParameters(scalaVersion, scalaBinaryVersion, maybePlatformSuffix)
172172
}
173173

174-
def artifacts(params: ScalaParameters, logger: Logger): Artifacts =
174+
def artifacts(logger: Logger): Artifacts =
175175
Artifacts(
176-
params = params,
177-
compilerPlugins = compilerPlugins(params),
178-
dependencies = dependencies(params),
176+
params = scalaParams,
177+
compilerPlugins = compilerPlugins,
178+
dependencies = dependencies,
179179
extraJars = allExtraJars,
180180
extraCompileOnlyJars = allExtraCompileOnlyJars,
181181
extraSourceJars = allExtraSourceJars,

0 commit comments

Comments
 (0)