fixes

Author: lihaoyi

core/util/src/mill/util/Retry.scala

@@ -26,12 +26,12 @@ import scala.concurrent.{Await, Promise}
  *         [[t]] fails more than [[count]] times
  */
 case class Retry(
-    logger: String => Unit,
     count: Int = 5,
     backoffMillis: Long = 10,
     backoffMultiplier: Double = 2.0,
     timeoutMillis: Long = -1,
-    filter: (Int, Throwable) => Boolean = (_, _) => true
+    filter: (Int, Throwable) => Boolean = (_, _) => true,
+    logger: String => Unit = _ => ()
 ) {
 
   def apply[T](t: => T): T = {

core/util/test/src/mill/util/RetryTests.scala

@@ -7,7 +7,7 @@ object RetryTests extends TestSuite {
     test("fail") {
       var count = 0
       try {
-        Retry(Retry.printStreamLogger(System.err)) {
+        Retry(logger = Retry.printStreamLogger(System.err)) {
           count += 1
           throw new Exception("boom")
         }
@@ -20,7 +20,7 @@ object RetryTests extends TestSuite {
     }
     test("succeed") {
       var count = 0
-      Retry(Retry.printStreamLogger(System.err)) {
+      Retry(logger = Retry.printStreamLogger(System.err)) {
         count += 1
         if (count < 3) throw new Exception("boom")
       }
@@ -30,7 +30,7 @@ object RetryTests extends TestSuite {
       var count = 0
       try {
         Retry(
-          Retry.printStreamLogger(System.err),
+          logger = Retry.printStreamLogger(System.err),
           filter = {
             case (i, ex: RuntimeException) => true
             case _ => false
@@ -50,7 +50,7 @@ object RetryTests extends TestSuite {
       test("fail") {
         var count = 0
         try {
-          Retry(Retry.printStreamLogger(System.err), timeoutMillis = 100) {
+          Retry(logger = Retry.printStreamLogger(System.err), timeoutMillis = 100) {
             count += 1
             Thread.sleep(1000)
           }
@@ -63,7 +63,7 @@ object RetryTests extends TestSuite {
       }
       test("success") {
         var count = 0
-        Retry(Retry.printStreamLogger(System.err), timeoutMillis = 100) {
+        Retry(logger = Retry.printStreamLogger(System.err), timeoutMillis = 100) {
           count += 1
           if (count < 3) Thread.sleep(1000)
         }

libs/scalalib/worker/src/mill/scalalib/worker/JvmWorkerImpl.scala

@@ -233,7 +233,7 @@ class JvmWorkerImpl(
     ) { (compilers: Compilers) =>
       // Not sure why dotty scaladoc is flaky, but add retries to workaround it
       // https://github.com/com-lihaoyi/mill/issues/4556
-      mill.util.Retry(mill.util.Retry.ctxLogger, count = 2) {
+      mill.util.Retry(count = 2) {
         if (JvmWorkerUtil.isDotty(scalaVersion) || JvmWorkerUtil.isScala3Milestone(scalaVersion)) {
           // dotty 0.x and scala 3 milestones use the dotty-doc tool
           val dottydocClass =

testkit/src/mill/testkit/IntegrationTestSuite.scala

@@ -43,7 +43,7 @@ trait IntegrationTestSuite {
    */
   def integrationTest[T](block: IntegrationTester => T): T = {
     Retry(
-      Retry.printStreamLogger(System.err),
+      logger = Retry.printStreamLogger(System.err),
       count = if (sys.env.contains("CI")) 1 else 0,
       timeoutMillis = 10.minutes.toMillis
     ) {

testkit/src/mill/testkit/IntegrationTesterBase.scala

@@ -42,7 +42,7 @@ trait IntegrationTesterBase {
   def initWorkspace(): Unit = {
     println(s"Copying integration test sources from $workspaceSourcePath to $workspacePath")
     os.makeDir.all(workspacePath)
-    Retry(Retry.printStreamLogger(System.err)) {
+    Retry(logger = Retry.printStreamLogger(System.err)) {
       val tmp = os.temp.dir()
       val outDir = os.Path(out, workspacePath)
       if (os.exists(outDir)) os.move.into(outDir, tmp)

testkit/src/mill/testkit/UtestExampleTestSuite.scala

@@ -17,7 +17,7 @@ object UtestExampleTestSuite extends TestSuite {
     test("exampleTest") {
       def run() =
         Retry(
-          Retry.printStreamLogger(System.err),
+          logger = Retry.printStreamLogger(System.err),
           count = if (sys.env.contains("CI")) 1 else 0,
           timeoutMillis = 15.minutes.toMillis
         ) {