From 5b11d3ecad2803a0d0cb81a7a29faf0a4389a6b3 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Tue, 29 Mar 2016 10:36:16 +1000 Subject: Use System.lineSeparator, rather than sys.props --- src/library/scala/compat/Platform.scala | 3 +-- src/library/scala/sys/process/BasicIO.scala | 2 +- src/library/scala/util/Properties.scala | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/library/scala/compat/Platform.scala b/src/library/scala/compat/Platform.scala index 42dfcbfdde..f3745bc189 100644 --- a/src/library/scala/compat/Platform.scala +++ b/src/library/scala/compat/Platform.scala @@ -105,8 +105,7 @@ object Platform { /** The default line separator. * * On the JVM, this is equivalent to calling the method: - * `System.getProperty("line.separator")` - * with a default value of "\n". + * `java.lang.System.lineSeparator` */ val EOL = scala.util.Properties.lineSeparator diff --git a/src/library/scala/sys/process/BasicIO.scala b/src/library/scala/sys/process/BasicIO.scala index 640f7e68c2..b39ae77c62 100644 --- a/src/library/scala/sys/process/BasicIO.scala +++ b/src/library/scala/sys/process/BasicIO.scala @@ -33,7 +33,7 @@ object BasicIO { final val BufferSize = 8192 /** Used to separate lines in the `processFully` function that takes `Appendable`. */ - final val Newline = props("line.separator") + final val Newline = System.lineSeparator private[process] final class Streamed[T]( val process: T => Unit, diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index 583f1539d1..a176748cd6 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -120,7 +120,7 @@ private[scala] trait PropertiesTrait { /** The default end of line character. */ - def lineSeparator = propOrElse("line.separator", "\n") + def lineSeparator = System.lineSeparator() /* Various well-known properties. */ def javaClassPath = propOrEmpty("java.class.path") -- cgit v1.2.3