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

Revert "ScmInfo" 

This reverts commit b00e242744.
This commit is contained in:
Eugene Yokota 2024-10-04 04:09:32 -04:00
parent 627cb888b2
commit 7076596f26
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/contraband-scala/sbt/librarymanagement/ScmInfo.scala
View File

@ -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)
@ -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 = {
@ -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
core/src/main/contraband-scala/sbt/librarymanagement/ScmInfoFormats.scala
View File

@ -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()

2
core/src/main/contraband/librarymanagement.json
View File

@ -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" }
]