From 93302621ec80da0385d3076a04e1608222fc79af Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sun, 28 Mar 2010 14:22:50 -0400 Subject: [PATCH] cleanup a couple dependency management related methods --- sbt/src/main/scala/sbt/BasicProjectTypes.scala | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/sbt/src/main/scala/sbt/BasicProjectTypes.scala b/sbt/src/main/scala/sbt/BasicProjectTypes.scala index 2cfaca54a..09fd52179 100644 --- a/sbt/src/main/scala/sbt/BasicProjectTypes.scala +++ b/sbt/src/main/scala/sbt/BasicProjectTypes.scala @@ -275,11 +275,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w * See http://code.google.com/p/simple-build-tool/wiki/LibraryManagement for details.*/ def ivyXML: NodeSeq = NodeSeq.Empty def pomExtra: NodeSeq = NodeSeq.Empty - def expandedIvyConfigurations = - { - val confs = ivyConfigurations - if(confs.isEmpty) Configurations.defaultMavenConfigurations else confs - } + override def ivyConfigurations: Iterable[Configuration] = { val reflective = super.ivyConfigurations @@ -332,14 +328,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w * be more appropriate, however.*/ def filterScalaJars = true /** The configurations to check/filter.*/ - def checkScalaInConfigurations: Iterable[Configuration] = - { - val all = ivyConfigurations - if(all.isEmpty) - Configurations.defaultMavenConfigurations - else - all - } + def checkScalaInConfigurations: Iterable[Configuration] = ivyConfigurations def defaultPublishRepository: Option[Resolver] = { reflectiveRepositories.get(PublishToName) orElse