From 2d2e300ae27139e0bce1720aef0b19e19c803aae Mon Sep 17 00:00:00 2001 From: e3ndr <33337309+e3ndr@users.noreply.github.com> Date: Wed, 16 Oct 2024 05:46:43 -0500 Subject: [PATCH] refactor(backends): Rename GTK -> WebKitGtk Makes a lot more sense for upstream. --- backends/_all/pom.xml | 6 +++--- backends/pom.xml | 2 +- backends/{gtk => webkitgtk}/pom.xml | 2 +- .../casterlabs/saucer/_impl/BackendWebKitGtk.java} | 6 +++--- .../natives/GNU_Linux-WebKitGtk-aarch64-Release.zip | Bin .../natives/GNU_Linux-WebKitGtk-arm-Release.zip | Bin .../natives/GNU_Linux-WebKitGtk-ppc64le-Release.zip | Bin .../natives/GNU_Linux-WebKitGtk-x86_64-Release.zip | Bin 8 files changed, 8 insertions(+), 8 deletions(-) rename backends/{gtk => webkitgtk}/pom.xml (92%) rename backends/{gtk/src/main/java/co/casterlabs/saucer/_impl/BackendGtk4.java => webkitgtk/src/main/java/co/casterlabs/saucer/_impl/BackendWebKitGtk.java} (89%) rename backends/{gtk => webkitgtk}/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-aarch64-Release.zip (100%) rename backends/{gtk => webkitgtk}/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-arm-Release.zip (100%) rename backends/{gtk => webkitgtk}/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-ppc64le-Release.zip (100%) rename backends/{gtk => webkitgtk}/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-x86_64-Release.zip (100%) diff --git a/backends/_all/pom.xml b/backends/_all/pom.xml index 74112d7..aec3e86 100644 --- a/backends/_all/pom.xml +++ b/backends/_all/pom.xml @@ -12,19 +12,19 @@ co.casterlabs.saucer4j - gtk + qt ${project.parent.version} compile co.casterlabs.saucer4j - qt + webkit ${project.parent.version} compile co.casterlabs.saucer4j - webkit + webkitgtk ${project.parent.version} compile diff --git a/backends/pom.xml b/backends/pom.xml index 328c0fb..631007e 100644 --- a/backends/pom.xml +++ b/backends/pom.xml @@ -5,10 +5,10 @@ _all - gtk qt qt_experimental webkit + webkitgtk webview2 diff --git a/backends/gtk/pom.xml b/backends/webkitgtk/pom.xml similarity index 92% rename from backends/gtk/pom.xml rename to backends/webkitgtk/pom.xml index 709705d..2f1d3cd 100644 --- a/backends/gtk/pom.xml +++ b/backends/webkitgtk/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - gtk + webkitgtk co.casterlabs.saucer4j diff --git a/backends/gtk/src/main/java/co/casterlabs/saucer/_impl/BackendGtk4.java b/backends/webkitgtk/src/main/java/co/casterlabs/saucer/_impl/BackendWebKitGtk.java similarity index 89% rename from backends/gtk/src/main/java/co/casterlabs/saucer/_impl/BackendGtk4.java rename to backends/webkitgtk/src/main/java/co/casterlabs/saucer/_impl/BackendWebKitGtk.java index d6dde77..13255d3 100644 --- a/backends/gtk/src/main/java/co/casterlabs/saucer/_impl/BackendGtk4.java +++ b/backends/webkitgtk/src/main/java/co/casterlabs/saucer/_impl/BackendWebKitGtk.java @@ -6,12 +6,12 @@ @SuppressWarnings("deprecation") @FindThisSaucerBackend(2) // Should be higher than Qt6 -public class BackendGtk4 extends _SaucerBackend { +public class BackendWebKitGtk extends _SaucerBackend { @Override public boolean checkDependencies() throws IOException { return checkForLibraries( - "libgtk-4-1", + "libgtk-4", "libwebkitgtk-6.0", "libadwaita-1" ); @@ -36,7 +36,7 @@ public String[] supportedArchTargets() { @Override public String getType() { - return "Gtk4"; + return "WebKitGtk"; } @Override diff --git a/backends/gtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-aarch64-Release.zip b/backends/webkitgtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-aarch64-Release.zip similarity index 100% rename from backends/gtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-aarch64-Release.zip rename to backends/webkitgtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-aarch64-Release.zip diff --git a/backends/gtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-arm-Release.zip b/backends/webkitgtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-arm-Release.zip similarity index 100% rename from backends/gtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-arm-Release.zip rename to backends/webkitgtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-arm-Release.zip diff --git a/backends/gtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-ppc64le-Release.zip b/backends/webkitgtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-ppc64le-Release.zip similarity index 100% rename from backends/gtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-ppc64le-Release.zip rename to backends/webkitgtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-ppc64le-Release.zip diff --git a/backends/gtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-x86_64-Release.zip b/backends/webkitgtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-x86_64-Release.zip similarity index 100% rename from backends/gtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-x86_64-Release.zip rename to backends/webkitgtk/src/main/resources/co/casterlabs/saucer/_impl/natives/GNU_Linux-WebKitGtk-x86_64-Release.zip