luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[2.x] Avoid deprecated url method in test (#9453)

This commit is contained in:
kenji yoshida 2026-07-15 23:56:04 +09:00 committed by GitHub
parent 972d574750
commit 5ff0c638d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbt-app/src/sbt-test/actions/external-doc/build.sbt
View File

@ -21,8 +21,8 @@ val bResolver = Def.setting {
} }
val apiBaseSetting = apiURL := Some(apiBase(name.value)) val apiBaseSetting = apiURL := Some(apiBase(name.value))
def apiBase(projectName: String) = url(s"http://example.org/${projectName}") def apiBase(projectName: String) = uri(s"http://example.org/${projectName}")
def scalaLibraryBase(v: String) = url(s"https://www.scala-lang.org/api/$v/") def scalaLibraryBase(v: String) = uri(s"https://www.scala-lang.org/api/$v/")
def addDep(projectName: String) = def addDep(projectName: String) =
libraryDependencies += organization.value %% projectName % version.value libraryDependencies += organization.value %% projectName % version.value

6
sbt-app/src/sbt-test/dependency-management/make-pom/build.sbt
View File

@ -7,15 +7,15 @@ lazy val root = (project in file(".")).settings(
XML.loadFile(converter.toPath(vf).toFile) XML.loadFile(converter.toPath(vf).toFile)
}, },
description := "pom.xml test description", 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]("checkPom") := checkPom.value,
TaskKey[Unit]("checkExtra") := checkExtra.value, TaskKey[Unit]("checkExtra") := checkExtra.value,
TaskKey[Unit]("checkVersionPlusMapping") := checkVersionPlusMapping.value, TaskKey[Unit]("checkVersionPlusMapping") := checkVersionPlusMapping.value,
TaskKey[Unit]("checkAPIURL") := checkAPIURL.value, TaskKey[Unit]("checkAPIURL") := checkAPIURL.value,
TaskKey[Unit]("checkReleaseNotesURL") := checkReleaseNotesURL.value, TaskKey[Unit]("checkReleaseNotesURL") := checkReleaseNotesURL.value,
resolvers += Resolver.sonatypeRepo("snapshots"), resolvers += Resolver.sonatypeRepo("snapshots"),
apiURL := Some(url("https://www.scala-sbt.org/1.x/api/")), apiURL := Some(uri("https://www.scala-sbt.org/1.x/api/")),
releaseNotesURL := Some(url("https://github.com/sbt/sbt/releases")), releaseNotesURL := Some(uri("https://github.com/sbt/sbt/releases")),
makePomConfiguration := { makePomConfiguration := {
val p = makePomConfiguration.value val p = makePomConfiguration.value
p.withExtra(<extra-tag/>) p.withExtra(<extra-tag/>)

2
sbt-app/src/sbt-test/ivy/make-ivy-xml/build.sbt
View File

@ -7,7 +7,7 @@ lazy val root = (project in file(".")) settings(
useIvy := true, useIvy := true,
name := "ivy-xml-test", name := "ivy-xml-test",
description := descriptionValue, description := descriptionValue,
homepage := Some(url(homepageValue)), homepage := Some(uri(homepageValue)),
TaskKey[Unit]("checkIvyXml") := { TaskKey[Unit]("checkIvyXml") := {
val ivyXml = XML.loadFile(makeIvyXml.value) val ivyXml = XML.loadFile(makeIvyXml.value)

2
sbt-app/src/sbt-test/lm-coursier/api-url/build.sbt
View File

@ -1,7 +1,7 @@
lazy val b = project lazy val b = project
.settings( .settings(
apiURL := Some(url(s"http://example.org/b")), apiURL := Some(uri(s"http://example.org/b")),
publishMavenStyle := false, publishMavenStyle := false,
publishTo := Some(bResolver.value), publishTo := Some(bResolver.value),
organization := "b", organization := "b",