From 7cf1e3fe3c88b85d87a061857661f62afd177ec9 Mon Sep 17 00:00:00 2001 From: Eugene Vigdorchik Date: Sat, 11 Feb 2012 12:32:40 +0400 Subject: [PATCH] Remove artificial TaskKey. --- main/Defaults.scala | 6 ++---- main/Keys.scala | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index 72c0657cd..7011ba2e9 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -769,9 +769,6 @@ object Classpaths }, deliverLocalConfiguration <<= (crossTarget, ivyLoggingLevel) map { (outDir, level) => deliverConfig( outDir, logging = level ) }, deliverConfiguration <<= deliverLocalConfiguration, - validateResolvers <<= (fullResolvers, otherResolvers, streams) map { case (full, other, s) => - warnResolversConflict(full ++: other, s.log) - }, publishConfiguration <<= (packagedArtifacts, publishTo, publishMavenStyle, deliver, checksums in publish, ivyLoggingLevel) map { (arts, publishTo, mavenStyle, ivyFile, checks, level) => publishConfig(arts, if(mavenStyle) None else Some(ivyFile), resolverName = getPublishTo(publishTo).name, checksums = checks, logging = level) }, @@ -971,7 +968,8 @@ object Classpaths def unmanagedDependencies: Initialize[Task[Classpath]] = (thisProjectRef, configuration, settings, buildDependencies) flatMap unmanagedDependencies0 def mkIvyConfiguration: Initialize[Task[IvyConfiguration]] = - (fullResolvers, ivyPaths, otherResolvers, moduleConfigurations, offline, checksums in update, appConfiguration, streams, validateResolvers) map { (rs, paths, other, moduleConfs, off, check, app, s, _) => + (fullResolvers, ivyPaths, otherResolvers, moduleConfigurations, offline, checksums in update, appConfiguration, streams) map { (rs, paths, other, moduleConfs, off, check, app, s) => + warnResolversConflict(rs ++: other, s.log) new InlineIvyConfiguration(paths, rs, other, moduleConfs, off, Some(lock(app)), check, s.log) } diff --git a/main/Keys.scala b/main/Keys.scala index 1b3bfac1a..3881f99e2 100644 --- a/main/Keys.scala +++ b/main/Keys.scala @@ -271,7 +271,6 @@ object Keys val projectResolver = TaskKey[Resolver]("project-resolver", "Resolver that handles inter-project dependencies.") val fullResolvers = TaskKey[Seq[Resolver]]("full-resolvers", "Combines the project resolver, default resolvers, and user-defined resolvers.") val otherResolvers = SettingKey[Seq[Resolver]]("other-resolvers", "Resolvers not included in the main resolver chain, such as those in module configurations.") - val validateResolvers = TaskKey[Unit]("validate-resolvers", "Validates that the configured resolvers don't conflict.") val moduleConfigurations = SettingKey[Seq[ModuleConfiguration]]("module-configurations", "Defines module configurations, which override resolvers on a per-module basis.") val retrievePattern = SettingKey[String]("retrieve-pattern", "Pattern used to retrieve managed dependencies to the current build.") val retrieveConfiguration = SettingKey[Option[RetrieveConfiguration]]("retrieve-configuration", "Configures retrieving dependencies to the current build.")