From 80276c1ee6c582920d784676b555f08a69d30744 Mon Sep 17 00:00:00 2001 From: jtaubner Date: Sat, 12 Oct 2024 12:45:01 -0400 Subject: [PATCH 1/6] update to java 17 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 90e02b6..9c42226 100644 --- a/pom.xml +++ b/pom.xml @@ -19,8 +19,8 @@ UTF-8 - 16 - 16 + 17 + 17 @@ -59,7 +59,7 @@ maven-compiler-plugin 3.8.0 - 16 + ${maven.compiler.target} From d0300f902689ff3d4aa77654bc0f199b636efea9 Mon Sep 17 00:00:00 2001 From: jtaubner Date: Sat, 12 Oct 2024 12:46:25 -0400 Subject: [PATCH 2/6] remove dependency on non-existent repo --- pom.xml | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/pom.xml b/pom.xml index 9c42226..fbdc81c 100644 --- a/pom.xml +++ b/pom.xml @@ -88,24 +88,6 @@ - - javassh-opensource-snapshots - artifactory.javassh.com-snapshots - http://artifactory.javassh.com/opensource-snapshots - - - false - - - - javassh-opensource-releases - artifactory.javassh.com-releases - http://artifactory.javassh.com/opensource-releases - - - false - - oss-snapshots https://oss.sonatype.org/content/repositories/snapshots @@ -115,26 +97,6 @@ - - - javassh-opensource-snapshots - artifactory.javassh.com-snapshots - http://artifactory.javassh.com/opensource-snapshots - - - false - - - - javassh-opensource-releases - artifactory.javassh.com-releases - http://artifactory.javassh.com/opensource-releases - - - false - - - Snake - Parent The parent module for all Snake modules. From 05b753fa7048e19da8357b6a764476e8361c8d1a Mon Sep 17 00:00:00 2001 From: jtaubner Date: Sat, 12 Oct 2024 13:00:33 -0400 Subject: [PATCH 3/6] fix most build issues --- pom.xml | 9 +++++++++ snake-backend-openrazer/pom.xml | 14 ++++++++------ snake-dist/pom.xml | 2 +- snake-ui/pom.xml | 10 +++------- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index fbdc81c..7321989 100644 --- a/pom.xml +++ b/pom.xml @@ -88,6 +88,15 @@ + + central + https://repo.maven.apache.org/maven2 + + + + jadaptive-os-repo + https://artifactory.jadaptive.com/opensource-releases/ + oss-snapshots https://oss.sonatype.org/content/repositories/snapshots diff --git a/snake-backend-openrazer/pom.xml b/snake-backend-openrazer/pom.xml index 3dd61a9..4af93c0 100644 --- a/snake-backend-openrazer/pom.xml +++ b/snake-backend-openrazer/pom.xml @@ -9,16 +9,18 @@ snake + com.github.hypfvieh dbus-java - 4.0.0-SNAPSHOT + 3.3.2 + + + + com.github.hypfvieh + dbus-java-transport-native-unixsocket + 5.1.0 - - com.github.hypfvieh - dbus-java-transport-native-unixsocket - 4.0.0-SNAPSHOT - ${project.groupId} ${project.version} diff --git a/snake-dist/pom.xml b/snake-dist/pom.xml index f3e7cdc..ab6db7a 100644 --- a/snake-dist/pom.xml +++ b/snake-dist/pom.xml @@ -54,7 +54,7 @@ com.sshtools forker-updater-maven-plugin - 1.7-SNAPSHOT + 1.7 updater diff --git a/snake-ui/pom.xml b/snake-ui/pom.xml index 456bf0b..b5ca120 100644 --- a/snake-ui/pom.xml +++ b/snake-ui/pom.xml @@ -15,7 +15,7 @@ com.github.hypfvieh dbus-java - 4.0.0-SNAPSHOT + 3.3.2 org.openjfx @@ -98,15 +98,11 @@ - + com.sshtools forker-wrapped - 1.7-SNAPSHOT + 1.7 com.sshtools From 60bccdfc4dce524f4cad915d21e5ca6c9bf9aeef Mon Sep 17 00:00:00 2001 From: jtaubner Date: Sat, 12 Oct 2024 13:46:49 -0400 Subject: [PATCH 4/6] remove raster plugin --- snake-themes/snake-theme-abluelife/pom.xml | 9 +-------- snake-themes/snake-theme-agreenfuture/pom.xml | 9 +-------- snake-themes/snake-theme-anorangetwist/pom.xml | 9 +-------- snake-themes/snake-theme-apinkburst/pom.xml | 9 +-------- snake-themes/snake-theme-apurplehaze/pom.xml | 9 +-------- snake-themes/snake-theme-aredsky/pom.xml | 9 +-------- snake-themes/snake-theme-awhitelight/pom.xml | 9 +-------- snake-themes/snake-theme-ayellowdwarf/pom.xml | 9 +-------- snake-updater/pom.xml | 2 +- 9 files changed, 9 insertions(+), 65 deletions(-) diff --git a/snake-themes/snake-theme-abluelife/pom.xml b/snake-themes/snake-theme-abluelife/pom.xml index ff46612..713a6ac 100644 --- a/snake-themes/snake-theme-abluelife/pom.xml +++ b/snake-themes/snake-theme-abluelife/pom.xml @@ -11,14 +11,7 @@ abluelife - - - - uk.co.bithatch - svg-rasterizer-maven-plugin - - - + ${project.groupId} diff --git a/snake-themes/snake-theme-agreenfuture/pom.xml b/snake-themes/snake-theme-agreenfuture/pom.xml index eb11b1d..3e16a3f 100644 --- a/snake-themes/snake-theme-agreenfuture/pom.xml +++ b/snake-themes/snake-theme-agreenfuture/pom.xml @@ -11,14 +11,7 @@ agreenfuture - - - - uk.co.bithatch - svg-rasterizer-maven-plugin - - - + ${project.groupId} diff --git a/snake-themes/snake-theme-anorangetwist/pom.xml b/snake-themes/snake-theme-anorangetwist/pom.xml index b9909d7..e831a80 100644 --- a/snake-themes/snake-theme-anorangetwist/pom.xml +++ b/snake-themes/snake-theme-anorangetwist/pom.xml @@ -11,14 +11,7 @@ anorangetwist - - - - uk.co.bithatch - svg-rasterizer-maven-plugin - - - + ${project.groupId} diff --git a/snake-themes/snake-theme-apinkburst/pom.xml b/snake-themes/snake-theme-apinkburst/pom.xml index 27a0d91..6f502a4 100644 --- a/snake-themes/snake-theme-apinkburst/pom.xml +++ b/snake-themes/snake-theme-apinkburst/pom.xml @@ -11,14 +11,7 @@ apinkburst - - - - uk.co.bithatch - svg-rasterizer-maven-plugin - - - + ${project.groupId} diff --git a/snake-themes/snake-theme-apurplehaze/pom.xml b/snake-themes/snake-theme-apurplehaze/pom.xml index aa7bc52..8fff3b3 100644 --- a/snake-themes/snake-theme-apurplehaze/pom.xml +++ b/snake-themes/snake-theme-apurplehaze/pom.xml @@ -11,14 +11,7 @@ apurplehaze - - - - uk.co.bithatch - svg-rasterizer-maven-plugin - - - + ${project.groupId} diff --git a/snake-themes/snake-theme-aredsky/pom.xml b/snake-themes/snake-theme-aredsky/pom.xml index efdc6cf..b58f3cc 100644 --- a/snake-themes/snake-theme-aredsky/pom.xml +++ b/snake-themes/snake-theme-aredsky/pom.xml @@ -11,14 +11,7 @@ aredsky - - - - uk.co.bithatch - svg-rasterizer-maven-plugin - - - + ${project.groupId} diff --git a/snake-themes/snake-theme-awhitelight/pom.xml b/snake-themes/snake-theme-awhitelight/pom.xml index 2ed9eb8..2c7afa9 100644 --- a/snake-themes/snake-theme-awhitelight/pom.xml +++ b/snake-themes/snake-theme-awhitelight/pom.xml @@ -11,14 +11,7 @@ awhitelight - - - - uk.co.bithatch - svg-rasterizer-maven-plugin - - - + Snake - Themes - Default The default theme. diff --git a/snake-themes/snake-theme-ayellowdwarf/pom.xml b/snake-themes/snake-theme-ayellowdwarf/pom.xml index f671440..06a5a2d 100644 --- a/snake-themes/snake-theme-ayellowdwarf/pom.xml +++ b/snake-themes/snake-theme-ayellowdwarf/pom.xml @@ -11,14 +11,7 @@ ayellowdwarf - - - - uk.co.bithatch - svg-rasterizer-maven-plugin - - - + ${project.groupId} diff --git a/snake-updater/pom.xml b/snake-updater/pom.xml index fbafaeb..6ace1c2 100644 --- a/snake-updater/pom.xml +++ b/snake-updater/pom.xml @@ -34,7 +34,7 @@ com.sshtools forker-updater - 1.7-SNAPSHOT + 1.7 org.kordamp.ikonli From 3dc6d23eef075728f07c2f08fcf0a24d4f7fe84e Mon Sep 17 00:00:00 2001 From: jtaubner Date: Sat, 12 Oct 2024 14:02:21 -0400 Subject: [PATCH 5/6] getting a lot closer now --- snake-app-linux/pom.xml | 4 +- snake-backend-openrazer/pom.xml | 2 +- snake-dist/pom.xml | 193 -------------------------------- snake-ui/pom.xml | 90 --------------- snake-widgets/pom.xml | 28 +---- 5 files changed, 4 insertions(+), 313 deletions(-) diff --git a/snake-app-linux/pom.xml b/snake-app-linux/pom.xml index 04ef095..6f1e1a7 100644 --- a/snake-app-linux/pom.xml +++ b/snake-app-linux/pom.xml @@ -148,8 +148,8 @@ org.apache.maven.plugins maven-compiler-plugin - 9 - 9 + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 diff --git a/snake-backend-openrazer/pom.xml b/snake-backend-openrazer/pom.xml index 4af93c0..946a994 100644 --- a/snake-backend-openrazer/pom.xml +++ b/snake-backend-openrazer/pom.xml @@ -19,7 +19,7 @@ com.github.hypfvieh dbus-java-transport-native-unixsocket - 5.1.0 + 4.0.0 ${project.groupId} diff --git a/snake-dist/pom.xml b/snake-dist/pom.xml index ab6db7a..84bd075 100644 --- a/snake-dist/pom.xml +++ b/snake-dist/pom.xml @@ -51,199 +51,6 @@ - - com.sshtools - forker-updater-maven-plugin - 1.7 - - - updater - package - - updates - - - ${project.version}-${buildNumber} - ${project.build.directory}/repository - snake - ${snakeRemote} - uk.co.bithatch.snake.app.linux/uk.co.bithatch.snake.app.linux.App - false - ${basedir}/src/main/images/splash.png - true - - -Xmx64m - - snake - - jvmarg -Dforker.releaseChannel=${snakeRemoteStable} - jvmarg -Dforker.betaChannel=${snakeRemoteSnapshot} - jvmarg -Djava.system.class.loader=uk.co.bithatch.snake.ui.DynamicClassLoader - restart-on 90 - single-instance-per-user - run-on-install - install-location ${installer.home}/snake-razer - jvmarg --add-modules - jvmarg themes.awhitelight,themes.agreenfuture,themes.aredsky,themes.abluelife,themes.ayellowdwarf,themes.anorangetwist,themes.apinkburst,themes.apurplehaze - jvmarg -Djfreedesktop.quiet=true - - - - ${basedir}/../README.md - docs - - - ${basedir}/target/CHANGES.md - docs - - - - javafx-base - javafx-base-linux - javafx-controls - javafx-controls-linux - javafx-fxml - javafx-fxml-linux - javafx-graphics - javafx-graphics-linux - FX-BorderlessScene - ikonli-core - ikonli-javafx - ikonli-fontawesome-pack - - - snake-updater - - - svgSalamander - kotlin-stdlib - kotlin-stdlib-common - annotations - kotlinx-coroutines-core-jvm - kotlin-logging-jvm - - - java.prefs - java.xml - jdk.unsupported - jdk.crypto.ec - jdk.zipfs - - java.instrument - jdk.xml.dom - java.scripting - jdk.jsobject - java.net.http - jdk.net - jdk.security.auth - jdk.management.agent - java.management - - - java.desktop - - - java.sql - - - - - - updater-noruntime - package - - updates - - - ${project.version}-${buildNumber} - ${project.build.directory}/repository-noruntime - snake - ${snakeRemoteNoRuntime} - uk.co.bithatch.snake.app.linux/uk.co.bithatch.snake.app.linux.App - false - ${project.build.directory}/image-noruntime - ${basedir}/src/main/images/splash.png - true - false - - -Xmx64m - - snake - - jvmarg -Dforker.releaseChannel=${snakeRemoteNoRuntimeStable} - jvmarg -Dforker.betaChannel=${snakeRemoteNoRuntimeSnapshot} - jvmarg -Djava.system.class.loader=uk.co.bithatch.snake.ui.DynamicClassLoader - restart-on 90 - run-on-install - single-instance-per-user - install-location ${installer.home}/snake-razer - jvmarg --add-modules - jvmarg themes.awhitelight,themes.agreenfuture,themes.aredsky,themes.abluelife,themes.ayellowdwarf,themes.anorangetwist,themes.apinkburst,themes.apurplehaze - jvmarg -Djfreedesktop.quiet=true - - - - ${basedir}/../README.md - docs - - - ${basedir}/target/CHANGES.md - docs - - - - javafx-base - javafx-base-linux - javafx-controls - javafx-controls-linux - javafx-fxml - javafx-fxml-linux - javafx-graphics - javafx-graphics-linux - FX-BorderlessScene - ikonli-core - ikonli-javafx - ikonli-fontawesome-pack - - - snake-updater - - - svgSalamander - kotlin-stdlib - kotlin-stdlib-common - annotations - kotlinx-coroutines-core-jvm - kotlin-logging-jvm - - - java.prefs - java.xml - jdk.unsupported - jdk.crypto.ec - - java.instrument - java.management - jdk.xml.dom - jdk.jsobject - java.net.http - jdk.net - java.scripting - jdk.management.agent - jdk.security.auth - - - java.desktop - - - java.sql - - - - - com.github.hazendaz.maven makeself-maven-plugin diff --git a/snake-ui/pom.xml b/snake-ui/pom.xml index b5ca120..74792dd 100644 --- a/snake-ui/pom.xml +++ b/snake-ui/pom.xml @@ -75,19 +75,7 @@ ch.qos.logback logback-classic - com.hierynomus sshj @@ -162,84 +150,6 @@ rasterize - - - - uk.co.bithatch - svg-rasterizer-maven-plugin - 1.2 - - - rasterize-icons - process-resources - - rasterize-directory - - - ${basedir}/src/main/svg/icons - ${basedir}/src/main/resources/uk/co/bithatch/snake/ui/icons - - - {name}16{ext} - png - 16 - 16 - - - {name}24{ext} - png - 24 - 24 - - - {name}32{ext} - png - 32 - 32 - - - {name}48{ext} - png - 48 - 48 - - - {name}64{ext} - png - 64 - 64 - - - {name}96{ext} - png - 96 - 96 - - - {name}128{ext} - png - 128 - 128 - - - {name}256{ext} - png - 256 - 256 - - - {name}512{ext} - png - 512 - 512 - - - - - - - - Snake - User Interface diff --git a/snake-widgets/pom.xml b/snake-widgets/pom.xml index 03a3de4..2204800 100644 --- a/snake-widgets/pom.xml +++ b/snake-widgets/pom.xml @@ -19,35 +19,9 @@ maven-compiler-plugin 3.8.0 - 11 + ${maven.compiler.target} - From e76266ae24c19adeec6c7e915811b6cdf0d46abe Mon Sep 17 00:00:00 2001 From: jtaubner Date: Sat, 12 Oct 2024 14:03:29 -0400 Subject: [PATCH 6/6] can be final --- .../uk/co/bithatch/snake/ui/macros/MacroManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/snake-ui/src/main/java/uk/co/bithatch/snake/ui/macros/MacroManager.java b/snake-ui/src/main/java/uk/co/bithatch/snake/ui/macros/MacroManager.java index 337c5e3..5be1dda 100644 --- a/snake-ui/src/main/java/uk/co/bithatch/snake/ui/macros/MacroManager.java +++ b/snake-ui/src/main/java/uk/co/bithatch/snake/ui/macros/MacroManager.java @@ -70,12 +70,12 @@ public class MacroManager implements AutoCloseable, ActiveBankListener, ActivePr public static final String CLIENT_PROP_INCLUDE_INPUT_EVENT_DEVICES = "includeInputEventDevices"; public static final String CLIENT_PROP_EXCLUDE_INPUT_EVENT_DEVICES = "excludeInputEventDevices"; - private MacroSystem macroSystem; - private App context; - private Map macroDevices = new HashMap<>(); - private Map reverseMacroDevices = new HashMap<>(); - private Map> includeDevicePatterns = new HashMap<>(); - private Map> excludeDevicePatterns = new HashMap<>(); + private final MacroSystem macroSystem; + private final App context; + private final Map macroDevices = new HashMap<>(); + private final Map reverseMacroDevices = new HashMap<>(); + private final Map> includeDevicePatterns = new HashMap<>(); + private final Map> excludeDevicePatterns = new HashMap<>(); private boolean started;