commit a4be87232936816d49be78f4be69dbe495a294be
parent dcff472cd1ab34a12dac7d7887bbb64f5b403847
Author: triesap <tyson@radroots.org>
Date: Fri, 19 Jun 2026 16:17:24 -0700
ffi: consume language-neutral field crate
- point the FFI build recipe at field_lib crates/field_ffi.
- package libradroots_field_ffi inside the existing RadrootsFFI xcframework.
- lock generated bindings to the committed field_lib rename.
- update local override guidance for the renamed manifest path.
Diffstat:
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/RadrootsFFI/Config/ffi-build.env b/RadrootsFFI/Config/ffi-build.env
@@ -1,3 +1,3 @@
# Optional overrides for local development.
# SOURCE_MODE=local
-# LOCAL_FFI_MANIFEST=/absolute/path/to/field_lib/crates/field_ffi_swift/Cargo.toml
+# LOCAL_FFI_MANIFEST=/absolute/path/to/field_lib/crates/field_ffi/Cargo.toml
diff --git a/RadrootsFFI/Makefile b/RadrootsFFI/Makefile
@@ -6,7 +6,7 @@ SHELL := /bin/bash
SOURCE_MODE ?= git
RADROOTS_FIELD_LIB_GIT_URL ?= git@github.com:radrootslabs/field_lib.git
-RADROOTS_FIELD_LIB_GIT_REV ?= a5485b1b8c9998ed30f6d560a1f4047d79dcea89
+RADROOTS_FIELD_LIB_GIT_REV ?= daedde8b8022190954ff4a68e34ed93b3423be34
RADROOTS_FIELD_FFI_CRATE_VERSION ?= 0.1.0-alpha.1
FFI_FEATURES ?= radroots_field_core/rt,radroots_field_core/nostr-client
LOCAL_FFI_MANIFEST ?=
@@ -25,9 +25,9 @@ OUT_DIR := $(BUILD_ROOT)/out
GENERATED_DIR := $(OUT_DIR)/generated
HEADERS_DIR := $(OUT_DIR)/headers
-CRATE_NAME := radroots_field_ffi_swift
+CRATE_NAME := radroots_field_ffi
FFI_OUTPUT_NAME := RadrootsFFI
-LIB_STEM := libradroots_field_ffi_swift
+LIB_STEM := libradroots_field_ffi
GIT_FIELD_LIB_DIR := $(SOURCE_ROOT)/field-lib
CRATE_ARCHIVE := $(SOURCE_ROOT)/$(CRATE_NAME)-$(RADROOTS_FIELD_FFI_CRATE_VERSION).crate
@@ -35,8 +35,8 @@ CRATE_EXTRACT_DIR := $(SOURCE_ROOT)/$(CRATE_NAME)-$(RADROOTS_FIELD_FFI_CRATE_VER
CARGO_FEATURE_FLAGS := $(if $(strip $(FFI_FEATURES)),--features $(FFI_FEATURES),)
ifeq ($(SOURCE_MODE),git)
-FFI_MANIFEST := $(GIT_FIELD_LIB_DIR)/crates/field_ffi_swift/Cargo.toml
-UNIFFI_CONFIG := $(GIT_FIELD_LIB_DIR)/crates/field_ffi_swift/uniffi.toml
+FFI_MANIFEST := $(GIT_FIELD_LIB_DIR)/crates/field_ffi/Cargo.toml
+UNIFFI_CONFIG := $(GIT_FIELD_LIB_DIR)/crates/field_ffi/uniffi.toml
SOURCE_TARGET := sync-source-git
else ifeq ($(SOURCE_MODE),crates)
FFI_MANIFEST := $(CRATE_EXTRACT_DIR)/Cargo.toml
diff --git a/RadrootsFFI/source.lock b/RadrootsFFI/source.lock
@@ -1,5 +1,5 @@
SOURCE_MODE=git
RADROOTS_FIELD_LIB_GIT_URL=git@github.com:radrootslabs/field_lib.git
-RADROOTS_FIELD_LIB_GIT_REV=a5485b1b8c9998ed30f6d560a1f4047d79dcea89
+RADROOTS_FIELD_LIB_GIT_REV=daedde8b8022190954ff4a68e34ed93b3423be34
RADROOTS_FIELD_FFI_CRATE_VERSION=0.1.0-alpha.1
FFI_FEATURES=radroots_field_core/rt,radroots_field_core/nostr-client