Add watchOS and tvOS to CI

.cargo/config.toml

@@ -0,0 +1,23 @@
+[target.aarch64-apple-ios-sim]
+runner = "cargo dinghy -p auto-ios-aarch64-sim runner"
+
+[target.x86_64-apple-ios]
+runner = "cargo dinghy -p auto-ios-x86_64 runner"
+
+# Running on device requires doing the steps in
+# https://github.com/sonos/dinghy/blob/main/docs/ios.md#additional-requirements
+[target.aarch64-apple-ios]
+runner = "cargo dinghy -p auto-ios-aarch64 runner"
+
+# These target runners are added in https://github.com/sonos/dinghy/pull/203
+[target.aarch64-apple-tvos-sim]
+runner = "cargo dinghy -p auto-tvos-aarch64-sim runner"
+
+[target.x86_64-apple-tvos]
+runner = "cargo dinghy -p auto-tvos-x86_64 runner"
+
+[target.x86_64-apple-watchos-sim]
+runner = "cargo dinghy -p auto-watchos-x86_64-sim runner"
+
+[target.aarch64-apple-watchos-sim]
+runner = "cargo dinghy -p auto-watchos-aarch64-sim runner"

.github/workflows/apple-devices.yml

@@ -0,0 +1,61 @@
+# based on https://gist.github.com/learnopengles/60c945b92fbe60a0fecaa0143c35c4a for testing in simulator
+name: x86_64-apple-ios
+
+on: pull_request
+
+env:
+  TOOLCHAIN: nightly
+  CARGO_TERM_COLOR: always
+  CARGO_DINGHY_REV: "a8ec5b0"
+
+jobs:
+  integration_tests:
+    # rust cross-compilation
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        rust-target: ["x86_64-apple-ios" ]
+        apple-sim: [ "iOS" ]
+        include:
+          - rust-target: "x86_64-apple-tvos"
+            apple-sim: "tvOS"
+          - rust-target: "x86_64-apple-watchos-sim"
+            apple-sim: "watchOS"
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.TOOLCHAIN }}
+          components: rust-src
+      - name: Cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin
+            ~/.cargo/git
+            ~/.cargo/registry
+            target
+          key: ${{ github.workflow }}-${{ github.job }}-toolchain-${{ env.TOOLCHAIN }}-cargo-${{ env.CARGO_DINGHY_REV }}-${{ hashFiles('**/Cargo.lock') }}
+      - name: Install cargo-dinghy
+        run: |
+          if ! command -v cargo-dinghy &> /dev/null; then
+            cargo install --git https://github.com/liveview-native/dinghy.git --force --rev ${CARGO_DINGHY_REV} cargo-dinghy
+          fi
+      - name: Build
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --package liveview-native-core
+
+      - name: Start Simulator
+        uses: futureware-tech/simulator-action@v3
+        with:
+          os: ${{ matrix.apple-sim }}
+
+      - name: Run Rust tests on simulator for ${{ matrix.rust-target }}
+        env:
+          DINGHY_LOG: debug
+        run: |
+          cargo dinghy all-platforms
+          cargo dinghy all-devices
+          cargo -Zbuild-std test --target ${{ matrix.rust-target }}

Cargo.toml

@@ -29,5 +29,5 @@ opt-level = 1
 split-debuginfo = "packed"
 debug = 1
 
-[patch.crates-io]
-uniffi = { git = "https://github.com/mozilla/uniffi-rs/", branch = "main" }
+#[patch.crates-io]
+#uniffi = { git = "https://github.com/mozilla/uniffi-rs/", branch = "main" }

crates/core/Cargo.toml

@@ -37,11 +37,11 @@ serde_json = { version = "1.0" }
 smallstr = { version = "0.3", features = ["union"] }
 smallvec = { version = "1.10", features = ["union", "const_generics", "specialization"] }
 thiserror = "1.0"
-uniffi = { version = "0.25", features = ["cli"] }
+uniffi = { version = "0.26", features = ["cli"] }
 
 [build-dependencies]
 Inflector = "0.11"
-uniffi = { version = "0.25", features = [ "build" ] }
+uniffi = { version = "0.26", features = [ "build" ] }
 
 [dev-dependencies]
 paste = { version = "1.0" }