Skip to content

Commit b6b8759

Browse files
horned-spherehorned-sphere
authored
Merge branch 'main' into circ-fix
2 parents 5f704c3 + 73f7316 commit b6b8759

File tree

71 files changed

+520
-438
lines changed

Some content is hidden

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

71 files changed

+520
-438
lines changed

‎Cargo.toml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ members = [
4444
"example_apps/devguide/2_3/*",
4545
]
4646

47+
[workspace.package]
48+
version = "0.1.0"
49+
authors = ["Swim Inc. developers [email protected]"]
50+
edition = "2021"
51+
license = "Apache-2.0"
52+
homepage = "https://github.com/swimos/swim-rust/"
53+
4754
[profile.release]
4855
opt-level = 3
4956

@@ -55,6 +62,44 @@ debug = false
5562
opt-level = "z"
5663

5764
[workspace.dependencies]
65+
swimos_msgpack = { path = "api/formats/swimos_msgpack", version = "0.1.0" }
66+
swimos_recon = { path = "api/formats/swimos_recon", version = "0.1.0" }
67+
swimos_agent_protocol = { path = "api/swimos_agent_protocol", version = "0.1.0" }
68+
swimos_api = { path = "api/swimos_api", version = "0.1.0" }
69+
swimos_client_api = { path = "api/swimos_client_api", version = "0.1.0" }
70+
swimos_form = { path = "api/swimos_form", version = "0.1.0" }
71+
swimos_form_derive = { path = "api/swimos_form_derive", version = "0.1.0" }
72+
swimos_meta = { path = "api/swimos_meta", version = "0.1.0" }
73+
swimos_model = { path = "api/swimos_model", version = "0.1.0" }
74+
swimos_http = { path = "runtime/swimos_http", version = "0.1.0" }
75+
swimos_messages = { path = "runtime/swimos_messages", version = "0.1.0" }
76+
swimos_remote = { path = "runtime/swimos_remote", version = "0.1.0" }
77+
swimos_rocks_store = { path = "runtime/swimos_rocks_store", version = "0.1.0" }
78+
swimos_runtime = { path = "runtime/swimos_runtime", version = "0.1.0" }
79+
swimos_agent = { path = "server/swimos_agent", version = "0.1.0" }
80+
swimos_agent_derive = { path = "server/swimos_agent_derive", version = "0.1.0" }
81+
swimos_introspection = { path = "server/swimos_introspection", version = "0.1.0" }
82+
swimos_server_app = { path = "server/swimos_server_app", version = "0.1.0" }
83+
swimos = { path = "swimos", version = "0.1.0" }
84+
swimos_client = { path = "swimos_client", version = "0.1.0" }
85+
swimos_downlink = { path = "swimos_downlink", version = "0.1.0" }
86+
swimos_macro_utilities = { path = "swimos_macro_utilities", version = "0.1.0" }
87+
swimos_utilities = { path = "swimos_utilities", version = "0.1.0" }
88+
swimos_byte_channel = { path = "swimos_utilities/swimos_byte_channel" }
89+
swimos_multi_reader = { path = "swimos_utilities/swimos_multi_reader" }
90+
swimos_algebra = { path = "swimos_utilities/swimos_algebra" }
91+
swimos_num = { path = "swimos_utilities/swimos_num" }
92+
swimos_errors = { path = "swimos_utilities/swimos_errors" }
93+
swimos_format = { path = "swimos_utilities/swimos_format" }
94+
swimos_trigger = { path = "swimos_utilities/swimos_trigger" }
95+
swimos_future = { path = "swimos_utilities/swimos_future" }
96+
swimos_fs = { path = "swimos_utilities/swimos_fs" }
97+
swimos_route = { path = "swimos_utilities/swimos_route" }
98+
swimos_rtree = { path = "swimos_utilities/swimos_rtree" }
99+
swimos_sync = { path = "swimos_utilities/swimos_sync" }
100+
swimos_time = { path = "swimos_utilities/swimos_time" }
101+
swimos_encoding = { path = "swimos_utilities/swimos_encoding" }
102+
58103
bytes = "1.3"
59104
tokio = "1.22"
60105
tokio-stream = "0.1.11"

‎api/formats/swimos_msgpack/Cargo.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
[package]
22
name = "swimos_msgpack"
3-
version = "0.1.0"
4-
authors = ["Swim Inc. developers [email protected]"]
5-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
66
description = "SwimOS MessagePack"
7-
license = "Apache-2.0"
8-
repository = "https://github.com/swimos/swim-rust/"
7+
license.workspace = true
8+
repository = "https://github.com/swimos/swim-rust/tree/main/api/formats/swimos_msgpack"
9+
homepage.workspace = true
910

