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

Keep "using" change in sbt.version mismatch messaging.

This commit is contained in:
Dale Wijnand 2019-12-23 22:24:49 +00:00
parent 56aa46308b
commit f5e73b610a
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -823,14 +823,15 @@ object BuiltinCommands {
val sbtVersionOpt = sbtVersionSystemOpt.orElse(sbtVersionBuildOpt) val sbtVersionOpt = sbtVersionSystemOpt.orElse(sbtVersionBuildOpt)
val app = state.configuration.provider sbtVersionOpt.foreach { version =>
sbtVersionOpt.foreach( val appVersion = state.configuration.provider.id.version()
version => if (version != appVersion) {
if (version != app.id.version()) { state.log.warn(
state.log.warn(s"""sbt version mismatch, current: ${app.id s"sbt version mismatch, using: $appVersion, " +
.version()}, in build.properties: "$version", use 'reboot' to use the new value.""") s"""in build.properties: "$version", use 'reboot' to use the new value.""".stripMargin
} )
) }
}
} }
def doLoadProject(s0: State, action: LoadAction.Value): State = { def doLoadProject(s0: State, action: LoadAction.Value): State = {

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

@ -3,6 +3,6 @@ TaskKey[Unit]("checkSbtVersionWarning") := {
val logging = state.globalLogging val logging = state.globalLogging
val currVersion = state.configuration.provider.id.version() val currVersion = state.configuration.provider.id.version()
val contents = IO.read(logging.backing.file) 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", use 'reboot' to use the new value."""))
() ()
} }