From 9e78b1cd9c5253322ea1893bb914ceb1dd4545f4 Mon Sep 17 00:00:00 2001 From: Dan Sanduleac Date: Wed, 10 Feb 2016 17:44:00 +0000 Subject: [PATCH] Get rid of InlineConfiguration --- .../CompatibilityWarning.scala | 1 - .../sbt/internal/librarymanagement/Ivy.scala | 2 -- .../librarymanagement/IvyActions.scala | 1 - .../librarymanagement/IvyConfigurations.scala | 23 ------------------- .../librarymanagement/EvictionWarning.scala | 3 +-- .../src/test/scala/BaseIvySpecification.scala | 2 +- 6 files changed, 2 insertions(+), 30 deletions(-) diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala index c039109d3..d5bb8af3d 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CompatibilityWarning.scala @@ -32,7 +32,6 @@ private[sbt] object CompatibilityWarning { def processIntransitive(config: CompatibilityWarningOptions, module: IvySbt#Module, log: Logger): Unit = { val monitoredConfigsStr: Set[String] = (config.configurations map { _.name }).toSet val directDependencies: Seq[ModuleID] = module.moduleSettings match { - case x: InlineConfiguration => x.dependencies case x: InlineConfigurationWithExcludes => x.dependencies case _ => Seq() } diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala index 400710b67..3421f12f2 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala @@ -170,7 +170,6 @@ final class IvySbt(val configuration: IvyConfiguration) { { val (baseModule, baseConfiguration) = moduleSettings match { - case ic: InlineConfiguration => configureInline(ic.withExcludes, configuration.log) case ic: InlineConfigurationWithExcludes => configureInline(ic, configuration.log) case pc: PomConfiguration => configurePom(pc) case ifc: IvyFileConfiguration => configureIvyFile(ifc) @@ -435,7 +434,6 @@ private[sbt] object IvySbt { { val sub = CrossVersion(scalaFullVersion, scalaBinaryVersion) m match { - case ic: InlineConfiguration => ic.copy(module = sub(ic.module), dependencies = ic.dependencies map sub, overrides = ic.overrides map sub) case ic: InlineConfigurationWithExcludes => ic.copy(module = sub(ic.module), dependencies = ic.dependencies map sub, overrides = ic.overrides map sub) case _ => m } diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala index b197b75e0..b56689b3f 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala @@ -148,7 +148,6 @@ object IvyActions { } private def crossVersionMap(moduleSettings: ModuleSettings): Option[String => String] = moduleSettings match { - case i: InlineConfiguration => CrossVersion(i.module, i.ivyScala) case i: InlineConfigurationWithExcludes => CrossVersion(i.module, i.ivyScala) case _ => None } diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala index adcd6a0da..d61a90f32 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala @@ -115,29 +115,6 @@ final case class PomConfiguration(file: File, ivyScala: Option[IvyScala], valida def noScala = copy(ivyScala = None) } -// TODO: When we go sbt 1.0 we should rename InlineConfigurationWithExcludes to InlineConfiguration. -@deprecated("Use InlineConfigurationWithExcludes.", "0.13.8") -final case class InlineConfiguration(module: ModuleID, moduleInfo: ModuleInfo, dependencies: Seq[ModuleID], overrides: Set[ModuleID] = Set.empty, ivyXML: NodeSeq = NodeSeq.Empty, configurations: Seq[Configuration] = Nil, defaultConfiguration: Option[Configuration] = None, ivyScala: Option[IvyScala] = None, validate: Boolean = false, conflictManager: ConflictManager = ConflictManager.default) extends ModuleSettings { - def withConfigurations(configurations: Seq[Configuration]) = copy(configurations = configurations) - def noScala = copy(ivyScala = None) - 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") - def configurations(explicitConfigurations: Iterable[Configuration], defaultConfiguration: Option[Configuration]) = - if (explicitConfigurations.isEmpty) { - defaultConfiguration match { - case Some(Configurations.DefaultIvyConfiguration) => Configurations.Default :: Nil - case Some(Configurations.DefaultMavenConfiguration) => Configurations.defaultMavenConfigurations - case _ => Nil - } - } else - explicitConfigurations -} final class InlineConfigurationWithExcludes private[sbt] ( val module: ModuleID, diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala index 3a05f2e72..3e74775ad 100644 --- a/librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala +++ b/librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala @@ -5,7 +5,7 @@ import Configurations.Compile import ScalaArtifacts.{ LibraryID, CompilerID } import sbt.util.Logger import sbt.internal.util.ShowLines -import sbt.internal.librarymanagement.{ IvySbt, InlineConfiguration, InlineConfigurationWithExcludes } +import sbt.internal.librarymanagement.{ IvySbt, InlineConfigurationWithExcludes } final class EvictionWarningOptions private[sbt] ( val configurations: Seq[Configuration], @@ -167,7 +167,6 @@ object EvictionWarning { private[sbt] def processEvictions(module: IvySbt#Module, options: EvictionWarningOptions, reports: Seq[OrganizationArtifactReport]): EvictionWarning = { val directDependencies = module.moduleSettings match { - case x: InlineConfiguration => x.dependencies case x: InlineConfigurationWithExcludes => x.dependencies case _ => Seq() } diff --git a/librarymanagement/src/test/scala/BaseIvySpecification.scala b/librarymanagement/src/test/scala/BaseIvySpecification.scala index 260ac3517..58cfb7f1b 100644 --- a/librarymanagement/src/test/scala/BaseIvySpecification.scala +++ b/librarymanagement/src/test/scala/BaseIvySpecification.scala @@ -33,7 +33,7 @@ trait BaseIvySpecification extends UnitSpec { ) } - val moduleSetting: ModuleSettings = InlineConfiguration( + val moduleSetting: ModuleSettings = InlineConfigurationWithExcludes( module = moduleId, moduleInfo = ModuleInfo("foo"), dependencies = deps,