diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87f2cf16..2836165d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,3 +12,5 @@ This changelog only contains the changes that are unreleased. For changes for in
 - Run analytics only on version specified in config
 
 ### Misc
+- Upgrade to Gradle 8.2
+- Update dependency versions
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index fde34677..e8f33d99 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,11 +7,13 @@ buildscript {
             url 'https://jitpack.io'
             content {
                 includeGroup "com.github.RyanTheAllmighty.gettext"
+                includeGroup "com.github.ATLauncher.gradle-macappbundle"
             }
         }
     }
     dependencies {
         classpath 'com.github.RyanTheAllmighty.gettext:gettext-gradle-plugin:aab5c30bf8'
+        classpath 'com.github.ATLauncher.gradle-macappbundle:edu.sc.seis.macAppBundle.gradle.plugin:d22f8cdb94'
     }
 }
 
@@ -22,10 +24,10 @@ plugins {
     id 'org.cadixdev.licenser' version '0.6.1'
     id 'com.adarshr.test-logger' version '3.2.0'
     id 'edu.sc.seis.macAppBundle' version '2.3.0'
-    id 'edu.sc.seis.launch4j' version '2.5.3'
-    id 'de.undercouch.download' version '5.1.0'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
-    id 'com.github.ben-manes.versions' version '0.42.0'
+    id 'edu.sc.seis.launch4j' version '3.0.3'
+    id 'de.undercouch.download' version '5.4.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'com.github.ben-manes.versions' version '0.47.0'
     id 'com.apollographql.apollo' version '2.5.14'
 }
 
