Skip to content

Commit

Permalink
Cleanup cargo files
Browse files Browse the repository at this point in the history
  • Loading branch information
Hinton committed Aug 13, 2024
1 parent 2cf9146 commit 36ea4ba
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crates/bitwarden-uniffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ schemars = { version = ">=0.8, <0.9", optional = true }
thiserror = ">=1.0.40, <2.0"
uniffi = "=0.28.0"
uuid = ">=1.3.3, <2"
tokio = { workspace = true }

[target.'cfg(target_os = "android")'.dependencies]
android_logger = "0.14"
Expand Down
2 changes: 1 addition & 1 deletion crates/bitwarden-uniffi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub struct Client(bitwarden::Client);
#[uniffi::export]
impl Client {
/// Initialize a new instance of the SDK client
#[uniffi::constructor(async_runtime = "tokio")]
#[uniffi::constructor]
pub async fn factory(settings: Option<ClientSettings>) -> Arc<Self> {
init_logger();
Arc::new(Self(bitwarden::Client::new(settings).await))
Expand Down
8 changes: 6 additions & 2 deletions crates/bitwarden-vault/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,18 @@ uniffi = [
"bitwarden-crypto/uniffi",
"dep:uniffi",
] # Uniffi bindings
state = ["bitwarden-core/state", "dep:tokio"] # Persistent state
state = [
"bitwarden-core/state",
"dep:tokio",
"dep:bitwarden-db",
] # Persistent state

[dependencies]
base64 = ">=0.22.1, <0.23"
bitwarden-api-api = { workspace = true }
bitwarden-core = { workspace = true, features = ["internal"] }
bitwarden-crypto = { workspace = true }
bitwarden-db = { workspace = true }
bitwarden-db = { workspace = true, optional = true }
chrono = { version = ">=0.4.26, <0.5", features = [
"clock",
"serde",
Expand Down
4 changes: 1 addition & 3 deletions crates/bitwarden-vault/src/sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ pub(crate) async fn sync(client: &Client, input: &SyncRequest) -> Result<SyncRes

let enc = client.internal.initialize_org_crypto(org_keys)?;

let res = SyncResponse::process_response(sync, &enc)?;

Ok(res)
SyncResponse::process_response(sync, &enc)
}

#[derive(Serialize, Deserialize, Debug, JsonSchema)]
Expand Down
1 change: 1 addition & 0 deletions crates/bitwarden/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ uniffi = [
"bitwarden-vault/uniffi",
] # Uniffi bindings
secrets = ["bitwarden-core/secrets", "dep:bitwarden-sm"] # Secrets manager API
state = ["bitwarden-core/state", "bitwarden-vault/state"] # Persistent state

[dependencies]
bitwarden-api-api = { workspace = true }
Expand Down

0 comments on commit 36ea4ba

Please sign in to comment.