Skip to content

Commit ddf3f5e

Browse files
eed3si9need3si9n
authored
Merge pull request #447 from eed3si9n/wip/revert
[2.x] Revert URI change
2 parents cb24883 + 18a9af8 commit ddf3f5e

File tree

17 files changed

+62
-60
lines changed

17 files changed

+62
-60
lines changed

‎core/src/main/contraband-scala/sbt/librarymanagement/Artifact.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ final class Artifact private (
1010
val extension: String,
1111
val classifier: Option[String],
1212
val configurations: Vector[sbt.librarymanagement.ConfigRef],
13-
val url: Option[java.net.URI],
13+
val url: Option[java.net.URL],
1414
val extraAttributes: Map[String, String],
1515
val checksum: Option[sbt.librarymanagement.Checksum],
1616
val allowInsecureProtocol: Boolean) extends sbt.librarymanagement.ArtifactExtra with Serializable {
1717
private[sbt] def validateProtocol(logger: sbt.util.Logger): Boolean = Resolver.validateArtifact(this, logger)
1818
private def this(name: String) = this(name, Artifact.DefaultType, Artifact.DefaultExtension, None, Vector.empty, None, Map.empty, None, false)
19-
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)
19+
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)
2020

2121
override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match {
2222
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)
@@ -28,7 +28,7 @@ final class Artifact private (
2828
override def toString: String = {
2929
"Artifact(" + name + ", " + `type` + ", " + extension + ", " + classifier + ", " + configurations + ", " + url + ", " + extraAttributes + ", " + checksum + ", " + allowInsecureProtocol + ")"
3030
}
31-
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 = {
31+
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 = {
3232
new Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes, checksum, allowInsecureProtocol)
3333
}
3434
def withName(name: String): Artifact = {
@@ -46,7 +46,7 @@ final class Artifact private (
4646
def withConfigurations(configurations: Vector[sbt.librarymanagement.ConfigRef]): Artifact = {
4747
copy(configurations = configurations)
4848
}
49-
def withUrl(url: Option[java.net.URI]): Artifact = {
49+
def withUrl(url: Option[java.net.URL]): Artifact = {
5050
copy(url = url)
5151
}
5252
def withExtraAttributes(extraAttributes: Map[String, String]): Artifact = {
@@ -62,6 +62,6 @@ final class Artifact private (
6262
object Artifact extends sbt.librarymanagement.ArtifactFunctions {
6363

6464
def apply(name: String): Artifact = new Artifact(name)
65-
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)
66-
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)
65+
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)
66+
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)
6767
}

‎core/src/main/contraband-scala/sbt/librarymanagement/ArtifactFormats.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ implicit lazy val ArtifactFormat: JsonFormat[sbt.librarymanagement.Artifact] = n
1616
val extension = unbuilder.readField[String]("extension")
1717
val classifier = unbuilder.readField[Option[String]]("classifier")
1818
val configurations = unbuilder.readField[Vector[sbt.librarymanagement.ConfigRef]]("configurations")
19-
val url = unbuilder.readField[Option[java.net.URI]]("url")
19+
val url = unbuilder.readField[Option[java.net.URL]]("url")
2020
val extraAttributes = unbuilder.readField[Map[String, String]]("extraAttributes")
2121
val checksum = unbuilder.readField[Option[sbt.librarymanagement.Checksum]]("checksum")
2222
val allowInsecureProtocol = unbuilder.readField[Boolean]("allowInsecureProtocol")

‎core/src/main/contraband-scala/sbt/librarymanagement/Developer.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ final class Developer private (
88
val id: String,
99
val name: String,
1010
val email: String,
11-
val url: java.net.URI) extends Serializable {
11+
val url: java.net.URL) extends Serializable {
1212

1313

1414

@@ -22,7 +22,7 @@ final class Developer private (
2222
override def toString: String = {
2323
"Developer(" + id + ", " + name + ", " + email + ", " + url + ")"
2424
}
25-
private[this] def copy(id: String = id, name: String = name, email: String = email, url: java.net.URI = url): Developer = {
25+
private[this] def copy(id: String = id, name: String = name, email: String = email, url: java.net.URL = url): Developer = {
2626
new Developer(id, name, email, url)
2727
}
2828
def withId(id: String): Developer = {
@@ -34,11 +34,11 @@ final class Developer private (
3434
def withEmail(email: String): Developer = {
3535
copy(email = email)
3636
}
37-
def withUrl(url: java.net.URI): Developer = {
37+
def withUrl(url: java.net.URL): Developer = {
3838
copy(url = url)
3939
}
4040
}
4141
object Developer {
4242

43-
def apply(id: String, name: String, email: String, url: java.net.URI): Developer = new Developer(id, name, email, url)
43+
def apply(id: String, name: String, email: String, url: java.net.URL): Developer = new Developer(id, name, email, url)
4444
}

‎core/src/main/contraband-scala/sbt/librarymanagement/DeveloperFormats.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ implicit lazy val DeveloperFormat: JsonFormat[sbt.librarymanagement.Developer] =
1414
val id = unbuilder.readField[String]("id")
1515
val name = unbuilder.readField[String]("name")
1616
val email = unbuilder.readField[String]("email")
17-
val url = unbuilder.readField[java.net.URI]("url")
17+
val url = unbuilder.readField[java.net.URL]("url")
1818
unbuilder.endObject()
1919
sbt.librarymanagement.Developer(id, name, email, url)
2020
case None =>

‎core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfo.scala‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ package sbt.librarymanagement
88
final class ModuleInfo private (
99
val nameFormal: String,
1010
val description: String,
11-
val homepage: Option[java.net.URI],
11+
val homepage: Option[java.net.URL],
1212
val startYear: Option[Int],
13-
val licenses: Vector[scala.Tuple2[String, java.net.URI]],
13+
val licenses: Vector[scala.Tuple2[String, java.net.URL]],
1414
val organizationName: String,
15-
val organizationHomepage: Option[java.net.URI],
15+
val organizationHomepage: Option[java.net.URL],
1616
val scmInfo: Option[sbt.librarymanagement.ScmInfo],
1717
val developers: Vector[sbt.librarymanagement.Developer]) extends Serializable {
1818

@@ -28,7 +28,7 @@ final class ModuleInfo private (
2828
override def toString: String = {
2929
"ModuleInfo(" + nameFormal + ", " + description + ", " + homepage + ", " + startYear + ", " + licenses + ", " + organizationName + ", " + organizationHomepage + ", " + scmInfo + ", " + developers + ")"
3030
}
31-
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 = {
31+
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 = {
3232
new ModuleInfo(nameFormal, description, homepage, startYear, licenses, organizationName, organizationHomepage, scmInfo, developers)
3333
}
3434
def withNameFormal(nameFormal: String): ModuleInfo = {
@@ -37,19 +37,19 @@ final class ModuleInfo private (
3737
def withDescription(description: String): ModuleInfo = {
3838
copy(description = description)
3939
}
40-
def withHomepage(homepage: Option[java.net.URI]): ModuleInfo = {
40+
def withHomepage(homepage: Option[java.net.URL]): ModuleInfo = {
4141
copy(homepage = homepage)
4242
}
4343
def withStartYear(startYear: Option[Int]): ModuleInfo = {
4444
copy(startYear = startYear)
4545
}
46-
def withLicenses(licenses: Vector[scala.Tuple2[String, java.net.URI]]): ModuleInfo = {
46+
def withLicenses(licenses: Vector[scala.Tuple2[String, java.net.URL]]): ModuleInfo = {
4747
copy(licenses = licenses)
4848
}
4949
def withOrganizationName(organizationName: String): ModuleInfo = {
5050
copy(organizationName = organizationName)
5151
}
52-
def withOrganizationHomepage(organizationHomepage: Option[java.net.URI]): ModuleInfo = {
52+
def withOrganizationHomepage(organizationHomepage: Option[java.net.URL]): ModuleInfo = {
5353
copy(organizationHomepage = organizationHomepage)
5454
}
5555
def withScmInfo(scmInfo: Option[sbt.librarymanagement.ScmInfo]): ModuleInfo = {
@@ -62,5 +62,5 @@ final class ModuleInfo private (
6262
object ModuleInfo {
6363

6464
def apply(nameFormal: String): ModuleInfo = new ModuleInfo(nameFormal)
65-
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)
65+
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)
6666
}

‎core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfoFormats.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ implicit lazy val ModuleInfoFormat: JsonFormat[sbt.librarymanagement.ModuleInfo]
1313
unbuilder.beginObject(__js)
1414
val nameFormal = unbuilder.readField[String]("nameFormal")
1515
val description = unbuilder.readField[String]("description")
16-
val homepage = unbuilder.readField[Option[java.net.URI]]("homepage")
16+
val homepage = unbuilder.readField[Option[java.net.URL]]("homepage")
1717
val startYear = unbuilder.readField[Option[Int]]("startYear")
18-
val licenses = unbuilder.readField[Vector[scala.Tuple2[String, java.net.URI]]]("licenses")
18+
val licenses = unbuilder.readField[Vector[scala.Tuple2[String, java.net.URL]]]("licenses")
1919
val organizationName = unbuilder.readField[String]("organizationName")
20-
val organizationHomepage = unbuilder.readField[Option[java.net.URI]]("organizationHomepage")
20+
val organizationHomepage = unbuilder.readField[Option[java.net.URL]]("organizationHomepage")
2121
val scmInfo = unbuilder.readField[Option[sbt.librarymanagement.ScmInfo]]("scmInfo")
2222
val developers = unbuilder.readField[Vector[sbt.librarymanagement.Developer]]("developers")
2323
unbuilder.endObject()

‎core/src/main/contraband-scala/sbt/librarymanagement/ScmInfo.scala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
package sbt.librarymanagement
77
/** Basic SCM information for a project module */
88
final class ScmInfo private (
9-
val browseUrl: java.net.URI,
9+
val browseUrl: java.net.URL,
1010
val connection: String,
1111
val devConnection: Option[String]) extends Serializable {
1212

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

1515
override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match {
1616
case x: ScmInfo => (this.browseUrl == x.browseUrl) && (this.connection == x.connection) && (this.devConnection == x.devConnection)
@@ -22,10 +22,10 @@ final class ScmInfo private (
2222
override def toString: String = {
2323
"ScmInfo(" + browseUrl + ", " + connection + ", " + devConnection + ")"
2424
}
25-
private[this] def copy(browseUrl: java.net.URI = browseUrl, connection: String = connection, devConnection: Option[String] = devConnection): ScmInfo = {
25+
private[this] def copy(browseUrl: java.net.URL = browseUrl, connection: String = connection, devConnection: Option[String] = devConnection): ScmInfo = {
2626
new ScmInfo(browseUrl, connection, devConnection)
2727
}
28-
def withBrowseUrl(browseUrl: java.net.URI): ScmInfo = {
28+
def withBrowseUrl(browseUrl: java.net.URL): ScmInfo = {
2929
copy(browseUrl = browseUrl)
3030
}
3131
def withConnection(connection: String): ScmInfo = {
@@ -40,7 +40,7 @@ final class ScmInfo private (
4040
}
4141
object ScmInfo {
4242

43-
def apply(browseUrl: java.net.URI, connection: String): ScmInfo = new ScmInfo(browseUrl, connection)
44-
def apply(browseUrl: java.net.URI, connection: String, devConnection: Option[String]): ScmInfo = new ScmInfo(browseUrl, connection, devConnection)
45-
def apply(browseUrl: java.net.URI, connection: String, devConnection: String): ScmInfo = new ScmInfo(browseUrl, connection, Option(devConnection))
43+
def apply(browseUrl: java.net.URL, connection: String): ScmInfo = new ScmInfo(browseUrl, connection)
44+
def apply(browseUrl: java.net.URL, connection: String, devConnection: Option[String]): ScmInfo = new ScmInfo(browseUrl, connection, devConnection)
45+
def apply(browseUrl: java.net.URL, connection: String, devConnection: String): ScmInfo = new ScmInfo(browseUrl, connection, Option(devConnection))
4646
}

‎core/src/main/contraband-scala/sbt/librarymanagement/ScmInfoFormats.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ implicit lazy val ScmInfoFormat: JsonFormat[sbt.librarymanagement.ScmInfo] = new
1111
__jsOpt match {
1212
case Some(__js) =>
1313
unbuilder.beginObject(__js)
14-
val browseUrl = unbuilder.readField[java.net.URI]("browseUrl")
14+
val browseUrl = unbuilder.readField[java.net.URL]("browseUrl")
1515
val connection = unbuilder.readField[String]("connection")
1616
val devConnection = unbuilder.readField[Option[String]]("devConnection")
1717
unbuilder.endObject()

‎core/src/main/contraband/librarymanagement.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
{ "name": "extension", "type": "String", "default": "Artifact.DefaultExtension", "since": "0.0.1" },
142142
{ "name": "classifier", "type": "Option[String]", "default": "None", "since": "0.0.1" },
143143
{ "name": "configurations", "type": "sbt.librarymanagement.ConfigRef*", "default": "Vector.empty", "since": "0.0.1" },
144-
{ "name": "url", "type": "Option[java.net.URI]", "default": "None", "since": "0.0.1" },
144+
{ "name": "url", "type": "Option[java.net.URL]", "default": "None", "since": "0.0.1" },
145145
{ "name": "extraAttributes", "type": "Map[String, String]", "default": "Map.empty", "since": "0.0.1" },
146146
{ "name": "checksum", "type": "Option[sbt.librarymanagement.Checksum]", "default": "None", "since": "0.0.1" },
147147
{ "name": "allowInsecureProtocol", "type": "Boolean", "default": "false", "since": "1.3.0" }
@@ -244,7 +244,7 @@
244244
{ "name": "id", "type": "String" },
245245
{ "name": "name", "type": "String" },
246246
{ "name": "email", "type": "String" },
247-
{ "name": "url", "type": "java.net.URI" }
247+
{ "name": "url", "type": "java.net.URL" }
248248
]
249249
},
250250
{
@@ -365,11 +365,11 @@
365365
"fields": [
366366
{ "name": "nameFormal", "type": "String" },
367367
{ "name": "description", "type": "String", "default": "\"\"", "since": "0.0.1" },
368-
{ "name": "homepage", "type": "Option[java.net.URI]", "default": "None", "since": "0.0.1" },
368+
{ "name": "homepage", "type": "Option[java.net.URL]", "default": "None", "since": "0.0.1" },
369369
{ "name": "startYear", "type": "Option[Int]", "default": "None", "since": "0.0.1" },
370-
{ "name": "licenses", "type": "scala.Tuple2[String, java.net.URI]*", "default": "Vector.empty", "since": "0.0.1" },
370+
{ "name": "licenses", "type": "scala.Tuple2[String, java.net.URL]*", "default": "Vector.empty", "since": "0.0.1" },
371371
{ "name": "organizationName", "type": "String", "default": "\"\"", "since": "0.0.1" },
372-
{ "name": "organizationHomepage", "type": "Option[java.net.URI]", "default": "None", "since": "0.0.1" },
372+
{ "name": "organizationHomepage", "type": "Option[java.net.URL]", "default": "None", "since": "0.0.1" },
373373
{ "name": "scmInfo", "type": "Option[sbt.librarymanagement.ScmInfo]", "default": "None", "since": "0.0.1" },
374374
{ "name": "developers", "type": "sbt.librarymanagement.Developer*", "default": "Vector.empty", "since": "0.0.1" }
375375
]
@@ -728,7 +728,7 @@
728728
"type": "record",
729729
"doc": "Basic SCM information for a project module",
730730
"fields": [
731-
{ "name": "browseUrl", "type": "java.net.URI" },
731+
{ "name": "browseUrl", "type": "java.net.URL" },
732732
{ "name": "connection", "type": "String" },
733733
{ "name": "devConnection", "type": "String?", "default": "None", "since": "0.0.1" }
734734
]

0 commit comments

Comments
 (0)