summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2013-08-01 02:09:09 -0700
committerSom Snytt <som.snytt@gmail.com>2013-08-01 02:09:09 -0700
commit8f5a892512ba848a52a4ddd5d79e9c79d12ccfc1 (patch)
tree60fcf213b77b7a8b7887b3f3ff09fd276f09cd3b /src
parent46616ea2e94fa6ac7100b1cde66295f68338e18e (diff)
downloadscala-8f5a892512ba848a52a4ddd5d79e9c79d12ccfc1.tar.gz
scala-8f5a892512ba848a52a4ddd5d79e9c79d12ccfc1.tar.bz2
scala-8f5a892512ba848a52a4ddd5d79e9c79d12ccfc1.zip
SI-7265 javaSpecVersion, adjust isJava... tests
Make this and related properties public, because they are useful. This change ought to have been committed at 2.11 and then backported with restrictions, rather than vice-versa. Note that they are defined in the order, version, vendor and name, which is the order from the underlying javadoc. It would be a neat feature of the PR validator, as previously imagined, to run a "pending" test and then, on success and merge, to move it automatically to the canonical suite.
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/util/Properties.scala7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala
index 02c461f3c6..8b63a73638 100644
--- a/src/library/scala/util/Properties.scala
+++ b/src/library/scala/util/Properties.scala
@@ -131,10 +131,9 @@ private[scala] trait PropertiesTrait {
def javaVmName = propOrEmpty("java.vm.name")
def javaVmVendor = propOrEmpty("java.vm.vendor")
def javaVmVersion = propOrEmpty("java.vm.version")
- // this property must remain less-well-known until 2.11
- private def javaSpecVersion = propOrEmpty("java.specification.version")
- //private def javaSpecVendor = propOrEmpty("java.specification.vendor")
- //private def javaSpecName = propOrEmpty("java.specification.name")
+ def javaSpecVersion = propOrEmpty("java.specification.version")
+ def javaSpecVendor = propOrEmpty("java.specification.vendor")
+ def javaSpecName = propOrEmpty("java.specification.name")
def osName = propOrEmpty("os.name")
def scalaHome = propOrEmpty("scala.home")
def tmpDir = propOrEmpty("java.io.tmpdir")