refactor: bindgen is part of taple-uniffi crate

opencanarias · Sep 19, 2023 · 0f4f0f2 · 0f4f0f2
1 parent 142bf86
commit 0f4f0f2
Show file tree

Hide file tree

Showing 29 changed files with 12 additions and 20 deletions.
diff --git a/taple-uniffi/Cargo.toml → Cargo.toml b/taple-uniffi/Cargo.toml → Cargo.toml
@@ -11,11 +11,15 @@ crate-type = [
   "cdylib",    # must for Android
 ]
 
+[[bin]]
+name = "uniffi-bindgen"
+path = "uniffi-bindgen.rs"
+
 [dependencies]
 # taple-core = { path = "../../taple-core/core" }
 taple-core = { git = "https://github.com/opencanarias/taple-core"}
 hex = "0.4.3"
-uniffi = "0.23.0"
+uniffi = { version = "0.23.0", features = ["cli"] }
 android_logger = {version = "0.13.3", optional = true}
 oslog = {version = "0.2.0", optional = true}
 log = "0.4"

diff --git a/README.md b/README.md
@@ -27,20 +27,19 @@ Minimium supported rust versión (MSRV) is 1.67.
 ### Compile
 ```bash
 $ git clone https://github.com/opencanarias/taple-ffi.git
-$ cd taple-ffi/taple-uniffi
 $ sudo apt install -y libprotobuf-dev protobuf-compiler cmake
+$ cd taple-ffi
 $ cargo build --release
-$ mkdir ../target
-$ cp ./target/release/libtaple_uniffi.a ../target
-$ cp ./target/release/libtaple_uniffi.so ../target
+$ ls ./target/release
 ```
 
 ### Generate bindings
+Any [Uniffi supported language](https://mozilla.github.io/uniffi-rs/Overview.html#supported-languages) with callback interfaces support can be used. For instance:
 ```bash
-$ cd ../uniffi-bindgen
-$ cargo run --bin uniffi-bindgen generate ../taple-uniffi/src/taple_uniffi.udl --out-dir ../target --language kotlin
+$ cargo run --bin uniffi-bindgen generate ./src/taple_uniffi.udl --out-dir ./target/bindings/kotlin --language kotlin
+$ cargo run --bin uniffi-bindgen generate ./src/taple_uniffi.udl --out-dir ./target/bindings/swift --language swift
+$ cargo run --bin uniffi-bindgen generate ./src/taple_uniffi.udl --out-dir ./target/bindings/python --language python
 ```
-Any [Uniffi supported language](https://mozilla.github.io/uniffi-rs/Overview.html#supported-languages) can be used instead of Kotlin.
 
 ## Documentation and examples
 Documentation and examples are under development. If you need more information, check out the following resources. 

diff --git a/taple-uniffi/build.rs → build.rs b/taple-uniffi/build.rs → build.rs
diff --git a/taple-uniffi/src/api.rs → src/api.rs b/taple-uniffi/src/api.rs → src/api.rs
diff --git a/taple-uniffi/src/db.rs → src/db.rs b/taple-uniffi/src/db.rs → src/db.rs
diff --git a/taple-uniffi/src/error.rs → src/error.rs b/taple-uniffi/src/error.rs → src/error.rs
diff --git a/taple-uniffi/src/lib.rs → src/lib.rs b/taple-uniffi/src/lib.rs → src/lib.rs
diff --git a/taple-uniffi/src/models/approval.rs → src/models/approval.rs b/taple-uniffi/src/models/approval.rs → src/models/approval.rs
diff --git a/taple-uniffi/src/models/approval_entity.rs → src/models/approval_entity.rs b/taple-uniffi/src/models/approval_entity.rs → src/models/approval_entity.rs
diff --git a/taple-uniffi/src/models/event.rs → src/models/event.rs b/taple-uniffi/src/models/event.rs → src/models/event.rs
diff --git a/taple-uniffi/src/models/mod.rs → src/models/mod.rs b/taple-uniffi/src/models/mod.rs → src/models/mod.rs
diff --git a/taple-uniffi/src/models/others.rs → src/models/others.rs b/taple-uniffi/src/models/others.rs → src/models/others.rs
diff --git a/taple-uniffi/src/models/policy.rs → src/models/policy.rs b/taple-uniffi/src/models/policy.rs → src/models/policy.rs
diff --git a/taple-uniffi/src/models/request.rs → src/models/request.rs b/taple-uniffi/src/models/request.rs → src/models/request.rs
diff --git a/taple-uniffi/src/models/role.rs → src/models/role.rs b/taple-uniffi/src/models/role.rs → src/models/role.rs
diff --git a/taple-uniffi/src/models/schema.rs → src/models/schema.rs b/taple-uniffi/src/models/schema.rs → src/models/schema.rs
diff --git a/taple-uniffi/src/models/signature.rs → src/models/signature.rs b/taple-uniffi/src/models/signature.rs → src/models/signature.rs
diff --git a/taple-uniffi/src/models/user_governance.rs → src/models/user_governance.rs b/taple-uniffi/src/models/user_governance.rs → src/models/user_governance.rs
diff --git a/taple-uniffi/src/models/user_subject.rs → src/models/user_subject.rs b/taple-uniffi/src/models/user_subject.rs → src/models/user_subject.rs
diff --git a/taple-uniffi/src/models/validation_proof.rs → src/models/validation_proof.rs b/taple-uniffi/src/models/validation_proof.rs → src/models/validation_proof.rs
diff --git a/taple-uniffi/src/node.rs → src/node.rs b/taple-uniffi/src/node.rs → src/node.rs
diff --git a/taple-uniffi/src/notification.rs → src/notification.rs b/taple-uniffi/src/notification.rs → src/notification.rs
diff --git a/taple-uniffi/src/settings.rs → src/settings.rs b/taple-uniffi/src/settings.rs → src/settings.rs
diff --git a/taple-uniffi/src/shutdown.rs → src/shutdown.rs b/taple-uniffi/src/shutdown.rs → src/shutdown.rs
diff --git a/taple-uniffi/src/subject_builder.rs → src/subject_builder.rs b/taple-uniffi/src/subject_builder.rs → src/subject_builder.rs
diff --git a/taple-uniffi/src/taple_uniffi.udl → src/taple_uniffi.udl b/taple-uniffi/src/taple_uniffi.udl → src/taple_uniffi.udl
diff --git a/uniffi-bindgen/uniffi-bindgen.rs → uniffi-bindgen.rs b/uniffi-bindgen/uniffi-bindgen.rs → uniffi-bindgen.rs
diff --git a/uniffi-bindgen/Cargo.toml b/uniffi-bindgen/Cargo.toml
diff --git a/taple-uniffi/uniffi.toml → uniffi.toml b/taple-uniffi/uniffi.toml → uniffi.toml
@@ -1,3 +1,3 @@
 [bindings.kotlin]
-package_name = "com.opencanarias.taple_uniffi"
+package_name = "com.opencanarias.taple.uniffi"
 cdylib_name = "taple_uniffi"