Skip to content

Commit 74c511f

Browse files
authored
Merge pull request #131 from CodeDead/feature/upgrades
feat: dependency upgrades, JDK upgrade, improved support for KDE (lin…
2 parents 7585d87 + 9dfde78 commit 74c511f

File tree

8 files changed

+24
-21
lines changed

8 files changed

+24
-21
lines changed

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323
if: ${{ matrix.os == 'ubuntu-latest' }}
2424
run: sudo apt-get install -y fuse libfuse2
2525

26-
- name: Setup JDK 22
26+
- name: Setup JDK 23
2727
uses: actions/setup-java@v4
2828
with:
29-
java-version: '22'
29+
java-version: '23'
3030
distribution: 'temurin'
3131

3232
- name: Setup Gradle
33-
uses: gradle/actions/setup-gradle@v3
33+
uses: gradle/actions/setup-gradle@v4
3434

3535
- name: Build
3636
run: ./gradlew build
@@ -63,14 +63,14 @@ jobs:
6363
if: ${{ matrix.os == 'ubuntu-latest' }}
6464
run: sudo apt-get install -y fuse libfuse2
6565

66-
- name: Setup JDK 22
66+
- name: Setup JDK 23
6767
uses: actions/setup-java@v4
6868
with:
69-
java-version: '22'
69+
java-version: '23'
7070
distribution: 'temurin'
7171

7272
- name: Setup Gradle
73-
uses: gradle/actions/setup-gradle@v3
73+
uses: gradle/actions/setup-gradle@v4
7474

7575
- name: Switch portable flag (Linux)
7676
if: ${{ matrix.os == 'ubuntu-latest' }}

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323
if: ${{ matrix.os == 'ubuntu-latest' }}
2424
run: sudo apt-get install -y fuse libfuse2
2525

26-
- name: Setup JDK 22
26+
- name: Setup JDK 23
2727
uses: actions/setup-java@v4
2828
with:
29-
java-version: '22'
29+
java-version: '23'
3030
distribution: 'temurin'
3131

3232
- name: Setup Gradle
33-
uses: gradle/actions/setup-gradle@v3
33+
uses: gradle/actions/setup-gradle@v4
3434

3535
- name: Test
3636
run: ./gradlew test

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ especially if you're targeting a specific platform and installation method.
7676

7777
The following dependencies are universal:
7878

79-
* [JDK21](https://openjdk.java.net/projects/jdk/21/)
79+
* [JDK23](https://openjdk.java.net/projects/jdk/23/)
8080
* [JavaFX](https://openjfx.io)
8181
* [Gradle](https://gradle.org)
8282
* [FasterXML/jackson](https://github.com/FasterXML/jackson)
83-
* [badass-jlink-plugin](https://github.com/beryx/badass-jlink-plugin)
83+
* [badass-jlink-plugin (patched)](https://github.com/xzel23/badass-jlink-plugin)
8484
* [Log4j2](https://logging.apache.org/log4j/2.x/)
8585
* [AtlantaFX](https://github.com/mkpaz/atlantafx)
8686
### Windows

build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
id 'idea'
66
id 'eclipse'
77
id 'application'
8-
id 'org.beryx.jlink' version '3.0.1'
8+
id 'com.dua3.gradle.jlink' version '3.0.1-patch-1'
99
id 'org.openjfx.javafxplugin' version '0.1.0'
1010
}
1111

@@ -15,8 +15,8 @@ version '1.4.0'
1515
def currentOS = DefaultNativePlatform.currentOperatingSystem
1616

1717
java {
18-
targetCompatibility = JavaVersion.VERSION_22
19-
sourceCompatibility = JavaVersion.VERSION_22
18+
targetCompatibility = JavaVersion.VERSION_23
19+
sourceCompatibility = JavaVersion.VERSION_23
2020
}
2121

2222
application {
@@ -25,7 +25,7 @@ application {
2525
}
2626

2727
javafx {
28-
version = '22.0.1'
28+
version = '23.0.1'
2929
configuration = 'implementation'
3030
modules = ['javafx.base', 'javafx.controls', 'javafx.fxml', 'javafx.media']
3131
}
@@ -140,11 +140,11 @@ repositories {
140140
}
141141

142142
dependencies {
143-
implementation 'org.apache.logging.log4j:log4j-core:2.23.1'
143+
implementation 'org.apache.logging.log4j:log4j-core:2.24.1'
144144
implementation 'io.github.mkpaz:atlantafx-base:2.0.1'
145-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
146-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
147-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
145+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.1'
146+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3'
147+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.3'
148148
}
149149

150150
tasks.named('test') {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#This file is generated by updateDaemonJvm
2-
toolchainVersion=22
2+
toolchainVersion=23

gradle/wrapper/gradle-wrapper.jar

79 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/main/java/com/codedead/opal/utils/RunnableSiteOpener.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ public void run() {
3838
try {
3939
if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
4040
Desktop.getDesktop().browse(new URI(url));
41+
} else {
42+
final String[] str = new String[]{"xdg-open", url};
43+
Runtime.getRuntime().exec(str);
4144
}
4245
if (iRunnableHelper != null) {
4346
iRunnableHelper.executed();

0 commit comments

Comments
 (0)