mirror of https://github.com/sbt/sbt.git
[2.x] Avoid deprecated url method in test (#9453)
This commit is contained in:
parent
972d574750
commit
5ff0c638d4
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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(<extra-tag/>)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
Loading…
Reference in New Issue