Skip to content

Commit 737e36c

Browse files
committed
wip: begin to consolidate crates
1 parent fc292d3 commit 737e36c

84 files changed

Lines changed: 1608 additions & 1432 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.release-plz.toml

Lines changed: 0 additions & 10 deletions
This file was deleted.

Cargo.lock

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,19 @@ members = [
99
"sandpolis-agent",
1010
"sandpolis-audit",
1111
"sandpolis-client",
12-
"sandpolis-core",
13-
"sandpolis-database",
1412
"sandpolis-deploy",
1513
"sandpolis-desktop",
1614
"sandpolis-filesystem",
1715
"sandpolis-instance",
1816
"sandpolis-inventory",
1917
"sandpolis-macros",
2018
"sandpolis-mobile",
21-
"sandpolis-network",
2219
"sandpolis-wake",
2320
"sandpolis-probe",
24-
"sandpolis-realm",
2521
"sandpolis-server",
2622
"sandpolis-shell",
2723
"sandpolis-snapshot",
2824
"sandpolis-tunnel",
29-
"sandpolis-user",
3025
]
3126

3227
[workspace.dependencies]

sandpolis-account/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ validator = { workspace = true }
1414
native_db = { workspace = true }
1515
native_model = { workspace = true }
1616
serde = { workspace = true }
17-
sandpolis-core = { path = "../sandpolis-core", version = "0.0.1" }
1817
sandpolis-instance = { path = "../sandpolis-instance", version = "0.0.1" }
19-
sandpolis-database = { path = "../sandpolis-database", version = "0.0.1" }
2018
sandpolis-macros = { path = "../sandpolis-macros", version = "0.0.1" }
2119

2220
[features]

sandpolis-agent/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ axum = { workspace = true }
1212
axum-macros = { workspace = true }
1313
clap = { workspace = true }
1414
tokio-cron-scheduler = { version = "0.14.0", optional = true }
15-
sandpolis-network = { path = "../sandpolis-network", version = "0.0.1" }
16-
sandpolis-database = { path = "../sandpolis-database", version = "0.0.1" }
17-
sandpolis-core = { path = "../sandpolis-core", version = "0.0.1" }
15+
sandpolis-instance = { path = "../sandpolis-instance", version = "0.0.1" }
1816
sandpolis-macros = { path = "../sandpolis-macros", version = "0.0.1" }
1917

2018
[features]

sandpolis-audit/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ linux-audit-parser = "0.2.7"
1212
native_db = { workspace = true }
1313
native_model = { workspace = true }
1414
sandpolis-instance = { path = "../sandpolis-instance", version = "0.0.1" }
15-
sandpolis-database = { path = "../sandpolis-database", version = "0.0.1" }
16-
sandpolis-core = { path = "../sandpolis-core", version = "0.0.1" }
1715
sandpolis-macros = { path = "../sandpolis-macros", version = "0.0.1" }
1816

1917
[features]

sandpolis-client/Cargo.toml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@ passwords = { workspace = true, optional = true, features = [
1616
"common-password",
1717
] }
1818
sandpolis-instance = { path = "../sandpolis-instance", version = "0.0.1" }
19-
sandpolis-database = { path = "../sandpolis-database", version = "0.0.1" }
2019
sandpolis-macros = { path = "../sandpolis-macros", version = "0.0.1" }
21-
sandpolis-core = { path = "../sandpolis-core", version = "0.0.1" }
22-
sandpolis-network = { path = "../sandpolis-network", version = "0.0.1", optional = true }
2320
sandpolis-server = { path = "../sandpolis-server", version = "0.0.1", optional = true }
24-
sandpolis-user = { path = "../sandpolis-user", version = "0.0.1", optional = true }
2521
native_db = { workspace = true, optional = true }
2622
native_model = { workspace = true, optional = true }
2723

@@ -57,14 +53,9 @@ client-gui = [
5753
"dep:egui_console",
5854
"dep:egui_extras",
5955
"dep:rand",
60-
"dep:sandpolis-network",
6156
"dep:sandpolis-server",
62-
"dep:sandpolis-user",
63-
"sandpolis-core/client-gui",
6457
"sandpolis-instance/client-gui",
65-
"sandpolis-network/client-gui",
6658
"sandpolis-server/client-gui",
67-
"sandpolis-user/client",
6859
]
6960
client-tui = [
7061
"client",
Lines changed: 31 additions & 0 deletions
Loading
Lines changed: 38 additions & 0 deletions
Loading
Lines changed: 35 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)