luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Scala version checking done for dependency declarations

This commit is contained in:
Mark Harrah 2009-10-19 23:18:52 -04:00
parent 293730d11b
commit 72c1e72426
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/sbt/BasicProjectTypes.scala
View File

@ -101,7 +101,7 @@ trait ManagedProject extends ClasspathProject
case ErrorIfNoConfiguration => errorIfNoConfiguration = true case ErrorIfNoConfiguration => errorIfNoConfiguration = true
case CacheDirectory(dir) => cacheDirectory = Some(dir) case CacheDirectory(dir) => cacheDirectory = Some(dir)
case CheckScalaVersion(configs, checkExplicit, filterImplicit) => case CheckScalaVersion(configs, checkExplicit, filterImplicit) =>
checkScalaVersion = getScalaVersion.map(version => new IvyScala(version, configs, checkExplicit, filterImplicit)) checkScalaVersion = Some(new IvyScala(buildScalaVersion, configs, checkExplicit, filterImplicit))
case _ => log.warn("Ignored unknown managed option " + option) case _ => log.warn("Ignored unknown managed option " + option)
} }
} }
@ -111,12 +111,6 @@ trait ManagedProject extends ClasspathProject
val updateConfiguration = new UpdateConfiguration(outputPattern, synchronize, quiet) val updateConfiguration = new UpdateConfiguration(outputPattern, synchronize, quiet)
doWith(ivyConfiguration, updateConfiguration) doWith(ivyConfiguration, updateConfiguration)
} }
private def getScalaVersion =
{
val v = scalaVersion.value
if(v.isEmpty) None
else Some(v)
}
protected def withIvyTask(doTask: => Option[String]) = protected def withIvyTask(doTask: => Option[String]) =
task task
{ {