From 3c35bfa4f8ff4fcd95d623355b3987fcc1e5eb54 Mon Sep 17 00:00:00 2001
From: bgrochowski <b.grochowski02@gmail.com>
Date: Tue, 9 Sep 2025 15:35:38 +0200
Subject: [PATCH 1/3] Fixed an issue with jinput native binary on Apple Silicon

---
 pom.xml                       | 40 +++++++++++++++++------------------
 src/main/assembly/release.xml | 10 ++++++++-
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index ea5f837..2af725e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>us.hebi.matlab</groupId>
     <artifactId>input</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
 
     <name>matlab-input</name>
     <description>MATLAB library for joystick and keyboard input</description>
@@ -44,11 +44,11 @@
 
         <!-- Dependency versions. KEEP IN ALPHABETICAL ORDER-->
         <junit.version>4.11</junit.version>
-        <jinput.version>2.0.6</jinput.version>
+        <jinput.version>2.0.10</jinput.version>
 
         <!-- Default to minimum Java version compatible with MATLAB >2009a -->
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
 
         <!-- Other Properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -64,23 +64,9 @@
 
         <dependency> <!-- Java Joystick JNI Binaries (Windows) -->
             <groupId>net.java.jinput</groupId>
-            <artifactId>jinput-platform</artifactId>
-            <version>${jinput.version}</version>
-            <classifier>natives-windows</classifier>
-            <scope>provided</scope>
-        </dependency>
-        <dependency> <!-- Java Joystick JNI Binaries (Linux) -->
-            <groupId>net.java.jinput</groupId>
-            <artifactId>jinput-platform</artifactId>
-            <version>${jinput.version}</version>
-            <classifier>natives-linux</classifier>
-            <scope>provided</scope>
-        </dependency>
-        <dependency> <!-- Java Joystick JNI Binaries (Mac OSX) -->
-            <groupId>net.java.jinput</groupId>
-            <artifactId>jinput-platform</artifactId>
+            <artifactId>jinput</artifactId>
             <version>${jinput.version}</version>
-            <classifier>natives-osx</classifier>
+            <classifier>natives-all</classifier>
             <scope>provided</scope>
         </dependency>
 
@@ -139,6 +125,20 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>com.googlecode.mavennatives</groupId>
+                <artifactId>maven-nativedependencies-plugin</artifactId>
+                <version>0.0.7</version>
+                <executions>
+                    <execution>
+                        <id>unpacknatives</id>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin> <!-- Creates a release zip file-->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
diff --git a/src/main/assembly/release.xml b/src/main/assembly/release.xml
index 27511bf..cea2b05 100644
--- a/src/main/assembly/release.xml
+++ b/src/main/assembly/release.xml
@@ -46,8 +46,16 @@
             <unpack>true</unpack>
             <scope>provided</scope>
             <includes>
-                <include>*:jinput-platform:*</include>
+                <include>*:jinput:*</include>
             </includes>
         </dependencySet>
     </dependencySets>
+    <files>
+        <!-- Copy libjinput-osx.jnilib from natives and rename to libjinput-osx.dylib -->
+        <file>
+            <source>${project.build.directory}/natives/libjinput-osx.jnilib</source>
+            <outputDirectory>/matlab/lib/</outputDirectory>
+            <destName>libjinput-osx.dylib</destName>
+        </file>
+    </files>
 </assembly>

From c2097223b3a1654cff4846cb1d84b10a6e5ca910 Mon Sep 17 00:00:00 2001
From: bgrochowski <b.grochowski02@gmail.com>
Date: Wed, 10 Sep 2025 11:15:43 +0200
Subject: [PATCH 2/3] Updated POM such that it recompiles jinput + plugins for
 JRE 1.8

---
 pom.xml | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 85 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2af725e..4f747c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,9 @@
         <contributor>
             <name>Jonas Withelm</name>
         </contributor>
+        <contributor>
+            <name>Bartek Grochowski</name>
+        </contributor>
     </contributors>
     
     <scm>
@@ -47,8 +50,7 @@
         <jinput.version>2.0.10</jinput.version>
 
         <!-- Default to minimum Java version compatible with MATLAB >2009a -->
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.release>8</maven.compiler.release>
 
         <!-- Other Properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -56,13 +58,7 @@
 
     <dependencies>
 
