feat: Dependency upgrades, javafx version bump, upgrade to jdk 24 #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

CodeDead merged 5 commits into development from feature/upgrades

Apr 27, 2025

.AppImage/createAppImage.sh

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     #!/bin/sh
-    wget "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
+    wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
     chmod a+x appimagetool-x86_64.AppImage
     BASEDIR=$(dirname "$0")
     PARENT_DIR="$(dirname "$BASEDIR")"
@@ Expand Down @@

.github/workflows/release.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -23,12 +23,6 @@ jobs: @@
             if: ${{ matrix.os == 'ubuntu-latest' }}
             run: sudo apt-get install -y fuse libfuse2
-          - name: Setup JDK 23
-            uses: actions/setup-java@v4
-            with:
-              java-version: '23'
-              distribution: 'temurin'
           - name: Setup Gradle
             uses: gradle/actions/setup-gradle@v4
@@ Expand Down Expand Up / @@ -63,12 +57,6 @@ jobs: @@
             if: ${{ matrix.os == 'ubuntu-latest' }}
             run: sudo apt-get install -y fuse libfuse2
-          - name: Setup JDK 23
-            uses: actions/setup-java@v4
-            with:
-              java-version: '23'
-              distribution: 'temurin'
           - name: Setup Gradle
             uses: gradle/actions/setup-gradle@v4
@@ Expand Down @@

.github/workflows/test.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -23,12 +23,6 @@ jobs: @@
             if: ${{ matrix.os == 'ubuntu-latest' }}
             run: sudo apt-get install -y fuse libfuse2
-          - name: Setup JDK 23
-            uses: actions/setup-java@v4
-            with:
-              java-version: '23'
-              distribution: 'temurin'
           - name: Setup Gradle
             uses: gradle/actions/setup-gradle@v4
@@ Expand Down @@

build.gradle

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -15,17 +15,20 @@ version '1.5.0'
  
    def currentOS = DefaultNativePlatform.currentOperatingSystem

    java {

        targetCompatibility = JavaVersion.VERSION_23

        sourceCompatibility = JavaVersion.VERSION_23

        targetCompatibility = JavaVersion.VERSION_24

        sourceCompatibility = JavaVersion.VERSION_24

    }

    application {

        mainModule = 'Opal'

        mainClass = 'com.codedead.opal.OpalApplication'

        applicationDefaultJvmArgs = [

                '--enable-native-access', 'javafx.graphics,javafx.media'

        ]

    }

    javafx {

        version = '23.0.1'

        version = '24.0.1'

        configuration = 'implementation'

        modules = ['javafx.base', 'javafx.controls', 'javafx.fxml', 'javafx.media']

    }

    @@ -106,9 +109,10 @@ tasks.register('AppImage') {
  
                from '.AppImage/.AppDir/Opal.png'

                into layout.buildDirectory.dir("AppImage/Opal.AppDir/usr/lib")

            }

            exec {

            def appCreate = providers.exec {

                commandLine 'sh', "${project.rootDir}/.AppImage/createAppImage.sh", "${project.version.toString()}"

            }

            println(appCreate.standardOutput.asText.get().toString())

            delete layout.buildDirectory.dir("AppImage/Opal.AppDir")

        }

    }

    @@ -135,9 +139,9 @@ repositories {
  
    dependencies {

        implementation 'org.apache.logging.log4j:log4j-core:2.24.3'

        implementation 'io.github.mkpaz:atlantafx-base:2.0.1'

        implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'

        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.4'

        testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.4'

        implementation 'com.fasterxml.jackson.core:jackson-databind:2.19.0'

        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.12.2'

        testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.12.2'

    }

    tasks.named('test') {

gradle/gradle-daemon-jvm.properties

-Original file line number
+Diff line change
@@ -1,2 +1,12 @@
     #This file is generated by updateDaemonJvm
-    toolchainVersion=23
+    toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2cc0e462b4aba5b04eca0c0195de913/redirect
+    toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/a5bf7c0ea8df214d631cfabda0bb22a1/redirect
+    toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2cc0e462b4aba5b04eca0c0195de913/redirect
+    toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a5bf7c0ea8df214d631cfabda0bb22a1/redirect
+    toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/2e552f294b8202503b915a2776a20522/redirect
+    toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/bafd1c103acb25b7a51b71a030745362/redirect
+    toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2cc0e462b4aba5b04eca0c0195de913/redirect
+    toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a5bf7c0ea8df214d631cfabda0bb22a1/redirect
+    toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ea8137c0d013bbba75915958eff8424d/redirect
+    toolchainVendor=AMAZON
+    toolchainVersion=24

gradle/wrapper/gradle-wrapper.jar

Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     distributionBase=GRADLE_USER_HOME
     distributionPath=wrapper/dists
-    distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+    distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
     networkTimeout=10000
     validateDistributionUrl=true
     zipStoreBase=GRADLE_USER_HOME
@@ Expand Down @@

gradlew

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

gradlew.bat

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

settings.gradle

-Original file line number
+Diff line change
@@ -1 +1,7 @@
-    rootProject.name = 'Opal'
+    buildscript {
+        rootProject.name = 'Opal'
+    }
+    plugins {
+        id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
+    }

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

-Original file line number
+Diff line change
@@ Expand Up @@
             if (runnableFileOpener == null)
                 throw new NullPointerException("RunnableFileOpener cannot be null!");
-            logger.info("Attempting to open file {}", runnableFileOpener.getFileLocation());
+            logger.info("Attempting to open file from filesystem {}", runnableFileOpener.getFileLocation());
             final Path filePath = Paths.get(runnableFileOpener.getFileLocation());
@@ Expand Down @@

src/main/java/module-info.java

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     module Opal {
-        requires java.base;
         requires java.net.http;
         requires javafx.controls;
         requires javafx.fxml;
@@ Expand Down @@

src/main/resources/translations/OpalApplication_uk_UA.properties

-Original file line number
+Diff line change
@@ Expand Up / @@ -101,3 +101,7 @@ Dolphins=Дельфіни @@
     RollerCoaster=Американські гірки
     LargeCrowd=Великий натовп
     Search=Пошук
+    CustomSounds=Користувацькі звуки
+    AddCustomSound=Додати користувацький звук
+    OpenCustomSoundError=Не вдалося відкрити користувацький звук!
+    CustomSound=Користувацький звук

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Dependency upgrades, javafx version bump, upgrade to jdk 24 #145

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!