Skip to content

Commit 1d0a45a

Browse files
Rename internalResolver to internalCoursierResolver
1 parent fd920a7 commit 1d0a45a

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

Diff for: bsp/worker/src/mill/bsp/worker/MillBuildServer.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ private class MillBuildServer(
296296
case m: JavaModule =>
297297
Task.Anon {
298298
(
299-
m.internalResolver().resolveDeps(
299+
m.internalCoursierResolver().resolveDeps(
300300
Seq(
301301
m.coursierDependency.withConfiguration(coursier.core.Configuration.provided),
302302
m.coursierDependency
@@ -339,7 +339,7 @@ private class MillBuildServer(
339339
Task.Anon {
340340
(
341341
// full list of dependencies, including transitive ones
342-
m.internalResolver().allDeps(
342+
m.internalCoursierResolver().allDeps(
343343
Seq(
344344
m.coursierDependency.withConfiguration(coursier.core.Configuration.provided),
345345
m.coursierDependency

Diff for: contrib/scalapblib/src/mill/contrib/scalapblib/ScalaPBModule.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ trait ScalaPBModule extends ScalaModule {
9191
}
9292

9393
def scalaPBProtoClasspath: T[Agg[PathRef]] = Task {
94-
internalResolver().resolveDeps(
94+
internalCoursierResolver().resolveDeps(
9595
Seq(
9696
coursierDependency.withConfiguration(coursier.core.Configuration.provided),
9797
coursierDependency

Diff for: scalalib/src/mill/javalib/revapi/RevapiModule.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ trait RevapiModule extends PublishModule {
8181
def revapiNewFiles: T[Agg[PathRef]] = Task {
8282
Agg(jar()) ++
8383
Task.traverse(recursiveModuleDeps)(_.jar)() ++
84-
internalResolver().resolveDeps(
84+
internalCoursierResolver().resolveDeps(
8585
Seq(coursierDependency),
8686
artifactTypes = Some(revapiArtifactTypes())
8787
)

Diff for: scalalib/src/mill/scalalib/CoursierModule.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ trait CoursierModule extends mill.Module {
4141
*
4242
* @return `CoursierModule.Resolver` instance
4343
*/
44-
def internalResolver: Task[CoursierModule.Resolver] = Task.Anon {
44+
def internalCoursierResolver: Task[CoursierModule.Resolver] = Task.Anon {
4545
new CoursierModule.Resolver(
4646
repositories = allRepositoriesTask(),
4747
bind = bindDependency(),

Diff for: scalalib/src/mill/scalalib/JavaModule.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ trait JavaModule
10011001
* Resolved dependencies
10021002
*/
10031003
def resolvedIvyDeps: T[Agg[PathRef]] = Task {
1004-
internalResolver().resolveDeps(
1004+
internalCoursierResolver().resolveDeps(
10051005
Seq(
10061006
BoundDep(
10071007
coursierDependency.withConfiguration(cs.Configuration.provided),
@@ -1024,7 +1024,7 @@ trait JavaModule
10241024
}
10251025

10261026
def resolvedRunIvyDeps: T[Agg[PathRef]] = Task {
1027-
internalResolver().resolveDeps(
1027+
internalCoursierResolver().resolveDeps(
10281028
Seq(
10291029
BoundDep(
10301030
coursierDependency.withConfiguration(cs.Configuration.runtime),
@@ -1465,7 +1465,7 @@ trait JavaModule
14651465
val tasks =
14661466
if (all.value) Seq(
14671467
Task.Anon {
1468-
internalResolver().resolveDeps(
1468+
internalCoursierResolver().resolveDeps(
14691469
Seq(
14701470
coursierDependency.withConfiguration(cs.Configuration.provided),
14711471
coursierDependency
@@ -1478,7 +1478,7 @@ trait JavaModule
14781478
)
14791479
},
14801480
Task.Anon {
1481-
internalResolver().resolveDeps(
1481+
internalCoursierResolver().resolveDeps(
14821482
Seq(coursierDependency.withConfiguration(cs.Configuration.runtime)),
14831483
sources = true
14841484
)

Diff for: scalalib/src/mill/scalalib/PublishModule.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ trait PublishModule extends JavaModule { outer =>
219219
@deprecated("Unused by Mill", "Mill after 0.12.5")
220220
def bomDetails: T[(Map[coursier.core.Module, String], coursier.core.DependencyManagement.Map)] =
221221
Task {
222-
val (processedDeps, depMgmt) = internalResolver().processDeps(
222+
val (processedDeps, depMgmt) = internalCoursierResolver().processDeps(
223223
processedIvyDeps(),
224224
resolutionParams = resolutionParams(),
225225
boms = allBomDeps().toSeq.map(_.withConfig(Configuration.compile))
@@ -244,7 +244,7 @@ trait PublishModule extends JavaModule { outer =>
244244
* @return
245245
*/
246246
private def ivy(hasJar: Boolean): Task[String] = Task.Anon {
247-
val (results, bomDepMgmt) = internalResolver().processDeps(
247+
val (results, bomDepMgmt) = internalCoursierResolver().processDeps(
248248
Seq(
249249
BoundDep(
250250
coursierDependency.withConfiguration(Configuration.runtime),

Diff for: scalalib/src/mill/scalalib/ScalaModule.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
471471
}
472472

473473
def resolvedAmmoniteReplIvyDeps = Task {
474-
internalResolver().resolveDeps {
474+
internalCoursierResolver().resolveDeps {
475475
val scaVersion = scalaVersion()
476476
val ammVersion = ammoniteVersion()
477477
if (scaVersion != BuildInfo.scalaVersion && ammVersion == Versions.ammonite) {

0 commit comments

Comments
 (0)