diff --git a/Cargo.lock b/Cargo.lock index 593c976..4357d5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -390,7 +390,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "foreman" -version = "1.6.1" +version = "1.6.2" dependencies = [ "artiaa_auth", "assert_cmd", diff --git a/Cargo.toml b/Cargo.toml index 4e12007..f57409c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ default-members = [".", "artiaa_auth"] [package] name = "foreman" description = "Toolchain manager for simple binary tools" -version = "1.6.1" +version = "1.6.2" authors = [ "Lucien Greathouse ", "Matt Hargett ", @@ -34,7 +34,7 @@ toml_edit = "0.14.4" urlencoding = "2.1.0" zip = "0.5" url = "2.4.1" -artiaa_auth = { path = "./artiaa_auth" } +artiaa_auth = { path = "./artiaa_auth", version = "1.0.0" } openssl = { version = "0.10.58", features = ["vendored"] } [target.'cfg(windows)'.dependencies] diff --git a/resources/artiaa-format.json b/artiaa_auth/resources/artiaa-format.json similarity index 100% rename from resources/artiaa-format.json rename to artiaa_auth/resources/artiaa-format.json diff --git a/artiaa_auth/src/error.rs b/artiaa_auth/src/error.rs index 97169e9..a26c7d1 100644 --- a/artiaa_auth/src/error.rs +++ b/artiaa_auth/src/error.rs @@ -29,7 +29,7 @@ impl ArtifactoryAuthError { } } -const ARTIFACTORY_AUTH_HELP: &str = include_str!("../../resources/artiaa-format.json"); +const ARTIFACTORY_AUTH_HELP: &str = include_str!("../resources/artiaa-format.json"); impl fmt::Display for ArtifactoryAuthError { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { diff --git a/artiaa_auth/src/lib.rs b/artiaa_auth/src/lib.rs index c428456..40591a3 100644 --- a/artiaa_auth/src/lib.rs +++ b/artiaa_auth/src/lib.rs @@ -55,7 +55,7 @@ mod test { use serde_json::Value; use tempfile::{tempdir, TempDir}; - const SCHEMA: &str = include_str!("../../resources/artiaa-format.json"); + const SCHEMA: &str = include_str!("../resources/artiaa-format.json"); const EXAMPLE_FILE: &str = r#"{ "tokens": {