@@ -55,33 +57,33 @@ repositories {
 }
 
 dependencies {
-    implementation 'net.java.dev.jna:jna:5.11.0'
-    implementation 'net.java.dev.jna:jna-platform:5.11.0'
-    implementation 'com.google.code.gson:gson:2.9.0'
-    implementation 'com.google.guava:guava:31.1-jre'
+    implementation 'net.java.dev.jna:jna:5.13.0'
+    implementation 'net.java.dev.jna:jna-platform:5.13.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.google.guava:guava:32.1.1-jre'
     implementation 'org.tukaani:xz:1.9'
     implementation 'com.mojang:authlib:1.5.21'
     implementation 'net.iharder:base64:2.3.9'
     implementation 'com.github.Vatuu:discord-rpc:1.6.2'
     implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
     implementation 'org.zeroturnaround:zt-zip:1.15'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'com.squareup.okhttp3:okhttp-tls:4.9.3'
-    implementation 'io.sentry:sentry:6.1.4'
+    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+    implementation 'com.squareup.okhttp3:okhttp-tls:4.11.0'
+    implementation 'io.sentry:sentry:6.25.0'
     implementation 'com.github.RyanTheAllmighty.gettext:gettext-lib:88ae68d897'
-    implementation 'org.apache.logging.log4j:log4j-api:2.17.2'
-    implementation 'org.apache.logging.log4j:log4j-core:2.17.2'
+    implementation 'org.apache.logging.log4j:log4j-api:2.20.0'
+    implementation 'org.apache.logging.log4j:log4j-core:2.20.0'
     implementation 'com.sangupta:murmur:1.0.0'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'org.apache.commons:commons-text:1.10.0'
-    implementation 'org.apache.commons:commons-compress:1.21'
-    implementation 'com.formdev:flatlaf:2.3'
-    implementation 'com.formdev:flatlaf-extras:2.3'
-    implementation 'com.github.oshi:oshi-core:6.1.6'
+    implementation 'org.apache.commons:commons-compress:1.23.0'
+    implementation 'com.formdev:flatlaf:3.1.1'
+    implementation 'com.formdev:flatlaf-extras:3.1.1'
+    implementation 'com.github.oshi:oshi-core:6.4.4'
     implementation 'net.freeutils:jlhttp:2.6'
-    implementation 'joda-time:joda-time:2.10.14'
-    implementation 'org.commonmark:commonmark:0.19.0'
-    implementation 'com.github.hypfvieh:dbus-java:3.3.1'
+    implementation 'joda-time:joda-time:2.12.5'
+    implementation 'org.commonmark:commonmark:0.21.0'
+    implementation 'com.github.hypfvieh:dbus-java:3.3.2'
     implementation 'com.apollographql.apollo:apollo-runtime:2.5.14'
     implementation 'com.apollographql.apollo:apollo-http-cache:2.5.14'
     implementation 'com.apollographql.apollo:apollo-rx3-support:2.5.14'
@@ -92,13 +94,13 @@ dependencies {
     implementation("com.gitlab.doomsdayrs:rxswing:a5749ad421") // TODO tag
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:4.6.1'
-    testImplementation 'org.mockito:mockito-inline:4.6.1'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.mockito:mockito-core:4.11.0' // Cannot update to 5.x.x as Java 11 min
+    testImplementation 'org.mockito:mockito-inline:4.11.0' // Cannot update to 5.x.x as Java 11 min
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.3'
     testImplementation 'org.assertj:assertj-swing-junit:3.17.1'
-    testImplementation 'org.mock-server:mockserver-netty:5.13.2'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
-    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.8.2'
+    testImplementation 'org.mock-server:mockserver-netty:5.15.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.3'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.9.3'
 }
 
 application {
@@ -174,7 +176,7 @@ license {
 }
 
 shadowJar {
-    classifier = null
+    archiveClassifier.set(null)
     minimize {
         exclude(dependency('org.apache.logging.log4j:.*:.*'))
         exclude(dependency('com.formdev:.*:.*'))
@@ -196,7 +198,7 @@ shadowJar {
     exclude("jni/i386-SunOS/")
     exclude("jni/Darwin/")
 
-    classifier = ''
+    archiveClassifier.set('')
 }
 
 macAppBundle {
@@ -265,7 +267,7 @@ task copyArtifacts(type: Copy) {
 
 task downloadNewerUniversalJavaApplicationStub(type: Download) {
     description 'Downloads newer universalJavaApplicationStub'
-    src 'https://raw.githubusercontent.com/tofi86/universalJavaApplicationStub/2dbbf92b35e61194266c985c8bc6b411053a1b4a/src/universalJavaApplicationStub'
+    src 'https://raw.githubusercontent.com/tofi86/universalJavaApplicationStub/404f5c1b008d6296065de7a93406b387c9f3dce1/src/universalJavaApplicationStub'
     dest file("$buildDir/macApp/${project.name}.app/Contents/MacOS/universalJavaApplicationStub")
     overwrite true
 }
@@ -275,7 +277,7 @@ task createTestLauncherDir {
 }
 
 task createMacApp(type: Zip) {
-    dependsOn createApp, shadowJar
+    dependsOn createApp, shadowJar, downloadNewerUniversalJavaApplicationStub
     from("$buildDir/macApp") {
         include "${project.name}.app/**"
         exclude "${project.name}.app/Contents/MacOS"
@@ -284,7 +286,7 @@ task createMacApp(type: Zip) {
         include "${project.name}.app/Contents/MacOS/**"
         fileMode 0777
     }
-    archiveName = "${project.name}-${project.version}.zip"
+    archiveFileName = "${project.name}-${project.version}.zip"
 }
 
 copyArtifacts.finalizedBy {
@@ -313,4 +315,6 @@ tasks.named("dependencyUpdates").configure {
 build.finalizedBy copyArtifacts
 shadowJar.dependsOn jar
 build.dependsOn createExe, createMacApp
-createApp.finalizedBy downloadNewerUniversalJavaApplicationStub
+startScripts.dependsOn shadowJar
+createExe.dependsOn shadowJar
+createAppZip.dependsOn downloadNewerUniversalJavaApplicationStub
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 249e5832..943f0cbf 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 13160558..a3638774 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-milestone-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index a69d9cb6..65dcd68d 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradlew.bat b/gradlew.bat
index f127cfd4..93e3f59f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%