macOS ml support

.github/workflows/build.yml

@@ -28,8 +28,8 @@ jobs:
         include:
           - os: windows-2022
             architecture: x64
-          - os: macos-14
-            architecture: aarch64
+          - os: macos-26
+            architecture: arm64
           - os: ubuntu-22.04
 
     name: "Photonlib - Build Examples - ${{ matrix.os }}"
@@ -41,6 +41,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          submodules: recursive
       - name: Fetch tags
         run: git fetch --tags --force
       - name: Install Java 17
@@ -57,7 +58,7 @@ jobs:
         if: matrix.os == 'ubuntu-22.04'
       # Need to publish to maven local first, so that C++ sim can pick it up
       - name: Publish photonlib to maven local
-        run: ./gradlew photon-targeting:publishtomavenlocal photon-lib:publishtomavenlocal -x check
+        run: ./gradlew photon-targeting:publishtomavenlocal photon-lib:publishtomavenlocal -x check -PphotonAppleForceStubs
       - name: Build Java examples
         working-directory: photonlib-java-examples
         run: |
@@ -80,10 +81,10 @@ jobs:
           fetch-depth: 0
       - name: Fetch tags
         run: git fetch --tags --force
-      - name: Install Java 17
+      - name: Install Java 24
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 24
           distribution: temurin
       - name: Install pnpm
         uses: pnpm/action-setup@v4
@@ -121,10 +122,10 @@ jobs:
           fetch-depth: 0
       - name: Fetch tags
         run: git fetch --tags --force
-      - name: Install Java 17
+      - name: Install Java 24
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 24
           distribution: temurin
       - name: Install pnpm
         uses: pnpm/action-setup@v4
@@ -205,7 +206,7 @@ jobs:
           - os: windows-2022
             artifact-name: Win64
             architecture: x64
-          - os: macos-14
+          - os: macos-26
             artifact-name: macOS
             architecture: aarch64
           - os: ubuntu-22.04
@@ -218,22 +219,23 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          submodules: recursive
       - name: Install Java 17
         uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
           architecture: ${{ matrix.architecture }}
       - run: git fetch --tags --force
-      - run: ./gradlew photon-targeting:build photon-lib:build
+      - run: ./gradlew photon-targeting:build photon-lib:build -PphotonAppleForceStubs
         name: Build with Gradle
-      - run: ./gradlew photon-lib:publish photon-targeting:publish
+      - run: ./gradlew photon-lib:publish photon-targeting:publish -PphotonAppleForceStubs
         name: Publish
         env:
           ARTIFACTORY_API_KEY: ${{ secrets.ARTIFACTORY_API_KEY }}
         if: github.event_name == 'push' && github.repository_owner == 'photonvision'
       # Copy artifacts to build/outputs/maven
-      - run: ./gradlew photon-lib:publish photon-targeting:publish -PcopyOfflineArtifacts
+      - run: ./gradlew photon-lib:publish photon-targeting:publish -PcopyOfflineArtifacts -PphotonAppleForceStubs
       - uses: actions/upload-artifact@v4
         with:
           name: maven-${{ matrix.artifact-name }}
@@ -340,10 +342,18 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Install Java 17
+          submodules: recursive
+      - name: Install Java 25 (macOS toolchain for SwiftKit)
         uses: actions/setup-java@v4
+        if: runner.os == 'macOS'
         with:
-          java-version: 17
+          java-version: 25
+          distribution: temurin
+          architecture: ${{ matrix.architecture }}
+      - name: Install Java 24 (for Gradle)
+        uses: actions/setup-java@v4
+        with:
+          java-version: 24
           distribution: temurin
           architecture: ${{ matrix.architecture }}
       - name: Install pnpm
@@ -356,6 +366,11 @@ jobs:
           node-version: 22
           cache: pnpm
           cache-dependency-path: photon-client/pnpm-lock.yaml
+      - name: Publish SwiftKit to Maven Local (macOS only)
+        if: runner.os == 'macOS'
+        run: |
+          cd photon-apple/swift-java
+          ./gradlew publishToMavenLocal -x :Samples:build
       - name: Install Arm64 Toolchain
         run: ./gradlew installArm64Toolchain
         if: ${{ (matrix.artifact-name) == 'LinuxArm64' }}
@@ -396,10 +411,10 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Install Java 17
+      - name: Install Java 24
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 24
           distribution: temurin
       - uses: actions/download-artifact@v4
         with:

.gitignore

@@ -156,3 +156,5 @@ photon-client/playwright-report/
 photon-client/blob-report/
 photon-client/playwright/.cache/
 photon-client/playwright/.auth/
+
+.build/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "photon-apple/swift-java"]
+	path = photon-apple/swift-java
+	url = https://github.com/swiftlang/swift-java.git

.wpiformat

@@ -6,4 +6,7 @@ modifiableFileExclude {
   photon-lib/py/photonlibpy/generated/
   photon-targeting/src/generated/
   photon-targeting/src/main/native/cpp/photon/constrained_solvepnp/generate/
+  .build/
+  photon-apple/.build/
+  photon-apple/swift-java/
 }