Skip to content

Commit 5df8544

Browse files
tresftresf
authored
Squash PR for fixing conflicts with upstream ivy branch (#7)
Initial ivy support (squashed)
1 parent b576864 commit 5df8544

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+370
-305
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
/out/
22
/js/node_modules
3-
/lib/javafx*
3+
/lib/*
4+
/deps/*
5+
!/deps/manual/
46
/.idea/workspace.xml
57
/.idea/misc.xml
68
/.idea/uiDesigner.xml
79
/.idea/compiler.xml
10+
/reports/
811
/fx.zip
912
/README.md
1013
/provision.json

‎.idea/runConfigurations/download_javafx.xml‎ renamed to ‎.idea/runConfigurations/ivy-deps.xml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/startup.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/tray.iml‎

Lines changed: 10 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ant/apple/installer.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,8 @@
318318
<include name="**/darwin-aarch64/*" if="target.arch.aarch64"/> <!-- jna/hid4java -->
319319
<include name="**/osx-aarch64/*" if="target.arch.aarch64"/> <!-- usb4java -->
320320
<include name="**/osx_arm64/*" if="target.arch.aarch64"/> <!-- jssc -->
321+
<!--javafx-->
322+
<include name="*.dylib"/>
321323
</fileset>
322324
</copy>
323325
</target>

‎ant/ivy-deps.properties‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Dependency versions
2+
jetty.version=10.0.24
3+
jna.version=5.15.0
4+
log4j.version=2.24.2
5+
pdfbox.version=2.0.32
6+
twelvemonkeys.version=3.12.0
7+
bouncycastle.version=1.79
8+
usb4java.version=1.2.0
9+
hid4java.version=0.8.0
10+
purejavahidapi.version=0.0.10
11+
javasemver.version=0.9.0
12+
jettison.version=1.5.4
13+
jssc.version=2.9.6
14+
jaiimageio.version=1.4.0
15+
icu4j.version=76.1
16+
javafx.version=24-headless+0-2024-12-02-101029
17+
18+
# General configuration
19+
ivy.report.todir=${basedir}/reports

‎ant/ivy-settings.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<ivysettings>
2+
<settings defaultResolver="default"/>
3+
4+
<!-- These "magic lines" are pulled from: https://ant.apache.org/ivy/history/latest-milestone/tutorial/defaultconf.html -->
5+
<include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
6+
<include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
7+
<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
8+
<include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
9+
<include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
10+
<resolvers>
11+
<!-- Custom Repos here -->
12+
<ibiblio name="gluonhq" m2compatible="true" root="https://nexus.gluonhq.com/nexus/content/repositories/releases/"/>
13+
</resolvers>
14+
<chain name="default" returnFirst="true" checkmodified="true" changingPattern=".*SNAPSHOT">
15+
<!-- These two are magic lines from the default conf -->
16+
<resolver ref="local"/>
17+
<resolver ref="main" />
18+
19+
<!-- Custom Repos here -->
20+
<resolver ref="gluonhq" />
21+
</chain>
22+
<modules>
23+
<module organisation="org.openjfx" name=".*" resolver="gluonhq"/>
24+
</modules>
25+
</ivysettings>
26+
27+
28+

‎ant/ivy.xml‎

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
<ivy-module version="2.0" xmlns:m="antlib:org.apache.ivy.ant">
2+
<info organisation="io.qz" module="qz-tray"/>
3+
<dependencies>
4+
<!-- Core -->
5+
<dependency name="jna-platform" org="net.java.dev.jna" conf="*->default" rev="${jna.version}"/>
6+
<dependency name="jna" org="net.java.dev.jna" conf="*->default" rev="${jna.version}"/>
7+
<dependency name="bcprov-jdk18on" org="org.bouncycastle" conf="*->default" rev="${bouncycastle.version}"/>
8+
<dependency name="bcpkix-jdk18on" org="org.bouncycastle" conf="*->default" rev="${bouncycastle.version}"/>
9+
<dependency name="java-semver" org="com.github.zafarkhaja" conf="*->default" rev="${javasemver.version}">
10+
<!-- Skip, need 0.10.0-SNAPSHOT -->
11+
<exclude name="*"/>
12+
</dependency>
13+
14+
<!-- Websockets -->
15+
<dependency name="jettison" org="org.codehaus.jettison" conf="*->default" rev="${jettison.version}">
16+
<!-- FIXME: Skip, currently 1.3.3-SNAPSHOT needs testing -->
17+
<exclude name="*"/>
18+
</dependency>
19+
20+
<dependency name="jakarta.websocket-api" org="jakarta.websocket" conf="*->default"
21+
rev="2.1.1">
22+
<!-- FIXME: Skip, currently 1.1 needs testing -->
23+
<exclude name="*"/>
24+
</dependency>
25+
<dependency name="javax.websocket-api" org="javax.websocket" conf="*->default"
26+
rev="1.1"/>
27+
<!-- FIXME: Replace with jakarta above? -->
28+
29+
<dependency name="jetty-servlet-api" org="org.eclipse.jetty.toolchain" conf="*->default"
30+
rev="4.0.6"/>
31+
32+
<!-- Jetty -->
33+
<dependency name="jetty-client" org="org.eclipse.jetty" conf="*->default" rev="${jetty.version}"/>
34+
<dependency name="jetty-http" org="org.eclipse.jetty" conf="*->default" rev="${jetty.version}"/>
35+
<dependency name="jetty-io" org="org.eclipse.jetty" conf="*->default" rev="${jetty.version}"/>
36+
<dependency name="jetty-security" org="org.eclipse.jetty" conf="*->default" rev="${jetty.version}"/>
37+
<dependency name="jetty-server" org="org.eclipse.jetty" conf="*->default" rev="${jetty.version}"/>
38+
<dependency name="jetty-servlet" org="org.eclipse.jetty" conf="*->default" rev="${jetty.version}"/>
39+
<dependency name="jetty-util" org="org.eclipse.jetty" conf="*->default" rev="${jetty.version}"/>
40+
41+
<!-- Jetty Websocket -->
42+
<dependency name="websocket-core-client" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
43+
<dependency name="websocket-core-common" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
44+
<dependency name="websocket-core-server" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
45+
<dependency name="websocket-jetty-api" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
46+
<dependency name="websocket-jetty-client" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
47+
<dependency name="websocket-jetty-common" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
48+
<dependency name="websocket-jetty-server" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
49+
<dependency name="websocket-servlet" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>
50+
51+
<!-- Apache Commons -->
52+
<dependency name="commons-codec" org="commons-codec" conf="*->default"
53+
rev="1.15">
54+
</dependency>
55+
<dependency name="commons-io" org="commons-io" conf="*->default"
56+
rev="2.11.0">
57+
</dependency>
58+
<dependency name="commons-pool2" org="org.apache.commons" conf="*->default"
59+
rev="2.11.1">
60+
</dependency>
61+
<dependency name="not-going-to-be-commons-ssl" org="com.narupley" conf="*->default"
62+
rev="0.3.20">
63+
<exclude name="bcprov-jdk15on"/>
64+
</dependency>
65+
66+
<!-- Communications -->
67+
<dependency name="usb-api" org="javax.usb" conf="*->default" rev="1.0.2"/>
68+
<dependency name="usb4java" org="org.usb4java" conf="*->default" rev="${usb4java.version}"/>
69+
<dependency name="usb4java-javax" org="org.usb4java" conf="*->default" rev="${usb4java.version}"/>
70+
<dependency name="libusb4java" org="org.usb4java" rev="1.2.0">
71+
<artifact name="libusb4java" type="jar" m:classifier="linux-arm"/>
72+
<artifact name="libusb4java" type="jar" m:classifier="linux-x86_64"/>
73+
<artifact name="libusb4java" type="jar" m:classifier="linux-x86"/>
74+
<artifact name="libusb4java" type="jar" m:classifier="osx-x86_64"/>
75+
<artifact name="libusb4java" type="jar" m:classifier="osx-x86"/>
76+
<artifact name="libusb4java" type="jar" m:classifier="windows-x86_64"/>
77+
<artifact name="libusb4java" type="jar" m:classifier="windows-x86"/>
78+
</dependency>
79+
80+
<dependency name="purejavahidapi" org="nyholku" conf="*->default" rev="${purejavahidapi.version}">
81+
<exclude name="jna"/>
82+
<!-- Skip, need 0.0.10-SNAPSHOT -->
83+
<exclude name="*"/>
84+
</dependency>
85+
<dependency name="hid4java" org="org.hid4java" conf="*->default" rev="${hid4java.version}">
86+
<exclude name="jna"/>
87+
<!-- Skip, need 0.8.0+7-SNAPSHOT https://github.com/qzind/tray/pull/1267 -->
88+
<exclude name="*"/>
89+
</dependency>
90+
<dependency name="jssc" org="io.github.java-native" conf="*->default" rev="${jssc.version}"/>
91+
<!-- Theming -->
92+
<dependency name="darcula-bobbylight" org="com.bulenkov.darcula" conf="*->default" rev="0.0.0">
93+
<!-- Skip, missing -->
94+
<exclude name="*"/>
95+
</dependency>
96+
97+
<!-- Windows Installer -->
98+
<dependency name="mslinks" org="mslinks" conf="*->default" rev="1.1.0">
99+
<!-- Skip, missing -->
100+
<exclude name="*"/>
101+
</dependency>
102+
103+
<!-- Charsets -->
104+
<dependency name="icu4j" org="com.ibm.icu" conf="*->default" rev="${icu4j.version}"/>
105+
<dependency name="icu4j-charset" org="com.ibm.icu" conf="*->default" rev="${icu4j.version}"/>
106+
<dependency name="TCVN-3" org="com.ibm.icu" conf="*->default" rev="${icu4j.version}">
107+
<!-- Skip, missing, send upstream? -->
108+
<exclude name="*"/>
109+
</dependency>
110+
111+
<!-- Imaging -->
112+
<dependency name="common-image" org="com.twelvemonkeys.common" conf="*->default" rev="${twelvemonkeys.version}"/>
113+
<dependency name="common-io" org="com.twelvemonkeys.common" conf="*->default" rev="${twelvemonkeys.version}"/>
114+
<dependency name="common-lang" org="com.twelvemonkeys.common" conf="*->default" rev="${twelvemonkeys.version}"/>
115+
<dependency name="imageio-core" org="com.twelvemonkeys.imageio" conf="*->default" rev="${twelvemonkeys.version}"/>
116+
<dependency name="imageio-jpeg" org="com.twelvemonkeys.imageio" conf="*->default" rev="${twelvemonkeys.version}"/>
117+
<dependency name="imageio-metadata" org="com.twelvemonkeys.imageio" conf="*->default" rev="${twelvemonkeys.version}"/>
118+
119+
<dependency name="jai-imageio-core" org="com.github.jai-imageio" conf="*->default" rev="${jaiimageio.version}"/>
120+
<dependency name="jai-imageio-jpeg2000" org="com.github.jai-imageio" conf="*->default" rev="${jaiimageio.version}"/>
121+
122+
<!-- Logging -->
123+
<dependency name="log4j-core" org="org.apache.logging.log4j" conf="*->default" rev="${log4j.version}"/>
124+
<dependency name="log4j-api" org="org.apache.logging.log4j" conf="*->default" rev="${log4j.version}"/>
125+
126+
<!-- Printing -->
127+
<dependency name="pdfbox" org="org.apache.pdfbox" conf="*->default" rev="${pdfbox.version}">
128+
<exclude name="log4j-core"/>
129+
<exclude name="log4j-api"/>
130+
<exclude name="commons-httpclient"/>
131+
<exclude name="bcprov-jdk15on"/>
132+
</dependency>
133+
134+
<!-- javafx -->
135+
<dependency name="javafx-controls" org="org.openjfx" conf="*->default" rev="${javafx.version}"/>
136+
<dependency name="javafx-fxml" org="org.openjfx" conf="*->default" rev="${javafx.version}"/>
137+
<dependency name="javafx-graphics" org="org.openjfx" conf="*->default" rev="${javafx.version}"/>
138+
<dependency name="javafx-base" org="org.openjfx" conf="*->default" rev="${javafx.version}"/>
139+
<dependency name="javafx-media" org="org.openjfx" conf="*->default" rev="${javafx.version}"/>
140+
<dependency name="javafx-swing" org="org.openjfx" conf="*->default" rev="${javafx.version}"/>
141+
<dependency name="javafx-web" org="org.openjfx" conf="*->default" rev="${javafx.version}"/>
142+
143+
<!-- host javafx natives -->
144+
<dependency org="org.openjfx" name="javafx-controls" rev="${javafx.version}">
145+
<artifact name="javafx-controls" type="jar" m:classifier="${host.javafx.platform}"/>
146+
</dependency>
147+
<dependency org="org.openjfx" name="javafx-fxml" rev="${javafx.version}">
148+
<artifact name="javafx-fxml" type="jar" m:classifier="${host.javafx.platform}"/>
149+
</dependency>
150+
<dependency org="org.openjfx" name="javafx-graphics" rev="${javafx.version}">
151+
<artifact name="javafx-graphics" type="jar" m:classifier="${host.javafx.platform}"/>
152+
</dependency>
153+
<dependency org="org.openjfx" name="javafx-base" rev="${javafx.version}">
154+
<artifact name="javafx-base" type="jar" m:classifier="${host.javafx.platform}"/>
155+
</dependency>
156+
<dependency org="org.openjfx" name="javafx-media" rev="${javafx.version}">
157+
<artifact name="javafx-media" type="jar" m:classifier="${host.javafx.platform}"/>
158+
</dependency>
159+
<dependency org="org.openjfx" name="javafx-swing" rev="${javafx.version}">
160+
<artifact name="javafx-swing" type="jar" m:classifier="${host.javafx.platform}"/>
161+
</dependency>
162+
<dependency org="org.openjfx" name="javafx-web" rev="${javafx.version}">
163+
<artifact name="javafx-web" type="jar" m:classifier="${host.javafx.platform}"/>
164+
</dependency>
165+
166+
<!-- target javafx natives -->
167+
<dependency org="org.openjfx" name="javafx-controls" rev="${javafx.version}">
168+
<artifact name="javafx-controls" type="jar" m:classifier="${target.javafx.platform}"/>
169+
</dependency>
170+
<dependency org="org.openjfx" name="javafx-fxml" rev="${javafx.version}">
171+
<artifact name="javafx-fxml" type="jar" m:classifier="${target.javafx.platform}"/>
172+
</dependency>
173+
<dependency org="org.openjfx" name="javafx-graphics" rev="${javafx.version}">
174+
<artifact name="javafx-graphics" type="jar" m:classifier="${target.javafx.platform}"/>
175+
</dependency>
176+
<dependency org="org.openjfx" name="javafx-base" rev="${javafx.version}">
177+
<artifact name="javafx-base" type="jar" m:classifier="${target.javafx.platform}"/>
178+
</dependency>
179+
<dependency org="org.openjfx" name="javafx-media" rev="${javafx.version}">
180+
<artifact name="javafx-media" type="jar" m:classifier="${target.javafx.platform}"/>
181+
</dependency>
182+
<dependency org="org.openjfx" name="javafx-swing" rev="${javafx.version}">
183+
<artifact name="javafx-swing" type="jar" m:classifier="${target.javafx.platform}"/>
184+
</dependency>
185+
<dependency org="org.openjfx" name="javafx-web" rev="${javafx.version}">
186+
<artifact name="javafx-web" type="jar" m:classifier="${target.javafx.platform}"/>
187+
</dependency>
188+
</dependencies>
189+
</ivy-module>

0 commit comments

Comments
 (0)