Skip to content

Commit 82879e5

Browse files
Ensure the coursier cache logger is properly initialized / stopped (#5361)
This fixes #5358 by ensuring the coursier cache logger is initialized and then stopped around calls that might download things. Fixes #5358
1 parent 2ee59e4 commit 82879e5

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

core/util/src/mill/util/Jvm.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,8 @@ object Jvm {
563563
coursierCacheCustomizer: Option[FileCache[Task] => FileCache[Task]] = None
564564
): JvmIndex = {
565565
val coursierCache0 = coursierCache(ctx, coursierCacheCustomizer)
566-
jvmIndex0(ctx, coursierCacheCustomizer).unsafeRun()(coursierCache0.ec)
566+
coursierCache0.logger.use(jvmIndex0(ctx, coursierCacheCustomizer))
567+
.unsafeRun()(using coursierCache0.ec)
567568
}
568569

569570
def jvmIndex0(
@@ -622,7 +623,8 @@ object Jvm {
622623
// when given a version like "17", always pick highest version in the index
623624
// rather than the highest already on disk
624625
.withUpdate(true)
625-
val file = javaHome.get(id).unsafeRun()(coursierCache0.ec)
626+
val file = coursierCache0.logger.use(javaHome.get(id))
627+
.unsafeRun()(using coursierCache0.ec)
626628
Result.Success(os.Path(file))
627629

628630
}

integration/bootstrap/no-java-bootstrap/src/NoJavaBootstrapTests.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ object NoJavaBootstrapTests extends UtestIntegrationTestSuite {
2727
)
2828
val jvmCache = JvmCache().withIndex(index)
2929

30-
val entry = jvmCache.entries(mill.client.BuildInfo.defaultJvmId).unsafeRun()(using cache.ec)
30+
val entry = cache.logger.use(jvmCache.entries(mill.client.BuildInfo.defaultJvmId))
31+
.unsafeRun()(using cache.ec)
3132
.left.map(err => sys.error(err))
3233
.merge
3334
.last

libs/androidlib/src/mill/androidlib/AndroidSdkModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ trait AndroidSdkModule extends Module {
8383
.pipe { cache =>
8484
if (Task.offline) cache.withCachePolicies(Seq(LocalOnly)) else cache
8585
}
86-
cache.file(Artifact(url)).run.unsafeRun()(using cache.ec) match {
86+
cache.logger.use(cache.file(Artifact(url)).run).unsafeRun()(using cache.ec) match {
8787
case Right(file) =>
8888
PathRef(os.Path(file)).withRevalidateOnce
8989
case Left(_) if Task.offline =>

libs/scalalib/src/mill/scalalib/dependency/metadata/MavenMetadataLoader.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ private[dependency] final case class MavenMetadataLoader(
2424

2525
override def getVersions(module: coursier.Module): List[Version] = {
2626
// TODO fallback to 'versionsFromListing' if 'versions' doesn't work? (needs to be made public in coursier first)
27-
val allVersions =
28-
mavenRepo.versions(module, cache.fetch).run.unsafeRun()(cache.ec)
27+
val allVersions = cache.logger.use(mavenRepo.versions(module, cache.fetch).run)
28+
.unsafeRun()(using cache.ec)
2929
allVersions
3030
.map(_._1.available.map(Version(_)))
3131
.getOrElse(List.empty)

runner/launcher/src/mill/launcher/CoursierClient.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ object CoursierClient {
6161
// rather than the highest already on disk
6262
.withUpdate(true)
6363

64-
javaHome.get(id).unsafeRun()(using coursierCache0.ec)
64+
coursierCache0.logger.using(javaHome.get(id)).unsafeRun()(using coursierCache0.ec)
6565
}
6666
}

0 commit comments

Comments
 (0)