Squash PR for fixing conflicts with upstream ivy branch (#7)

Initial ivy support (squashed)
tresf · Dec 10, 2024 · 5df8544 · 5df8544
1 parent b576864
commit 5df8544
Show file tree

Hide file tree

Showing 45 changed files with 370 additions and 305 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,13 @@
 /out/
 /js/node_modules
-/lib/javafx*
+/lib/*
+/deps/*
+!/deps/manual/
 /.idea/workspace.xml
 /.idea/misc.xml
 /.idea/uiDesigner.xml
 /.idea/compiler.xml
+/reports/
 /fx.zip
 /README.md
 /provision.json

diff --git a/.idea/runConfigurations/download_javafx.xml → .idea/runConfigurations/ivy-deps.xml b/.idea/runConfigurations/download_javafx.xml → .idea/runConfigurations/ivy-deps.xml
diff --git a/.idea/startup.xml b/.idea/startup.xml
diff --git a/.idea/tray.iml b/.idea/tray.iml
diff --git a/ant/apple/installer.xml b/ant/apple/installer.xml
@@ -318,6 +318,8 @@
                     <include name="**/darwin-aarch64/*" if="target.arch.aarch64"/> <!-- jna/hid4java -->
                     <include name="**/osx-aarch64/*" if="target.arch.aarch64"/> <!-- usb4java -->
                     <include name="**/osx_arm64/*" if="target.arch.aarch64"/> <!-- jssc -->
+                    <!--javafx-->
+                    <include name="*.dylib"/>
                 </fileset>
         </copy>
     </target>

diff --git a/ant/ivy-deps.properties b/ant/ivy-deps.properties
@@ -0,0 +1,19 @@
+# Dependency versions
+jetty.version=10.0.24
+jna.version=5.15.0
+log4j.version=2.24.2
+pdfbox.version=2.0.32
+twelvemonkeys.version=3.12.0
+bouncycastle.version=1.79
+usb4java.version=1.2.0
+hid4java.version=0.8.0
+purejavahidapi.version=0.0.10
+javasemver.version=0.9.0
+jettison.version=1.5.4
+jssc.version=2.9.6
+jaiimageio.version=1.4.0
+icu4j.version=76.1
+javafx.version=24-headless+0-2024-12-02-101029
+
+# General configuration
+ivy.report.todir=${basedir}/reports
diff --git a/ant/ivy-settings.xml b/ant/ivy-settings.xml
@@ -0,0 +1,28 @@
+<ivysettings>
+    <settings defaultResolver="default"/>
+
+    <!-- These "magic lines" are pulled from: https://ant.apache.org/ivy/history/latest-milestone/tutorial/defaultconf.html -->
+    <include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
+    <include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
+    <include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
+    <include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
+    <include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
+    <resolvers>
+        <!-- Custom Repos here -->
+        <ibiblio name="gluonhq" m2compatible="true" root="https://nexus.gluonhq.com/nexus/content/repositories/releases/"/>
+    </resolvers>
+    <chain name="default" returnFirst="true" checkmodified="true" changingPattern=".*SNAPSHOT">
+        <!-- These two are magic lines from the default conf -->
+        <resolver ref="local"/>
+        <resolver ref="main" />
+
+        <!-- Custom Repos here -->
+        <resolver ref="gluonhq" />
+    </chain>
+    <modules>
+        <module organisation="org.openjfx" name=".*" resolver="gluonhq"/>
+    </modules>
+</ivysettings>
+
+
+
diff --git a/ant/ivy.xml b/ant/ivy.xml
@@ -0,0 +1,189 @@
+<ivy-module version="2.0" xmlns:m="antlib:org.apache.ivy.ant">
+    <info organisation="io.qz" module="qz-tray"/>
+    <dependencies>
+        <!-- Core -->
+        <dependency name="jna-platform"  org="net.java.dev.jna"  conf="*->default" rev="${jna.version}"/>
+        <dependency name="jna" org="net.java.dev.jna" conf="*->default" rev="${jna.version}"/>
+        <dependency name="bcprov-jdk18on" org="org.bouncycastle" conf="*->default" rev="${bouncycastle.version}"/>
+        <dependency name="bcpkix-jdk18on" org="org.bouncycastle" conf="*->default" rev="${bouncycastle.version}"/>
+        <dependency name="java-semver" org="com.github.zafarkhaja" conf="*->default" rev="${javasemver.version}">
+            <!-- Skip, need 0.10.0-SNAPSHOT -->
+            <exclude name="*"/>
+        </dependency>
+
+        <!-- Websockets -->
+        <dependency name="jettison" org="org.codehaus.jettison" conf="*->default" rev="${jettison.version}">
+            <!-- FIXME: Skip, currently 1.3.3-SNAPSHOT needs testing -->
+            <exclude name="*"/>
+        </dependency>
+
+        <dependency name="jakarta.websocket-api" org="jakarta.websocket" conf="*->default"
+                    rev="2.1.1">
+            <!-- FIXME: Skip, currently 1.1 needs testing -->
+            <exclude name="*"/>
+        </dependency>
+        <dependency name="javax.websocket-api" org="javax.websocket" conf="*->default"
+                    rev="1.1"/>
+        <!-- FIXME: Replace with jakarta above? -->
+
+        <dependency name="jetty-servlet-api" org="org.eclipse.jetty.toolchain" conf="*->default"
+                    rev="4.0.6"/>
+
+        <!-- Jetty -->
+        <dependency name="jetty-client" org="org.eclipse.jetty" conf="*->default" rev="${jetty.version}"/>
+        <dependency name="jetty-http" org="org.eclipse.jetty" conf="*->default" rev="${jetty.version}"/>
+        <dependency name="jetty-io" org="org.eclipse.jetty" conf="*->default" rev="${jetty.version}"/>
+        <dependency name="jetty-security" org="org.eclipse.jetty" conf="*->default" rev="${jetty.version}"/>
+        <dependency name="jetty-server" org="org.eclipse.jetty" conf="*->default" rev="${jetty.version}"/>
+        <dependency name="jetty-servlet" org="org.eclipse.jetty" conf="*->default" rev="${jetty.version}"/>
+        <dependency name="jetty-util" org="org.eclipse.jetty" conf="*->default" rev="${jetty.version}"/>
+
+        <!-- Jetty Websocket -->
+        <dependency name="websocket-core-client" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
+        <dependency name="websocket-core-common" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
+        <dependency name="websocket-core-server" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
+        <dependency name="websocket-jetty-api" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
+        <dependency name="websocket-jetty-client" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
+        <dependency name="websocket-jetty-common" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
+        <dependency name="websocket-jetty-server" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
+        <dependency name="websocket-servlet" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
+
+        <!-- Apache Commons -->
+        <dependency name="commons-codec" org="commons-codec" conf="*->default"
+                    rev="1.15">
+        </dependency>
+        <dependency name="commons-io" org="commons-io" conf="*->default"
+                    rev="2.11.0">
+        </dependency>
+        <dependency name="commons-pool2" org="org.apache.commons" conf="*->default"
+                    rev="2.11.1">
+        </dependency>
+        <dependency name="not-going-to-be-commons-ssl" org="com.narupley" conf="*->default"
+                    rev="0.3.20">
+            <exclude name="bcprov-jdk15on"/>
+        </dependency>
+
+        <!-- Communications -->
+        <dependency name="usb-api" org="javax.usb" conf="*->default"  rev="1.0.2"/>
+        <dependency name="usb4java" org="org.usb4java" conf="*->default" rev="${usb4java.version}"/>
+        <dependency name="usb4java-javax" org="org.usb4java" conf="*->default" rev="${usb4java.version}"/>
+        <dependency name="libusb4java" org="org.usb4java" rev="1.2.0">
+            <artifact name="libusb4java" type="jar" m:classifier="linux-arm"/>
+            <artifact name="libusb4java" type="jar" m:classifier="linux-x86_64"/>
+            <artifact name="libusb4java" type="jar" m:classifier="linux-x86"/>
+            <artifact name="libusb4java" type="jar" m:classifier="osx-x86_64"/>
+            <artifact name="libusb4java" type="jar" m:classifier="osx-x86"/>
+            <artifact name="libusb4java" type="jar" m:classifier="windows-x86_64"/>
+            <artifact name="libusb4java" type="jar" m:classifier="windows-x86"/>
+        </dependency>
+
+        <dependency name="purejavahidapi" org="nyholku" conf="*->default" rev="${purejavahidapi.version}">
+            <exclude name="jna"/>
+            <!-- Skip, need 0.0.10-SNAPSHOT -->
+            <exclude name="*"/>
+        </dependency>
+        <dependency name="hid4java" org="org.hid4java" conf="*->default" rev="${hid4java.version}">
+            <exclude name="jna"/>
+            <!-- Skip, need 0.8.0+7-SNAPSHOT https://github.com/qzind/tray/pull/1267 -->
+            <exclude name="*"/>
+        </dependency>
+        <dependency name="jssc" org="io.github.java-native" conf="*->default" rev="${jssc.version}"/>
+        <!-- Theming -->
+        <dependency name="darcula-bobbylight" org="com.bulenkov.darcula" conf="*->default" rev="0.0.0">
+            <!-- Skip, missing -->
+            <exclude name="*"/>
+        </dependency>
+
+        <!-- Windows Installer -->
+        <dependency name="mslinks" org="mslinks" conf="*->default" rev="1.1.0">
+            <!-- Skip, missing -->
+            <exclude name="*"/>
+        </dependency>
+
+        <!-- Charsets -->
+        <dependency name="icu4j" org="com.ibm.icu" conf="*->default" rev="${icu4j.version}"/>
+        <dependency name="icu4j-charset" org="com.ibm.icu" conf="*->default" rev="${icu4j.version}"/>
+        <dependency name="TCVN-3" org="com.ibm.icu" conf="*->default" rev="${icu4j.version}">
+            <!-- Skip, missing, send upstream? -->
+            <exclude name="*"/>
+        </dependency>
+
+        <!-- Imaging -->
+        <dependency name="common-image" org="com.twelvemonkeys.common" conf="*->default" rev="${twelvemonkeys.version}"/>
+        <dependency name="common-io" org="com.twelvemonkeys.common" conf="*->default" rev="${twelvemonkeys.version}"/>
+        <dependency name="common-lang" org="com.twelvemonkeys.common" conf="*->default" rev="${twelvemonkeys.version}"/>
+        <dependency name="imageio-core" org="com.twelvemonkeys.imageio" conf="*->default" rev="${twelvemonkeys.version}"/>
+        <dependency name="imageio-jpeg" org="com.twelvemonkeys.imageio" conf="*->default" rev="${twelvemonkeys.version}"/>
+        <dependency name="imageio-metadata" org="com.twelvemonkeys.imageio" conf="*->default" rev="${twelvemonkeys.version}"/>
+
+        <dependency name="jai-imageio-core" org="com.github.jai-imageio" conf="*->default"  rev="${jaiimageio.version}"/>
+        <dependency name="jai-imageio-jpeg2000" org="com.github.jai-imageio" conf="*->default" rev="${jaiimageio.version}"/>
+
+        <!-- Logging -->
+        <dependency name="log4j-core"  org="org.apache.logging.log4j"  conf="*->default"  rev="${log4j.version}"/>
+        <dependency name="log4j-api"  org="org.apache.logging.log4j" conf="*->default" rev="${log4j.version}"/>
+
+        <!-- Printing -->
+        <dependency name="pdfbox"  org="org.apache.pdfbox"  conf="*->default"  rev="${pdfbox.version}">
+            <exclude name="log4j-core"/>
+            <exclude name="log4j-api"/>
+            <exclude name="commons-httpclient"/>
+            <exclude name="bcprov-jdk15on"/>
+        </dependency>
+
+        <!-- javafx -->
+        <dependency name="javafx-controls" org="org.openjfx" conf="*->default" rev="${javafx.version}"/>
+        <dependency name="javafx-fxml" org="org.openjfx" conf="*->default" rev="${javafx.version}"/>
+        <dependency name="javafx-graphics" org="org.openjfx" conf="*->default" rev="${javafx.version}"/>
+        <dependency name="javafx-base" org="org.openjfx" conf="*->default" rev="${javafx.version}"/>
+        <dependency name="javafx-media" org="org.openjfx" conf="*->default" rev="${javafx.version}"/>
+        <dependency name="javafx-swing" org="org.openjfx" conf="*->default" rev="${javafx.version}"/>
+        <dependency name="javafx-web" org="org.openjfx" conf="*->default" rev="${javafx.version}"/>
+
+        <!-- host javafx natives -->
+        <dependency org="org.openjfx" name="javafx-controls" rev="${javafx.version}">
+            <artifact name="javafx-controls" type="jar" m:classifier="${host.javafx.platform}"/>
+        </dependency>
+        <dependency org="org.openjfx" name="javafx-fxml" rev="${javafx.version}">
+            <artifact name="javafx-fxml" type="jar" m:classifier="${host.javafx.platform}"/>
+        </dependency>
+        <dependency org="org.openjfx" name="javafx-graphics" rev="${javafx.version}">
+            <artifact name="javafx-graphics" type="jar" m:classifier="${host.javafx.platform}"/>
+        </dependency>
+        <dependency org="org.openjfx" name="javafx-base" rev="${javafx.version}">
+            <artifact name="javafx-base" type="jar" m:classifier="${host.javafx.platform}"/>
+        </dependency>
+        <dependency org="org.openjfx" name="javafx-media" rev="${javafx.version}">
+            <artifact name="javafx-media" type="jar" m:classifier="${host.javafx.platform}"/>
+        </dependency>
+        <dependency org="org.openjfx" name="javafx-swing" rev="${javafx.version}">
+            <artifact name="javafx-swing" type="jar" m:classifier="${host.javafx.platform}"/>
+        </dependency>
+        <dependency org="org.openjfx" name="javafx-web" rev="${javafx.version}">
+            <artifact name="javafx-web" type="jar" m:classifier="${host.javafx.platform}"/>
+        </dependency>
+
+        <!-- target javafx natives -->
+        <dependency org="org.openjfx" name="javafx-controls" rev="${javafx.version}">
+            <artifact name="javafx-controls" type="jar" m:classifier="${target.javafx.platform}"/>
+        </dependency>
+        <dependency org="org.openjfx" name="javafx-fxml" rev="${javafx.version}">
+            <artifact name="javafx-fxml" type="jar" m:classifier="${target.javafx.platform}"/>
+        </dependency>
+        <dependency org="org.openjfx" name="javafx-graphics" rev="${javafx.version}">
+            <artifact name="javafx-graphics" type="jar" m:classifier="${target.javafx.platform}"/>
+        </dependency>
+        <dependency org="org.openjfx" name="javafx-base" rev="${javafx.version}">
+            <artifact name="javafx-base" type="jar" m:classifier="${target.javafx.platform}"/>
+        </dependency>
+        <dependency org="org.openjfx" name="javafx-media" rev="${javafx.version}">
+            <artifact name="javafx-media" type="jar" m:classifier="${target.javafx.platform}"/>
+        </dependency>
+        <dependency org="org.openjfx" name="javafx-swing" rev="${javafx.version}">
+            <artifact name="javafx-swing" type="jar" m:classifier="${target.javafx.platform}"/>
+        </dependency>
+        <dependency org="org.openjfx" name="javafx-web" rev="${javafx.version}">
+            <artifact name="javafx-web" type="jar" m:classifier="${target.javafx.platform}"/>
+        </dependency>
+    </dependencies>
+</ivy-module>