Retire the gdx-lwjgl3-glfw-awt-macos extension

backends/gdx-backend-lwjgl3/src/com/badlogic/gdx/backends/lwjgl3/Lwjgl3Application.java

@@ -56,7 +56,6 @@
 import com.badlogic.gdx.utils.GdxRuntimeException;
 import com.badlogic.gdx.utils.ObjectMap;
 import com.badlogic.gdx.utils.SharedLibraryLoader;
-import org.lwjgl.system.Configuration;
 
 public class Lwjgl3Application implements Lwjgl3ApplicationBase {
 	private final Lwjgl3ApplicationConfiguration config;
@@ -80,7 +79,6 @@ public class Lwjgl3Application implements Lwjgl3ApplicationBase {
 
 	static void initializeGlfw () {
 		if (errorCallback == null) {
-			if (SharedLibraryLoader.isMac) loadGlfwAwtMacos();
 			Lwjgl3NativesLoader.load();
 			errorCallback = GLFWErrorCallback.createPrint(Lwjgl3ApplicationConfiguration.errorStream);
 			GLFW.glfwSetErrorCallback(errorCallback);
@@ -116,20 +114,6 @@ static void postLoadANGLE () {
 		}
 	}
 
-	static void loadGlfwAwtMacos () {
-		try {
-			Class loader = Class.forName("com.badlogic.gdx.backends.lwjgl3.awt.GlfwAWTLoader");
-			Method load = loader.getMethod("load");
-			File sharedLib = (File)load.invoke(loader);
-			Configuration.GLFW_LIBRARY_NAME.set(sharedLib.getAbsolutePath());
-			Configuration.GLFW_CHECK_THREAD0.set(false);
-		} catch (ClassNotFoundException t) {
-			return;
-		} catch (Throwable t) {
-			throw new GdxRuntimeException("Couldn't load GLFW AWT for macOS.", t);
-		}
-	}
-
 	public Lwjgl3Application (ApplicationListener listener) {
 		this(listener, new Lwjgl3ApplicationConfiguration());
 	}

backends/gdx-backend-lwjgl3/src/com/badlogic/gdx/backends/lwjgl3/Lwjgl3Graphics.java

@@ -76,7 +76,7 @@ public class Lwjgl3Graphics extends AbstractGraphics implements Disposable {
 
 		@Override
 		public void invoke (long windowHandle, final int width, final int height) {
-			if (Configuration.GLFW_CHECK_THREAD0.get(true)) {
+			if (!Configuration.GLFW_LIBRARY_NAME.get().equals("glfw_async")) {
 				renderWindow(windowHandle, width, height);
 			} else {
 				if (posted) return;

build.gradle

@@ -180,8 +180,6 @@ tasks.register('setupExternalNativesDirs') {
 	doLast {
 		file("build").mkdir();
 		file("extensions/gdx-lwjgl3-angle/res").mkdirs();
-		file("extensions/gdx-lwjgl3-glfw-awt-macos/res/macosx64").mkdirs();
-		file("extensions/gdx-lwjgl3-glfw-awt-macos/res/macosarm64").mkdirs();
 	}
 	doNotTrackState("Don't track state")
 }
@@ -194,24 +192,8 @@ tasks.register('fetchAngleNativesZIP', Download) {
 	useETag "all"
 }
 
-tasks.register('fetchGlfwAWT', Download) {
-	dependsOn setupExternalNativesDirs
-	src 'https://raw.githubusercontent.com/badlogic/glfw/master/libglfw.dylib'
-	dest 'extensions/gdx-lwjgl3-glfw-awt-macos/res/macosx64/libglfw.dylib'
-	onlyIfModified true
-	useETag "all"
-}
-
-tasks.register('fetchGlfwAWTARM64', Download) {
-	dependsOn setupExternalNativesDirs
-	src 'https://raw.githubusercontent.com/badlogic/glfw/master/libglfwarm64.dylib'
-	dest 'extensions/gdx-lwjgl3-glfw-awt-macos/res/macosarm64/libglfwarm64.dylib'
-	onlyIfModified true
-	useETag "all"
-}
-
 tasks.register('fetchExternalNatives', Copy) {
-	dependsOn fetchAngleNativesZIP, fetchGlfwAWT, fetchGlfwAWTARM64
+	dependsOn fetchAngleNativesZIP
 	from zipTree("build/gdx-angle-natives.zip")
 	into "./extensions/gdx-lwjgl3-angle/res"
 	doNotTrackState("Don't track state")

publish.gradle

@@ -13,7 +13,6 @@ configure([
 	project(":extensions:gdx-bullet"),
 	project(":extensions:gdx-freetype"),
 	project(":extensions:gdx-lwjgl3-angle"),
-	project(":extensions:gdx-lwjgl3-glfw-awt-macos"),
 	project(":extensions:gdx-tools")
 ]) {
 	apply plugin: 'maven-publish'

settings.gradle

@@ -34,7 +34,6 @@ include ":extensions:gdx-freetype"
 include ":extensions:gdx-setup"
 include ":extensions:gdx-tools"
 include ":extensions:gdx-lwjgl3-angle"
-include ":extensions:gdx-lwjgl3-glfw-awt-macos"
 
 include ":tests"
 include ":tests:gdx-tests"

tests/gdx-tests-lwjgl3/build.gradle

@@ -31,7 +31,6 @@ dependencies {
 	implementation project(":tests:gdx-tests")
 	implementation project(":backends:gdx-backend-lwjgl3")
 	implementation project(":extensions:gdx-lwjgl3-angle")
-	implementation project(":extensions:gdx-lwjgl3-glfw-awt-macos")
 	implementation testnatives.desktop
 }
 

tests/gdx-tests-lwjgl3/src/com/badlogic/gdx/tests/lwjgl3/AwtTestLWJGL.java

@@ -9,7 +9,6 @@
 import javax.imageio.ImageIO;
 import javax.swing.*;
 
-import com.badlogic.gdx.backends.lwjgl3.awt.GlfwAWTLoader;
 import com.badlogic.gdx.utils.SharedLibraryLoader;
 import org.lwjgl.glfw.GLFWMouseButtonCallback;
 import org.lwjgl.opengl.GL;
@@ -52,9 +51,14 @@ public void run () {
 	};
 
 	public static void main (String[] args) throws Exception {
+		java.awt.EventQueue.invokeAndWait(new Runnable() {
+			public void run () {
+				java.awt.Toolkit.getDefaultToolkit();
+			}
+		});
+
 		if (SharedLibraryLoader.isMac) {
-			Configuration.GLFW_CHECK_THREAD0.set(false);
-			Configuration.GLFW_LIBRARY_NAME.set(GlfwAWTLoader.load().getAbsolutePath());
+			Configuration.GLFW_LIBRARY_NAME.set("glfw_async");
 		}
 
 		if (!glfwInit()) {