mirror of https://github.com/sbt/sbt.git
disable overrideScalaVersion when scalaHome is set
This commit is contained in:
parent
f3d18f051f
commit
b56701f37e
|
|
@ -508,7 +508,7 @@ object Classpaths
|
|||
ivyLoggingLevel in GlobalScope :== UpdateLogging.Quiet,
|
||||
ivyXML in GlobalScope :== NodeSeq.Empty,
|
||||
ivyValidate in GlobalScope :== false,
|
||||
ivyScala in GlobalScope <<= scalaVersion(v => Some(new IvyScala(v, Nil, filterImplicit = true, checkExplicit = true, overrideScalaVersion = true))),
|
||||
ivyScala in GlobalScope <<= (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),
|
||||
|
|
|
|||
Loading…
Reference in New Issue