From 7519a4ac7bcf973e6c2d14980f786b3514dcb96c Mon Sep 17 00:00:00 2001 From: Christopher Hunt Date: Fri, 15 Mar 2013 13:06:00 +1100 Subject: [PATCH 1/2] Changed the Play console message to report the actual version of Scala being used at runtime - to be consistent with the reporting of the Java runtime. Fixes issue #854 --- framework/src/console/src/main/scala/Console.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/framework/src/console/src/main/scala/Console.scala b/framework/src/console/src/main/scala/Console.scala index 13ca9f562ff..f2729e51d2b 100644 --- a/framework/src/console/src/main/scala/Console.scala +++ b/framework/src/console/src/main/scala/Console.scala @@ -21,7 +21,11 @@ object Console { || __/|_|\____|\__ (_) ||_| |__/ | - |""".stripMargin) + ("play! " + play.core.PlayVersion.current + " (using Java " + System.getProperty("java.version") + " and Scala " + play.core.PlayVersion.scalaVersion + "), http://www.playframework.com") + |""".stripMargin) + + ("play! " + play.core.PlayVersion.current + + " (using Java " + System.getProperty("java.version") + + " and Scala " + scala.util.Properties.scalaPropOrElse("version.number", "unknown") + + "), http://www.playframework.com") // -- Commands From e59223c528385aaa668692f48b7f943e4786082b Mon Sep 17 00:00:00 2001 From: Christopher Hunt Date: Mon, 8 Apr 2013 12:56:28 +1000 Subject: [PATCH 2/2] Reverted back to the same values being reported but cleared up the meaning of them. --- framework/src/console/src/main/scala/Console.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/src/console/src/main/scala/Console.scala b/framework/src/console/src/main/scala/Console.scala index f2729e51d2b..be70c33ef34 100644 --- a/framework/src/console/src/main/scala/Console.scala +++ b/framework/src/console/src/main/scala/Console.scala @@ -22,10 +22,10 @@ object Console { ||_| |__/ | |""".stripMargin) + - ("play! " + play.core.PlayVersion.current + - " (using Java " + System.getProperty("java.version") + - " and Scala " + scala.util.Properties.scalaPropOrElse("version.number", "unknown") + - "), http://www.playframework.com") + ("play! " + play.core.PlayVersion.current + + " built with Scala " + play.core.PlayVersion.scalaVersion + + " (running Java " + System.getProperty("java.version") + ")," + + " http://www.playframework.com") // -- Commands