From 4795799a1520876f36fee9d833728d376cf0ab95 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Thu, 11 Jul 2013 18:49:30 -0400 Subject: [PATCH] Drop defaultConfigurationMapping, which wasn't used. Fixes #421. --- main/src/main/scala/sbt/Defaults.scala | 1 - main/src/main/scala/sbt/Keys.scala | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index ffde75a53..7523b777b 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -982,7 +982,6 @@ object Classpaths } }, moduleName <<= normalizedName, - defaultConfigurationMapping in GlobalScope <<= defaultConfiguration{ case Some(d) => "*->" + d.name; case None => "*->*" }, ivyPaths := new IvyPaths(baseDirectory.value, bootIvyHome(appConfiguration.value)), otherResolvers := Resolver.publishMavenLocal :: publishTo.value.toList, projectResolver <<= projectResolverTask, diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala index 09d1eb0a0..56ce049c4 100644 --- a/main/src/main/scala/sbt/Keys.scala +++ b/main/src/main/scala/sbt/Keys.scala @@ -216,8 +216,7 @@ object Keys val autoAPIMappings = SettingKey[Boolean]("auto-api-mappings", "If true, automatically manages mappings to the API doc URL.", BMinusSetting) val scmInfo = SettingKey[Option[ScmInfo]]("scm-info", "Basic SCM information for the project.", BMinusSetting) val projectInfo = SettingKey[ModuleInfo]("project-info", "Addition project information like formal name, homepage, licenses etc.", CSetting) - val defaultConfiguration = SettingKey[Option[Configuration]]("default-configuration", "Defines the configuration used when none is specified for a dependency.", CSetting) - val defaultConfigurationMapping = SettingKey[String]("default-configuration-mapping", "Defines the mapping used for a simple, unmapped configuration definition.", CSetting) + val defaultConfiguration = SettingKey[Option[Configuration]]("default-configuration", "Defines the configuration used when none is specified for a dependency in ivyXML.", CSetting) val products = TaskKey[Seq[File]]("products", "Build products that get packaged.", BMinusTask) @deprecated("This task is unused by the default project and will be removed.", "0.13.0")