chore(cargo/sdk): prep for publishing spin-sdk crate (#2151)

chore(sdk/rust): prep for publishing spin-macro and spin-sdk crates Also: - symlink wit dir; update lib.rs - align spin-macro crate version with workspace; update Cargo.locks Signed-off-by: Vaughn Dice <[email protected]>
spinframework · Dec 13, 2023 · 09a0434 · 09a0434
1 parent 6c2c0ff
commit 09a0434
Show file tree

Hide file tree

Showing 34 changed files with 60 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,13 +3,16 @@ name = "spin-cli"
 version = { workspace = true }
 authors = { workspace = true }
 edition = { workspace = true }
-license = "Apache-2.0 WITH LLVM-exception"
-rust-version = "1.71"
+license = { workspace = true }
 
 [workspace.package]
 version = "2.1.0-pre0"
 authors = ["Fermyon Engineering <[email protected]>"]
 edition = "2021"
+license = "Apache-2.0 WITH LLVM-exception"
+homepage = "https://developer.fermyon.com/spin"
+repository = "https://github.com/fermyon/spin"
+rust-version = "1.71"
 
 [dependencies]
 anyhow = { workspace = true }

diff --git a/examples/http-rust-outbound-http/http-hello/Cargo.lock b/examples/http-rust-outbound-http/http-hello/Cargo.lock
diff --git a/examples/http-rust-outbound-http/outbound-http-to-same-app/Cargo.lock b/examples/http-rust-outbound-http/outbound-http-to-same-app/Cargo.lock
diff --git a/examples/http-rust-outbound-http/outbound-http/Cargo.lock b/examples/http-rust-outbound-http/outbound-http/Cargo.lock
diff --git a/examples/http-rust-outbound-post/Cargo.lock b/examples/http-rust-outbound-post/Cargo.lock
diff --git a/examples/http-rust-router-macro/Cargo.lock b/examples/http-rust-router-macro/Cargo.lock
diff --git a/examples/http-rust-router/Cargo.lock b/examples/http-rust-router/Cargo.lock
diff --git a/examples/http-rust/Cargo.lock b/examples/http-rust/Cargo.lock
diff --git a/examples/json-http-rust/Cargo.lock b/examples/json-http-rust/Cargo.lock
diff --git a/examples/redis-rust/Cargo.lock b/examples/redis-rust/Cargo.lock
diff --git a/examples/rust-key-value/Cargo.lock b/examples/rust-key-value/Cargo.lock
diff --git a/examples/rust-outbound-mysql/Cargo.lock b/examples/rust-outbound-mysql/Cargo.lock
diff --git a/examples/rust-outbound-pg/Cargo.lock b/examples/rust-outbound-pg/Cargo.lock
diff --git a/examples/rust-outbound-redis/Cargo.lock b/examples/rust-outbound-redis/Cargo.lock
diff --git a/examples/spin-wagi-http/http-rust/Cargo.lock b/examples/spin-wagi-http/http-rust/Cargo.lock
diff --git a/examples/variables-rust/Cargo.lock b/examples/variables-rust/Cargo.lock
diff --git a/examples/wasi-http-rust-streaming-outgoing-body/Cargo.lock b/examples/wasi-http-rust-streaming-outgoing-body/Cargo.lock
diff --git a/examples/wasi-http-streaming-file/Cargo.lock b/examples/wasi-http-streaming-file/Cargo.lock
diff --git a/sdk/rust/Cargo.toml b/sdk/rust/Cargo.toml
@@ -3,7 +3,16 @@ name = "spin-sdk"
 version = { workspace = true }
 authors = { workspace = true }
 edition = { workspace = true }
-rust-version = "1.64"
+license = { workspace = true }
+homepage = { workspace = true }
+repository = { workspace = true }
+documentation = "https://docs.rs/spin-sdk"
+readme = "README.md"
+rust-version = { workspace = true }
+
+description = """
+The Spin Rust SDK makes it easy to build Spin components in Rust.
+"""
 
 [lib]
 name = "spin_sdk"
@@ -12,7 +21,7 @@ name = "spin_sdk"
 anyhow = "1"
 async-trait = "0.1.74"
 form_urlencoded = "1.0"
-spin-macro = { path = "macro" }
+spin-macro = { version = "2.1.0-pre0", path = "macro" }
 thiserror = "1.0.37"
 wit-bindgen = "0.13.0"
 routefinder = "0.5.3"

diff --git a/sdk/rust/readme.md → sdk/rust/README.md b/sdk/rust/readme.md → sdk/rust/README.md
diff --git a/sdk/rust/macro/Cargo.toml b/sdk/rust/macro/Cargo.toml
@@ -1,7 +1,17 @@
 [package]
-edition = "2021"
 name = "spin-macro"
-version = "0.1.0"
+version = { workspace = true }
+edition = { workspace = true }
+authors = { workspace = true }
+license = { workspace = true }
+homepage = { workspace = true }
+repository = { workspace = true }
+documentation = "https://docs.rs/spin-macro"
+readme = "README.md"
+
+description = """
+Rust procedural macros for Spin and associated WIT files
+"""
 
 [lib]
 name = "spin_macro"

diff --git a/sdk/rust/macro/README.md b/sdk/rust/macro/README.md
@@ -0,0 +1,3 @@
+# The spin-macro crate
+
+This crate contains procedural macros for Spin and associated WIT files.
diff --git a/sdk/rust/src/lib.rs b/sdk/rust/src/lib.rs
@@ -23,7 +23,7 @@ pub mod wit {
 
     wit_bindgen::generate!({
         world: "platform",
-        path: "../../wit",
+        path: "./wit",
     });
     pub use fermyon::spin2_0_0 as v2;
 }

diff --git a/sdk/rust/wit b/sdk/rust/wit
@@ -0,0 +1 @@
+../../wit
diff --git a/tests/testcases/application-variables/Cargo.lock b/tests/testcases/application-variables/Cargo.lock
diff --git a/tests/testcases/head-rust-sdk-http/Cargo.lock b/tests/testcases/head-rust-sdk-http/Cargo.lock
diff --git a/tests/testcases/head-rust-sdk-redis/Cargo.lock b/tests/testcases/head-rust-sdk-redis/Cargo.lock
diff --git a/tests/testcases/headers-dynamic-env-test/Cargo.lock b/tests/testcases/headers-dynamic-env-test/Cargo.lock
diff --git a/tests/testcases/headers-env-routes-test/Cargo.lock b/tests/testcases/headers-env-routes-test/Cargo.lock
diff --git a/tests/testcases/key-value/Cargo.lock b/tests/testcases/key-value/Cargo.lock
diff --git a/tests/testcases/llm/Cargo.lock b/tests/testcases/llm/Cargo.lock
diff --git a/tests/testcases/outbound-http-to-same-app/http-component/Cargo.lock b/tests/testcases/outbound-http-to-same-app/http-component/Cargo.lock
diff --git a/tests/testcases/outbound-http-to-same-app/outbound-http-component/Cargo.lock b/tests/testcases/outbound-http-to-same-app/outbound-http-component/Cargo.lock
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# The spin-macro crate

		This crate contains procedural macros for Spin and associated WIT files.