summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-02-15 14:20:08 +1000
committerJason Zaugg <jzaugg@gmail.com>2016-02-19 10:10:57 +1000
commitd09964c625cf45ed1ed5bca983d71e5dd7030803 (patch)
treecf87e171596eb98a423728a6163422e40dba9dad /project
parentfdbf59d345ca5141f935773e80bece6889f42401 (diff)
downloadscala-d09964c625cf45ed1ed5bca983d71e5dd7030803.tar.gz
scala-d09964c625cf45ed1ed5bca983d71e5dd7030803.tar.bz2
scala-d09964c625cf45ed1ed5bca983d71e5dd7030803.zip
[sbt] Allow system properties to override entries in verions.props
Diffstat (limited to 'project')
-rw-r--r--project/VersionUtil.scala4
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` */