@ondeinference / ed / commits / 81b2e80

Disable watchOS

Seto Elkahfi committed Sep 12, 2026 at 08:14 UTC 81b2e805f9c6880e69a0b2df515b9def7e0c02fe
7 files changed +250 -35
.github/scripts/build-swift-xcframework.sh
-4
@@ -51,8 +51,6 @@ build_target aarch64-apple-tvos "TVOS_DEPLOYMENT_TARGET=$TVOS_DEPLOYMENT
51 build_target aarch64-apple-tvos-sim "TVOS_DEPLOYMENT_TARGET=$TVOS_DEPLOYMENT_TARGET" +nightly -Z build-std
52 build_target aarch64-apple-visionos "XROS_DEPLOYMENT_TARGET=$VISIONOS_DEPLOYMENT_TARGET" +nightly -Z build-std
53 build_target aarch64-apple-visionos-sim "XROS_DEPLOYMENT_TARGET=$VISIONOS_DEPLOYMENT_TARGET" +nightly -Z build-std
54 -build_target aarch64-apple-watchos "WATCHOS_DEPLOYMENT_TARGET=$WATCHOS_DEPLOYMENT_TARGET" +nightly -Z build-std
55 -build_target aarch64-apple-watchos-sim "WATCHOS_DEPLOYMENT_TARGET=$WATCHOS_DEPLOYMENT_TARGET" +nightly -Z build-std
54
55 "$BINDGEN" generate "$APPLE_TARGET_DIR/aarch64-apple-ios/release/libed_agent_ffi.a" --crate ed_agent_ffi --language swift --out-dir "$PACKAGE_DIR/Sources/Ed"
56 cp "$PACKAGE_DIR/Sources/Ed/ed_agent_ffiFFI.h" "$HEADERS_DIR/ed_agent_ffiFFI.h"
@@ -65,8 +63,6 @@ xcodebuild -create-xcframework \
63 -library "$APPLE_TARGET_DIR/aarch64-apple-tvos-sim/release/libed_agent_ffi.a" -headers "$HEADERS_DIR" \
64 -library "$APPLE_TARGET_DIR/aarch64-apple-visionos/release/libed_agent_ffi.a" -headers "$HEADERS_DIR" \
65 -library "$APPLE_TARGET_DIR/aarch64-apple-visionos-sim/release/libed_agent_ffi.a" -headers "$HEADERS_DIR" \
68 - -library "$APPLE_TARGET_DIR/aarch64-apple-watchos/release/libed_agent_ffi.a" -headers "$HEADERS_DIR" \
69 - -library "$APPLE_TARGET_DIR/aarch64-apple-watchos-sim/release/libed_agent_ffi.a" -headers "$HEADERS_DIR" \
66 -library "$APPLE_TARGET_DIR/aarch64-apple-darwin/release/libed_agent_ffi.a" -headers "$HEADERS_DIR" \
67 -output "$FRAMEWORK_DIR"
68
.gitignore
+1
@@ -3,3 +3,4 @@
3 **/*.rs.bk
4 Cargo.lock.bak
5 .DS_Store
6 +.idea
Cargo.lock
+245 -27
@@ -236,7 +236,20 @@ version = "0.14.0"
236 source = "registry+https://github.com/rust-lang/crates.io-index"
237 checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"
238 dependencies = [
239 - "askama_derive",
239 + "askama_derive 0.14.0",
240 + "itoa",
241 + "percent-encoding",
242 + "serde",
243 + "serde_json",
244 +]
245 +
246 +[[package]]
247 +name = "askama"
248 +version = "0.16.1"
249 +source = "registry+https://github.com/rust-lang/crates.io-index"
250 +checksum = "6024d73179f43f15ccd2b881bfea6fee7f3a46ec53f33b52210dea749ebebaa4"
251 +dependencies = [
252 + "askama_macros",
253 "itoa",
254 "percent-encoding",
255 "serde",
@@ -249,7 +262,7 @@ version = "0.14.0"
262 source = "registry+https://github.com/rust-lang/crates.io-index"
263 checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
264 dependencies = [
252 - "askama_parser",
265 + "askama_parser 0.14.0",
266 "basic-toml",
267 "memchr",
268 "proc-macro2",
@@ -260,6 +273,33 @@ dependencies = [
273 "syn 2.0.119",
274 ]
275
276 +[[package]]
277 +name = "askama_derive"
278 +version = "0.16.1"
279 +source = "registry+https://github.com/rust-lang/crates.io-index"
280 +checksum = "071ee5ebf2138e3ad180e0aacf6940c2cab5e6d8333741d9925c7bee2b153f39"
281 +dependencies = [
282 + "askama_parser 0.16.1",
283 + "basic-toml",
284 + "glob",
285 + "memchr",
286 + "proc-macro2",
287 + "quote",
288 + "rustc-hash 2.1.3",
289 + "serde",
290 + "serde_derive",
291 + "syn 3.0.5",
292 +]
293 +
294 +[[package]]
295 +name = "askama_macros"
296 +version = "0.16.1"
297 +source = "registry+https://github.com/rust-lang/crates.io-index"
298 +checksum = "643e1c7cbb6aec1d920332fe51a7c0d8219e273dcb8602db03f5263e4d16487b"
299 +dependencies = [
300 + "askama_derive 0.16.1",
301 +]
302 +
303 [[package]]
304 name = "askama_parser"
305 version = "0.14.0"
@@ -272,6 +312,19 @@ dependencies = [
312 "winnow 0.7.15",
313 ]
314
315 +[[package]]
316 +name = "askama_parser"
317 +version = "0.16.1"
318 +source = "registry+https://github.com/rust-lang/crates.io-index"
319 +checksum = "2c5ae75772275d268b03ab8bdccdd12117b6169ee23256942b34e46c9f476583"
320 +dependencies = [
321 + "rustc-hash 2.1.3",
322 + "serde",
323 + "serde_derive",
324 + "unicode-ident",
325 + "winnow 1.0.4",
326 +]
327 +
328 [[package]]
329 name = "async-compat"
330 version = "0.2.6"
@@ -735,6 +788,16 @@ dependencies = [
788 "serde",
789 ]
790
791 +[[package]]
792 +name = "cargo-platform"
793 +version = "0.3.3"
794 +source = "registry+https://github.com/rust-lang/crates.io-index"
795 +checksum = "dd0061da739915fae12ea00e16397555ed4371a6bb285431aab930f61b0aa4ba"
796 +dependencies = [
797 + "serde",
798 + "serde_core",
799 +]
800 +
801 [[package]]
802 name = "cargo_metadata"
803 version = "0.19.2"
@@ -742,7 +805,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
805 checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
806 dependencies = [
807 "camino",
745 - "cargo-platform",
808 + "cargo-platform 0.1.9",
809 + "semver",
810 + "serde",
811 + "serde_json",
812 + "thiserror 2.0.20",
813 +]
814 +
815 +[[package]]
816 +name = "cargo_metadata"
817 +version = "0.23.1"
818 +source = "registry+https://github.com/rust-lang/crates.io-index"
819 +checksum = "ef987d17b0a113becdd19d3d0022d04d7ef41f9efe4f3fb63ac44ba61df3ade9"
820 +dependencies = [
821 + "camino",
822 + "cargo-platform 0.3.3",
823 "semver",
824 "serde",
825 "serde_json",
@@ -1742,7 +1819,7 @@ dependencies = [
1819 "serde_json",
1820 "smbcloud-gresiq-sdk",
1821 "thiserror 2.0.20",
1745 - "uniffi",
1822 + "uniffi 0.32.1",
1823 ]
1824
1825 [[package]]
@@ -1759,7 +1836,7 @@ dependencies = [
1836 name = "ed-uniffi-bindgen"
1837 version = "0.1.0"
1838 dependencies = [
1762 - "uniffi",
1839 + "uniffi 0.32.1",
1840 ]
1841
1842 [[package]]
@@ -2086,6 +2163,15 @@ dependencies = [
2163 "autocfg",
2164 ]
2165
2166 +[[package]]
2167 +name = "fs-err"
2168 +version = "3.3.1"
2169 +source = "registry+https://github.com/rust-lang/crates.io-index"
2170 +checksum = "b91aa448ca50d7e79433bdf3ee8d99215430d2ec02ade5aefab2a073a1822e8a"
2171 +dependencies = [
2172 + "autocfg",
2173 +]
2174 +
2175 [[package]]
2176 name = "fs_extra"
2177 version = "1.3.0"
@@ -4574,7 +4660,7 @@ dependencies = [
4660 "thiserror 2.0.20",
4661 "tokio",
4662 "tsync",
4577 - "uniffi",
4663 + "uniffi 0.31.0",
4664 ]
4665
4666 [[package]]
@@ -7503,7 +7589,7 @@ checksum = "3e176a18e67764923c4f1ce66f25ae4abe5f688384d5eb1a0fa6c77f3d90f887"
7589 dependencies = [
7590 "anyhow",
7591 "brotli",
7506 - "cargo_metadata",
7592 + "cargo_metadata 0.19.2",
7593 "ctor",
7594 "dom_query",
7595 "dunce",
@@ -8344,16 +8430,31 @@ name = "uniffi"
8430 version = "0.31.0"
8431 source = "registry+https://github.com/rust-lang/crates.io-index"
8432 checksum = "b8c6dec3fc6645f71a16a3fa9ff57991028153bd194ca97f4b55e610c73ce66a"
8433 +dependencies = [
8434 + "anyhow",
8435 + "cargo_metadata 0.19.2",
8436 + "uniffi_bindgen 0.31.0",
8437 + "uniffi_build 0.31.0",
8438 + "uniffi_core 0.31.0",
8439 + "uniffi_macros 0.31.0",
8440 + "uniffi_pipeline 0.31.0",
8441 +]
8442 +
8443 +[[package]]
8444 +name = "uniffi"
8445 +version = "0.32.1"
8446 +source = "registry+https://github.com/rust-lang/crates.io-index"
8447 +checksum = "edf78ecfb9bb8d7c4f8da11e8eb2ab6304e8ec0adb3ab32d8fc77c21a5bb0b86"
8448 dependencies = [
8449 "anyhow",
8450 "camino",
8350 - "cargo_metadata",
8451 + "cargo_metadata 0.23.1",
8452 "clap 4.6.6",
8352 - "uniffi_bindgen",
8353 - "uniffi_build",
8354 - "uniffi_core",
8355 - "uniffi_macros",
8356 - "uniffi_pipeline",
8453 + "uniffi_bindgen 0.32.1",
8454 + "uniffi_build 0.32.1",
8455 + "uniffi_core 0.32.1",
8456 + "uniffi_macros 0.32.1",
8457 + "uniffi_pipeline 0.32.1",
8458 ]
8459
8460 [[package]]
@@ -8363,10 +8464,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
8464 checksum = "4ed0150801958d4825da56a41c71f000a457ac3a4613fa9647df78ac4b6b6881"
8465 dependencies = [
8466 "anyhow",
8366 - "askama",
8467 + "askama 0.14.0",
8468 "camino",
8368 - "cargo_metadata",
8369 - "fs-err",
8469 + "cargo_metadata 0.19.2",
8470 + "fs-err 2.11.0",
8471 "glob",
8472 "goblin",
8473 "heck 0.5.0",
@@ -8376,10 +8477,36 @@ dependencies = [
8477 "tempfile",
8478 "textwrap 0.16.3",
8479 "toml 0.9.12+spec-1.1.0",
8379 - "uniffi_internal_macros",
8380 - "uniffi_meta",
8381 - "uniffi_pipeline",
8382 - "uniffi_udl",
8480 + "uniffi_internal_macros 0.31.0",
8481 + "uniffi_meta 0.31.0",
8482 + "uniffi_pipeline 0.31.0",
8483 + "uniffi_udl 0.31.0",
8484 +]
8485 +
8486 +[[package]]
8487 +name = "uniffi_bindgen"
8488 +version = "0.32.1"
8489 +source = "registry+https://github.com/rust-lang/crates.io-index"
8490 +checksum = "cdea7c4574723928bef87dfc04b203d96321d0bf34ab295a56379e633be579f3"
8491 +dependencies = [
8492 + "anyhow",
8493 + "askama 0.16.1",
8494 + "camino",
8495 + "cargo_metadata 0.23.1",
8496 + "fs-err 3.3.1",
8497 + "glob",
8498 + "goblin",
8499 + "heck 0.5.0",
8500 + "indexmap 2.14.2",
8501 + "once_cell",
8502 + "serde",
8503 + "tempfile",
8504 + "textwrap 0.16.3",
8505 + "toml 1.1.5+spec-1.1.0",
8506 + "uniffi_internal_macros 0.32.1",
8507 + "uniffi_meta 0.32.1",
8508 + "uniffi_pipeline 0.32.1",
8509 + "uniffi_udl 0.32.1",
8510 ]
8511
8512 [[package]]
@@ -8390,7 +8517,18 @@ checksum = "b78fd9271a4c2e85bd2c266c5a9ede1fac676eb39fd77f636c27eaf67426fd5f"
8517 dependencies = [
8518 "anyhow",
8519 "camino",
8393 - "uniffi_bindgen",
8520 + "uniffi_bindgen 0.31.0",
8521 +]
8522 +
8523 +[[package]]
8524 +name = "uniffi_build"
8525 +version = "0.32.1"
8526 +source = "registry+https://github.com/rust-lang/crates.io-index"
8527 +checksum = "dfe2d9769b6c0c15d7c7832d53eaa595c683bb80a30512614a67268ce16132f9"
8528 +dependencies = [
8529 + "anyhow",
8530 + "camino",
8531 + "uniffi_bindgen 0.32.1",
8532 ]
8533
8534 [[package]]
@@ -8406,6 +8544,19 @@ dependencies = [
8544 "static_assertions",
8545 ]
8546
8547 +[[package]]
8548 +name = "uniffi_core"
8549 +version = "0.32.1"
8550 +source = "registry+https://github.com/rust-lang/crates.io-index"
8551 +checksum = "f8b1c62ee415b805f063c82e8ef6bbcaa1b87f8eed360cf217537b7724e05601"
8552 +dependencies = [
8553 + "anyhow",
8554 + "async-compat",
8555 + "bytes",
8556 + "once_cell",
8557 + "static_assertions",
8558 +]
8559 +
8560 [[package]]
8561 name = "uniffi_internal_macros"
8562 version = "0.31.0"
@@ -8419,6 +8570,19 @@ dependencies = [
8570 "syn 2.0.119",
8571 ]
8572
8573 +[[package]]
8574 +name = "uniffi_internal_macros"
8575 +version = "0.32.1"
8576 +source = "registry+https://github.com/rust-lang/crates.io-index"
8577 +checksum = "c79d4a3129d6c2c15e367d3954886a0533dd3e85d445ce4d93379f62c6949d7b"
8578 +dependencies = [
8579 + "anyhow",
8580 + "indexmap 2.14.2",
8581 + "proc-macro2",
8582 + "quote",
8583 + "syn 2.0.119",
8584 +]
8585 +
8586 [[package]]
8587 name = "uniffi_macros"
8588 version = "0.31.0"
@@ -8426,14 +8590,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
8590 checksum = "db9d12529f1223d014fd501e5f29ca0884d15d6ed5ddddd9f506e55350327dc3"
8591 dependencies = [
8592 "camino",
8429 - "fs-err",
8593 + "fs-err 2.11.0",
8594 "once_cell",
8595 "proc-macro2",
8596 "quote",
8597 "serde",
8598 "syn 2.0.119",
8599 "toml 0.9.12+spec-1.1.0",
8436 - "uniffi_meta",
8600 + "uniffi_meta 0.31.0",
8601 +]
8602 +
8603 +[[package]]
8604 +name = "uniffi_macros"
8605 +version = "0.32.1"
8606 +source = "registry+https://github.com/rust-lang/crates.io-index"
8607 +checksum = "2f6a9826a83f1140b2ec67c7944f562e1ef616e6eaf40e76247adccbd5b8a091"
8608 +dependencies = [
8609 + "camino",
8610 + "fs-err 3.3.1",
8611 + "once_cell",
8612 + "proc-macro2",
8613 + "quote",
8614 + "serde",
8615 + "syn 2.0.119",
8616 + "toml 1.1.5+spec-1.1.0",
8617 + "uniffi_meta 0.32.1",
8618 ]
8619
8620 [[package]]
@@ -8444,8 +8625,20 @@ checksum = "9df6d413db2827c68588f8149d30d49b71d540d46539e435b23a7f7dbd4d4f86"
8625 dependencies = [
8626 "anyhow",
8627 "siphasher",
8447 - "uniffi_internal_macros",
8448 - "uniffi_pipeline",
8628 + "uniffi_internal_macros 0.31.0",
8629 + "uniffi_pipeline 0.31.0",
8630 +]
8631 +
8632 +[[package]]
8633 +name = "uniffi_meta"
8634 +version = "0.32.1"
8635 +source = "registry+https://github.com/rust-lang/crates.io-index"
8636 +checksum = "cf233eb014b595e8997c98df4ac6863b486a4ac6d54bd00230c7700753d7ef13"
8637 +dependencies = [
8638 + "anyhow",
8639 + "siphasher",
8640 + "uniffi_internal_macros 0.32.1",
8641 + "uniffi_pipeline 0.32.1",
8642 ]
8643
8644 [[package]]
@@ -8458,7 +8651,20 @@ dependencies = [
8651 "heck 0.5.0",
8652 "indexmap 2.14.2",
8653 "tempfile",
8461 - "uniffi_internal_macros",
8654 + "uniffi_internal_macros 0.31.0",
8655 +]
8656 +
8657 +[[package]]
8658 +name = "uniffi_pipeline"
8659 +version = "0.32.1"
8660 +source = "registry+https://github.com/rust-lang/crates.io-index"
8661 +checksum = "55179706fbb6e7a23e729780d2c6165e6afe1ce725fa63754bcf217b440afc04"
8662 +dependencies = [
8663 + "anyhow",
8664 + "heck 0.5.0",
8665 + "indexmap 2.14.2",
8666 + "tempfile",
8667 + "uniffi_internal_macros 0.32.1",
8668 ]
8669
8670 [[package]]
@@ -8469,7 +8675,19 @@ checksum = "0d1a7339539bf6f6fa3e9b534dece13f778bda2d54b1a6d4e40b4d6090ac26e7"
8675 dependencies = [
8676 "anyhow",
8677 "textwrap 0.16.3",
8472 - "uniffi_meta",
8678 + "uniffi_meta 0.31.0",
8679 + "weedle2",
8680 +]
8681 +
8682 +[[package]]
8683 +name = "uniffi_udl"
8684 +version = "0.32.1"
8685 +source = "registry+https://github.com/rust-lang/crates.io-index"
8686 +checksum = "421a9add7a19c5a264a2aba760514125ef3840a8b246ec88237fc91e3f2f79b1"
8687 +dependencies = [
8688 + "anyhow",
8689 + "textwrap 0.16.3",
8690 + "uniffi_meta 0.32.1",
8691 "weedle2",
8692 ]
8693
Cargo.toml
+1 -1
@@ -25,7 +25,7 @@ log = "0.4"
25 thiserror = "2"
26 tokio = { version = "1", features = ["sync", "rt"] }
27 tauri = { version = "2", features = [] }
28 -uniffi = { version = "=0.31.0", features = ["tokio"] }
28 +uniffi = { version = "=0.32.1", features = ["tokio"] }
29 smbcloud-gresiq-sdk = "0.4.7"
30
31 # Internal
crates/ed-agent-ffi/Cargo.toml
+1 -1
@@ -25,4 +25,4 @@ smbcloud-gresiq-sdk.workspace = true
25
26 [build-dependencies]
27 cc = "1"
28 -uniffi = { version = "=0.31.0", features = ["build"] }
28 +uniffi = { version = "=0.32.1", features = ["build"] }
crates/ed-agent-ffi/build.rs
+1 -1
@@ -1,6 +1,6 @@
1 fn main() {
2 let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();
3 - if matches!(target_os.as_str(), "ios" | "tvos" | "visionos" | "watchos") {
3 + if matches!(target_os.as_str(), "ios" | "tvos" | "visionos") {
4 cc::Build::new()
5 .file("scripts/tvos_chkstk.s")
6 .compile("tvos_chkstk");
uniffi-bindgen/Cargo.toml
+1 -1
@@ -9,4 +9,4 @@ name = "uniffi-bindgen"
9 path = "uniffi-bindgen.rs"
10
11 [dependencies]
12 -uniffi = { version = "=0.31.0", features = ["cli"] }
12 +uniffi = { version = "=0.32.1", features = ["cli"] }