Merge pull request #341 from xuwei-k/java-net-URL-constructor

avoid deprecated `java.net.URL` constructor
sbt · Mar 25, 2023 · bcfb7bb · bcfb7bb
2 parents f035146 + 097c9a0
commit bcfb7bb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/io/src/main/scala/sbt/io/IO.scala b/io/src/main/scala/sbt/io/IO.scala
@@ -148,19 +148,16 @@ object IO {
               case "jar" =>
                 val path = url.getPath
                 val end = path.indexOf('!')
-                new URL(
+                new URI(
                   if (end == -1) path
                   else path.substring(0, end)
-                )
+                ).toURL
               case "jrt" =>
                 val path = url.getPath
                 val end = path.indexOf('/', 1)
-                new URL(
-                  "jrt",
-                  null,
-                  if (end == -1) path
-                  else path.substring(0, end)
-                )
+                new URI(
+                  s"jrt://${if (end == -1) path else path.substring(0, end)}"
+                ).toURL
               case _ => url
             }
         )

diff --git a/io/src/main/scala/sbt/io/syntax.scala b/io/src/main/scala/sbt/io/syntax.scala
@@ -36,7 +36,7 @@ object syntax extends IOSyntax0 {
 
   def uri(s: String): URI = new URI(s)
   def file(s: String): File = new File(s)
-  def url(s: String): URL = new URL(s)
+  def url(s: String): URL = uri(s).toURL
 
   implicit def fileToRichFile(file: File): RichFile = new RichFile(file)
   implicit def filesToFinder(cc: Traversable[File]): PathFinder = PathFinder.strict(cc)