a mess of stuff

.github/workflows/bundletool-android-arm64.yml

@@ -11,33 +11,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install GraalVM (Java 21)
-        uses: graalvm/setup-graalvm@v1
-        with:
-          distribution: "graalvm-community"
-          version: "22.0.1"
-          java-version: "21"
-          components: "native-image"
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Setup QEMU for multi-arch
+        uses: docker/setup-qemu-action@v2
 
-      - name: Install cross-compilation toolchain
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v2
 
-      - name: Build Native ARM64 Bundletool
+      - name: Build aarch64 bundletool using GraalVM aarch64 container
         run: |
-          native-image \
-            --no-fallback \
-            -H:+StaticExecutableWithDynamicLibC \
-            --target=aarch64-linux-gnu \
-            -jar bundletool/bundletool.jar \
-            bundletool-arm64
+          docker run --rm --platform linux/arm64 \
+            -v "${{ github.workspace }}":/work -w /work \
+            ghcr.io/graalvm/native-image:23.3.2-java21 \
+            sh -c "apt-get update && apt-get install -y unzip zip build-essential clang pkg-config zlib1g-dev && native-image --no-fallback -jar bundletool/bundletool.jar -H:Name=bundletool-arm64"
 
-      - name: Verify binary
+      - name: Verify binary (if produced)
         run: |
-          file bundletool-arm64
-          ls -lh bundletool-arm64
+          file bundletool-arm64 || true
+          ls -lh bundletool-arm64 || true
 
       - name: Upload Native Binary
         uses: actions/upload-artifact@v4

.github/workflows/bundletool-native.yml

@@ -1,4 +1,4 @@
-name: Convert bundletool.jar to Native ARM64
+name: Convert bundletool.jar to Native x64
 
 on:
   workflow_dispatch:
@@ -11,38 +11,31 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install GraalVM (Java 21)
-        uses: graalvm/setup-graalvm@v1
+      - name: Set up GraalVM (Java 21) with native-image
+        uses: graalvm/setup-graalvm@v2
         with:
-          distribution: "graalvm-community"
-          version: "22.0.1"
-          java-version: "21"
-          components: "native-image"
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
+          distribution: 'graalvm-ce'
+          graalvm-version: '23.3.2'
+          java-version: '21'
+          components: 'native-image'
+          github-token: '${{ secrets.GITHUB_TOKEN }}'
 
       - name: Install build deps
         run: |
           sudo apt-get update
-          sudo apt-get install -y unzip zip curl clang build-essential
+          sudo apt-get install -y unzip zip clang build-essential pkg-config zlib1g-dev
 
       - name: Prepare bundletool JAR
         run: |
           mkdir -p bundletool
-          cp bundletool/bundletool.jar .
+          if [ ! -f bundletool/bundletool.jar ]; then echo "bundletool/bundletool.jar missing"; ls -la; exit 1; fi
 
       - name: Build Native x64 Bundletool
         run: |
-          native-image \
-            --no-fallback \
-            -jar bundletool.jar \
-            bundletool-native
-          
-      - name: Move binary to bundletool directory
-        run: |
-          mv bundletool-native bundletool/bundletool-native
+          native-image --no-fallback -jar bundletool/bundletool.jar -H:Name=bundletool-native
 
       - name: Upload Native Binary
         uses: actions/upload-artifact@v4
         with:
           name: bundletool-native-linux-x64
-          path: bundletool/bundletool-native
+          path: bundletool-native

.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Fri Nov 14 12:56:34 EST 2025
+gradle.version=8.14.3