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

Switch to FooExtra naming convention for contraband parents

This commit is contained in:
Dale Wijnand 2016-11-16 01:41:47 +00:00
parent f2efa10af1
commit 5475a3c01c
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
librarymanagement/src/main/datatype/librarymanagement.json
View File

@ -27,7 +27,7 @@
"Provides information about the resolution of a module.",
"This information is in the context of a specific configuration."
],
"parents": "sbt.librarymanagement.ModuleReportParent",
"parents": "sbt.librarymanagement.ModuleReportExtra",
"fields": [
{ "name": "module", "type": "sbt.librarymanagement.ModuleID" },
{ "name": "artifacts", "type": "scala.Tuple2[sbt.librarymanagement.Artifact, java.io.File]*" },
@ -343,7 +343,7 @@
"target": "Scala",
"type": "record",
"doc": "Represents an Ivy configuration.",
"parents": "sbt.librarymanagement.ConfigurationParent",
"parents": "sbt.librarymanagement.ConfigurationExtra",
"fields": [
{ "name": "name", "type": "String" },
{ "name": "description", "type": "String", "default": "\"\"", "since": "0.0.1" },
@ -358,7 +358,7 @@
"namespace": "sbt.librarymanagement",
"target": "Scala",
"type": "record",
"parents": "sbt.librarymanagement.ArtifactParent",
"parents": "sbt.librarymanagement.ArtifactExtra",
"fields": [
{ "name": "name", "type": "String" },
{ "name": "type", "type": "String", "default": "Artifact.DefaultType", "since": "0.0.1" },
@ -672,7 +672,7 @@
"namespace": "sbt.librarymanagement",
"target": "Scala",
"type": "record",
"parents": "sbt.librarymanagement.ModuleIDParent",
"parents": "sbt.librarymanagement.ModuleIDExtra",
"fields": [
{ "name": "organization", "type": "String" },
{ "name": "name", "type": "String" },
@ -701,7 +701,7 @@
"target": "Scala",
"type": "record",
"doc": "Work around the inadequacy of Ivy's ArtifactTypeFilter (that it cannot reverse a filter)",
"parents": "sbt.librarymanagement.ArtifactTypeFilterParent",
"parents": "sbt.librarymanagement.ArtifactTypeFilterExtra",
"fields": [
{
"name": "types",
@ -730,7 +730,7 @@
"It does not include information about evicted modules, only about the modules ultimately selected by the conflict manager.",
"This means that for a given configuration, there should only be one revision for a given organization and module name."
],
"parents": "sbt.librarymanagement.UpdateReportParent",
"parents": "sbt.librarymanagement.UpdateReportExtra",
"fields": [
{
"name": "cachedDescriptor",
@ -759,7 +759,7 @@
"doc": [
"Provides information about resolution of a single configuration."
],
"parents": "sbt.librarymanagement.ConfigurationReportParent",
"parents": "sbt.librarymanagement.ConfigurationReportExtra",
"fields": [
{ "name": "configuration", "type": "String", "doc": [ "the configuration this report is for." ] },
{

2
librarymanagement/src/main/scala/sbt/librarymanagement/Artifact.scala
View File

@ -6,7 +6,7 @@ package sbt.librarymanagement
import java.io.File
import java.net.URL
abstract class ArtifactParent {
abstract class ArtifactExtra {
def name: String
def `type`: String
def extension: String

2
librarymanagement/src/main/scala/sbt/librarymanagement/Configuration.scala
View File

@ -49,7 +49,7 @@ object Configurations {
private[sbt] def removeDuplicates(configs: Iterable[Configuration]) = Set(scala.collection.mutable.Map(configs.map(config => (config.name, config)).toSeq: _*).values.toList: _*)
}
abstract class ConfigurationParent {
abstract class ConfigurationExtra {
def name: String
def description: String
def isPublic: Boolean

2
librarymanagement/src/main/scala/sbt/librarymanagement/IvyInterface.scala
View File

@ -10,7 +10,7 @@ abstract class InclExclRuleCompanion {
def everything = new InclExclRule("*", "*", "*", Vector.empty)
}
abstract class ArtifactTypeFilterParent {
abstract class ArtifactTypeFilterExtra {
def types: Set[String]
def inverted: Boolean

2
librarymanagement/src/main/scala/sbt/librarymanagement/ModuleID.scala
View File

@ -7,7 +7,7 @@ import java.net.URL
import sbt.internal.librarymanagement.mavenint.SbtPomExtraProperties
abstract class ModuleIDParent {
abstract class ModuleIDExtra {
def organization: String
def name: String
def revision: String

6
librarymanagement/src/main/scala/sbt/librarymanagement/UpdateReport.scala
View File

@ -6,7 +6,7 @@ package sbt.librarymanagement
import java.io.File
import java.{ util => ju }
abstract class ConfigurationReportParent {
abstract class ConfigurationReportExtra {
def configuration: String
def modules: Vector[ModuleReport]
def details: Vector[OrganizationArtifactReport]
@ -36,7 +36,7 @@ abstract class ConfigurationReportParent {
new ConfigurationReport(configuration, modules map { _.retrieve((mid, art, file) => f(configuration, mid, art, file)) }, details)
}
abstract class ModuleReportParent {
abstract class ModuleReportExtra {
def module: ModuleID
def artifacts: Vector[(Artifact, File)]
def missingArtifacts: Vector[Artifact]
@ -120,7 +120,7 @@ abstract class ModuleReportParent {
): ModuleReport
}
abstract class UpdateReportParent {
abstract class UpdateReportExtra {
def cachedDescriptor: File
def configurations: Vector[ConfigurationReport]
def stats: UpdateStats