-        <dependency> <!-- Java Joystick Input -->
-            <groupId>net.java.jinput</groupId>
-            <artifactId>jinput</artifactId>
-            <version>${jinput.version}</version>
-        </dependency>
-
-        <dependency> <!-- Java Joystick JNI Binaries (Windows) -->
+        <dependency> <!-- Java Joystick JNI Binaries -->
             <groupId>net.java.jinput</groupId>
             <artifactId>jinput</artifactId>
             <version>${jinput.version}</version>
@@ -81,7 +77,77 @@
     <build>
         <plugins>
 
-            <plugin> <!-- Builds a jar that includes all runtime dependencies -->
+            <!-- Unpack jinput + platform sources -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.1</version>
+                <executions>
+                    <execution>
+                        <id>unpack-jinput-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>net.java.jinput</groupId>
+                                    <artifactId>jinput</artifactId>
+                                    <version>${jinput.version}</version>
+                                    <classifier>sources</classifier>
+                                    <outputDirectory>${project.build.directory}/jinput-src</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>net.java.jinput</groupId>
+                                    <artifactId>windows-plugin</artifactId>
+                                    <version>${jinput.version}</version>
+                                    <classifier>sources</classifier>
+                                    <outputDirectory>${project.build.directory}/jinput-src</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>net.java.jinput</groupId>
+                                    <artifactId>linux-plugin</artifactId>
+                                    <version>${jinput.version}</version>
+                                    <classifier>sources</classifier>
+                                    <outputDirectory>${project.build.directory}/jinput-src</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>net.java.jinput</groupId>
+                                    <artifactId>osx-plugin</artifactId>
+                                    <version>${jinput.version}</version>
+                                    <classifier>sources</classifier>
+                                    <outputDirectory>${project.build.directory}/jinput-src</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Add jinput sources to compilation -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.5.0</version>
+                <executions>
+                    <execution>
+                        <id>add-jinput-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/jinput-src</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Shade plugin: bundle everything -->
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>2.4.3</version>
@@ -95,10 +161,16 @@
                 </executions>
                 <configuration>
                     <finalName>${releaseName}</finalName>
+                    <artifactSet>
+                        <excludes>
+                            <exclude>net.java.jinput:jinput</exclude>
+                        </excludes>
+                    </artifactSet>
                 </configuration>
             </plugin>
 
-            <plugin> <!-- Change MATLAB script to reference the correct jar file -->
+            <!-- Replace release name in MATLAB files -->
+            <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
                 <artifactId>replacer</artifactId>
                 <version>1.5.2</version>
@@ -139,7 +211,8 @@
                 </executions>
             </plugin>
 
-            <plugin> <!-- Creates a release zip file-->
+            <!-- Creates release zip -->
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.0.0</version>

From 4ac4e53a09cd286e3038dde0a6d61a41ab5b8f55 Mon Sep 17 00:00:00 2001
From: Bartek Grochowski <90771203+bgrochowski@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:55:27 +0200
Subject: [PATCH 3/3] Fixed missing AWTKeyboard class dependency.

---
 pom.xml                       | 7 +++++++
 src/main/assembly/release.xml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4f747c6..13ac6bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,6 +119,13 @@
                                     <classifier>sources</classifier>
                                     <outputDirectory>${project.build.directory}/jinput-src</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>net.java.jinput</groupId>
+                                    <artifactId>awt-plugin</artifactId>
+                                    <version>${jinput.version}</version>
+                                    <classifier>sources</classifier>
+                                    <outputDirectory>${project.build.directory}/jinput-src</outputDirectory>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
diff --git a/src/main/assembly/release.xml b/src/main/assembly/release.xml
index cea2b05..8c68510 100644
--- a/src/main/assembly/release.xml
+++ b/src/main/assembly/release.xml
@@ -54,7 +54,7 @@
         <!-- Copy libjinput-osx.jnilib from natives and rename to libjinput-osx.dylib -->
         <file>
             <source>${project.build.directory}/natives/libjinput-osx.jnilib</source>
-            <outputDirectory>/matlab/lib/</outputDirectory>
+            <outputDirectory>matlab/lib/</outputDirectory>
             <destName>libjinput-osx.dylib</destName>
         </file>
     </files>