From a01a2f8bacbdb77ef875b9f5c4c4dc6a8ea57cf2 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 4 Oct 2024 04:08:09 -0400
Subject: [PATCH] Revert "remove a few more java.net.URL"

This reverts commit 861b8aa7921090f3abf1106d432181812d5fd6d6.
---
 .../librarymanagement/ComponentManager.scala         |  5 ++++-
 .../internal/librarymanagement/ConvertResolver.scala | 12 ++++++------
 .../internal/librarymanagement/FakeResolver.scala    |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/ComponentManager.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/ComponentManager.scala
index 7f84c3bf8..710c120de 100644
--- a/ivy/src/main/scala/sbt/internal/librarymanagement/ComponentManager.scala
+++ b/ivy/src/main/scala/sbt/internal/librarymanagement/ComponentManager.scala
@@ -101,7 +101,7 @@ object IfMissing {
 object ComponentManager {
   lazy val (version, timestamp) = {
     val properties = new java.util.Properties
-    val propertiesStream = getClass.getResourceAsStream("/xsbt.version.properties")
+    val propertiesStream = versionResource.openStream
     try {
       properties.load(propertiesStream)
     } finally {
@@ -110,4 +110,7 @@ object ComponentManager {
     (properties.getProperty("version"), properties.getProperty("timestamp"))
   }
   lazy val stampedVersion = version + "_" + timestamp
+
+  import java.net.URL
+  private def versionResource: URL = getClass.getResource("/xsbt.version.properties")
 }
diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala
index ef59c2e02..1bd0d7aad 100644
--- a/ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala
+++ b/ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala
@@ -394,17 +394,17 @@ private[sbt] object ConvertResolver {
     private[this] val repo = new WarnOnOverwriteFileRepo()
     private[this] val progress = new RepositoryCopyProgressListener(this);
     override def getResource(source: String) = {
-      val uri = new URI(source)
-      if (uri.getScheme == IO.FileScheme)
-        new FileResource(repo, IO.toFile(uri))
+      val url = new URI(source).toURL
+      if (url.getProtocol == IO.FileScheme)
+        new FileResource(repo, IO.toFile(url))
       else
         super.getResource(source)
     }
 
     override def put(source: File, destination: String, overwrite: Boolean): Unit = {
-      val uri = new URI(destination)
+      val url = new URI(destination).toURL
       try {
-        if (uri.getScheme != IO.FileScheme) super.put(source, destination, overwrite)
+        if (url.getProtocol != IO.FileScheme) super.put(source, destination, overwrite)
         else {
           // Here we duplicate the put method for files so we don't just bail on trying ot use Http handler
           val resource = getResource(destination)
@@ -417,7 +417,7 @@ private[sbt] object ConvertResolver {
             if (totalLength > 0) {
               progress.setTotalLength(totalLength);
             }
-            FileUtil.copy(source, new java.io.File(uri), progress, overwrite)
+            FileUtil.copy(source, new java.io.File(url.toURI), progress, overwrite)
             ()
           } catch {
             case ex: IOException =>
diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/FakeResolver.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/FakeResolver.scala
index 00c0275ae..2d6ef89de 100644
--- a/ivy/src/main/scala/sbt/internal/librarymanagement/FakeResolver.scala
+++ b/ivy/src/main/scala/sbt/internal/librarymanagement/FakeResolver.scala
@@ -69,7 +69,7 @@ private[sbt] class FakeResolver(private var name: String, cacheDir: File, module
   ): ArtifactDownloadReport = {
 
     val report = new ArtifactDownloadReport(artifact.getArtifact)
-    val path = new URI(artifact.getLocation).getPath
+    val path = new URI(artifact.getLocation).toURL.toURI.getPath
     val localFile = new File(path)
 
     if (path.nonEmpty && localFile.exists) {