Changeset 789f15f

Timestamp:

Dec 11, 2017 11:41:19 AM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

34d879a

Parents:

b04924d

Message:

Java 10 test

File:

• core/java/src/net/i2p/util/SystemVersion.java (modified) (5 diffs)

core/java/src/net/i2p/util/SystemVersion.java

@@ -46 +46 @@
     private static final boolean _oneDotEight;
     private static final boolean _oneDotNine;
+    private static final boolean _oneDotTen;
     private static final int _androidSDK;
 
@@ -86 +87 @@
             _oneDotSix = _androidSDK >= 9;
             _oneDotSeven = _androidSDK >= 19;
-            // https://developer.android.com/guide/platform/j8-jack.html
-            // some stuff in 23, some in 24
+            // https://developer.android.com/studio/write/java8-support.html
+            // some stuff in 24
             _oneDotEight = false;
             _oneDotNine = false;
+            _oneDotTen = false;
         } else {
             String version = System.getProperty("java.version");
@@ -99 +101 @@
             _oneDotEight = _oneDotSeven && VersionComparator.comp(version, "1.8") >= 0;
             _oneDotNine = _oneDotEight && VersionComparator.comp(version, "1.9") >= 0;
+            // Starting 2018, versions are YY.M, this works for that also
+            _oneDotTen = _oneDotNine && VersionComparator.comp(version, "1.10") >= 0;
         }
     }
@@ -200 +204 @@
     /**
      *
-     *  @return true if Java 1.9 or higher, false for Android.
+     *  @return true if Java 9 or higher, false for Android.
      *  @since 0.9.23
      */
     public static boolean isJava9() {
         return _oneDotNine;
+    }
+
+    /**
+     *
+     *  @return true if Java 10 or higher, false for Android.
+     *  @since 0.9.33
+     */
+    public static boolean isJava10() {
+        return _oneDotTen;
     }
 
@@ -295 +308 @@
         System.out.println("Java 8   : " + isJava8());
         System.out.println("Java 9   : " + isJava9());
+        System.out.println("Java 10  : " + isJava10());
         System.out.println("Android  : " + isAndroid());
         if (isAndroid())