From 243264257121c40b82c330e655b5bb6d3d9f6f65 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 30 May 2011 22:10:01 -0400 Subject: [PATCH] Adjust ivyScala to not use build-level scalaVersion. fixes #28 --- main/Defaults.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index d5c9cfebd..2d9c6a405 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -584,7 +584,7 @@ object Classpaths ivyLoggingLevel in GlobalScope :== UpdateLogging.Quiet, ivyXML in GlobalScope :== NodeSeq.Empty, ivyValidate in GlobalScope :== false, - ivyScala in GlobalScope <<= (scalaHome, scalaVersion)((sh,v) => Some(new IvyScala(v, Nil, filterImplicit = true, checkExplicit = true, overrideScalaVersion = sh.isEmpty))), + ivyScala <<= ivyScala or (scalaHome, scalaVersion)((sh,v) => Some(new IvyScala(v, Nil, filterImplicit = true, checkExplicit = true, overrideScalaVersion = sh.isEmpty))), moduleConfigurations in GlobalScope :== Nil, publishTo in GlobalScope :== None, artifactPath in makePom <<= artifactPathSetting(artifact in makePom),