1011
[dependencies]
1112
base64 = { workspace = true }
1213
either = { workspace = true }
13-
swimos_form = { path = "../../swimos_form", version = "0.1.0" }
14-
swimos_model = { path = "../../swimos_model", version = "0.1.0" }
14+
swimos_form = { workspace = true }
15+
swimos_model = { workspace = true }
1516
bytes = { workspace = true }
1617
byteorder = { workspace = true }
1718
rmp = { workspace = true }

‎api/formats/swimos_recon/Cargo.toml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
[package]
22
name = "swimos_recon"
3-
version = "0.1.0"
4-
authors = ["Swim Inc. developers [email protected]"]
5-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
66
description = "SwimOS Recon"
7-
license = "Apache-2.0"
8-
repository = "https://github.com/swimos/swim-rust/"
7+
license.workspace = true
8+
repository = "https://github.com/swimos/swim-rust/tree/main/api/formats/swimos_recon"
9+
homepage.workspace = true
910

1011
[features]
1112
default = []
1213

1314
[dependencies]
1415
base64 = { workspace = true }
1516
either = { workspace = true }
16-
swimos_form = { path = "../../swimos_form", version = "0.1.0" }
17-
swimos_model = { path = "../../swimos_model", version = "0.1.0" }
18-
swimos_utilities = { path = "../../../swimos_utilities", features = ["encoding"], version = "0.1.0" }
17+
swimos_form = { workspace = true }
18+
swimos_model = { workspace = true }
19+
swimos_utilities = { workspace = true, features = ["encoding"] }
1920
nom = { workspace = true }
2021
nom_locate = { workspace = true }
2122
num-traits = { workspace = true }

‎api/swimos_agent_protocol/Cargo.toml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
[package]
22
name = "swimos_agent_protocol"
3-
version = "0.1.0"
4-
authors = ["Swim Inc. developers [email protected]"]
5-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
66
description = "SwimOS Agent Protocol"
7-
license = "Apache-2.0"
8-
repository = "https://github.com/swimos/swim-rust/"
7+
license.workspace = true
8+
repository = "https://github.com/swimos/swim-rust/tree/main/api/swimos_agent_protocol"
9+
homepage.workspace = true
910

1011
[dependencies]
1112
bytes = { workspace = true }
1213
tokio-util = { workspace = true, features = ["codec"] }
13-
swimos_api = { path = "../swimos_api", version = "0.1.0" }
14-
swimos_model = { path = "../swimos_model", version = "0.1.0" }
14+
swimos_api = { workspace = true }
15+
swimos_model = { workspace = true }
1516
uuid = { workspace = true }
16-
swimos_form = { path = "../swimos_form", version = "0.1.0" }
17-
swimos_recon = { path = "../formats/swimos_recon", version = "0.1.0" }
17+
swimos_form = { workspace = true }
18+
swimos_recon = { workspace = true }
1819
thiserror = { workspace = true }
19-
swimos_utilities = { path = "../../swimos_utilities", features = ["encoding"], version = "0.1.0" }
20+
swimos_utilities = { workspace = true, features = ["encoding"] }

‎api/swimos_api/Cargo.toml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
[package]
22
name = "swimos_api"
3-
version = "0.1.0"
4-
authors = ["Swim Inc. developers [email protected]"]
5-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
66
description = "SwimOS API"
7-
license = "Apache-2.0"
8-
repository = "https://github.com/swimos/swim-rust/"
7+
license.workspace = true
8+
repository = "https://github.com/swimos/swim-rust/tree/main/api/swimos_api"
9+
homepage.workspace = true
910

1011
[dependencies]
1112
futures = { workspace = true }
12-
swimos_utilities = { path = "../../swimos_utilities", features = ["io", "errors", "trigger"], version = "0.1.0" }
13-
swimos_model = { path = "../swimos_model", version = "0.1.0" }
14-
swimos_form = { path = "../swimos_form", version = "0.1.0" }
15-
swimos_recon = { path = "../formats/swimos_recon", version = "0.1.0" }
13+
swimos_utilities = { workspace = true, features = ["io", "errors", "trigger"] }
14+
swimos_model = { workspace = true }
15+
swimos_form = { workspace = true }
16+
swimos_recon = { workspace = true }
1617
thiserror = { workspace = true }
1718
bytes = { workspace = true }
1819
tokio = { workspace = true }

‎api/swimos_client_api/Cargo.toml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
[package]
22
name = "swimos_client_api"
3-
version = "0.1.0"
4-
authors = ["Swim Inc. developers [email protected]"]
5-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
66
description = "SwimOS Client API"
7-
license = "Apache-2.0"
8-
repository = "https://github.com/swimos/swim-rust/"
7+
license.workspace = true
8+
repository = "https://github.com/swimos/swim-rust/tree/main/api/swimos_client_api"
9+
homepage.workspace = true
910

