Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: [ubuntu-latest]
strategy:
matrix:
java: [11, 21]
java: [25]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
Expand All @@ -24,7 +24,7 @@ jobs:
runs-on: [macos-latest]
strategy:
matrix:
java: [11, 21]
java: [25]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
Expand All @@ -42,7 +42,7 @@ jobs:
runs-on: [windows-latest]
strategy:
matrix:
java: [11, 21]
java: [25]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
Expand Down
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
/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
.DS_Store
windows-debug-launcher.nsi.in
/ant/private/qz.ks
/ant/private/qz.ks
/ant/deps/ivy
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/App.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/startup.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 10 additions & 23 deletions .idea/tray.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions ant/apple/apple.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# Apple build properties
apple.packager.signid=P5DMU6659X
# jdk9+ flags
# - Tray icon requires workaround https://github.com/dyorgio/macos-tray-icon-fixer/issues/9
# - Dark theme requires workaround https://github.com/bobbylight/Darcula/issues/8
apple.launch.jigsaw=--add-opens java.desktop/sun.lwawt.macosx=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-exports java.desktop/com.apple.laf=ALL-UNNAMED
# Apple launcher options
apple.launch.opts=
2 changes: 2 additions & 0 deletions ant/apple/installer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,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>
Expand Down
6 changes: 6 additions & 0 deletions ant/deps/ivy-ant.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<ivy-module version="2.0" xmlns:m="antlib:org.apache.ivy.ant">
<info organisation="io.qz" module="qz-tray-ant"/>
<dependencies>
<dependency name="jsign" org="net.jsign" conf="*->default" rev="${jsign.version}"/>
</dependencies>
</ivy-module>
Binary file added ant/deps/manual/ivy-2.5.3.jar
Binary file not shown.
35 changes: 35 additions & 0 deletions ant/ivy-deps.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Dependency versions
#darcula.version=0.0.0
bouncycastle.version=1.82
flatlaf.version=3.6.2
#hid4java.version=0.8.0
icu4j.version=77.1
jaiimageio.version=1.4.0
javafx.version=26-ea+12
#javasemver.version=0.9.0
#jettison.version=1.5.4
jbig2.version=3.0.4
jetty.version=10.0.26
jna.version=5.18.1
jssc.version=2.10.2
libusb4java.version=1.2.0
log4j.version=2.25.2
#mslinks.version=1.1.0
pdfbox.version=2.0.35
purejavahidapi.version=0.0.10
servlet-api.version=4.0.6
twelvemonkeys.version=3.12.0
usb-api.version=1.0.2
usb4java.version=1.2.0
websocket-api.version=1.1

commons-codec.version=1.19.0
commons-io.version=2.20.0
commons-pool2.version=2.12.1
commons-ssl.version=0.3.20

# Dependency versions for ant only
jsign.version=7.3

# General configuration
ivy.report.todir=${basedir}/reports
28 changes: 28 additions & 0 deletions ant/ivy-settings.xml
Original file line number Diff line number Diff line change
@@ -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>



Loading