chore: Update to latest maturin/uniffi (#65)

* Makefile

* WIP

* Up maturin

* Up maturin

* WIP

* up

* WIP

* WIP

* Revert name changes

* WIP

* WIP

* Fix version for build

* WIP

* Name change

* Update .gitignore

* Update lib.rs

* Update Makefile

* Reexport Signer

* Fix pyproject build

Author: tmathern

Cargo.toml

@@ -6,8 +6,7 @@ authors = ["Gavin Peacock <[email protected]"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
-name = "c2pa"
-crate-type = ["cdylib"]
+crate-type = ["lib", "cdylib"]
 
 [package.metadata.cargo-udeps.ignore]
 normal = ["openssl-src"]
@@ -19,9 +18,9 @@ serde = { version = "1.0.197", features = ["derive"] }
 serde_derive = "1.0"
 serde_json = "1.0"
 thiserror = "1.0.49"
-uniffi = "0.24.1"
+uniffi = "0.28.2"
 openssl-src = "=300.3.1" # Required for openssl-sys
 log = "0.4.21"
 
 [build-dependencies]
-uniffi = { version = "0.24.1", features = ["build"] }
+uniffi = { version = "0.28.2", features = ["build"] }

Makefile

@@ -0,0 +1,9 @@
+# For Python bindings ===========================================================
+
+# Start from clean env: Delete `.venv`, then `python3 -m venv .venv`
+# Pre-requisite: Python virtual environment is active (source .venv/bin/activate)
+build-python: release
+  python3 -m venv .venv
+  source .venv/bin/activate
+  python3 -m pip install -r requirements.txt
+  maturin develop

pyproject.toml

@@ -1,9 +1,9 @@
 [build-system]
-requires = ["maturin>=1.2,<2.0","uniffi_bindgen>=0.24,<0.25"]
+requires = ["maturin>=1.7.4,<2.0","uniffi_bindgen>=0.28,<0.30"]
 build-backend = "maturin"
 
 [project]
-name = "c2pa-python"
+name = "c2pa"
 dependencies = ["cffi"]
 requires-python = ">=3.7"
 description = "Python bindings for the C2PA Content Authenticity Initiative (CAI) library"

requirements.txt

@@ -1,3 +1,3 @@
-maturin==1.2.0
-uniffi-bindgen==0.24.1
+maturin==1.7.4
+uniffi-bindgen==0.28.0
 cryptography==43.0.1

src/lib.rs

@@ -14,7 +14,7 @@
 use std::env;
 use std::sync::RwLock;
 
-pub use c2pa::SigningAlg;
+pub use c2pa::{Signer, SigningAlg};
 
 /// these all need to be public so that the uniffi macro can see them
 mod error;