Skip to content

Commit 16236b8

Browse files
committed
Merge remote-tracking branch 'upstream/master' into secret-service-with-keyutils
2 parents 6df3d93 + 9a4184c commit 16236b8

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## Version 3.5.0
2+
- Add debug logging of internal operations (thanks to @soywod).
3+
- Revert iOS security-framework dependency to v2 (see #225).
4+
15
## Version 3.4.0
26
- Allow use of both secret-service and keyutils.
37

Cargo.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ keywords = ["password", "credential", "keychain", "keyring", "cross-platform"]
66
license = "MIT OR Apache-2.0"
77
name = "keyring"
88
repository = "https://github.com/hwchen/keyring-rs.git"
9-
version = "3.4.0"
9+
version = "3.5.0"
1010
rust-version = "1.75"
1111
edition = "2021"
1212
exclude = [".github/"]
@@ -31,9 +31,12 @@ vendored = ["dbus-secret-service?/vendored", "openssl?/vendored"]
3131
log = "0.4.22"
3232
openssl = { version = "0.10.55", optional = true }
3333

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

37+
[target.'cfg(target_os = "ios")'.dependencies] # see issue #190
38+
security-framework = { version = "2", optional = true }
39+
3740
[target.'cfg(target_os = "linux")'.dependencies]
3841
secret-service = { version = "4", optional = true }
3942
zbus = { version = "4", optional = true }

0 commit comments

Comments
 (0)