Convert repository into a workspace

Author: complexspaces

Cargo.toml

@@ -1,76 +1,4 @@
-[package]
-name = "rustls-platform-verifier"
-version = "0.1.0"
-authors = ["ComplexSpaces <[email protected]>", "1Password"]
-description = "rustls-platform-verifier supports verifying TLS certificates in rustls with the operating system verifier"
-keywords = ["tls", "certificate", "verification", "os", "native"]
-repository = "https://github.com/1Password/rustls-platform-verifier"
-license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.64.0"
+[workspace]
+members = ["rustls-platform-verifier"]
 
-exclude = [
-    "android/.run",
-    "android/gradle/**",
-    "android/gradle*",
-    "android/settings.gradle",
-    "android/src/androidTest",
-]
-
-[lib]
-name = "rustls_platform_verifier"
-# Note: The `cdylib` specification is for testing only. The shared library
-# is not expected to have a stable API.
-crate-type = ["cdylib", "rlib"]
-
-[features]
-# Enables a C interface to use for testing where `cargo` can't be used.
-# This feature is not stable, nor is the interface exported when it is enabled.
-# Do not rely on this or use it in production.
-ffi-testing = ["android_logger"]
-# Enables APIs that expose lower-level verifier types for debugging purposes.
-dbg = []
-# Enables `log::debug` base64-encoded logging of all end-entity certificates processed
-# by the platform's verifier.
-cert-logging = ["base64"]
-# Used for nicely documenting the Android-specific APIs. This feature is not stable.
-docsrs = ["jni", "once_cell"]
-
-[dependencies]
-rustls = { version = "0.21", features = ["dangerous_configuration", "tls12", "logging"] }
-log = { version = "0.4" }
-base64 = { version = "0.21", optional = true } # Only used when the `cert-logging` feature is enabled.
-jni = { version = "0.19", default-features = false, optional = true } # Only used during doc generation
-once_cell = { version = "1.9", optional = true } # Only used during doc generation.
-
-[target.'cfg(target_os = "linux")'.dependencies]
-rustls-native-certs = "0.6"
-once_cell = "1.9"
-webpki = { package = "rustls-webpki", version = "0.101", features = ["alloc", "std"] }
-
-[target.'cfg(target_os = "android")'.dependencies]
-jni = { version = "0.19", default-features = false }
-webpki = { package = "rustls-webpki", version = "0.101", features = ["alloc", "std"] }
-once_cell = "1.9"
-android_logger = { version = "0.13", optional = true } # Only used during testing.
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-once_cell = "1.9"
-webpki-roots = "0.25"
-
-[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
-core-foundation = "0.9"
-core-foundation-sys = "0.8"
-security-framework = { version = "2.6", features = ["OSX_10_14"] }
-security-framework-sys = { version = "2.4", features = ["OSX_10_14"] }
-
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["wincrypt", "winerror"] }
-
-[dev-dependencies]
-tokio = { version = "1.5", features = ["macros", "rt-multi-thread"] }
-reqwest = { version = "0.11.18", default-features = false, features = ["rustls-tls-manual-roots"] }
-
-[package.metadata.docs.rs]
-rustdoc-args = ["--cfg", "docsrs"]
-features = ["dbg", "docsrs"]
+resolver = "2"

android/rustls-platform-verifier/build.gradle

@@ -50,7 +50,7 @@ android {
 
     task buildTestLib(type: Exec) {
         workingDir "../../"
-        commandLine "cargo", "ndk", "-t", getOsArch(), "-o", "android/rustls-platform-verifier/src/androidTest/jniLibs", "build", "--features", "ffi-testing"
+        commandLine "cargo", "ndk", "-t", getOsArch(), "-o", "android/rustls-platform-verifier/src/androidTest/jniLibs", "build", "-p", "rustls-platform-verifier", "--features", "ffi-testing"
     }
 
     // Only compile the test library if this package is being built for testing by itself.

rustls-platform-verifier/Cargo.toml

@@ -0,0 +1,76 @@
+[package]
+name = "rustls-platform-verifier"
+version = "0.1.0"
+authors = ["ComplexSpaces <[email protected]>", "1Password"]
+description = "rustls-platform-verifier supports verifying TLS certificates in rustls with the operating system verifier"
+keywords = ["tls", "certificate", "verification", "os", "native"]
+repository = "https://github.com/1Password/rustls-platform-verifier"
+license = "MIT OR Apache-2.0"
+edition = "2021"
+rust-version = "1.64.0"
+
+exclude = [
+    "android/.run",
+    "android/gradle/**",
+    "android/gradle*",
+    "android/settings.gradle",
+    "android/src/androidTest",
+]
+
+[lib]
+name = "rustls_platform_verifier"
+# Note: The `cdylib` specification is for testing only. The shared library
+# is not expected to have a stable API.
+crate-type = ["cdylib", "rlib"]
+
+[features]
+# Enables a C interface to use for testing where `cargo` can't be used.
+# This feature is not stable, nor is the interface exported when it is enabled.
+# Do not rely on this or use it in production.
+ffi-testing = ["android_logger"]
+# Enables APIs that expose lower-level verifier types for debugging purposes.
+dbg = []
+# Enables `log::debug` base64-encoded logging of all end-entity certificates processed
+# by the platform's verifier.
+cert-logging = ["base64"]
+# Used for nicely documenting the Android-specific APIs. This feature is not stable.
+docsrs = ["jni", "once_cell"]
+
+[dependencies]
+rustls = { version = "0.21", features = ["dangerous_configuration", "tls12", "logging"] }
+log = { version = "0.4" }
+base64 = { version = "0.21", optional = true } # Only used when the `cert-logging` feature is enabled.
+jni = { version = "0.19", default-features = false, optional = true } # Only used during doc generation
+once_cell = { version = "1.9", optional = true } # Only used during doc generation.
+
+[target.'cfg(target_os = "linux")'.dependencies]
+rustls-native-certs = "0.6"
+once_cell = "1.9"
+webpki = { package = "rustls-webpki", version = "0.101", features = ["alloc", "std"] }
+
+[target.'cfg(target_os = "android")'.dependencies]
+jni = { version = "0.19", default-features = false }
+webpki = { package = "rustls-webpki", version = "0.101", features = ["alloc", "std"] }
+once_cell = "1.9"
+android_logger = { version = "0.13", optional = true } # Only used during testing.
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+once_cell = "1.9"
+webpki-roots = "0.25"
+
+[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
+core-foundation = "0.9"
+core-foundation-sys = "0.8"
+security-framework = { version = "2.6", features = ["OSX_10_14"] }
+security-framework-sys = { version = "2.4", features = ["OSX_10_14"] }
+
+[target.'cfg(windows)'.dependencies]
+winapi = { version = "0.3", features = ["wincrypt", "winerror"] }
+
+[dev-dependencies]
+tokio = { version = "1.5", features = ["macros", "rt-multi-thread"] }
+reqwest = { version = "0.11.18", default-features = false, features = ["rustls-tls-manual-roots"] }
+
+[package.metadata.docs.rs]
+rustdoc-args = ["--cfg", "docsrs"]
+features = ["dbg", "docsrs"]