diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala index 07cfbec51..d570e6bba 100644 --- a/main/src/main/scala/sbt/Main.scala +++ b/main/src/main/scala/sbt/Main.scala @@ -827,8 +827,8 @@ object BuiltinCommands { sbtVersionOpt.foreach( version => if (version != app.id.version()) { - state.log.warn(s"""sbt version mismatch, using: ${app.id - .version()}, in build.properties: "$version".""") + state.log.warn(s"""sbt version mismatch, current: ${app.id + .version()}, in build.properties: "$version", use 'reboot' to use the new value.""") } ) } diff --git a/sbt/src/sbt-test/project/sbt-version-change/build.sbt b/sbt/src/sbt-test/project/sbt-version-change/build.sbt index 6d9dc4e80..8bc0b3ddf 100644 --- a/sbt/src/sbt-test/project/sbt-version-change/build.sbt +++ b/sbt/src/sbt-test/project/sbt-version-change/build.sbt @@ -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, using: $currVersion, in build.properties: "1.1.1".""")) + assert(contents.contains(s"""sbt version mismatch, current: $currVersion, in build.properties: "1.1.1", use 'reboot' to use the new value.""")) () } \ No newline at end of file