Skip to content

Commit 294d171

Browse files
committed
Merge remote-tracking branch 'origin/master' into CORE3_IDF5
2 parents 1e9a4fc + 775d331 commit 294d171

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
mv Firef*.exe FireflyLuciferinSetup.exe;
6565
shell: bash
6666
- name: Creating artifact from BIN file
67-
uses: actions/upload-artifact@v5
67+
uses: actions/upload-artifact@v6
6868
with:
6969
name: FireflyLuciferinSetup_${{steps.get-id.outputs.id}}_ALPHA.exe
7070
path: FireflyLuciferinSetup.exe
@@ -119,7 +119,7 @@ jobs:
119119
cat firetoedit/DEBIAN/control
120120
rm -rf firetoedit
121121
- name: Creating artifact from BIN file
122-
uses: actions/upload-artifact@v5
122+
uses: actions/upload-artifact@v6
123123
with:
124124
name: FireflyLuciferinLinux_${{steps.get-id.outputs.id}}_ALPHA.deb
125125
path: FireflyLuciferinLinux.deb
@@ -131,7 +131,7 @@ jobs:
131131
sudo alien -r FireflyLuciferinLinux.deb
132132
mv *.rpm FireflyLuciferinLinux.rpm;
133133
- name: Creating artifact from BIN file
134-
uses: actions/upload-artifact@v5
134+
uses: actions/upload-artifact@v6
135135
with:
136136
name: FireflyLuciferinLinux_${{steps.get-id.outputs.id}}_ALPHA.rpm
137137
path: FireflyLuciferinLinux.rpm

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<project.version>2.25.6</project.version>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24-
<java.fx.version>25</java.fx.version>
24+
<java.fx.version>25.0.1</java.fx.version>
2525
<javafx.maven.plugin.version>0.0.8</javafx.maven.plugin.version>
2626
<maven.compiler.source>25</maven.compiler.source>
2727
<maven.compiler.target>25</maven.compiler.target>
@@ -35,10 +35,10 @@
3535
<jna.version>5.18.1</jna.version>
3636
<gstreamer.binding.version>1.4.0</gstreamer.binding.version>
3737
<paho.version>1.2.5</paho.version>
38-
<logback.version>1.5.22</logback.version>
38+
<logback.version>1.5.23</logback.version>
3939
<slf4j.version>2.0.17</slf4j.version>
4040
<xtaudio.version>2.0</xtaudio.version>
41-
<dbus.java.version>5.1.1</dbus.java.version>
41+
<dbus.java.version>5.2.0</dbus.java.version>
4242
</properties>
4343

4444
<profiles>

0 commit comments

Comments
 (0)