Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into secret-service-wi…
Browse files Browse the repository at this point in the history
…th-keyutils
  • Loading branch information
soywod committed Oct 19, 2024
2 parents 6df3d93 + 9a4184c commit 16236b8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Version 3.5.0
- Add debug logging of internal operations (thanks to @soywod).
- Revert iOS security-framework dependency to v2 (see #225).

## Version 3.4.0
- Allow use of both secret-service and keyutils.

Expand Down
7 changes: 5 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords = ["password", "credential", "keychain", "keyring", "cross-platform"]
license = "MIT OR Apache-2.0"
name = "keyring"
repository = "https://github.com/hwchen/keyring-rs.git"
version = "3.4.0"
version = "3.5.0"
rust-version = "1.75"
edition = "2021"
exclude = [".github/"]
Expand All @@ -31,9 +31,12 @@ vendored = ["dbus-secret-service?/vendored", "openssl?/vendored"]
log = "0.4.22"
openssl = { version = "0.10.55", optional = true }

[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies] # see issue #190
[target.'cfg(target_os = "macos")'.dependencies] # see issue #190
security-framework = { version = "3", optional = true }

[target.'cfg(target_os = "ios")'.dependencies] # see issue #190
security-framework = { version = "2", optional = true }

[target.'cfg(target_os = "linux")'.dependencies]
secret-service = { version = "4", optional = true }
zbus = { version = "4", optional = true }
Expand Down

0 comments on commit 16236b8

Please sign in to comment.