echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Console: Change Java 10 warning to Java 11,

Browse Source 
since bionic uses 10
This commit is contained in:
zzz
2018-05-31 17:16:00 +00:00
parent 481e28750b
commit 24a1cf713e
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@ -330,8 +330,8 @@ public class RouterConsoleRunner implements RouterApp {
boolean noPack200 = (PluginStarter.pluginsEnabled(_context) || !NewsHelper.isUpdateDisabled(_context)) && boolean noPack200 = (PluginStarter.pluginsEnabled(_context) || !NewsHelper.isUpdateDisabled(_context)) &&
!FileUtil.isPack200Supported(); !FileUtil.isPack200Supported();
boolean openARM = SystemVersion.isARM() && SystemVersion.isOpenJDK(); boolean openARM = SystemVersion.isARM() && SystemVersion.isOpenJDK();
boolean isJava10 = SystemVersion.isJava10(); boolean isJava11 = SystemVersion.isJava11();
if (noJava7 || noPack200 || openARM || isJava10) { if (noJava7 || noPack200 || openARM || isJava11) {
String s = "Java version: " + System.getProperty("java.version") + String s = "Java version: " + System.getProperty("java.version") +
" OS: " + System.getProperty("os.name") + ' ' + " OS: " + System.getProperty("os.name") + ' ' +
System.getProperty("os.arch") + ' ' + System.getProperty("os.arch") + ' ' +
@ -354,7 +354,7 @@ public class RouterConsoleRunner implements RouterApp {
log.logAlways(net.i2p.util.Log.WARN, s); log.logAlways(net.i2p.util.Log.WARN, s);
System.out.println("Warning: " + s); System.out.println("Warning: " + s);
} }
if (isJava10) { if (isJava11) {
s = "Java 10/11 support is beta, and not recommended for general use"; s = "Java 10/11 support is beta, and not recommended for general use";
log.logAlways(net.i2p.util.Log.WARN, s); log.logAlways(net.i2p.util.Log.WARN, s);
System.out.println("Warning: " + s); System.out.println("Warning: " + s);

13
core/java/src/net/i2p/util/SystemVersion.java
View File

@ -46,6 +46,7 @@ public abstract class SystemVersion {
private static final boolean _oneDotEight; private static final boolean _oneDotEight;
private static final boolean _oneDotNine; private static final boolean _oneDotNine;
private static final boolean _oneDotTen; private static final boolean _oneDotTen;
private static final boolean _oneDotEleven;
private static final int _androidSDK; private static final int _androidSDK;
static { static {
@ -91,6 +92,7 @@ public abstract class SystemVersion {
_oneDotEight = false; _oneDotEight = false;
_oneDotNine = false; _oneDotNine = false;
_oneDotTen = false; _oneDotTen = false;
_oneDotEleven = false;
} else { } else {
String version = System.getProperty("java.version"); String version = System.getProperty("java.version");
// handle versions like "8-ea" or "9-internal" // handle versions like "8-ea" or "9-internal"
@ -102,6 +104,7 @@ public abstract class SystemVersion {
_oneDotNine = _oneDotEight && VersionComparator.comp(version, "1.9") >= 0; _oneDotNine = _oneDotEight && VersionComparator.comp(version, "1.9") >= 0;
// Starting 2018, versions are YY.M, this works for that also // Starting 2018, versions are YY.M, this works for that also
_oneDotTen = _oneDotNine && VersionComparator.comp(version, "1.10") >= 0; _oneDotTen = _oneDotNine && VersionComparator.comp(version, "1.10") >= 0;
_oneDotEleven = _oneDotTen && VersionComparator.comp(version, "1.11") >= 0;
} }
} }
@ -219,6 +222,15 @@ public abstract class SystemVersion {
return _oneDotTen; return _oneDotTen;
} }
/**
*
* @return true if Java 11 or higher, false for Android.
* @since 0.9.35
*/
public static boolean isJava11() {
return _oneDotEleven;
}
/** /**
* This isn't always correct. * This isn't always correct.
* http://stackoverflow.com/questions/807263/how-do-i-detect-which-kind-of-jre-is-installed-32bit-vs-64bit * http://stackoverflow.com/questions/807263/how-do-i-detect-which-kind-of-jre-is-installed-32bit-vs-64bit
@ -317,6 +329,7 @@ public abstract class SystemVersion {
System.out.println("Java 8 : " + isJava8()); System.out.println("Java 8 : " + isJava8());
System.out.println("Java 9 : " + isJava9()); System.out.println("Java 9 : " + isJava9());
System.out.println("Java 10 : " + isJava10()); System.out.println("Java 10 : " + isJava10());
System.out.println("Java 11 : " + isJava11());
System.out.println("Android : " + isAndroid()); System.out.println("Android : " + isAndroid());
if (isAndroid()) if (isAndroid())
System.out.println(" Version: " + getAndroidVersion()); System.out.println(" Version: " + getAndroidVersion());