Merge branch 'upstream' into mapping-io

1 files changed, 18 insertions, 5 deletions

diff --git a/enigma-swing/build.gradle b/enigma-swing/build.gradle
index fff4dafe..452df5e7 100644
--- a/enigma-swing/build.gradle
+++ b/enigma-swing/build.gradle
@@ -1,23 +1,36 @@
 plugins {
         id 'application'
-        id 'com.github.johnrengelman.shadow' version '7.0.0'
+        id 'com.github.johnrengelman.shadow'
 }
 
+def flatLafNatives = [
+                "windows-arm64@dll",
+                "windows-x86@dll",
+                "windows-x86_64@dll",
+                "linux-x86_64@so",
+]
+
 dependencies {
         implementation project(':enigma')
         implementation project(':enigma-server')
 
         implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3'
-        implementation 'com.formdev:flatlaf:2.6'
-        implementation 'com.formdev:flatlaf-extras:2.6' // for SVG icons
+        implementation 'com.formdev:flatlaf:3.2.5'
+        implementation 'com.formdev:flatlaf-extras:3.2.5' // for SVG icons
         implementation 'de.sciss:syntaxpane:1.2.1'
         implementation 'com.github.lukeu:swing-dpi:0.10'
         implementation 'org.drjekyll:fontchooser:2.5.2'
+
+        flatLafNatives.forEach {
+                implementation 'com.formdev:flatlaf:3.2.5:' + it
+        }
 }
 
-mainClassName = 'cuchaz.enigma.gui.Main'
+application {
+        mainClass = 'cuchaz.enigma.gui.Main'
+}
 
-jar.manifest.attributes 'Main-Class': mainClassName
+jar.manifest.attributes 'Main-Class': application.mainClass.get()
 
 publishing {
         publications {