Revert "refactor jar strategy from fatjar to jar by plateform"

This reverts commit 2cd82a3.

Author: elebras1

.github/workflows/build-and-publish.yml

@@ -10,67 +10,32 @@ permissions:
 
 jobs:
   build-natives:
-    name: Natives ${{ matrix.platform-id }} (${{ matrix.variant }})
+    name: Build natives for ${{ matrix.platform }}-${{ matrix.arch }}
     strategy:
-      fail-fast: false
       matrix:
         include:
           - os: ubuntu-latest
-            platform-id: linux-x64
+            platform: linux
+            arch: x64
             lib: libflecs.so
-            variant: release
-
-          - os: ubuntu-24.04-arm
-            platform-id: linux-aarch64
-            lib: libflecs.so
-            variant: release
-
-          - os: windows-latest
-            platform-id: windows-x64
-            lib: flecs.dll
-            variant: release
-
-          - os: macos-latest
-            platform-id: macos-x64
-            lib: libflecs.dylib
-            variant: release
-            compiler_target: x86_64-apple-macos10.15
-
-          - os: macos-latest
-            platform-id: macos-aarch64
-            lib: libflecs.dylib
-            variant: release
-
-          - os: ubuntu-latest
-            platform-id: linux-x64
-            lib: libflecs.so
-            variant: debug
-
-          - os: ubuntu-24.04-arm
-            platform-id: linux-aarch64
-            lib: libflecs.so
-            variant: debug
-
           - os: windows-latest
-            platform-id: windows-x64
+            platform: windows
+            arch: x64
             lib: flecs.dll
-            variant: debug
-
-          - os: macos-latest
-            platform-id: macos-x64
+          - os: macos-15
+            platform: macos
+            arch: x64
             lib: libflecs.dylib
-            variant: debug
-            compiler_target: x86_64-apple-macos10.15
-
           - os: macos-latest
-            platform-id: macos-aarch64
+            platform: macos
+            arch: aarch64
             lib: libflecs.dylib
-            variant: debug
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
 
       - name: Set up JDK 25
         uses: actions/setup-java@v4
@@ -86,48 +51,45 @@ jobs:
 
       - name: Install GCC (Windows)
         if: runner.os == 'Windows'
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          install: mingw-w64-x86_64-gcc
+        run: choco install mingw -y
 
       - name: Grant execute permission for gradlew
         if: runner.os != 'Windows'
         run: chmod +x gradlew
 
-      - name: Compile native (${{ matrix.variant }})
+      - name: Build natives
+        run: ./gradlew compileFlecsNative -PNATIVE_ARCH=${{ matrix.platform }}-${{ matrix.arch }}
         shell: bash
-        run: |
-          EXTRA_ARGS=""
-          if [ -n "${{ matrix.compiler_target }}" ]; then
-            EXTRA_ARGS="-PCOMPILER_TARGET=${{ matrix.compiler_target }}"
-          fi
-          ./gradlew \
-            :compileFlecsNative-${{ matrix.platform-id }}-${{ matrix.variant }} \
-            -PNATIVE_ARCH=${{ matrix.platform-id }} \
-            $EXTRA_ARGS
 
-      - name: Verify native library
-        shell: bash
+      - name: Verify native library was built
         run: |
-          FILE="build/natives/${{ matrix.platform-id }}/${{ matrix.variant }}/${{ matrix.lib }}"
-          echo "Checking $FILE ..."
-          if [ ! -f "$FILE" ]; then
-            echo "❌  Not found: $FILE"; exit 1
+          FILE_PATH="build/resources/main/natives/${{ matrix.platform }}-${{ matrix.arch }}/${{ matrix.lib }}"
+          echo "Checking for native library at $FILE_PATH..."
+
+          if [ ! -f "$FILE_PATH" ]; then
+            echo "Error: Native library not found!"
+            exit 1
           fi
-          SIZE=$(wc -c < "$FILE")
-          echo "Size: $SIZE bytes"
-          if [ "$SIZE" -lt 102400 ]; then
-            echo "❌  Too small ($SIZE bytes, expected ≥ 102400)"; exit 1
+
+          FILE_SIZE=$(wc -c < "$FILE_PATH")
+          MIN_SIZE=102400
+
+          echo "File size: $FILE_SIZE bytes"
+
+          if [ "$FILE_SIZE" -lt "$MIN_SIZE" ]; then
+            echo "Error: File size is too small ($FILE_SIZE bytes). Expected at least $MIN_SIZE bytes."
+            exit 1
           fi
-          echo "✅  OK"
-          ls -lh "$FILE"
 
-      - name: Upload native artifact
+          echo "✓ File exists and size is valid."
+          ls -la "$FILE_PATH"
+        shell: bash
+
+      - name: Upload natives artifact
         uses: actions/upload-artifact@v4
         with:
-          name: native-${{ matrix.platform-id }}-${{ matrix.variant }}
-          path: build/natives/${{ matrix.platform-id }}/${{ matrix.variant }}/${{ matrix.lib }}
+          name: natives-${{ matrix.platform }}-${{ matrix.arch }}
+          path: build/resources/main/natives/${{ matrix.platform }}-${{ matrix.arch }}/${{ matrix.lib }}
           retention-days: 1
 
   publish:
