From b0322b3630cdc3515f0d81586d45dd2365d62d74 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Mon, 30 Dec 2024 21:30:24 +0900
Subject: [PATCH 1/4] .

---
 main/api/src/mill/api/ClassLoader.scala | 32 +------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/main/api/src/mill/api/ClassLoader.scala b/main/api/src/mill/api/ClassLoader.scala
index 3c25f6379ba..934fe23f57a 100644
--- a/main/api/src/mill/api/ClassLoader.scala
+++ b/main/api/src/mill/api/ClassLoader.scala
@@ -22,10 +22,7 @@ object ClassLoader {
       sharedPrefixes: Seq[String] = Seq(),
       logger: Option[mill.api.Logger] = None
   )(implicit ctx: Ctx.Home): URLClassLoader = {
-    new URLClassLoader(
-      makeUrls(urls).toArray,
-      refinePlatformParent(parent)
-    ) {
+    new URLClassLoader(urls.toArray, refinePlatformParent(parent)) {
       override def findClass(name: String): Class[?] = {
         if (sharedPrefixes.exists(name.startsWith)) {
           logger.foreach(
@@ -73,31 +70,4 @@ object ClassLoader {
       appClassLoader.getParent()
     }
   }
-
-  private def makeUrls(urls: Seq[URL])(implicit ctx: Ctx.Home): Seq[URL] = {
-    if (java9OrAbove) {
-      val java90rtJar = ctx.home / Export.rtJarName
-      if (!os.exists(java90rtJar)) {
-        // Time between retries should go from 100 ms to around 10s, which should
-        // leave plenty of time for another process to write fully this 50+ MB file
-        val retry = Retry(
-          count = 7,
-          backoffMillis = 100,
-          filter = {
-            case (_, _: FileSystemException) if Properties.isWin => true
-            case _ => false
-          }
-        )
-        retry {
-          try os.copy(os.Path(Export.rt()), java90rtJar, createFolders = true)
-          catch {
-            case e: FileAlreadyExistsException => /* someone else already did this */
-          }
-        }
-      }
-      urls :+ java90rtJar.toIO.toURI().toURL()
-    } else {
-      urls
-    }
-  }
 }

From d900a41635acec9772310fa9c2e03e49db654df0 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Mon, 30 Dec 2024 21:33:35 +0900
Subject: [PATCH 2/4] .

---
 runner/src/mill/runner/MillMain.scala | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/runner/src/mill/runner/MillMain.scala b/runner/src/mill/runner/MillMain.scala
index 7cc01375bd5..e3a610d2bad 100644
--- a/runner/src/mill/runner/MillMain.scala
+++ b/runner/src/mill/runner/MillMain.scala
@@ -195,16 +195,6 @@ object MillMain {
 
                 val threadCount = Some(maybeThreadCount.toOption.get)
 
-                if (mill.main.client.Util.isJava9OrAbove) {
-                  val rt = config.home / Export.rtJarName
-                  if (!os.exists(rt)) {
-                    streams.err.println(
-                      s"Preparing Java ${System.getProperty("java.version")} runtime; this may take a minute or two ..."
-                    )
-                    Export.rtTo(rt.toIO, false)
-                  }
-                }
-
                 val bspContext =
                   if (bspMode) Some(new BspContext(streams, bspLog, config.home)) else None
 

From 6e4ca15ab8143a8c83a0fcb1c8f9ed3b1ad3e438 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Mon, 30 Dec 2024 21:43:43 +0900
Subject: [PATCH 3/4] .

---
 main/api/src/mill/api/ClassLoader.scala | 3 ---
 runner/src/mill/runner/MillMain.scala   | 1 -
 2 files changed, 4 deletions(-)

diff --git a/main/api/src/mill/api/ClassLoader.scala b/main/api/src/mill/api/ClassLoader.scala
index 934fe23f57a..9e74e493252 100644
--- a/main/api/src/mill/api/ClassLoader.scala
+++ b/main/api/src/mill/api/ClassLoader.scala
@@ -2,10 +2,7 @@ package mill.api
 
 import java.net.{URL, URLClassLoader}
 
-import java.nio.file.{FileAlreadyExistsException, FileSystemException}
 
-import mill.java9rtexport.Export
-import scala.util.Properties
 
 /**
  * Utilities for creating classloaders for running compiled Java/Scala code in
diff --git a/runner/src/mill/runner/MillMain.scala b/runner/src/mill/runner/MillMain.scala
index e3a610d2bad..aea2cb16a54 100644
--- a/runner/src/mill/runner/MillMain.scala
+++ b/runner/src/mill/runner/MillMain.scala
@@ -6,7 +6,6 @@ import java.nio.file.StandardOpenOption
 import java.util.Locale
 import scala.jdk.CollectionConverters.*
 import scala.util.Properties
-import mill.java9rtexport.Export
 import mill.api.{MillException, SystemStreams, WorkspaceRoot, internal}
 import mill.bsp.{BspContext, BspServerResult}
 import mill.main.BuildInfo

From 1e79b6ff782a4cfe58ede9302e4a4e6462af07b5 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Mon, 30 Dec 2024 22:11:40 +0900
Subject: [PATCH 4/4] .

---
 main/api/src/mill/api/ClassLoader.scala | 2 --
 1 file changed, 2 deletions(-)

diff --git a/main/api/src/mill/api/ClassLoader.scala b/main/api/src/mill/api/ClassLoader.scala
index 9e74e493252..29d32e0a9f7 100644
--- a/main/api/src/mill/api/ClassLoader.scala
+++ b/main/api/src/mill/api/ClassLoader.scala
@@ -2,8 +2,6 @@ package mill.api
 
 import java.net.{URL, URLClassLoader}
 
-
-
 /**
  * Utilities for creating classloaders for running compiled Java/Scala code in
  * isolated classpaths.