From aae546326fac9bce438004847ee82f0b073049ae Mon Sep 17 00:00:00 2001 From: Heiko Schaefer Date: Tue, 12 Apr 2022 11:26:16 +0200 Subject: [PATCH] Clean up dependencies; move openpgp-card-sequoia test-code into examples/. --- openpgp-card-sequoia/Cargo.toml | 13 +++++++++---- .../{src/main.rs => examples/test.rs} | 2 +- openpgp-card/Cargo.toml | 6 ++++-- tools/Cargo.toml | 3 --- 4 files changed, 14 insertions(+), 10 deletions(-) rename openpgp-card-sequoia/{src/main.rs => examples/test.rs} (99%) diff --git a/openpgp-card-sequoia/Cargo.toml b/openpgp-card-sequoia/Cargo.toml index 0997065..c9aa5b9 100644 --- a/openpgp-card-sequoia/Cargo.toml +++ b/openpgp-card-sequoia/Cargo.toml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Heiko Schaefer +# SPDX-FileCopyrightText: 2021-2022 Heiko Schaefer # SPDX-License-Identifier: MIT OR Apache-2.0 [package] @@ -15,10 +15,15 @@ documentation = "https://docs.rs/crate/openpgp-card-sequoia" sequoia-openpgp = "1.4" nettle = "7" openpgp-card = { path = "../openpgp-card", version = "0.2" } -openpgp-card-pcsc = { path = "../pcsc", version = "0.2" } -openpgp-card-scdc = { path = "../scdc", version = "0.2" } chrono = "0.4" anyhow = "1" thiserror = "1" +log = "0.4" + +[dev-dependencies] +openpgp-card-pcsc = { path = "../pcsc", version = "0.2" } +openpgp-card-scdc = { path = "../scdc", version = "0.2" } env_logger = "0.9" -log = "0.4" \ No newline at end of file + +[[example]] +name = "test" diff --git a/openpgp-card-sequoia/src/main.rs b/openpgp-card-sequoia/examples/test.rs similarity index 99% rename from openpgp-card-sequoia/src/main.rs rename to openpgp-card-sequoia/examples/test.rs index 6213a58..729a0e1 100644 --- a/openpgp-card-sequoia/src/main.rs +++ b/openpgp-card-sequoia/examples/test.rs @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2021 Heiko Schaefer +// SPDX-FileCopyrightText: 2021-2022 Heiko Schaefer // SPDX-License-Identifier: MIT OR Apache-2.0 use anyhow::Result; diff --git a/openpgp-card/Cargo.toml b/openpgp-card/Cargo.toml index 78f743e..efbf681 100644 --- a/openpgp-card/Cargo.toml +++ b/openpgp-card/Cargo.toml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Heiko Schaefer +# SPDX-FileCopyrightText: 2021-2022 Heiko Schaefer # SPDX-License-Identifier: MIT OR Apache-2.0 [package] @@ -14,8 +14,10 @@ documentation = "https://docs.rs/crate/openpgp-card" [dependencies] blanket = "0.2.0" nom = "6" -hex-literal = "0.3" hex-slice = "0.1" thiserror = "1" log = "0.4" chrono = "0.4" + +[dev-dependencies] +hex-literal = "0.3" diff --git a/tools/Cargo.toml b/tools/Cargo.toml index c830bf0..069e472 100644 --- a/tools/Cargo.toml +++ b/tools/Cargo.toml @@ -13,15 +13,12 @@ documentation = "https://docs.rs/crate/openpgp-card-tools" [dependencies] sequoia-openpgp = "1.3" -nettle = "7" openpgp-card = { path = "../openpgp-card", version = "0.2" } openpgp-card-pcsc = { path = "../pcsc", version = "0.2" } openpgp-card-sequoia = { path = "../openpgp-card-sequoia", version = "0.0.9" } sshkeys = "0.3.2" rpassword = "5" -chrono = "0.4" anyhow = "1" -thiserror = "1" clap = { version = "3.1", features = ["derive"] } env_logger = "0.9" log = "0.4"