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

Merge pull request #1858 from sbt/fix/inline-configuration 

Adds an hook treating InlineConfigurationWithExcludes structurally
This commit is contained in:
Havoc Pennington 2015-02-17 16:51:42 -05:00
parent d8d4e99fdf 78881eefb3
commit 2dc23ecf99
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ivy/src/main/scala/sbt/IvyConfigurations.scala
View File

@ -121,6 +121,8 @@ final case class InlineConfiguration(module: ModuleID, moduleInfo: ModuleInfo, d
def withExcludes: InlineConfigurationWithExcludes =
InlineConfigurationWithExcludes(this.module, this.moduleInfo, this.dependencies, this.overrides, Nil, this.ivyXML,
this.configurations, this.defaultConfiguration, this.ivyScala, this.validate, this.conflictManager)
def withOverrides(overrides: Set[ModuleID]): ModuleSettings =
copy(overrides = overrides)
}
object InlineConfiguration {
@deprecated("Use InlineConfigurationWithExcludes.explicitConfigurations.", "0.13.8")
@ -148,6 +150,8 @@ final class InlineConfigurationWithExcludes private[sbt] (val module: ModuleID,
val conflictManager: ConflictManager) extends ModuleSettings {
def withConfigurations(configurations: Seq[Configuration]) = copy(configurations = configurations)
def noScala = copy(ivyScala = None)
def withOverrides(overrides: Set[ModuleID]): ModuleSettings =
copy(overrides = overrides)
private[sbt] def copy(module: ModuleID = this.module,
moduleInfo: ModuleInfo = this.moduleInfo,