From a60d591f9ce440a28ef606105f3c1bfe011f7a59 Mon Sep 17 00:00:00 2001
From: Miles Vella <673-vella@users.noreply.gitlab.cs.uni-duesseldorf.de>
Date: Thu, 9 Jan 2025 13:46:03 +0100
Subject: [PATCH] update deps

---
 build.gradle                             | 35 ++++++++++++++----------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 76df35c9f..946aecf0d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 	id "java"
 	id "application"
 
-	id "com.gradleup.shadow" version "8.3.3"
+	id "com.gradleup.shadow" version "8.3.5"
 	id "com.google.osdetector" version "1.7.3"
 	id "org.openjfx.javafxplugin" version "0.1.0"
 }
@@ -43,8 +43,8 @@ repositories {
 	mavenCentral()
 	if (isSnapshot) {
 		maven {
-			name "sonatype snapshots"
-			url "https://oss.sonatype.org/content/repositories/snapshots"
+			name = "sonatype snapshots"
+			url = "https://oss.sonatype.org/content/repositories/snapshots"
 		}
 	}
 }
@@ -124,29 +124,36 @@ dependencies {
 	implementation group: "ch.qos.logback", name: "logback-classic", version: "1.4.14"
 	implementation group: "com.fatboyindustrial.gson-javatime-serialisers", name: "gson-javatime-serialisers", version: "1.1.2"
 	implementation group: "com.google.code.gson", name: "gson", version: "2.11.0"
-	implementation group: "com.google.guava", name: "guava", version: "33.3.1-jre"
-	implementation group: "io.github.java-diff-utils", name: "java-diff-utils", version: "4.12"
+	implementation group: "com.google.guava", name: "guava", version: "33.4.0-jre"
+	implementation group: "io.github.java-diff-utils", name: "java-diff-utils", version: "4.15"
 	implementation group: "commons-cli", name: "commons-cli", version: "1.9.0"
-	implementation group: "de.jangassen", name: "nsmenufx", version: "3.1.0"
 	implementation(platform(group: "de.hhu.stups", name: "prob-java-bom", version: "4.13.2-SNAPSHOT"))
 	implementation group: "de.hhu.stups", name: "de.prob2.kernel"
 	implementation group: "de.hhu.stups", name: "voparser", version: "0.3.0-SNAPSHOT"
-	// cannot update to 1.2.2 as this breaks nsmenufx due to a transitive dependency on jna
-	implementation group: "net.harawata", name: "appdirs", version: "1.2.1"
 	implementation group: "org.controlsfx", name: "controlsfx", version: "11.2.1"
-	implementation group: "org.fxmisc.richtext", name: "richtextfx", version: "0.11.3"
-	implementation group: "org.pf4j", name: "pf4j", version: "3.12.0"
-	implementation group: "se.sawano.java", name: "alphanumeric-comparator", version: "1.4.1"
+	implementation group: "org.fxmisc.richtext", name: "richtextfx", version: "0.11.4"
+	implementation group: "org.pf4j", name: "pf4j", version: "3.13.0"
+	implementation group: "se.sawano.java", name: "alphanumeric-comparator", version: "2.0.0"
 	implementation group: "org.apache.commons", name: "commons-csv", version: "1.12.0"
 	implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
 	implementation group: 'org.apache.velocity', name: 'velocity-engine-core', version: '2.4'
-
 	implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-guava'
 
-	testImplementation platform('org.junit:junit-bom:5.11.1')
+	// nsmenufx indirectly requires the jna:5.9.0:jpms dependency
+	// appdirs 1.2.2+ indirectly requires jna:5.13+, but the jpms classifier does not exist for jna 5.13+
+	// so we manually fix that
+	implementation(group: "net.harawata", name: "appdirs", version: "1.3.0") {
+		exclude group: 'net.java.dev.jna'
+	}
+	implementation(group: "de.jangassen", name: "nsmenufx", version: "3.1.0") {
+		exclude group: 'net.java.dev.jna'
+	}
+	implementation group: "net.java.dev.jna", name: "jna-platform", version: "5.16.0"
+
+	testImplementation platform('org.junit:junit-bom:5.11.4')
 	testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter'
 	testRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-launcher'
-	testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.14.1'
+	testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.15.2'
 }
 
 final osArch = System.getProperty("os.arch")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index df97d72b8..cea7a793a 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.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME