Skip to content

Commit 830230f

Browse files
authored
Avoid deprecated URL ctor in scaladoc (#17426)
Follow-up to #17403 includes scaladoc.
1 parent f7ba81c commit 830230f

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

scaladoc/src/dotty/tools/scaladoc/ExternalDocLink.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dotty.tools.scaladoc
22

3-
import java.net.URL
3+
import java.net.{URI, URL}
44
import scala.util.matching._
55
import scala.util.{ Try, Success, Failure }
66

@@ -30,7 +30,7 @@ object ExternalDocLink:
3030
def parseLegacy(mapping: String): Either[String, ExternalDocLink] =
3131
mapping.split("#").toList match
3232
case path :: apiUrl :: Nil => for {
33-
url <- tryParse(mapping, "url")(URL(stripIndex(apiUrl)))
33+
url <- tryParse(mapping, "url")(URI(stripIndex(apiUrl)).toURL)
3434
} yield ExternalDocLink(
3535
List(s"${Regex.quote(path)}.*".r),
3636
url,
@@ -42,7 +42,7 @@ object ExternalDocLink:
4242
def parse(mapping: String): Either[String, ExternalDocLink] =
4343

4444
def parsePackageList(elements: List[String]) = elements match
45-
case List(urlStr) => tryParse(mapping, "packageList")(Some(URL(urlStr)))
45+
case List(urlStr) => tryParse(mapping, "packageList")(Some(URI(urlStr).toURL))
4646
case Nil => Right(None)
4747
case other => fail(mapping, s"Provided multiple package lists: $other")
4848

@@ -57,7 +57,7 @@ object ExternalDocLink:
5757
case regexStr :: docToolStr :: urlStr :: rest =>
5858
for {
5959
regex <- tryParse(mapping, "regex")(regexStr.r)
60-
url <- tryParse(mapping, "url")(URL(stripIndex(urlStr)))
60+
url <- tryParse(mapping, "url")(URI(stripIndex(urlStr)).toURL)
6161
doctool <- doctoolByName(docToolStr)
6262
packageList <- parsePackageList(rest)
6363
} yield ExternalDocLink(

scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools.scaladoc
22
package renderers
33

44
import util.HTML._
5-
import java.net.URL
5+
import java.net.{URI, URL}
66
import java.nio.file.Paths
77
import java.nio.file.Path
88
import java.nio.file.Files
@@ -565,4 +565,4 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
565565
case Resource.URL(url) =>
566566
Nil
567567
case Resource.URLToCopy(url, dest) =>
568-
Seq(copy(new URL(url).openStream(), dest))
568+
Seq(copy(URI(url).toURL.openStream(), dest))

scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ package renderers
33

44
import util.HTML._
55
import scala.jdk.CollectionConverters._
6-
import java.net.URI
7-
import java.net.URL
6+
import java.net.{URI, URL}
87
import dotty.tools.scaladoc.site._
98
import scala.util.Try
109
import org.jsoup.Jsoup
@@ -40,7 +39,7 @@ trait SiteRenderer(using DocContext) extends Locations:
4039

4140
def processLocalLink(str: String): String =
4241
val staticSiteRootPath = content.ctx.root.toPath.toAbsolutePath
43-
def asValidURL: Option[String] = Try(URL(str)).toOption.map(_ => str)
42+
def asValidURL: Option[String] = Try(URI(str).toURL).toOption.map(_ => str)
4443
def asAsset: Option[String] = Option.when(
4544
Files.exists(staticSiteRootPath.resolve("_assets").resolve(str.stripPrefix("/")))
4645
)(

0 commit comments

Comments
 (0)