updated OS versions in ci/cd (#7)

* updated OS versions in ci/cd
* fixed msvc c11 requirements
* fixed gradle
* fixed work with arch

Author: rssdev10

.github/workflows/publish.yml

@@ -11,22 +11,26 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        # https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
         include:
-          - os: ubuntu-22.04
-            arch: x86_64
+          - os: ubuntu-24.04
+            arch: x64
             OUT_OS_NAME: linux
-          - os: ubuntu-22.04
-            arch: aarch64
+          - os: ubuntu-24.04-arm
+            arch: arm64
             OUT_OS_NAME: linux
-          - os: macos-12
-            arch: x86_64
+          - os: macos-13
+            arch: x64
             OUT_OS_NAME: darwin
-          - os: macos-12
+          - os: macos-15
             arch: arm64
             OUT_OS_NAME: darwin
-          - os: windows-2022
-            arch: x86_64
+          - os: windows-2025
+            arch: x64
             OUT_OS_NAME: windows
+          # - os: windows-11-arm
+          #   arch: arm64
+          #   OUT_OS_NAME: windows
       fail-fast: false
 
     steps:
@@ -45,47 +49,65 @@ jobs:
     - name: Setup Julia
       uses: julia-actions/setup-julia@v2
       with:
-        version: '1.10'
+        version: '1.11'
 
     - name: Setup JDK
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '21'
 
+    # Install cross toolchain for aarch64 on Ubuntu
+    - name: Install cross toolchain (aarch64)
+      if: ${{ startsWith(matrix.os, 'ubuntu-') && matrix.arch == 'aarch64' }}
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+
     - name: Install dependencies
       shell: bash
       run: |
         if [[ "$RUNNER_OS" == "Linux" ]]; then
           sudo apt-get update
-          sudo apt-get install -y cmake make swig gcc g++
+          sudo apt-get install -y cmake swig gcc g++
         elif [[ "$RUNNER_OS" == "macOS" ]]; then
           brew update
-          brew install cmake make swig
+          brew install cmake swig
         elif [[ "$RUNNER_OS" == "Windows" ]]; then
-          choco install cmake make swig
+          choco install cmake swig
         fi
 
     - name: Build native library
       shell: bash
       run: |
         cd swig
         cmake .
-        make install
+        cmake --build . --config Release
+        cmake --install . --config Release
         cd ..
-        echo "Library built at: $(pwd)/src/main/resources/native/64/${{ matrix.OUT_OS_NAME }}"
+        echo "Library built at: $(pwd)/src/main/resources/native/${{ matrix.OUT_OS_NAME }}/${{ matrix.arch }}"
+
+    - name: Local test of native library
+      shell: bash
+      run: |
+        if [[ "$RUNNER_OS" == "Windows" ]]; then
+          ./gradlew.bat test
+        else
+          ./gradlew test
+        fi
+        echo "Native library tests passed."
 
     # Add artifact retention period based on release type
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
         name: native-${{ matrix.OUT_OS_NAME }}-${{ matrix.arch }}
-        path: src/main/resources/native/64/${{ matrix.OUT_OS_NAME }}/
+        path: src/main/resources/native/${{ matrix.OUT_OS_NAME }}/${{ matrix.arch }}/
         retention-days: ${{ github.event.release.draft && 7 || 1 }}
 
   build-java:
     name: Build Java Library
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: build-native
     if: ${{ !cancelled() }}  # Run unless previous jobs were cancelled
 
@@ -110,8 +132,9 @@ jobs:
         for artifact in native-artifacts/*; do
           os_arch=$(basename $artifact)
           os=$(echo $os_arch | cut -d'-' -f2)
-          mkdir -p "src/main/resources/native/64/$os"
-          cp -R "$artifact"/* "src/main/resources/native/64/$os/"
+          arch=$(echo $os_arch | cut -d'-' -f3)
+          mkdir -p "src/main/resources/native/$os/$arch"
+          cp -R "$artifact"/* "src/main/resources/native/$os/$arch/"
         done
         echo "Assembled native libraries:"
         find src/main/resources/native -type f
@@ -120,17 +143,18 @@ jobs:
       run: ./gradlew build
 
     # Test artifact before final upload
-    - name: Test JAR (Example)
+    - name: Test presence of JAR
       run: |
-        java -jar build/libs/*.jar --version
-        # Add your real validation commands here
+        # java -jar build/libs/*.jar --version
+        jar xf build/libs/*.jar META-INF/MANIFEST.MF
+        grep 'Implementation-Version' META-INF/MANIFEST.MF | awk -F ': ' '{print $2}'
 
     # Conditional artifact upload
     - name: Upload Java artifact
       if: ${{ github.event.release.draft || github.event_name == 'workflow_dispatch' }}
       uses: actions/upload-artifact@v4
       with:
-        name: java-library
+        name: julia4j-crossplatform-jar
         path: build/libs/*.jar
         retention-days: 7
 

.gitignore

@@ -62,4 +62,6 @@ gradle-app.setting
 .gradletasknamecache
 
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
-# gradle/wrapper/gradle-wrapper.properties
+# gradle/wrapper/gradle-wrapper.properties
+
+tmp/

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-    id 'java'
+    id 'java-library'
     id 'maven-publish'
 }
 
 group = 'org.julia'
-version = '0.0.3.SNAPSHOT'
+version = '0.0.3-SNAPSHOT'
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21
@@ -28,12 +28,12 @@ publishing {
     }
 }
 
-// Helper function to get Julia's lib directory
+// Helper function to get Julia's lib directory (cross-platform)
 def getJuliaLibPath() {
     def juliaCmd = [
-        'julia', 
-        '-e', 
-        'print(abspath(joinpath(Sys.BINDIR, "..", "lib")))'
+        'julia',
+        '-e',
+        'print(abspath(joinpath(dirname(Sys.BINDIR), string(:lib))))'
     ]
     def process = juliaCmd.execute()
     process.waitFor()
@@ -43,33 +43,45 @@ def getJuliaLibPath() {
     return process.text.trim()
 }
 
-test {
+// Helper to detect OS in a stable way
+def getOsName() {
+    def os = System.getProperty('os.name').toLowerCase()
+    if (os.contains('mac')) return 'mac'
+    if (os.contains('win')) return 'windows'
+    if (os.contains('nux')) return 'linux'
+    return 'other'
+}
+
+tasks.test {
     useJUnitPlatform()
 
-    // Set library paths for all platforms
-    def juliaLibPath = getJuliaLibPath()
-    
-    // macOS specific configuration
-    if (org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem.isMacOsX()) {
-        environment "DYLD_LIBRARY_PATH", juliaLibPath + (
-            System.getenv('DYLD_LIBRARY_PATH') 
-                ? ":" + System.getenv('DYLD_LIBRARY_PATH') 
-                : ""
-        )
+    testClassesDirs = testing.suites.test.sources.output.classesDirs
+    classpath = testing.suites.test.sources.runtimeClasspath
+
+    doFirst {
+        def juliaLibPath = getJuliaLibPath()
+        def osName = getOsName()
+
+        if (osName == 'mac') {
+            def current = System.getenv('DYLD_LIBRARY_PATH')
+            environment "DYLD_LIBRARY_PATH", juliaLibPath + (current ? ":" + current : "")
+        } else if (osName == 'linux') {
+            def current = System.getenv('LD_LIBRARY_PATH')
+            environment "LD_LIBRARY_PATH", juliaLibPath + (current ? ":" + current : "")
+        } else if (osName == 'windows') {
+            def current = System.getenv('PATH') ?: ""
+            environment "PATH", juliaLibPath + File.pathSeparator + current
+        }
     }
-    // Linux specific configuration
-    else if (org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem.isLinux()) {
-        environment "LD_LIBRARY_PATH", juliaLibPath + (
-            System.getenv('LD_LIBRARY_PATH') 
-                ? ":" + System.getenv('LD_LIBRARY_PATH') 
-                : ""
+}
+
+tasks.named('jar') {
+    manifest {
+        attributes(
+            'Automatic-Module-Name': 'JuliaEngine',
+            'Implementation-Version': project.version
         )
     }
-    // Windows specific configuration
-    else if (org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem.isWindows()) {
-        def currentPath = System.getenv('PATH') ?: ""
-        environment "PATH", juliaLibPath + File.pathSeparator + currentPath
-    }
 }
 
 dependencies {

src/main/java/org/julia/jni/NativeUtils.java

@@ -154,26 +154,53 @@ private static File createTempDirectory(String prefix) throws IOException {
         return generatedDir;
     }
 
+    /**
+     * Returns the resource path for a native library based on the current OS and architecture.
+     * Example: /native/linux/x86_64/libfoo.so
+     */
     public static String libnameToPlatform(String libname) {
+        String osName = System.getProperty("os.name").toLowerCase();
+        String arch = System.getProperty("os.arch").toLowerCase();
+
+        String osFolder;
+        if (osName.contains("mac")) {
+            osFolder = "darwin";
+        } else if (osName.contains("linux")) {
+            osFolder = "linux";
+        } else if (osName.contains("windows")) {
+            osFolder = "windows";
+        } else {
+            throw new IllegalArgumentException("Unsupported OS: " + osName);
+        }
 
-        String path = "/native/";
-        if (System.getProperty("os.arch").toLowerCase().endsWith("64")) {
-            path += "64/";
+        String archFolder;
+        if (arch.contains("aarch64") || arch.contains("arm64")) {
+            archFolder = "arm64";
+        } else if (arch.contains("arm")) {
+            archFolder = "arm";
+        } else if (arch.contains("x86_64") || arch.contains("amd64") || arch.contains("x64")) {
+            archFolder = "x64";
+        } else if (arch.matches("^(x86|i[3-6]86)$") || arch.contains("x86")) {
+            archFolder = "x86";
         } else {
-            throw new IllegalArgumentException("Not support this arch");
+            throw new IllegalArgumentException("Unsupported architecture: " + arch);
         }
-        String osName = System.getProperty("os.name").toLowerCase();
-        if (osName.startsWith("mac os")) {
-            path += "darwin/" + libname + ".jnilib";
-        } else if (osName.startsWith("linux")) {
-            path += "linux/" + libname + ".so";
-        } else if (osName.startsWith("windows")) {
-            path += "windows/" + libname + ".dll";
+
+        String extension;
+        if (osFolder.equals("darwin")) {
+            extension = ".jnilib";
+        } else if (osFolder.equals("linux")) {
+            extension = ".so";
+        } else if (osFolder.equals("windows")) {
+            extension = ".dll";
         } else {
-            throw new IllegalArgumentException("Not support this OS");
+            throw new IllegalArgumentException("Unknown extension for OS: " + osFolder);
         }
 
-        return path;
+        // On Windows, libraries are usually named without "lib" prefix
+        String fileName = (osFolder.equals("windows") ? "" : "lib") + libname + extension;
+
+        return "/native/" + osFolder + "/" + archFolder + "/" + fileName;
     }
 
     /**

src/main/java/org/julia/scripting/JuliaEngine.java

@@ -16,7 +16,7 @@
 public class JuliaEngine  extends AbstractScriptEngine {
     static {
         try {
-            NativeUtils.loadLibraryFromJar(NativeUtils.libnameToPlatform("libjulia4j"));
+            NativeUtils.loadLibraryFromJar(NativeUtils.libnameToPlatform("julia4j"));
         } catch (IOException e) {
             e.printStackTrace();
         }

src/main/resources/native/64/darwin/.gitkeep

@@ -13,7 +13,7 @@
 public class Julia4JJNITest {
     static {
         try {
-            NativeUtils.loadLibraryFromJar(NativeUtils.libnameToPlatform("libjulia4j"));
+            NativeUtils.loadLibraryFromJar(NativeUtils.libnameToPlatform("julia4j"));
         } catch (IOException e) {
             e.printStackTrace();
         }

src/main/resources/native/64/linux/.gitkeep

@@ -1,5 +1,7 @@
 CMakeCache.txt
 CMakeFiles/
+cmake_install.cmake
+install_manifest.txt
 Makefile
 *.jnilib
 *.dll