1011
[dependencies]
1112
futures = { workspace = true }
12-
swimos_utilities = { path = "../../swimos_utilities", features = ["io"], version = "0.1.0" }
13-
swimos_model = { path = "../swimos_model", version = "0.1.0" }
14-
swimos_form = { path = "../swimos_form", version = "0.1.0" }
15-
swimos_recon = { path = "../formats/swimos_recon", version = "0.1.0" }
16-
swimos_api = { path = "../swimos_api", version = "0.1.0" }
13+
swimos_utilities = { workspace = true, features = ["io"] }
14+
swimos_model = { workspace = true }
15+
swimos_form = { workspace = true }
16+
swimos_recon = { workspace = true }
17+
swimos_api = { workspace = true }
1718
thiserror = { workspace = true }
1819
static_assertions = { workspace = true }
1920

‎api/swimos_form/Cargo.toml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
[package]
22
name = "swimos_form"
3-
version = "0.1.0"
4-
authors = ["Swim Inc. developers [email protected]"]
5-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
66
description = "SwimOS Serialization and Deserialization"
7-
license = "Apache-2.0"
8-
repository = "https://github.com/swimos/swim-rust/"
7+
license.workspace = true
8+
repository = "https://github.com/swimos/swim-rust/tree/main/api/swimos_form"
9+
homepage.workspace = true
910

1011
[dependencies]
11-
swimos_utilities = { path = "../../swimos_utilities", features = ["text", "future"], version = "0.1.0" }
12-
swimos_form_derive = { path = "../swimos_form_derive", version = "0.1.0" }
13-
swimos_model = { path = "../swimos_model", version = "0.1.0" }
12+
swimos_utilities = { workspace = true, features = ["text", "future"] }
13+
swimos_form_derive = { workspace = true }
14+
swimos_model = { workspace = true }
1415
chrono = { workspace = true }
1516
either = { workspace = true }
1617
num-traits = { workspace = true }

‎api/swimos_form_derive/Cargo.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
[package]
22
name = "swimos_form_derive"
3-
version = "0.1.0"
4-
authors = ["Swim Inc. developers [email protected]"]
5-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
66
description = "SwimOS Serialization and Deserialization Derive Macros"
7-
license = "Apache-2.0"
8-
repository = "https://github.com/swimos/swim-rust/"
7+
license.workspace = true
8+
repository = "https://github.com/swimos/swim-rust/tree/main/api/swimos_form_derive"
9+
homepage.workspace = true
910

1011
[lib]
1112
name = "swimos_form_derive"
1213
proc-macro = true
1314

1415
[dependencies]
1516
either = { workspace = true }
16-
swimos_utilities = { path = "../../swimos_utilities", features = ["errors", "text"], version = "0.1.0" }
17-
swimos_macro_utilities = { path = "../../swimos_macro_utilities", version = "0.1.0" }
17+
swimos_utilities = { workspace = true, features = ["errors", "text"] }
18+
swimos_macro_utilities = { workspace = true }
1819
proc-macro2 = { workspace = true }
1920
syn = { workspace = true, features = ["full"] }
2021
quote = { workspace = true }

‎api/swimos_meta/Cargo.toml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
[package]
22
name = "swimos_meta"
3-
version = "0.1.0"
4-
authors = ["Swim Inc. developers [email protected]"]
5-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
66
description = "SwimOS Metadata API"
7-
license = "Apache-2.0"
8-
repository = "https://github.com/swimos/swim-rust/"
7+
license.workspace = true
8+
repository = "https://github.com/swimos/swim-rust/tree/main/api/swimos_meta"
9+
homepage.workspace = true
910

1011
[dependencies]
11-
swimos_model = { path = "../swimos_model", version = "0.1.0" }
12-
swimos_form = { path = "../swimos_form", version = "0.1.0" }
13-
swimos_api = { path = "../swimos_api", version = "0.1.0" }
12+
swimos_model = { workspace = true }
13+
swimos_form = { workspace = true }
14+
swimos_api = { workspace = true }

‎api/swimos_model/Cargo.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
[package]
22
name = "swimos_model"
3-
version = "0.1.0"
4-
authors = ["Swim Inc. developers [email protected]"]
5-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
66
description = "SwimOS Generic Representation of the SwimOS Serialization Model"
7-
license = "Apache-2.0"
8-
repository = "https://github.com/swimos/swim-rust/"
7+
license.workspace = true
8+
repository = "https://github.com/swimos/swim-rust/tree/main/api/swimos_model"
9+
homepage.workspace = true
910

1011
[dependencies]
1112
chrono = { workspace = true }
@@ -14,7 +15,7 @@ either = { workspace = true }
1415
num-bigint = { workspace = true }
1516
base64 = { workspace = true }
1617
http = { workspace = true }
17-
swimos_utilities = { path = "../../swimos_utilities", features = ["text", "encoding"], version = "0.1.0" }
18+
swimos_utilities = { workspace = true, features = ["text", "encoding"] }
1819
num-traits = { workspace = true }
1920
thiserror = { workspace = true }
2021

0 commit comments

Comments
 (0)