Workspace dependencies (#2381)

* Use workspace dependencies

* Update CI workflow to account for the two workspaces

* Make the tables in the root workspace a bit nicer to look at

* Use workspace package version

* Remove workspace package version

* Make winit a workspace dependency as well

.github/workflows/rust.yml

@@ -19,23 +19,35 @@ jobs:
 #   - name: Ninja Install
 #     run: pip install ninja
     - uses: actions/checkout@v3
-    - name: Build
+    - name: Build tests
       run: cargo build --verbose
     - name: Run tests
       run: cargo test --verbose
+    - name: Build examples
+      run: |
+        cd examples
+        cargo build --verbose
   linux_stable:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Build
+    - name: Build tests
       run: cargo build --verbose
     - name: Run tests
       run: cargo test --verbose
+    - name: Build examples
+      run: |
+        cd examples
+        cargo build --verbose
   macos_stable:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Build
+    - name: Build tests
       run: cargo build --verbose
     - name: Run tests
       run: cargo test --verbose
+    - name: Build examples
+      run: |
+        cd examples
+        cargo build --verbose

.gitignore

@@ -1,5 +1,5 @@
 target
-/Cargo.lock
+Cargo.lock
 .cargo
 examples/dynamic-local-size/mandelbrot.png
 examples/msaa-renderpass/triangle.png

Cargo.toml

@@ -1,10 +1,58 @@
 [workspace]
 members = [
-    "examples/*",
     "vulkano",
     "vulkano-macros",
     "vulkano-shaders",
     "vulkano-util",
     "vulkano-win",
 ]
 resolver = "2"
+
+[workspace.dependencies.vulkano]
+version = "0.34"
+path = "vulkano"
+default-features = false
+
+[workspace.dependencies.vulkano-macros]
+version = "0.34"
+path = "vulkano-macros"
+
+[workspace.dependencies.vulkano-shaders]
+version = "0.34"
+path = "vulkano-shaders"
+
+[workspace.dependencies.vulkano-util]
+version = "0.34"
+path = "vulkano-util"
+
+[workspace.dependencies]
+ahash = "0.8"
+# When updating Ash, also update vk.xml to the same Vulkan patch version that Ash uses.
+# All versions of vk.xml can be found at:
+# /~https://github.com/KhronosGroup/Vulkan-Headers/commits/main/registry/vk.xml
+ash = "0.37.3"
+bytemuck = "1.9"
+cgmath = "0.18"
+core-graphics-types = "0.1"
+crossbeam-queue = "0.3"
+half = "2.0"
+heck = "0.4"
+indexmap = "2.0"
+libloading = "0.8"
+objc = "0.2.5"
+once_cell = "1.17"
+nalgebra = "0.32"
+parking_lot = "0.12"
+proc-macro2 = "1.0"
+proc-macro-crate = "1.2"
+quote = "1.0"
+raw-window-handle = "0.5"
+regex = "1.8"
+serde = "1.0"
+serde_json = "1.0"
+shaderc = "0.8"
+smallvec = "1.8"
+syn = "1.0"
+thread_local = "1.1"
+vk-parse = "0.12"
+winit = "0.28"

examples/Cargo.toml

@@ -0,0 +1,15 @@
+[workspace]
+members = ["*"]
+resolver = "2"
+
+[workspace.dependencies]
+cgmath = "0.18"
+png = "0.17"
+rand = "0.8"
+ron = "0.8"
+serde = "1.0"
+vulkano = { path = "../vulkano" }
+vulkano-macros = { path = "../vulkano-macros" }
+vulkano-shaders = { path = "../vulkano-shaders" }
+vulkano-util = { path = "../vulkano-util" }
+winit = "0.28"

examples/async-update/Cargo.toml

@@ -9,8 +9,8 @@ name = "async-update"
 path = "main.rs"
 
 [dependencies]
-cgmath = "0.18"
-rand = "0.8"
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-winit = "0.28"
+cgmath = { workspace = true }
+rand = { workspace = true }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+winit = { workspace = true }

examples/basic-compute-shader/Cargo.toml

@@ -9,5 +9,5 @@ name = "basic-compute-shader"
 path = "main.rs"
 
 [dependencies]
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }

examples/buffer-allocator/Cargo.toml

@@ -9,6 +9,6 @@ name = "buffer-allocator"
 path = "main.rs"
 
 [dependencies]
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-winit = "0.28"
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+winit = { workspace = true }

examples/clear-attachments/Cargo.toml

@@ -9,5 +9,5 @@ name = "clear-attachments"
 path = "main.rs"
 
 [dependencies]
-vulkano = { path = "../../vulkano" }
-winit = "0.28"
+vulkano = { workspace = true }
+winit = { workspace = true }

examples/debug/Cargo.toml

@@ -9,4 +9,4 @@ name = "debug"
 path = "main.rs"
 
 [dependencies]
-vulkano = { path = "../../vulkano" }
+vulkano = { workspace = true }

examples/deferred/Cargo.toml

@@ -9,7 +9,7 @@ name = "deferred"
 path = "main.rs"
 
 [dependencies]
-cgmath = "0.18"
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-winit = "0.28"
+cgmath = { workspace = true }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+winit = { workspace = true }

examples/dynamic-buffers/Cargo.toml

