diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index d0a768ae2..866eface9 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -404,7 +404,7 @@ object Defaults extends BuildCommon { logManager := LogManager.defaults(extraLoggers.value, StandardMain.console), onLoadMessage := (onLoadMessage or Def.setting { - s"Set current project to ${name.value} (in build ${thisProjectRef.value.build})" + s"set current project to ${name.value} (in build ${thisProjectRef.value.build})" }).value ) diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala index 0ab32f035..f796b16af 100644 --- a/main/src/main/scala/sbt/Main.scala +++ b/main/src/main/scala/sbt/Main.scala @@ -842,7 +842,15 @@ object BuiltinCommands { } } + private def welcomeBanner(state: State): Unit = { + import scala.util.Properties + val appVersion = state.configuration.provider.id.version() + val javaVersion = s"${Properties.javaVendor} Java ${Properties.javaVersion}" + state.log.info(s"welcome to sbt $appVersion ($javaVersion)") + } + def doLoadProject(s0: State, action: LoadAction.Value): State = { + welcomeBanner(s0) checkSBTVersionChanged(s0) val (s1, base) = Project.loadAction(SessionVar.clear(s0), action) IO.createDirectory(base) diff --git a/main/src/main/scala/sbt/MainLoop.scala b/main/src/main/scala/sbt/MainLoop.scala index 5c7487f0f..b9d9fa43c 100644 --- a/main/src/main/scala/sbt/MainLoop.scala +++ b/main/src/main/scala/sbt/MainLoop.scala @@ -99,7 +99,7 @@ object MainLoop { val sbtVersion = sbtVersionOpt.getOrElse(appId.version) val currentArtDirs = defaultBoot * "*" / appId.groupID / appId.name / sbtVersion currentArtDirs.get foreach { dir => - state.log.info(s"Deleting $dir") + state.log.info(s"deleting $dir") IO.delete(dir) } } diff --git a/main/src/main/scala/sbt/internal/GlobalPlugin.scala b/main/src/main/scala/sbt/internal/GlobalPlugin.scala index 34e2d62b8..5f25200bb 100644 --- a/main/src/main/scala/sbt/internal/GlobalPlugin.scala +++ b/main/src/main/scala/sbt/internal/GlobalPlugin.scala @@ -108,7 +108,7 @@ object GlobalPlugin { val globalPluginSettings = Project.inScope(Scope.GlobalScope in LocalRootProject)( Seq( organization := SbtArtifacts.Organization, - onLoadMessage := Keys.baseDirectory("Loading global plugins from " + _).value, + onLoadMessage := Keys.baseDirectory("loading global plugins from " + _).value, name := "global-plugin", sbtPlugin := true, version := "0.0" diff --git a/main/src/main/scala/sbt/internal/Load.scala b/main/src/main/scala/sbt/internal/Load.scala index d188072fb..c3f52dcfe 100755 --- a/main/src/main/scala/sbt/internal/Load.scala +++ b/main/src/main/scala/sbt/internal/Load.scala @@ -254,7 +254,7 @@ private[sbt] object Load { val data = timed("Load.apply: Def.make(settings)...", log) { // When settings.size is 100000, Def.make takes around 10s. if (settings.size > 10000) { - log.info(s"Resolving key references (${settings.size} settings) ...") + log.info(s"resolving key references (${settings.size} settings) ...") } Def.make(settings)(delegates, config.scopeLocal, Project.showLoadingKey(loaded)) } @@ -565,7 +565,7 @@ private[sbt] object Load { checkDirectory(projectBase) assert( buildBase == projectBase || IO.relativize(buildBase, projectBase).isDefined, - s"Directory $projectBase is not contained in build root $buildBase" + s"directory $projectBase is not contained in build root $buildBase" ) } @@ -669,12 +669,12 @@ private[sbt] object Load { def getBuild[T](map: Map[URI, T], uri: URI): T = map.getOrElse(uri, noBuild(uri)) - def emptyBuild(uri: URI) = sys.error(s"No root project defined for build unit '$uri'") - def noBuild(uri: URI) = sys.error(s"Build unit '$uri' not defined.") - def noProject(uri: URI, id: String) = sys.error(s"No project '$id' defined in '$uri'.") + def emptyBuild(uri: URI) = sys.error(s"no root project defined for build unit '$uri'") + def noBuild(uri: URI) = sys.error(s"build unit '$uri' not defined.") + def noProject(uri: URI, id: String) = sys.error(s"no project '$id' defined in '$uri'.") def noConfiguration(uri: URI, id: String, conf: String) = - sys.error(s"No configuration '$conf' defined in project '$id' in '$uri'") + sys.error(s"no configuration '$conf' defined in project '$id' in '$uri'") // Called from builtinLoader def loadUnit(uri: URI, localBase: File, s: State, config: LoadBuildConfiguration): BuildUnit = @@ -975,7 +975,7 @@ private[sbt] object Load { e: AutoPluginException, project: Project ): AutoPluginException = - e.withPrefix(s"Error determining plugins for project '${project.id}' in ${project.base}:\n") + e.withPrefix(s"error determining plugins for project '${project.id}' in ${project.base}:\n") /** * Represents the results of flushing out a directory and discovering all the projects underneath it. @@ -1034,7 +1034,7 @@ private[sbt] object Load { def settings(files: Seq[File]): Seq[Setting[_]] = { if (files.nonEmpty) log.info( - s"${files.map(_.getName).mkString(s"Loading settings for project ${p.id} from ", ",", " ...")}" + s"${files.map(_.getName).mkString(s"loading settings for project ${p.id} from ", ",", " ...")}" ) for { file <- files @@ -1163,7 +1163,7 @@ private[sbt] object Load { opts ) }, - onLoadMessage := ("Loading project definition from " + baseDirectory.value) + onLoadMessage := ("loading project definition from " + baseDirectory.value) ) )