Updated osx

silverXnoise · Oct 4, 2024 · 9b26d35 · 9b26d35
1 parent 610a42e
commit 9b26d35
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 4 deletions.
diff --git a/opencv-macos-amd64/pom.xml b/opencv-macos-amd64/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>spectracle-parent</artifactId>
+        <groupId>io.github.grillbaer</groupId>
+        <version>0.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>opencv-osx-amd64</artifactId>
+
+    <!-- The goal of this module is to create a size-reduced version of the
+         opencv jar with all shared libraries for other OS platforms removed.
+         Filtering is done by the shade plugin. -->
+    <profiles>
+        <profile>
+            <id>osx</id>
+            <activation>
+                <os>
+                    <family>osx</family>
+                    <arch>amd64</arch>
+                </os>
+            </activation>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-shade-plugin</artifactId>
+                        <version>3.2.0</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>shade</goal>
+                                </goals>
+                                <configuration>
+                                    <filters>
+                                        <filter>
+                                            <artifact>org.openpnp:opencv</artifact>
+                                            <includes>
+                                                <include>**</include>
+                                            </includes>
+                                            <excludes>
+                                                <exclude>nu/pattern/opencv/osx/x86_32/**</exclude>
+                                                <exclude>nu/pattern/opencv/osx/ARM*/**</exclude>
+                                                <exclude>nu/pattern/opencv/linux/**</exclude>
+                                                <exclude>nu/pattern/opencv/windows/**</exclude>
+                                            </excludes>
+                                        </filter>
+                                    </filters>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.openpnp</groupId>
+            <artifactId>opencv</artifactId>
+            <version>4.5.1-2</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/pom.xml b/pom.xml
@@ -17,8 +17,8 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>16</maven.compiler.source>
-        <maven.compiler.target>16</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <main.class>grillbaer.spectracle.Main</main.class>

diff --git a/spectracle-app/pom.xml b/spectracle-app/pom.xml
@@ -268,12 +268,12 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>16</version>
+            <version>17</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-swing</artifactId>
-            <version>16</version>
+            <version>17</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/spectracle-app/src/main/java/grillbaer/spectracle/Main.java b/spectracle-app/src/main/java/grillbaer/spectracle/Main.java
@@ -21,6 +21,7 @@
 /**
  * Application entry point.
  */
+@SuppressWarnings("unused")
 public class Main {
     private final static Logger LOG = LoggerFactory.getLogger(Main.class);
 

diff --git a/spectracle-app/src/main/java/grillbaer/spectracle/ui/components/NamedWaveLengthRenderer.java b/spectracle-app/src/main/java/grillbaer/spectracle/ui/components/NamedWaveLengthRenderer.java
@@ -12,6 +12,7 @@
 @AllArgsConstructor
 public class NamedWaveLengthRenderer extends DefaultListCellRenderer {
 
+    @SuppressWarnings("unused")
     private boolean withName;
 
     @Override