WIP

wireapp · Aug 14, 2023 · c172925 · c172925
1 parent 0d16454
commit c172925
Show file tree

Hide file tree

Showing 6 changed files with 493 additions and 551 deletions.
diff --git a/crypto-ffi/Cargo.toml b/crypto-ffi/Cargo.toml
@@ -36,7 +36,8 @@ sha2 = { version = "0.10", features = ["force-soft"] }
 # UniFFI - Android + iOS bindings - Runtime support
 [target.'cfg(not(target_family = "wasm"))'.dependencies.uniffi]
 version = "0.24"
-# git = "https://github.com/mozilla/uniffi-rs.git"
+git = "https://github.com/mozilla/uniffi-rs.git"
+rev = "6bdfdceaf51fbfac9b41e0688fece6a4e384c3b8"
 
 [target.wasm32-unknown-unknown.dependencies]
 wasm-bindgen = "0.2"
@@ -52,7 +53,8 @@ strum = "0.25"
 # UniFFI - Android + iOS bindings - Build support
 [target.'cfg(not(target_family = "wasm"))'.build-dependencies.uniffi]
 version = "0.24"
-# git = "https://github.com/mozilla/uniffi-rs.git"
+git = "https://github.com/mozilla/uniffi-rs.git"
+rev = "6bdfdceaf51fbfac9b41e0688fece6a4e384c3b8"
 features = ["build", "bindgen"]
 
 [build-dependencies]

diff --git a/crypto-ffi/build.rs b/crypto-ffi/build.rs
@@ -14,9 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see http://www.gnu.org/licenses/.
 
-#[allow(dead_code)]
-const UDL_FILE: &str = "./src/CoreCrypto.udl";
-
 fn main() {
     cfg_if::cfg_if! {
         if #[cfg(target_family = "wasm")] {
@@ -26,8 +23,6 @@ fn main() {
             println!("cargo:rustc-cfg=ios");
             #[cfg(target_os = "android")]
             println!("cargo:rustc-cfg=android");
-
-            uniffi::generate_scaffolding(UDL_FILE).unwrap();
         }
     }
 }
diff --git a/crypto-ffi/src/CoreCrypto.udl b/crypto-ffi/src/CoreCrypto.udl