Skip to content

Commit

Permalink
Merge pull request sbt#447 from eed3si9n/wip/revert
Browse files Browse the repository at this point in the history 
[2.x] Revert URI change
  • Loading branch information
@eed3si9n
eed3si9n authored Oct 4, 2024
2 parents cb24883 + 18a9af8 commit ddf3f5e
Show file tree
Hide file tree
Showing 17 changed files with 62 additions and 60 deletions.
12 changes: 6 additions & 6 deletions core/src/main/contraband-scala/sbt/librarymanagement/Artifact.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ final class Artifact private (
val extension: String,
val classifier: Option[String],
val configurations: Vector[sbt.librarymanagement.ConfigRef],
val url: Option[java.net.URI],
val url: Option[java.net.URL],
val extraAttributes: Map[String, String],
val checksum: Option[sbt.librarymanagement.Checksum],
val allowInsecureProtocol: Boolean) extends sbt.librarymanagement.ArtifactExtra with Serializable {
private[sbt] def validateProtocol(logger: sbt.util.Logger): Boolean = Resolver.validateArtifact(this, logger)
private def this(name: String) = this(name, Artifact.DefaultType, Artifact.DefaultExtension, None, Vector.empty, None, Map.empty, None, false)
private def this(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Vector[sbt.librarymanagement.ConfigRef], url: Option[java.net.URI], extraAttributes: Map[String, String], checksum: Option[sbt.librarymanagement.Checksum]) = this(name, `type`, extension, classifier, configurations, url, extraAttributes, checksum, false)
private def this(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Vector[sbt.librarymanagement.ConfigRef], url: Option[java.net.URL], extraAttributes: Map[String, String], checksum: Option[sbt.librarymanagement.Checksum]) = this(name, `type`, extension, classifier, configurations, url, extraAttributes, checksum, false)

override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match {
case x: Artifact => (this.name == x.name) && (this.`type` == x.`type`) && (this.extension == x.extension) && (this.classifier == x.classifier) && (this.configurations == x.configurations) && (this.url == x.url) && (this.extraAttributes == x.extraAttributes) && (this.checksum == x.checksum) && (this.allowInsecureProtocol == x.allowInsecureProtocol)
Expand All @@ -28,7 +28,7 @@ final class Artifact private (
override def toString: String = {
"Artifact(" + name + ", " + `type` + ", " + extension + ", " + classifier + ", " + configurations + ", " + url + ", " + extraAttributes + ", " + checksum + ", " + allowInsecureProtocol + ")"
}
private[this] def copy(name: String = name, `type`: String = `type`, extension: String = extension, classifier: Option[String] = classifier, configurations: Vector[sbt.librarymanagement.ConfigRef] = configurations, url: Option[java.net.URI] = url, extraAttributes: Map[String, String] = extraAttributes, checksum: Option[sbt.librarymanagement.Checksum] = checksum, allowInsecureProtocol: Boolean = allowInsecureProtocol): Artifact = {
private[this] def copy(name: String = name, `type`: String = `type`, extension: String = extension, classifier: Option[String] = classifier, configurations: Vector[sbt.librarymanagement.ConfigRef] = configurations, url: Option[java.net.URL] = url, extraAttributes: Map[String, String] = extraAttributes, checksum: Option[sbt.librarymanagement.Checksum] = checksum, allowInsecureProtocol: Boolean = allowInsecureProtocol): Artifact = {
new Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes, checksum, allowInsecureProtocol)
}
def withName(name: String): Artifact = {
Expand All @@ -46,7 +46,7 @@ final class Artifact private (
def withConfigurations(configurations: Vector[sbt.librarymanagement.ConfigRef]): Artifact = {
copy(configurations = configurations)
}
def withUrl(url: Option[java.net.URI]): Artifact = {
def withUrl(url: Option[java.net.URL]): Artifact = {
copy(url = url)
}
def withExtraAttributes(extraAttributes: Map[String, String]): Artifact = {
Expand All @@ -62,6 +62,6 @@ final class Artifact private (
object Artifact extends sbt.librarymanagement.ArtifactFunctions {

def apply(name: String): Artifact = new Artifact(name)
def apply(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Vector[sbt.librarymanagement.ConfigRef], url: Option[java.net.URI], extraAttributes: Map[String, String], checksum: Option[sbt.librarymanagement.Checksum]): Artifact = new Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes, checksum)
def apply(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Vector[sbt.librarymanagement.ConfigRef], url: Option[java.net.URI], extraAttributes: Map[String, String], checksum: Option[sbt.librarymanagement.Checksum], allowInsecureProtocol: Boolean): Artifact = new Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes, checksum, allowInsecureProtocol)
def apply(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Vector[sbt.librarymanagement.ConfigRef], url: Option[java.net.URL], extraAttributes: Map[String, String], checksum: Option[sbt.librarymanagement.Checksum]): Artifact = new Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes, checksum)
def apply(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Vector[sbt.librarymanagement.ConfigRef], url: Option[java.net.URL], extraAttributes: Map[String, String], checksum: Option[sbt.librarymanagement.Checksum], allowInsecureProtocol: Boolean): Artifact = new Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes, checksum, allowInsecureProtocol)
}
2 changes: 1 addition & 1 deletion core/src/main/contraband-scala/sbt/librarymanagement/ArtifactFormats.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ implicit lazy val ArtifactFormat: JsonFormat[sbt.librarymanagement.Artifact] = n
val extension = unbuilder.readField[String]("extension")
val classifier = unbuilder.readField[Option[String]]("classifier")
val configurations = unbuilder.readField[Vector[sbt.librarymanagement.ConfigRef]]("configurations")
val url = unbuilder.readField[Option[java.net.URI]]("url")
val url = unbuilder.readField[Option[java.net.URL]]("url")
val extraAttributes = unbuilder.readField[Map[String, String]]("extraAttributes")
val checksum = unbuilder.readField[Option[sbt.librarymanagement.Checksum]]("checksum")
val allowInsecureProtocol = unbuilder.readField[Boolean]("allowInsecureProtocol")
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/contraband-scala/sbt/librarymanagement/Developer.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ final class Developer private (
val id: String,
val name: String,
val email: String,
val url: java.net.URI) extends Serializable {
val url: java.net.URL) extends Serializable {



Expand All @@ -22,7 +22,7 @@ final class Developer private (
override def toString: String = {
"Developer(" + id + ", " + name + ", " + email + ", " + url + ")"
}
private[this] def copy(id: String = id, name: String = name, email: String = email, url: java.net.URI = url): Developer = {
private[this] def copy(id: String = id, name: String = name, email: String = email, url: java.net.URL = url): Developer = {
new Developer(id, name, email, url)
}
def withId(id: String): Developer = {
Expand All @@ -34,11 +34,11 @@ final class Developer private (
def withEmail(email: String): Developer = {
copy(email = email)
}
def withUrl(url: java.net.URI): Developer = {
def withUrl(url: java.net.URL): Developer = {
copy(url = url)
}
}
object Developer {

def apply(id: String, name: String, email: String, url: java.net.URI): Developer = new Developer(id, name, email, url)
def apply(id: String, name: String, email: String, url: java.net.URL): Developer = new Developer(id, name, email, url)
}
2 changes: 1 addition & 1 deletion core/src/main/contraband-scala/sbt/librarymanagement/DeveloperFormats.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ implicit lazy val DeveloperFormat: JsonFormat[sbt.librarymanagement.Developer] =
val id = unbuilder.readField[String]("id")
val name = unbuilder.readField[String]("name")
val email = unbuilder.readField[String]("email")
val url = unbuilder.readField[java.net.URI]("url")
val url = unbuilder.readField[java.net.URL]("url")
unbuilder.endObject()
sbt.librarymanagement.Developer(id, name, email, url)
case None =>
Expand Down
16 changes: 8 additions & 8 deletions core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfo.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ package sbt.librarymanagement
final class ModuleInfo private (
val nameFormal: String,
val description: String,
val homepage: Option[java.net.URI],
val homepage: Option[java.net.URL],
val startYear: Option[Int],
val licenses: Vector[scala.Tuple2[String, java.net.URI]],
val licenses: Vector[scala.Tuple2[String, java.net.URL]],
val organizationName: String,
val organizationHomepage: Option[java.net.URI],
val organizationHomepage: Option[java.net.URL],
val scmInfo: Option[sbt.librarymanagement.ScmInfo],
val developers: Vector[sbt.librarymanagement.Developer]) extends Serializable {

Expand All @@ -28,7 +28,7 @@ final class ModuleInfo private (
override def toString: String = {
"ModuleInfo(" + nameFormal + ", " + description + ", " + homepage + ", " + startYear + ", " + licenses + ", " + organizationName + ", " + organizationHomepage + ", " + scmInfo + ", " + developers + ")"
}
private[this] def copy(nameFormal: String = nameFormal, description: String = description, homepage: Option[java.net.URI] = homepage, startYear: Option[Int] = startYear, licenses: Vector[scala.Tuple2[String, java.net.URI]] = licenses, organizationName: String = organizationName, organizationHomepage: Option[java.net.URI] = organizationHomepage, scmInfo: Option[sbt.librarymanagement.ScmInfo] = scmInfo, developers: Vector[sbt.librarymanagement.Developer] = developers): ModuleInfo = {
private[this] def copy(nameFormal: String = nameFormal, description: String = description, homepage: Option[java.net.URL] = homepage, startYear: Option[Int] = startYear, licenses: Vector[scala.Tuple2[String, java.net.URL]] = licenses, organizationName: String = organizationName, organizationHomepage: Option[java.net.URL] = organizationHomepage, scmInfo: Option[sbt.librarymanagement.ScmInfo] = scmInfo, developers: Vector[sbt.librarymanagement.Developer] = developers): ModuleInfo = {
new ModuleInfo(nameFormal, description, homepage, startYear, licenses, organizationName, organizationHomepage, scmInfo, developers)
}
def withNameFormal(nameFormal: String): ModuleInfo = {
Expand All @@ -37,19 +37,19 @@ final class ModuleInfo private (
def withDescription(description: String): ModuleInfo = {
copy(description = description)
}
def withHomepage(homepage: Option[java.net.URI]): ModuleInfo = {
def withHomepage(homepage: Option[java.net.URL]): ModuleInfo = {
copy(homepage = homepage)
}
def withStartYear(startYear: Option[Int]): ModuleInfo = {
copy(startYear = startYear)
}
def withLicenses(licenses: Vector[scala.Tuple2[String, java.net.URI]]): ModuleInfo = {
def withLicenses(licenses: Vector[scala.Tuple2[String, java.net.URL]]): ModuleInfo = {
copy(licenses = licenses)
}
def withOrganizationName(organizationName: String): ModuleInfo = {
copy(organizationName = organizationName)
}
def withOrganizationHomepage(organizationHomepage: Option[java.net.URI]): ModuleInfo = {
def withOrganizationHomepage(organizationHomepage: Option[java.net.URL]): ModuleInfo = {
copy(organizationHomepage = organizationHomepage)
}
def withScmInfo(scmInfo: Option[sbt.librarymanagement.ScmInfo]): ModuleInfo = {
Expand All @@ -62,5 +62,5 @@ final class ModuleInfo private (
object ModuleInfo {

def apply(nameFormal: String): ModuleInfo = new ModuleInfo(nameFormal)
def apply(nameFormal: String, description: String, homepage: Option[java.net.URI], startYear: Option[Int], licenses: Vector[scala.Tuple2[String, java.net.URI]], organizationName: String, organizationHomepage: Option[java.net.URI], scmInfo: Option[sbt.librarymanagement.ScmInfo], developers: Vector[sbt.librarymanagement.Developer]): ModuleInfo = new ModuleInfo(nameFormal, description, homepage, startYear, licenses, organizationName, organizationHomepage, scmInfo, developers)
def apply(nameFormal: String, description: String, homepage: Option[java.net.URL], startYear: Option[Int], licenses: Vector[scala.Tuple2[String, java.net.URL]], organizationName: String, organizationHomepage: Option[java.net.URL], scmInfo: Option[sbt.librarymanagement.ScmInfo], developers: Vector[sbt.librarymanagement.Developer]): ModuleInfo = new ModuleInfo(nameFormal, description, homepage, startYear, licenses, organizationName, organizationHomepage, scmInfo, developers)
}
6 changes: 3 additions & 3 deletions core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfoFormats.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ implicit lazy val ModuleInfoFormat: JsonFormat[sbt.librarymanagement.ModuleInfo]
unbuilder.beginObject(__js)
val nameFormal = unbuilder.readField[String]("nameFormal")
val description = unbuilder.readField[String]("description")
val homepage = unbuilder.readField[Option[java.net.URI]]("homepage")
val homepage = unbuilder.readField[Option[java.net.URL]]("homepage")
val startYear = unbuilder.readField[Option[Int]]("startYear")
val licenses = unbuilder.readField[Vector[scala.Tuple2[String, java.net.URI]]]("licenses")
val licenses = unbuilder.readField[Vector[scala.Tuple2[String, java.net.URL]]]("licenses")
val organizationName = unbuilder.readField[String]("organizationName")
val organizationHomepage = unbuilder.readField[Option[java.net.URI]]("organizationHomepage")
val organizationHomepage = unbuilder.readField[Option[java.net.URL]]("organizationHomepage")
val scmInfo = unbuilder.readField[Option[sbt.librarymanagement.ScmInfo]]("scmInfo")
val developers = unbuilder.readField[Vector[sbt.librarymanagement.Developer]]("developers")
unbuilder.endObject()
Expand Down
14 changes: 7 additions & 7 deletions core/src/main/contraband-scala/sbt/librarymanagement/ScmInfo.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
package sbt.librarymanagement
/** Basic SCM information for a project module */
final class ScmInfo private (
val browseUrl: java.net.URI,
val browseUrl: java.net.URL,
val connection: String,
val devConnection: Option[String]) extends Serializable {

private def this(browseUrl: java.net.URI, connection: String) = this(browseUrl, connection, None)
private def this(browseUrl: java.net.URL, connection: String) = this(browseUrl, connection, None)

override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match {
case x: ScmInfo => (this.browseUrl == x.browseUrl) && (this.connection == x.connection) && (this.devConnection == x.devConnection)
Expand All @@ -22,10 +22,10 @@ final class ScmInfo private (
override def toString: String = {
"ScmInfo(" + browseUrl + ", " + connection + ", " + devConnection + ")"
}
private[this] def copy(browseUrl: java.net.URI = browseUrl, connection: String = connection, devConnection: Option[String] = devConnection): ScmInfo = {
private[this] def copy(browseUrl: java.net.URL = browseUrl, connection: String = connection, devConnection: Option[String] = devConnection): ScmInfo = {
new ScmInfo(browseUrl, connection, devConnection)
}
def withBrowseUrl(browseUrl: java.net.URI): ScmInfo = {
def withBrowseUrl(browseUrl: java.net.URL): ScmInfo = {
copy(browseUrl = browseUrl)
}
def withConnection(connection: String): ScmInfo = {
Expand All @@ -40,7 +40,7 @@ final class ScmInfo private (
}
object ScmInfo {

def apply(browseUrl: java.net.URI, connection: String): ScmInfo = new ScmInfo(browseUrl, connection)
def apply(browseUrl: java.net.URI, connection: String, devConnection: Option[String]): ScmInfo = new ScmInfo(browseUrl, connection, devConnection)
def apply(browseUrl: java.net.URI, connection: String, devConnection: String): ScmInfo = new ScmInfo(browseUrl, connection, Option(devConnection))
def apply(browseUrl: java.net.URL, connection: String): ScmInfo = new ScmInfo(browseUrl, connection)
def apply(browseUrl: java.net.URL, connection: String, devConnection: Option[String]): ScmInfo = new ScmInfo(browseUrl, connection, devConnection)
def apply(browseUrl: java.net.URL, connection: String, devConnection: String): ScmInfo = new ScmInfo(browseUrl, connection, Option(devConnection))
}
2 changes: 1 addition & 1 deletion core/src/main/contraband-scala/sbt/librarymanagement/ScmInfoFormats.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ implicit lazy val ScmInfoFormat: JsonFormat[sbt.librarymanagement.ScmInfo] = new
__jsOpt match {
case Some(__js) =>
unbuilder.beginObject(__js)
val browseUrl = unbuilder.readField[java.net.URI]("browseUrl")
val browseUrl = unbuilder.readField[java.net.URL]("browseUrl")
val connection = unbuilder.readField[String]("connection")
val devConnection = unbuilder.readField[Option[String]]("devConnection")
unbuilder.endObject()
Expand Down
12 changes: 6 additions & 6 deletions core/src/main/contraband/librarymanagement.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
{ "name": "extension", "type": "String", "default": "Artifact.DefaultExtension", "since": "0.0.1" },
{ "name": "classifier", "type": "Option[String]", "default": "None", "since": "0.0.1" },
{ "name": "configurations", "type": "sbt.librarymanagement.ConfigRef*", "default": "Vector.empty", "since": "0.0.1" },
{ "name": "url", "type": "Option[java.net.URI]", "default": "None", "since": "0.0.1" },
{ "name": "url", "type": "Option[java.net.URL]", "default": "None", "since": "0.0.1" },
{ "name": "extraAttributes", "type": "Map[String, String]", "default": "Map.empty", "since": "0.0.1" },
{ "name": "checksum", "type": "Option[sbt.librarymanagement.Checksum]", "default": "None", "since": "0.0.1" },
{ "name": "allowInsecureProtocol", "type": "Boolean", "default": "false", "since": "1.3.0" }
Expand Down Expand Up @@ -244,7 +244,7 @@
{ "name": "id", "type": "String" },
{ "name": "name", "type": "String" },
{ "name": "email", "type": "String" },
{ "name": "url", "type": "java.net.URI" }
{ "name": "url", "type": "java.net.URL" }
]
},
{
Expand Down Expand Up @@ -365,11 +365,11 @@
"fields": [
{ "name": "nameFormal", "type": "String" },
{ "name": "description", "type": "String", "default": "\"\"", "since": "0.0.1" },
{ "name": "homepage", "type": "Option[java.net.URI]", "default": "None", "since": "0.0.1" },
{ "name": "homepage", "type": "Option[java.net.URL]", "default": "None", "since": "0.0.1" },
{ "name": "startYear", "type": "Option[Int]", "default": "None", "since": "0.0.1" },
{ "name": "licenses", "type": "scala.Tuple2[String, java.net.URI]*", "default": "Vector.empty", "since": "0.0.1" },
{ "name": "licenses", "type": "scala.Tuple2[String, java.net.URL]*", "default": "Vector.empty", "since": "0.0.1" },
{ "name": "organizationName", "type": "String", "default": "\"\"", "since": "0.0.1" },
{ "name": "organizationHomepage", "type": "Option[java.net.URI]", "default": "None", "since": "0.0.1" },
{ "name": "organizationHomepage", "type": "Option[java.net.URL]", "default": "None", "since": "0.0.1" },
{ "name": "scmInfo", "type": "Option[sbt.librarymanagement.ScmInfo]", "default": "None", "since": "0.0.1" },
{ "name": "developers", "type": "sbt.librarymanagement.Developer*", "default": "Vector.empty", "since": "0.0.1" }
]
Expand Down Expand Up @@ -728,7 +728,7 @@
"type": "record",
"doc": "Basic SCM information for a project module",
"fields": [
{ "name": "browseUrl", "type": "java.net.URI" },
{ "name": "browseUrl", "type": "java.net.URL" },
{ "name": "connection", "type": "String" },
{ "name": "devConnection", "type": "String?", "default": "None", "since": "0.0.1" }
]
Expand Down
Loading

0 comments on commit ddf3f5e

Please sign in to comment.