Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ members = [
"crates/connetto-app-attest",
"crates/connetto-peer",
"crates/connetto-peer-android",
"crates/connetto-peer-apple",
# The documents and the build-time translation every browser demo shares.
# A member rather than an exclusion, so the root gate lints it with the rest.
"examples/deployment",
Expand Down
5 changes: 3 additions & 2 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
# binaries are outside that set: the browser stack only ever runs inside the
# browser test workflow, which compiles for wasm and reports no native
# coverage at all, and the demo stack and Android proof need a device. Their
# shared provisioning module is reached from nothing else. The wasm crate, the
# examples and the Rust that builds only for Android, iOS, Windows, macOS
# shared provisioning module and phone-driving steps are reached from nothing
# else. The wasm crate, the examples and the Rust that builds only for Android, iOS, Windows, macOS
# or wasm are outside it too. So these lines are unreachable by any instrument, not missing tests.
# sonar-project.properties excludes the same paths, which the two tools share.
coverage:
ignore:
- crates/connetto-test-harness/src/bin/**
- crates/connetto-test-harness/src/stack.rs
- crates/connetto-test-harness/src/peer_devices.rs
- crates/connetto-web/**
- examples/**
- crates/connetto-app-attest/src/ios.rs
Expand Down
20 changes: 16 additions & 4 deletions crates/connetto-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,13 @@ bot = ["dep:ring"]
device-identity = ["native-auth", "connetto-core/device-cert", "dep:ring", "dep:core-foundation", "dep:rmp-serde", "dep:serde_bytes", "dep:connetto-app-attest"]
# The peer link (R76): the device serves its identity to other devices over
# a second, server-independent channel, and dials them.
peer = ["device-identity", "dep:connetto-peer", "dep:btleplug", "dep:connetto-peer-android"]
peer = [
"device-identity",
"dep:connetto-peer",
"dep:btleplug",
"dep:connetto-peer-android",
"dep:connetto-peer-apple",
]
native-auth = [
"native-transport",
"dep:reqwest",
Expand Down Expand Up @@ -217,6 +223,12 @@ apple-native-keyring-store = { version = "1.0.2", features = [
], optional = true }
security-framework = { version = "3.7", optional = true }
core-foundation = { version = "0.10", optional = true }
# The peer's Apple bridge, the peripheral and the Network Extension join (R76).
connetto-peer-apple = { path = "../connetto-peer-apple", optional = true }
# The interfaces the personal hotspot's landing bound reads (R76 decision 26).
if-addrs = "0.15"
# The streams btleplug's central answers with (R76 decision 22).
futures-util = { version = "0.3", default-features = false, features = ["std"], optional = true }

[target.'cfg(target_os = "linux")'.dependencies]
linux-keyutils-keyring-store = { version = "1.0.0", optional = true }
Expand Down Expand Up @@ -246,6 +258,9 @@ open = { version = "5.4", optional = true }
# iOS.
[target.'cfg(any(target_os = "android", target_os = "ios"))'.dependencies]
webbrowser = { version = "1.2", optional = true }
# The peer's Bluetooth, the central the joiner runs on Android and on the
# Apple side through CoreBluetooth (R76 decision 22).
btleplug = { version = "0.13.5", optional = true }

# Android: the Keystore-backed store of the same family. The NDK ships no
# OpenSSL headers, so SQLCipher builds its own from source here.
Expand All @@ -260,9 +275,6 @@ android_system_properties = { version = "0.1.6", optional = true }
socket2 = "0.6"
# The joined network's subnet, the targets its bind admits (R76).
ipnet = "2.12"
# The joiner's Bluetooth central (R76 decision 22), from the release whose
# Android init resolves its classes through the context class loader.
btleplug = { version = "0.13.5", optional = true }
# The jni 0.22 virtual machine btleplug's init takes, and btleplug's Java
# bundled in its Gradle module (R76 decision 22).
connetto-peer-android = { path = "../connetto-peer-android", optional = true }
Expand Down
Loading
Loading