add apple silicon .dylib to release jar

Author: DimitrisStaratzis

build.gradle

@@ -125,20 +125,31 @@ test {
 }
 
 jar {
-    into(new File('lib').toString()) {
-        // Linux and macOS
-        from file("$buildDir/install/lib/libtiledb.so")
-        from file("$buildDir/install/lib64/libtiledb.so")
-        from file("$buildDir/tiledb_jni/libtiledbjni.so")
-
-        from file("$buildDir/install/lib/libtiledb.dylib")
-        from file("$buildDir/install/lib64/libtiledb.dylib")
-        from file("$buildDir/tiledb_jni/libtiledbjni.dylib")
-
-        // Windows
-        from file("$buildDir/install/bin/tbb.dll")
-        from file("$buildDir/install/bin/tiledb.dll")
-        from file("$buildDir/tiledb_jni/Release/tiledbjni.dll")
+    def osName = System.getProperty('os.name').toLowerCase()
+    def arch = System.getProperty('os.arch').toLowerCase()
+
+    if (osName.contains('mac') && arch == "aarch64") {
+        into(new File('lib/arm').toString()) {
+            from file("$buildDir/install/lib/libtiledb.dylib")
+            from file("$buildDir/install/lib64/libtiledb.dylib")
+            from file("$buildDir/tiledb_jni/libtiledbjni.dylib")
+        }
+    }else {
+        into(new File('lib').toString()) {
+            // Linux
+            from file("$buildDir/install/lib/libtiledb.so")
+            from file("$buildDir/install/lib64/libtiledb.so")
+            from file("$buildDir/tiledb_jni/libtiledbjni.so")
+
+            from file("$buildDir/install/lib/libtiledb.dylib")
+            from file("$buildDir/install/lib64/libtiledb.dylib")
+            from file("$buildDir/tiledb_jni/libtiledbjni.dylib")
+
+            // Windows
+            from file("$buildDir/install/bin/tbb.dll")
+            from file("$buildDir/install/bin/tiledb.dll")
+            from file("$buildDir/tiledb_jni/Release/tiledbjni.dll")
+        }
     }
 
     manifest {

src/main/java/io/tiledb/libtiledb/NativeLibLoader.java

@@ -322,6 +322,12 @@ private static Path extractLibraryFile(
   private static Path findNativeLibrary(String libraryName, boolean mapLibraryName) {
     String mappedLibraryName = mapLibraryName ? System.mapLibraryName(libraryName) : libraryName;
     String libDir = LIB_RESOURCE_DIR;
+
+    if (System.getProperty("os.name").contains("mac")
+        && System.getProperty("os.arch").equals("aarch64")) {
+      libDir += "/arm";
+    }
+
     String libPath = libDir + "/" + mappedLibraryName;
 
     boolean hasNativeLib = hasResource(libPath);

swig/customCode/NativeLibLoader.java

@@ -322,6 +322,12 @@ private static Path extractLibraryFile(
   private static Path findNativeLibrary(String libraryName, boolean mapLibraryName) {
     String mappedLibraryName = mapLibraryName ? System.mapLibraryName(libraryName) : libraryName;
     String libDir = LIB_RESOURCE_DIR;
+
+    if (System.getProperty("os.name").contains("mac")
+        && System.getProperty("os.arch").equals("aarch64")) {
+      libDir += "/arm";
+    }
+
     String libPath = libDir + "/" + mappedLibraryName;
 
     boolean hasNativeLib = hasResource(libPath);