build: Fix native image file folder selection

jagodevreede · Oct 14, 2024 · afdb4fc · afdb4fc
1 parent 9548170
commit afdb4fc
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 7 deletions.
diff --git a/sdkman-ui/pom.xml b/sdkman-ui/pom.xml
@@ -22,6 +22,7 @@
         <main.class>io.github.jagodevreede.sdkmanui.Main</main.class>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
+        <native-image-folder-name>native-image-unknown</native-image-folder-name>
     </properties>
 
     <dependencies>
@@ -125,7 +126,7 @@
                             <outputDirectory>${basedir}/src/main/resources/META-INF/native-image</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>src/main/resources/META-INF/native-image-${os.name}</directory>
+                                    <directory>src/main/resources/META-INF/${native-image-folder-name}</directory>
                                     <filtering>false</filtering>
                                 </resource>
                             </resources>
@@ -169,4 +170,30 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>mac</id>
+            <activation>
+                <os>
+                    <name>Mac OS X</name>
+                </os>
+            </activation>
+            <properties>
+                <native-image-folder-name>native-image-mac</native-image-folder-name>
+            </properties>
+        </profile>
+        <profile>
+            <id>windows</id>
+            <activation>
+                <os>
+                    <family>windows</family>
+                </os>
+            </activation>
+            <properties>
+                <native-image-folder-name>native-image-windows</native-image-folder-name>
+            </properties>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/sdkman-ui/src/main/resources/META-INF/native-image-windows/reflect-config.json b/sdkman-ui/src/main/resources/META-INF/native-image-windows/reflect-config.json
@@ -195,15 +195,15 @@
   "queryAllDeclaredMethods":true,
   "methods":[
     {"name":"<init>","parameterTypes":[] }, 
-    {"name":"openConfig","parameterTypes":[] },
+    {"name":"openConfig","parameterTypes":[] }, 
     {"name":"startUpdate","parameterTypes":[] }
   ]
 },
 {
   "name":"io.github.jagodevreede.sdkmanui.view.VersionView",
   "methods":[
     {"name":"getActions","parameterTypes":[] }, 
-    {"name":"getAvailable","parameterTypes":[] },
+    {"name":"getAvailable","parameterTypes":[] }, 
     {"name":"getIdentifier","parameterTypes":[] }, 
     {"name":"getInstalled","parameterTypes":[] }, 
     {"name":"getVendor","parameterTypes":[] }, 

diff --git a/sdkman-ui/src/main/resources/META-INF/native-image-windows/resource-config.json b/sdkman-ui/src/main/resources/META-INF/native-image-windows/resource-config.json
@@ -18,13 +18,13 @@
     }, 
     {
       "pattern":"\\Qsdkui.cmd\\E"
-    },
-    {
-      "pattern":"\\Qupdate.cmd\\E"
-    },
+    }, 
     {
       "pattern":"\\Qsimplelogger.properties\\E"
     }, 
+    {
+      "pattern":"\\Qupdate.cmd\\E"
+    }, 
     {
       "pattern":"\\Qversion.txt\\E"
     }