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

Utils: Handle Java version detection for internal or ea versions

Browse Source
This commit is contained in:
zzz
2016-10-28 15:08:13 +00:00
parent 4f0cae59c2
commit 51e35eb572
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,13 +70,19 @@ public abstract class SystemVersion {
if (_isAndroid) {
_oneDotSix = _androidSDK >= 9;
_oneDotSeven = _androidSDK >= 19;
// https://developer.android.com/guide/platform/j8-jack.html
// some stuff in 23, some in 24
_oneDotEight = false;
_oneDotNine = false;
} else {
_oneDotSix = VersionComparator.comp(System.getProperty("java.version"), "1.6") >= 0;
_oneDotSeven = _oneDotSix && VersionComparator.comp(System.getProperty("java.version"), "1.7") >= 0;
_oneDotEight = _oneDotSeven && VersionComparator.comp(System.getProperty("java.version"), "1.8") >= 0;
_oneDotNine = _oneDotEight && VersionComparator.comp(System.getProperty("java.version"), "1.9") >= 0;
String version = System.getProperty("java.version");
// handle versions like "8-ea" or "9-internal"
if (!version.startsWith("1."))
version = "1." + version;
_oneDotSix = VersionComparator.comp(version, "1.6") >= 0;
_oneDotSeven = _oneDotSix && VersionComparator.comp(version, "1.7") >= 0;
_oneDotEight = _oneDotSeven && VersionComparator.comp(version, "1.8") >= 0;
_oneDotNine = _oneDotEight && VersionComparator.comp(version, "1.9") >= 0;
}
}