diff options
| author | Stefan Zeiger <szeiger@novocode.com> | 2016-02-19 11:42:14 +0100 |
|---|---|---|
| committer | Stefan Zeiger <szeiger@novocode.com> | 2016-02-19 11:42:14 +0100 |
| commit | 32dd86e4d0c84e312728d2ea1928ef5e847e392d (patch) | |
| tree | cf87e171596eb98a423728a6163422e40dba9dad | |
| parent | fdbf59d345ca5141f935773e80bece6889f42401 (diff) | |
| parent | d09964c625cf45ed1ed5bca983d71e5dd7030803 (diff) | |
| download | scala-32dd86e4d0c84e312728d2ea1928ef5e847e392d.tar.gz scala-32dd86e4d0c84e312728d2ea1928ef5e847e392d.tar.bz2 scala-32dd86e4d0c84e312728d2ea1928ef5e847e392d.zip | |
Merge pull request #4981 from retronym/topic/version-override-sbt
[sbt] Allow system properties to override entries in verions.props
| -rw-r--r-- | project/VersionUtil.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/project/VersionUtil.scala b/project/VersionUtil.scala index fab22e66d4..6c8aebf74f 100644 --- a/project/VersionUtil.scala +++ b/project/VersionUtil.scala @@ -115,7 +115,9 @@ object VersionUtil { val in = new FileInputStream(file("versions.properties")) try props.load(in) finally in.close() - props.asScala.toMap + props.asScala.toMap.map { + case (k, v) => (k, sys.props.getOrElse(k, v)) // allow system properties to override versions.properties + } } /** Get a subproject version number from `versionProps` */ |