Revert "SI-9750 isJavaAtLeast(Int)"

This reverts commit 656162bb48fbbd703790a2c94d4563e40ddfdfc2.

Adding new APIs is not possible until a major release.

2 files changed, 3 insertions, 14 deletions

diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala
index 9d62bfe6ef..7b21351cf6 100644
--- a/src/library/scala/util/Properties.scala
+++ b/src/library/scala/util/Properties.scala
@@ -217,12 +217,6 @@ private[scala] trait PropertiesTrait {
     }
   }
 
-  /** Tests whether the major version of the platform specification is at least the given value.
-   *
-   *  @param version a major version number
-   */
-  def isJavaAtLeast(version: Int): Boolean = isJavaAtLeast(version.toString)
-
   // provide a main method so version info can be obtained by running this
   def main(args: Array[String]) {
     val writer = new PrintWriter(Console.err, true)
diff --git a/test/junit/scala/util/SpecVersionTest.scala b/test/junit/scala/util/SpecVersionTest.scala
index 4639389dd9..82fc4fdf7b 100644
--- a/test/junit/scala/util/SpecVersionTest.scala
+++ b/test/junit/scala/util/SpecVersionTest.scala
@@ -33,8 +33,6 @@ class SpecVersionTest {
     assert(sut9 isJavaAtLeast "1.8")
     assert(sut9 isJavaAtLeast "8")
     assert(sut9 isJavaAtLeast "9")
-    assert(sut9.isJavaAtLeast(9))
-    assertFalse(sut9.isJavaAtLeast(10))
     assertFalse(sut9.isJavaAtLeast("10"))
   }
 
@@ -47,8 +45,8 @@ class SpecVersionTest {
     assert(sut7 isJavaAtLeast "5")
     assert(sut7 isJavaAtLeast "1.6")
     assert(sut7 isJavaAtLeast "1.7")
-    assert(sut7.isJavaAtLeast(7))
-    assertFalse(sut7.isJavaAtLeast(9))
+    assert(sut7.isJavaAtLeast("7"))
+    assertFalse(sut7.isJavaAtLeast("9"))
     assertFalse(sut7 isJavaAtLeast "1.8")
     assertFalse(sut7 isJavaAtLeast "9")
     assertFalse(sut7 isJavaAtLeast "10")
@@ -69,7 +67,6 @@ class SpecVersionTest {
 
   @Test def `spec has minor or more`(): Unit = {
     val sut = new TestProperties("9.2.5")
-    assert(sut.isJavaAtLeast(9))
     assert(sut.isJavaAtLeast("9"))
     assert(sut.isJavaAtLeast("9.0.1"))
     assert(sut.isJavaAtLeast("9.2.1"))
@@ -81,7 +78,6 @@ class SpecVersionTest {
 
   @Test def `compares only major minor security`(): Unit = {
     val sut = new TestProperties("9.2.5.1.2.3")
-    assert(sut.isJavaAtLeast(9))
     assert(sut.isJavaAtLeast("9"))
     assert(sut.isJavaAtLeast("9.0.1"))
     assert(sut.isJavaAtLeast("9.2.5.9.9.9"))
@@ -90,8 +86,7 @@ class SpecVersionTest {
 
   @Test def `futurely proofed`(): Unit = {
     val sut = new TestProperties("10.2.5")
-    assert(sut.isJavaAtLeast(9))
-    assert(sut.isJavaAtLeast(10))
+    assert(sut.isJavaAtLeast("10"))
     assert(sut.isJavaAtLeast("9"))
     assert(sut.isJavaAtLeast("9.0.1"))
     assert(sut.isJavaAtLeast("9.2.1"))