switch to keyring-manager

.gitmodules

@@ -7,9 +7,9 @@
 [submodule "external/cursive-flexi-logger-view"]
 	path = external/cursive-flexi-logger-view
 	url = ../cursive-flexi-logger-view.git
-[submodule "external/keyring-rs"]
-	path = external/keyring-rs
-	url = ../keyring-rs.git
+[submodule "external/keyring-manager"]
+	path = external/keyring-manager
+	url = ../keyring-manager.git
 [submodule "external/keyvaluedb"]
 	path = external/keyvaluedb
 	url = ../keyvaluedb.git

Cargo.lock

@@ -1830,8 +1830,8 @@ dependencies = [
 ]
 
 [[package]]
-name = "keyring"
-version = "0.10.1"
+name = "keyring-manager"
+version = "0.5.0"
 dependencies = [
  "android_logger",
  "backtrace",
@@ -1855,7 +1855,7 @@ dependencies = [
  "security-framework-sys",
  "serde 1.0.133",
  "serde_cbor",
- "serial_test 0.5.1",
+ "serial_test 0.4.0",
  "simplelog",
  "snailquote",
  "tempfile",
@@ -3832,7 +3832,7 @@ dependencies = [
  "jni",
  "jni-sys",
  "js-sys",
- "keyring",
+ "keyring-manager",
  "keyvaluedb-sqlite",
  "keyvaluedb-web",
  "lazy_static",

external/keyring-manager

@@ -0,0 +1 @@
+Subproject commit 3713e10599c6078e058aab785ef46594420dc11b

external/keyring-rs

@@ -1 +0,0 @@
-Subproject commit 8dd37fa4c629f80951cd78f8cc245317b44bdb05

veilid-core/Cargo.toml

@@ -50,7 +50,7 @@ async-std = { version = "^1", features = ["unstable"] }
 async-tungstenite = { version = "^0", features = ["async-std-runtime", "async-tls"] }
 maplit = "^1"
 config = { version = "^0", features = ["yaml"] }
-keyring = { path = "../external/keyring-rs" }
+keyring-manager = { path = "../external/keyring-manager" }
 lru = "^0"
 async-tls = "^0.11"
 webpki = "^0"

veilid-core/src/intf/native/protected_store.rs

@@ -1,7 +1,7 @@
 use crate::xx::*;
 use crate::*;
 use data_encoding::BASE64URL_NOPAD;
-use keyring::*;
+use keyring_manager::*;
 use std::path::Path;
 use std::result::Result;