Merge pull request #145 from CodeDead/feature/upgrades

CodeDead · web-flow · commit 01935be01cfe · 2025-04-28T01:23:40.000+02:00
feat: Dependency upgrades, javafx version bump, upgrade to jdk 24
diff --git a/.AppImage/createAppImage.sh b/.AppImage/createAppImage.sh
@@ -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")"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -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
 
@@ -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
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -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
 
diff --git a/build.gradle b/build.gradle
@@ -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') {
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
@@ -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
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,7 @@
-rootProject.name = 'Opal'
+buildscript {
+    rootProject.name = 'Opal'
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
+}
diff --git a/src/main/java/com/codedead/opal/utils/HelpUtils.java b/src/main/java/com/codedead/opal/utils/HelpUtils.java
@@ -36,7 +36,7 @@ public void openFile(final RunnableFileOpener runnableFileOpener) throws FileNot
         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());
 
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -1,5 +1,4 @@
 module Opal {
-    requires java.base;
     requires java.net.http;
     requires javafx.controls;
     requires javafx.fxml;
diff --git a/src/main/resources/translations/OpalApplication_uk_UA.properties b/src/main/resources/translations/OpalApplication_uk_UA.properties
@@ -101,3 +101,7 @@ Dolphins=Дельфіни
 RollerCoaster=Американські гірки
 LargeCrowd=Великий натовп
 Search=Пошук
+CustomSounds=Користувацькі звуки
+AddCustomSound=Додати користувацький звук
+OpenCustomSoundError=Не вдалося відкрити користувацький звук!
+CustomSound=Користувацький звук

Original file line number	Diff line number	Diff line change
`@@ -15,17 +15,20 @@ version '1.5.0'`
`15`	`15`	`def currentOS = DefaultNativePlatform.currentOperatingSystem`
`16`	`16`
`17`	`17`	`java {`
`18`		`- targetCompatibility = JavaVersion.VERSION_23`
`19`		`- sourceCompatibility = JavaVersion.VERSION_23`
	`18`	`+ targetCompatibility = JavaVersion.VERSION_24`
	`19`	`+ sourceCompatibility = JavaVersion.VERSION_24`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`application {`
`23`	`23`	`mainModule = 'Opal'`
`24`	`24`	`mainClass = 'com.codedead.opal.OpalApplication'`
	`25`	`+ applicationDefaultJvmArgs = [`
	`26`	`+ '--enable-native-access', 'javafx.graphics,javafx.media'`
	`27`	`+ ]`
`25`	`28`	`}`
`26`	`29`
`27`	`30`	`javafx {`
`28`		`- version = '23.0.1'`
	`31`	`+ version = '24.0.1'`
`29`	`32`	`configuration = 'implementation'`
`30`	`33`	`modules = ['javafx.base', 'javafx.controls', 'javafx.fxml', 'javafx.media']`
`31`	`34`	`}`
`@@ -106,9 +109,10 @@ tasks.register('AppImage') {`
`106`	`109`	`from '.AppImage/.AppDir/Opal.png'`
`107`	`110`	`into layout.buildDirectory.dir("AppImage/Opal.AppDir/usr/lib")`
`108`	`111`	`}`
`109`		`- exec {`
	`112`	`+ def appCreate = providers.exec {`
`110`	`113`	`commandLine 'sh', "${project.rootDir}/.AppImage/createAppImage.sh", "${project.version.toString()}"`
`111`	`114`	`}`
	`115`	`+ println(appCreate.standardOutput.asText.get().toString())`
`112`	`116`	`delete layout.buildDirectory.dir("AppImage/Opal.AppDir")`
`113`	`117`	`}`
`114`	`118`	`}`
`@@ -135,9 +139,9 @@ repositories {`
`135`	`139`	`dependencies {`
`136`	`140`	`implementation 'org.apache.logging.log4j:log4j-core:2.24.3'`
`137`	`141`	`implementation 'io.github.mkpaz:atlantafx-base:2.0.1'`
`138`		`- implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'`
`139`		`- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.4'`
`140`		`- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.4'`
	`142`	`+ implementation 'com.fasterxml.jackson.core:jackson-databind:2.19.0'`
	`143`	`+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.12.2'`
	`144`	`+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.12.2'`
`141`	`145`	`}`
`142`	`146`
`143`	`147`	`tasks.named('test') {`