Skip to content

Workspace dependencies #2381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AustinJ235 merged 7 commits into from
Oct 30, 2023
Merged

Workspace dependencies #2381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
248c2dd
Use workspace dependencies
marc0246 Oct 29, 2023
fd87bac
Update CI workflow to account for the two workspaces
marc0246 Oct 29, 2023
f50c3ec
Make the tables in the root workspace a bit nicer to look at
marc0246 Oct 29, 2023
7c3ff0d
Use workspace package version
marc0246 Oct 29, 2023
b54005b
Merge branch 'master' into workspace-dependencies
marc0246 Oct 30, 2023
33565dd
Remove workspace package version
marc0246 Oct 30, 2023
90850e9
Make winit a workspace dependency as well
marc0246 Oct 30, 2023
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
18 changes: 15 additions & 3 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
target
/Cargo.lock
Cargo.lock
.cargo
examples/dynamic-local-size/mandelbrot.png
examples/msaa-renderpass/triangle.png
Expand Down
50 changes: 49 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
15 changes: 15 additions & 0 deletions examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
10 changes: 5 additions & 5 deletions examples/async-update/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
4 changes: 2 additions & 2 deletions examples/basic-compute-shader/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
6 changes: 3 additions & 3 deletions examples/buffer-allocator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
4 changes: 2 additions & 2 deletions examples/clear-attachments/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ name = "clear-attachments"
path = "main.rs"

[dependencies]
vulkano = { path = "../../vulkano" }
winit = "0.28"
vulkano = { workspace = true }
winit = { workspace = true }
2 changes: 1 addition & 1 deletion examples/debug/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ name = "debug"
path = "main.rs"

[dependencies]
vulkano = { path = "../../vulkano" }
vulkano = { workspace = true }
8 changes: 4 additions & 4 deletions examples/deferred/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
4 changes: 2 additions & 2 deletions examples/dynamic-buffers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
6 changes: 3 additions & 3 deletions examples/dynamic-local-size/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
6 changes: 3 additions & 3 deletions examples/gl-interop/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
8 changes: 4 additions & 4 deletions examples/image-self-copy-blit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
8 changes: 4 additions & 4 deletions examples/image/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
8 changes: 4 additions & 4 deletions examples/immutable-sampler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
6 changes: 3 additions & 3 deletions examples/indirect/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
6 changes: 3 additions & 3 deletions examples/instancing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
12 changes: 6 additions & 6 deletions examples/interactive-fractal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
6 changes: 3 additions & 3 deletions examples/msaa-renderpass/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
12 changes: 6 additions & 6 deletions examples/multi-window-game-of-life/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
6 changes: 3 additions & 3 deletions examples/multi-window/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
6 changes: 3 additions & 3 deletions examples/multiview/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
6 changes: 3 additions & 3 deletions examples/occlusion-query/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
4 changes: 2 additions & 2 deletions examples/pipeline-caching/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
4 changes: 2 additions & 2 deletions examples/push-constants/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
8 changes: 4 additions & 4 deletions examples/push-descriptors/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
8 changes: 4 additions & 4 deletions examples/runtime-array/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
4 changes: 2 additions & 2 deletions examples/runtime-shader/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ name = "runtime-shader"
path = "main.rs"

[dependencies]
vulkano = { path = "../../vulkano" }
winit = "0.28"
vulkano = { workspace = true }
winit = { workspace = true }
4 changes: 2 additions & 2 deletions examples/self-copy-buffer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Loading