spigot-mirror/buildtools
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/buildtools.git synced 2025-04-13 09:31:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finish up Mac OSX support, require Java 7 for BuildTools.

Browse source 
Support for Java 6 ended over a year ago, plus SpecialSource-2 requires it.
This commit is contained in:
md_5 2015-01-06 09:44:23 +11:00
parent a48f9fafe5
commit 2bc3c93e18
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/org/spigotmc/builder/Builder.java
View file

@ -55,7 +55,6 @@ public class Builder
public static final String LOG_FILE = "BuildTools.log.txt";
public static final boolean IS_WINDOWS = System.getProperty( "os.name" ).startsWith( "Windows" );
public static final boolean IS_MAC = System.getProperty( "os.name" ).startsWith( "Mac" );
public static final File CWD = new File( "." );
public static final String MC_VERSION = "1.8";
private static boolean dontUpdate;
@ -81,12 +80,11 @@ public class Builder
logOutput();
if ( IS_MAC && !Boolean.getBoolean( "mac.supported" ) )
if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 51.0 )
{
System.out.println( "Sorry, but Macintosh is not currently a supported platform for compilation at this time." );
System.out.println( "If you feel like testing Macintosh support please run this script with the -Dmac.supported=true option." );
System.out.println( "Else please run this script on a Windows or Linux PC and then copy the jars to this computer." );
System.exit( 1 );
System.err.println( "*** ERROR *** BuildTools should be run with Java 7 or above." );
System.err.println( "*** ERROR *** Use java -version to check your Java version." );
return;
}
try