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

Merge pull request #5322 from renatocaval/develop 

Clarify message on sbt.version mismatch
This commit is contained in:
eugene yokota 2019-12-20 15:32:07 -05:00 committed by GitHub
parent e4131814e7 2f4b6f476a
commit 60979336d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/scala/sbt/Main.scala
View File

@ -827,8 +827,8 @@ object BuiltinCommands {
sbtVersionOpt.foreach(
version =>
if (version != app.id.version()) {
state.log.warn(s"""sbt version mismatch, current: ${app.id
.version()}, in build.properties: "$version", use 'reboot' to use the new value.""")
state.log.warn(s"""sbt version mismatch, using: ${app.id
.version()}, in build.properties: "$version".""")
}
)
}

2
sbt/src/sbt-test/project/sbt-version-change/build.sbt
View File

@ -3,6 +3,6 @@ TaskKey[Unit]("checkSbtVersionWarning") := {
val logging = state.globalLogging
val currVersion = state.configuration.provider.id.version()
val contents = IO.read(logging.backing.file)
assert(contents.contains(s"""sbt version mismatch, current: $currVersion, in build.properties: "1.1.1", use 'reboot' to use the new value."""))
assert(contents.contains(s"""sbt version mismatch, using: $currVersion, in build.properties: "1.1.1"."""))
()
}