From 5ff0c638d41347fe318f65ef3ea442dd648a2c7d Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Wed, 15 Jul 2026 23:56:04 +0900 Subject: [PATCH] [2.x] Avoid deprecated url method in test (#9453) --- sbt-app/src/sbt-test/actions/external-doc/build.sbt | 4 ++-- .../src/sbt-test/dependency-management/make-pom/build.sbt | 6 +++--- sbt-app/src/sbt-test/ivy/make-ivy-xml/build.sbt | 2 +- sbt-app/src/sbt-test/lm-coursier/api-url/build.sbt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sbt-app/src/sbt-test/actions/external-doc/build.sbt b/sbt-app/src/sbt-test/actions/external-doc/build.sbt index ac76a0a4d..440dc30f5 100644 --- a/sbt-app/src/sbt-test/actions/external-doc/build.sbt +++ b/sbt-app/src/sbt-test/actions/external-doc/build.sbt @@ -21,8 +21,8 @@ val bResolver = Def.setting { } val apiBaseSetting = apiURL := Some(apiBase(name.value)) -def apiBase(projectName: String) = url(s"http://example.org/${projectName}") -def scalaLibraryBase(v: String) = url(s"https://www.scala-lang.org/api/$v/") +def apiBase(projectName: String) = uri(s"http://example.org/${projectName}") +def scalaLibraryBase(v: String) = uri(s"https://www.scala-lang.org/api/$v/") def addDep(projectName: String) = libraryDependencies += organization.value %% projectName % version.value diff --git a/sbt-app/src/sbt-test/dependency-management/make-pom/build.sbt b/sbt-app/src/sbt-test/dependency-management/make-pom/build.sbt index ecf866e0e..e2ca26e90 100644 --- a/sbt-app/src/sbt-test/dependency-management/make-pom/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/make-pom/build.sbt @@ -7,15 +7,15 @@ lazy val root = (project in file(".")).settings( XML.loadFile(converter.toPath(vf).toFile) }, description := "pom.xml test description", - homepage := Some(url("https://example.com/pom_test_url")), + homepage := Some(uri("https://example.com/pom_test_url")), TaskKey[Unit]("checkPom") := checkPom.value, TaskKey[Unit]("checkExtra") := checkExtra.value, TaskKey[Unit]("checkVersionPlusMapping") := checkVersionPlusMapping.value, TaskKey[Unit]("checkAPIURL") := checkAPIURL.value, TaskKey[Unit]("checkReleaseNotesURL") := checkReleaseNotesURL.value, resolvers += Resolver.sonatypeRepo("snapshots"), - apiURL := Some(url("https://www.scala-sbt.org/1.x/api/")), - releaseNotesURL := Some(url("https://github.com/sbt/sbt/releases")), + apiURL := Some(uri("https://www.scala-sbt.org/1.x/api/")), + releaseNotesURL := Some(uri("https://github.com/sbt/sbt/releases")), makePomConfiguration := { val p = makePomConfiguration.value p.withExtra() diff --git a/sbt-app/src/sbt-test/ivy/make-ivy-xml/build.sbt b/sbt-app/src/sbt-test/ivy/make-ivy-xml/build.sbt index 7f3863520..76de7b65b 100644 --- a/sbt-app/src/sbt-test/ivy/make-ivy-xml/build.sbt +++ b/sbt-app/src/sbt-test/ivy/make-ivy-xml/build.sbt @@ -7,7 +7,7 @@ lazy val root = (project in file(".")) settings( useIvy := true, name := "ivy-xml-test", description := descriptionValue, - homepage := Some(url(homepageValue)), + homepage := Some(uri(homepageValue)), TaskKey[Unit]("checkIvyXml") := { val ivyXml = XML.loadFile(makeIvyXml.value) diff --git a/sbt-app/src/sbt-test/lm-coursier/api-url/build.sbt b/sbt-app/src/sbt-test/lm-coursier/api-url/build.sbt index 6ad7026ba..dd55ec9bc 100644 --- a/sbt-app/src/sbt-test/lm-coursier/api-url/build.sbt +++ b/sbt-app/src/sbt-test/lm-coursier/api-url/build.sbt @@ -1,7 +1,7 @@ lazy val b = project .settings( - apiURL := Some(url(s"http://example.org/b")), + apiURL := Some(uri(s"http://example.org/b")), publishMavenStyle := false, publishTo := Some(bResolver.value), organization := "b",