@@ -9,5 +9,5 @@ name = "dynamic-buffers"
 path = "main.rs"
 
 [dependencies]
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }

examples/dynamic-local-size/Cargo.toml

@@ -9,6 +9,6 @@ name = "dynamic-local-size"
 path = "main.rs"
 
 [dependencies]
-png = "0.17"
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
+png = { workspace = true }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }

examples/gl-interop/Cargo.toml

@@ -10,8 +10,8 @@ path = "main.rs"
 
 [dependencies]
 glium = "0.32.1"
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-winit = "0.28"
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+winit = { workspace = true }
 # Glium has still not been updated to the latest winit version
 winit_glium = { package = "winit", version = "0.27.1" }

examples/image-self-copy-blit/Cargo.toml

@@ -9,7 +9,7 @@ name = "image-self-copy-blit"
 path = "main.rs"
 
 [dependencies]
-png = "0.17"
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-winit = "0.28"
+png = { workspace = true }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+winit = { workspace = true }

examples/image/Cargo.toml

@@ -9,7 +9,7 @@ name = "image"
 path = "main.rs"
 
 [dependencies]
-png = "0.17"
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-winit = "0.28"
+png = { workspace = true }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+winit = { workspace = true }

examples/immutable-sampler/Cargo.toml

@@ -9,7 +9,7 @@ name = "immutable-sampler"
 path = "main.rs"
 
 [dependencies]
-png = "0.17"
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-winit = "0.28"
+png = { workspace = true }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+winit = { workspace = true }

examples/indirect/Cargo.toml

@@ -9,6 +9,6 @@ name = "indirect"
 path = "main.rs"
 
 [dependencies]
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-winit = "0.28"
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+winit = { workspace = true }

examples/instancing/Cargo.toml

@@ -9,6 +9,6 @@ name = "instancing"
 path = "main.rs"
 
 [dependencies]
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-winit = "0.28"
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+winit = { workspace = true }

examples/interactive-fractal/Cargo.toml

@@ -9,9 +9,9 @@ name = "interactive-fractal"
 path = "main.rs"
 
 [dependencies]
-cgmath = "0.18"
-rand = "0.8"
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-vulkano-util = { path = "../../vulkano-util" }
-winit = "0.28"
+cgmath = { workspace = true }
+rand = { workspace = true }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+vulkano-util = { workspace = true }
+winit = { workspace = true }

examples/msaa-renderpass/Cargo.toml

@@ -9,6 +9,6 @@ name = "msaa-renderpass"
 path = "main.rs"
 
 [dependencies]
-png = "0.17"
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
+png = { workspace = true }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }

examples/multi-window-game-of-life/Cargo.toml

@@ -9,9 +9,9 @@ name = "multi-window-game-of-life"
 path = "main.rs"
 
 [dependencies]
-cgmath = "0.18"
-rand = "0.8"
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-vulkano-util = { path = "../../vulkano-util" }
-winit = "0.28"
+cgmath = { workspace = true }
+rand = { workspace = true }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+vulkano-util = { workspace = true }
+winit = { workspace = true }

examples/multi-window/Cargo.toml

@@ -9,6 +9,6 @@ name = "multi-window"
 path = "main.rs"
 
 [dependencies]
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-winit = "0.28"
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+winit = { workspace = true }

examples/multiview/Cargo.toml

@@ -9,6 +9,6 @@ name = "multiview"
 path = "main.rs"
 
 [dependencies]
-png = "0.17"
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
+png = { workspace = true }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }

examples/occlusion-query/Cargo.toml

@@ -9,6 +9,6 @@ name = "occlusion-query"
 path = "main.rs"
 
 [dependencies]
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-winit = "0.28"
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+winit = { workspace = true }

examples/pipeline-caching/Cargo.toml

@@ -9,5 +9,5 @@ name = "pipeline-caching"
 path = "main.rs"
 
 [dependencies]
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }

examples/push-constants/Cargo.toml

@@ -9,5 +9,5 @@ name = "push-constants"
 path = "main.rs"
 
 [dependencies]
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }

examples/push-descriptors/Cargo.toml

@@ -9,7 +9,7 @@ name = "push-descriptors"
 path = "main.rs"
 
 [dependencies]
-png = "0.17"
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-winit = "0.28"
+png = { workspace = true }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+winit = { workspace = true }

examples/runtime-array/Cargo.toml

@@ -9,7 +9,7 @@ name = "runtime-array"
 path = "main.rs"
 
 [dependencies]
-png = "0.17"
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
-winit = "0.28"
+png = { workspace = true }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }
+winit = { workspace = true }

examples/runtime-shader/Cargo.toml

@@ -9,5 +9,5 @@ name = "runtime-shader"
 path = "main.rs"
 
 [dependencies]
-vulkano = { path = "../../vulkano" }
-winit = "0.28"
+vulkano = { workspace = true }
+winit = { workspace = true }

examples/self-copy-buffer/Cargo.toml

@@ -9,5 +9,5 @@ name = "self-copy-buffer"
 path = "main.rs"
 
 [dependencies]
-vulkano = { path = "../../vulkano" }
-vulkano-shaders = { path = "../../vulkano-shaders" }
+vulkano = { workspace = true }
+vulkano-shaders = { workspace = true }