diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 00000000..fca290be --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +java adoptopenjdk-8.0.302+8 diff --git a/Containerfile b/Containerfile new file mode 100644 index 00000000..b51213b7 --- /dev/null +++ b/Containerfile @@ -0,0 +1,15 @@ +FROM docker.io/alpine:edge + +ARG JDK=openjdk17-jdk +ENV JDK=$JDK + +RUN apk --no-cache add build-base ${JDK} wget bash ant git + +COPY . /opt/lwjgl2 + +WORKDIR /opt/lwjgl2 + +RUN ant generate-all +RUN ant compile +RUN ant compile_native + diff --git a/applet/advance/appletloader.html b/applet/advance/appletloader.html index 3589baba..84d79c5c 100644 --- a/applet/advance/appletloader.html +++ b/applet/advance/appletloader.html @@ -39,7 +39,7 @@ - + diff --git a/applet/basic/basicapplet.html b/applet/basic/basicapplet.html index 4e6937a1..cd4d98de 100644 --- a/applet/basic/basicapplet.html +++ b/applet/basic/basicapplet.html @@ -39,7 +39,7 @@ - + diff --git a/build.sh b/build.sh new file mode 100755 index 00000000..4c218990 --- /dev/null +++ b/build.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +set -e + +ant generate-all + +ant compile + +ant compile_native + diff --git a/build.xml b/build.xml index 7f6bb68e..b8d5e743 100644 --- a/build.xml +++ b/build.xml @@ -462,7 +462,7 @@ - + @@ -475,8 +475,8 @@ - - + + @@ -671,7 +671,7 @@ - + Lightweight Java Game Toolkit]]> Copyright © 2002-2009 lwjgl.org. All Rights Reserved.]]> diff --git a/platform_build/build-generator.xml b/platform_build/build-generator.xml index fa121198..f113d380 100644 --- a/platform_build/build-generator.xml +++ b/platform_build/build-generator.xml @@ -24,7 +24,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -230,7 +230,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -277,7 +277,7 @@ - + @@ -296,7 +296,7 @@ - + @@ -322,7 +322,7 @@ - + @@ -345,7 +345,7 @@ - + @@ -369,7 +369,7 @@ - + @@ -388,7 +388,7 @@ - + diff --git a/platform_build/build-maven.xml b/platform_build/build-maven.xml index c3f869be..6878a2fa 100644 --- a/platform_build/build-maven.xml +++ b/platform_build/build-maven.xml @@ -134,7 +134,7 @@ - + Lightweight Java Game Toolkit]]> @@ -144,7 +144,7 @@ - + Lightweight Java Game Toolkit]]> Copyright © 2002-2010 lwjgl.org. All Rights Reserved.]]> @@ -153,7 +153,7 @@ - + Lightweight Java Game Toolkit]]> Copyright © 2002-2010 lwjgl.org. All Rights Reserved.]]> @@ -208,4 +208,4 @@ - \ No newline at end of file + diff --git a/src/java/org/lwjgl/util/applet/AppletLoader.java b/src/java/org/lwjgl/util/applet/AppletLoader.java index 2628ad1a..83690e2e 100644 --- a/src/java/org/lwjgl/util/applet/AppletLoader.java +++ b/src/java/org/lwjgl/util/applet/AppletLoader.java @@ -124,7 +124,7 @@ import java.util.zip.ZipFile; * reused if the version matches. If version doesn't match all of the files are reloaded. * *
  • al_debug - [boolean] Whether to enable debug mode. Default: false.
    • - *
  • al_min_jre - [String] Specify the minimum jre version that the applet requires, should be in format like 1.6.0_24 or a subset like 1.6 Default: 1.5.
    • + *
  • al_min_jre - [String] Specify the minimum jre version that the applet requires, should be in format like 1.8.0_291-b10 or a subset like 1.8 Default: 1.8.
    • *
  • al_prepend_host - [boolean] Whether to limit caching to this domain, disable if your applet is hosted on multiple domains and needs to share the cache. Default: true.
    • *
  • al_lookup_threads - [int] Specify the number of concurrent threads to use to get file information before downloading. Default: 1.
    • *

    @@ -835,7 +835,7 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { // check JRE version meets minimum requirements if (!isMinJREVersionAvailable()) { minimumJreNotFound = true; - fatalErrorOccured("Java " + getStringParameter("al_min_jre", "1.5") + " or greater is required.", null); + fatalErrorOccured("Java " + getStringParameter("al_min_jre", "1.8") + " or greater is required.", null); return; } @@ -931,7 +931,7 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { * current JRE version. * * minimum requried JRE version is set using al_min_jre parameter, if not - * this is not set then the value will default to version 1.5 + * this is not set then the value will default to version 1.8 * * The minimumVersion should follow a structure such as x.x.x_x * Example values would include 1.6.0_10 or a subset like 1.6.0 or 1.6 @@ -944,10 +944,10 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { public boolean isMinJREVersionAvailable() throws Exception { setState(STATE_CHECK_JRE_VERSION); - String minimumVersion = getStringParameter("al_min_jre", "1.5"); + String minimumVersion = getStringParameter("al_min_jre", "1.8"); String javaVersion = System.getProperty("java.version"); - // remove dash and anything after it (letters) from version string e.g. 1.5.0_01-ea + // remove dash and anything after it (letters) from version string e.g. 1.8.0_291-b10 minimumVersion = javaVersion.split("-")[0]; javaVersion = minimumVersion.split("-")[0]; diff --git a/src/java/org/lwjgl/util/generator/GeneratorProcessor.java b/src/java/org/lwjgl/util/generator/GeneratorProcessor.java index dc034047..e718f3fd 100644 --- a/src/java/org/lwjgl/util/generator/GeneratorProcessor.java +++ b/src/java/org/lwjgl/util/generator/GeneratorProcessor.java @@ -51,7 +51,7 @@ import javax.tools.Diagnostic; * @version $Revision$ $Id$ */ @SupportedAnnotationTypes({ "*" }) -@SupportedSourceVersion(SourceVersion.RELEASE_6) +@SupportedSourceVersion(SourceVersion.RELEASE_8) @SupportedOptions({ "binpath", "typemap", "generatechecks", "contextspecific" }) public class GeneratorProcessor extends AbstractProcessor { diff --git a/src/java/org/lwjgl/util/generator/opencl/CLGeneratorProcessor.java b/src/java/org/lwjgl/util/generator/opencl/CLGeneratorProcessor.java index c4e1bad0..80702dd7 100644 --- a/src/java/org/lwjgl/util/generator/opencl/CLGeneratorProcessor.java +++ b/src/java/org/lwjgl/util/generator/opencl/CLGeneratorProcessor.java @@ -50,7 +50,7 @@ import javax.lang.model.util.ElementFilter; * @author Spasi */ @SupportedAnnotationTypes({ "*" }) -@SupportedSourceVersion(SourceVersion.RELEASE_6) +@SupportedSourceVersion(SourceVersion.RELEASE_8) @SupportedOptions({ "generatechecks", "contextspecific" }) public class CLGeneratorProcessor extends AbstractProcessor { diff --git a/src/java/org/lwjgl/util/generator/opengl/GLESGeneratorProcessor.java b/src/java/org/lwjgl/util/generator/opengl/GLESGeneratorProcessor.java index 5e539664..a8a74e25 100644 --- a/src/java/org/lwjgl/util/generator/opengl/GLESGeneratorProcessor.java +++ b/src/java/org/lwjgl/util/generator/opengl/GLESGeneratorProcessor.java @@ -50,7 +50,7 @@ import javax.lang.model.util.ElementFilter; * 2010-04-09 23:57:40Z spasi $ */ @SupportedAnnotationTypes({ "*" }) -@SupportedSourceVersion(SourceVersion.RELEASE_6) +@SupportedSourceVersion(SourceVersion.RELEASE_8) @SupportedOptions({ "contextspecific", "generatechecks" }) public class GLESGeneratorProcessor extends AbstractProcessor { diff --git a/src/java/org/lwjgl/util/generator/opengl/GLGeneratorProcessor.java b/src/java/org/lwjgl/util/generator/opengl/GLGeneratorProcessor.java index 1581af4d..c1bfa720 100644 --- a/src/java/org/lwjgl/util/generator/opengl/GLGeneratorProcessor.java +++ b/src/java/org/lwjgl/util/generator/opengl/GLGeneratorProcessor.java @@ -50,7 +50,7 @@ import javax.lang.model.util.ElementFilter; * 2010-04-09 23:57:40Z spasi $ */ @SupportedAnnotationTypes({ "*" }) -@SupportedSourceVersion(SourceVersion.RELEASE_6) +@SupportedSourceVersion(SourceVersion.RELEASE_8) @SupportedOptions({ "generatechecks", "contextspecific" }) public class GLGeneratorProcessor extends AbstractProcessor { diff --git a/src/java/org/lwjgl/util/generator/opengl/GLReferencesGeneratorProcessor.java b/src/java/org/lwjgl/util/generator/opengl/GLReferencesGeneratorProcessor.java index c27fb170..e0327385 100644 --- a/src/java/org/lwjgl/util/generator/opengl/GLReferencesGeneratorProcessor.java +++ b/src/java/org/lwjgl/util/generator/opengl/GLReferencesGeneratorProcessor.java @@ -53,7 +53,7 @@ import javax.lang.model.util.ElementFilter; * 2009-09-08 15:07:15Z spasi $ */ @SupportedAnnotationTypes({ "*" }) -@SupportedSourceVersion(SourceVersion.RELEASE_6) +@SupportedSourceVersion(SourceVersion.RELEASE_8) @SupportedOptions({ "generatechecks", "contextspecific" }) public class GLReferencesGeneratorProcessor extends AbstractProcessor {