@@ -136,111 +98,63 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
 
       - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
           java-version: '25'
           distribution: 'temurin'
 
-      - name: Download all native artifacts
+      - name: Download all natives
         uses: actions/download-artifact@v4
         with:
-          pattern: native-*
           path: downloaded-natives
-          merge-multiple: false
 
-      - name: Place natives in build/natives/
-        shell: bash
+      - name: Debug downloaded artifacts
+        run: |
+          echo "Downloaded artifacts structure:"
+          find downloaded-natives -type f
+
+      - name: Organize natives
         run: |
-          echo "=== Downloaded artifacts ==="
-          find downloaded-natives -type f | sort
-
-          for artifact_dir in downloaded-natives/native-*/; do
-            basename=$(basename "$artifact_dir")
-            rest=${basename#native-}
-            variant=${rest##*-}
-            platform=${rest%-$variant}
-
-            dest="build/natives/$platform/$variant"
-            mkdir -p "$dest"
-            cp "$artifact_dir"/* "$dest/"
-            echo "✅  $platform/$variant → $dest"
+          mkdir -p src/main/resources/natives
+
+          for artifact_dir in downloaded-natives/natives-*/; do
+            platform_arch=$(basename "$artifact_dir" | sed 's/^natives-//')
+            echo "Processing $platform_arch..."
+            mkdir -p "src/main/resources/natives/$platform_arch"
+            cp "$artifact_dir"/* "src/main/resources/natives/$platform_arch/"
           done
 
-          echo ""
-          echo "=== Final tree ==="
-          find build/natives -type f | sort
+          echo "Final native libraries structure:"
+          find src/main/resources/natives -type f
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Build JAR (API + processor, sans natifs embarqués)
-        run: ./gradlew :jar :sourcesJar :javadocJar -PskipNative
-
-      - name: Build all native JARs
-        run: |
-          ./gradlew \
-            :jarNatives-linux-x64-release \
-            :jarNatives-linux-aarch64-release \
-            :jarNatives-windows-x64-release \
-            :jarNatives-macos-x64-release \
-            :jarNatives-macos-aarch64-release \
-            :jarNatives-linux-x64-debug \
-            :jarNatives-linux-aarch64-debug \
-            :jarNatives-windows-x64-debug \
-            :jarNatives-macos-x64-debug \
-            :jarNatives-macos-aarch64-debug \
-            -PskipNative
+      - name: Build final JAR with all natives
+        run: ./gradlew jar -x compileFlecsNative
 
       - name: Verify JAR contents
-        shell: bash
         run: |
           VERSION=${GITHUB_REF_NAME#v}
-          JAR="build/libs/flecs-java-$VERSION.jar"
-
-          echo "=== Main JAR: $JAR ==="
-          jar tf "$JAR" | grep "natives/" | sort || echo "✅ Aucun natif embarqué (attendu)"
-
+          echo "Verifying JAR for version $VERSION..."
           echo ""
-          echo "=== Native JARs ==="
-          for f in build/libs/flecs-java-$VERSION-natives-*.jar; do
-            [ -f "$f" ] || { echo "Aucun jar natif trouvé"; break; }
-            echo "--- $(basename "$f") ---"
-            jar tf "$f" | grep "natives/"
-          done
-
+          echo "All natives in JAR:"
+          jar tf build/libs/flecs-java-$VERSION.jar | grep "natives/" | sort
           echo ""
-          echo "Verifying all expected classifiers..."
-          EXPECTED=(
-            "natives-linux-x64"
-            "natives-linux-aarch64"
-            "natives-windows-x64"
-            "natives-macos-x64"
-            "natives-macos-aarch64"
-            "natives-linux-x64-debug"
-            "natives-linux-aarch64-debug"
-            "natives-windows-x64-debug"
-            "natives-macos-x64-debug"
-            "natives-macos-aarch64-debug"
-          )
-          ALL_OK=true
-          for classifier in "${EXPECTED[@]}"; do
-            f="build/libs/flecs-java-$VERSION-$classifier.jar"
-            if [ -f "$f" ]; then
-              echo "✅  $classifier"
-            else
-              echo "❌  $classifier — MISSING"
-              ALL_OK=false
-            fi
-          done
-          $ALL_OK || exit 1
+
+          jar tf build/libs/flecs-java-$VERSION.jar | grep "natives/linux-x64/libflecs.so"    && echo "✓ Linux x64"   || echo "✗ Linux x64 MISSING"
+          jar tf build/libs/flecs-java-$VERSION.jar | grep "natives/windows-x64/flecs.dll"    && echo "✓ Windows x64" || echo "✗ Windows x64 MISSING"
+          jar tf build/libs/flecs-java-$VERSION.jar | grep "natives/macos-x64/libflecs.dylib" && echo "✓ macOS x64"   || echo "✗ macOS x64 MISSING"
+          jar tf build/libs/flecs-java-$VERSION.jar | grep "natives/macos-aarch64/libflecs.dylib" && echo "✓ macOS ARM64" || echo "✗ macOS ARM64 MISSING"
 
       - name: Publish to Maven Central
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
           SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-        run: ./gradlew :publishToSonatype :closeAndReleaseSonatypeStagingRepository -PskipNative
+        run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository