diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 98ce541..2d8d8a4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,14 +23,14 @@ jobs: if: ${{ matrix.os == 'ubuntu-latest' }} run: sudo apt-get install -y fuse libfuse2 - - name: Setup JDK 22 + - name: Setup JDK 23 uses: actions/setup-java@v4 with: - java-version: '22' + java-version: '23' distribution: 'temurin' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Build run: ./gradlew build @@ -63,14 +63,14 @@ jobs: if: ${{ matrix.os == 'ubuntu-latest' }} run: sudo apt-get install -y fuse libfuse2 - - name: Setup JDK 22 + - name: Setup JDK 23 uses: actions/setup-java@v4 with: - java-version: '22' + java-version: '23' distribution: 'temurin' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Switch portable flag (Linux) if: ${{ matrix.os == 'ubuntu-latest' }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ac81ed3..4bff1e3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,14 +23,14 @@ jobs: if: ${{ matrix.os == 'ubuntu-latest' }} run: sudo apt-get install -y fuse libfuse2 - - name: Setup JDK 22 + - name: Setup JDK 23 uses: actions/setup-java@v4 with: - java-version: '22' + java-version: '23' distribution: 'temurin' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Test run: ./gradlew test diff --git a/README.md b/README.md index edcc23a..b49694b 100644 --- a/README.md +++ b/README.md @@ -76,11 +76,11 @@ especially if you're targeting a specific platform and installation method. The following dependencies are universal: -* [JDK21](https://openjdk.java.net/projects/jdk/21/) +* [JDK23](https://openjdk.java.net/projects/jdk/23/) * [JavaFX](https://openjfx.io) * [Gradle](https://gradle.org) * [FasterXML/jackson](https://github.com/FasterXML/jackson) -* [badass-jlink-plugin](https://github.com/beryx/badass-jlink-plugin) +* [badass-jlink-plugin (patched)](https://github.com/xzel23/badass-jlink-plugin) * [Log4j2](https://logging.apache.org/log4j/2.x/) * [AtlantaFX](https://github.com/mkpaz/atlantafx) ### Windows diff --git a/build.gradle b/build.gradle index 05366b9..38eaa61 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' id 'eclipse' id 'application' - id 'org.beryx.jlink' version '3.0.1' + id 'com.dua3.gradle.jlink' version '3.0.1-patch-1' id 'org.openjfx.javafxplugin' version '0.1.0' } @@ -15,8 +15,8 @@ version '1.4.0' def currentOS = DefaultNativePlatform.currentOperatingSystem java { - targetCompatibility = JavaVersion.VERSION_22 - sourceCompatibility = JavaVersion.VERSION_22 + targetCompatibility = JavaVersion.VERSION_23 + sourceCompatibility = JavaVersion.VERSION_23 } application { @@ -25,7 +25,7 @@ application { } javafx { - version = '22.0.1' + version = '23.0.1' configuration = 'implementation' modules = ['javafx.base', 'javafx.controls', 'javafx.fxml', 'javafx.media'] } @@ -140,11 +140,11 @@ repositories { } dependencies { - implementation 'org.apache.logging.log4j:log4j-core:2.23.1' + implementation 'org.apache.logging.log4j:log4j-core:2.24.1' implementation 'io.github.mkpaz:atlantafx-base:2.0.1' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.1' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.3' } tasks.named('test') { diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index ef4314f..cb5c20f 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -1,2 +1,2 @@ #This file is generated by updateDaemonJvm -toolchainVersion=22 +toolchainVersion=23 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c35211..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/com/codedead/opal/utils/RunnableSiteOpener.java b/src/main/java/com/codedead/opal/utils/RunnableSiteOpener.java index c0914b6..a6fe489 100644 --- a/src/main/java/com/codedead/opal/utils/RunnableSiteOpener.java +++ b/src/main/java/com/codedead/opal/utils/RunnableSiteOpener.java @@ -38,6 +38,9 @@ public void run() { try { if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { Desktop.getDesktop().browse(new URI(url)); + } else { + final String[] str = new String[]{"xdg-open", url}; + Runtime.getRuntime().exec(str); } if (iRunnableHelper != null) { iRunnableHelper.executed();