Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ audrey = "0.3"
futures = "0.3"
hotglsl = { git = "https://github.com/nannou-org/hotglsl", branch = "master" }
hrtf = "0.2"
nannou = { version ="0.17.0", path = "../nannou" }
nannou_audio = { version ="0.17.0", path = "../nannou_audio" }
nannou_conrod = { version ="0.17.0", path = "../nannou_conrod" }
nannou = { version ="0.18.0", path = "../nannou" }
nannou_audio = { version ="0.18.0", path = "../nannou_audio" }
nannou_conrod = { version ="0.18.0", path = "../nannou_conrod" }
nannou_isf = { version = "0.1.0", path = "../nannou_isf" }
nannou_laser = { version ="0.17.0", features = ["ffi", "ilda-idtf"], path = "../nannou_laser" }
nannou_osc = { version ="0.17.0", path = "../nannou_osc" }
nannou_timeline = { version ="0.17.0", features = ["serde1"], path = "../nannou_timeline" }
nannou_laser = { version ="0.18.0", features = ["ffi", "ilda-idtf"], path = "../nannou_laser" }
nannou_osc = { version ="0.18.0", path = "../nannou_osc" }
nannou_timeline = { version ="0.18.0", features = ["serde1"], path = "../nannou_timeline" }
pitch_calc = { version = "0.12", features = ["serde"] }
time_calc = { version= "0.13", features = ["serde"] }
walkdir = "2"
Expand Down
2 changes: 1 addition & 1 deletion generative_design/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ homepage = "https://github.com/nannou-org/nannou"
edition = "2018"

[dev-dependencies]
nannou = { version ="0.17.0", path = "../nannou" }
nannou = { version ="0.18.0", path = "../nannou" }
usvg = "0.4"
wikipedia = "0.3"

Expand Down
4 changes: 2 additions & 2 deletions guide/book_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ skeptic = { git = "https://github.com/mitchmindtree/rust-skeptic", branch = "1.4
# https://github.com/budziq/rust-skeptic/pull/121
skeptic = { git = "https://github.com/mitchmindtree/rust-skeptic", branch = "1.45-extern" }
#skeptic = "0.13"
nannou = { version ="0.17.0", path = "../../nannou" }
nannou_osc = { version ="0.17.0", path = "../../nannou_osc" }
nannou = { version ="0.18.0", path = "../../nannou" }
nannou_osc = { version ="0.18.0", path = "../../nannou_osc" }

29 changes: 26 additions & 3 deletions guide/src/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,33 @@ back to the origins.

# Unreleased

*No unreleased changes yet!*

---

# Version 0.18.0 (2021-11-15)

### wgpu 0.9 -> 0.11

- `resolver = "2"` is now required in the top-level cargo manifest. See the
nannou workspace's `Cargo.toml` for an example.
**Note:** As of wgpu 0.10, all nannou projects now require either:

1. The following line in their top-level cargo manifest:
```toml
resolver = "2"
```
OR
2. All packages must use the 2021 edition (or later) of Rust, e.g.
```toml
edition = "2021"
```

This requirement is due to wgpu 0.10's reliance on the new version of cargo's
dependency resolver and how it unifies features. Without either of the above
amendments, you will likely run into strange upstream compilation errors. You
can read more about the cargo dependency resolver versions here:

https://doc.rust-lang.org/cargo/reference/resolver.html#resolver-versions

- As of wgpu 0.10, it is now pure Rust! No more SPIR-V cross.
- The concept of the wgpu `SwapChain` has been removed by merging it into the
`Surface`, simplifying internals and improving approachability.
Expand All @@ -32,7 +55,7 @@ For more details, see the wgpu CHANGELOG:
- 0.10: https://github.com/gfx-rs/wgpu/blob/master/CHANGELOG.md#v010-2021-08-18
- 0.11: https://github.com/gfx-rs/wgpu/blob/master/CHANGELOG.md#wgpu-011-2021-10-07

### Other
### General

- Update `lyon` to version `0.17`.
- Refactor the `nannou::mesh` module into a `nannou_mesh` crate, re-exported to
Expand Down
8 changes: 4 additions & 4 deletions nannou/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nannou"
version ="0.17.1"
version ="0.18.0"
authors = ["mitchmindtree <mitchell.nordine@gmail.com>"]
description = "A Creative Coding Framework for Rust."
readme = "README.md"
Expand All @@ -16,9 +16,9 @@ futures = { version = "0.3", features = ["executor", "thread-pool"] }
image = "0.23"
instant = "0.1.9"
lyon = "0.17"
nannou_core = { version ="0.17.0", path = "../nannou_core", features = ["std", "serde"] }
nannou_mesh = { version ="0.17.0", path = "../nannou_mesh", features = ["serde1"] }
nannou_wgpu = { version ="0.17.0", path = "../nannou_wgpu", features = ["capturer"] }
nannou_core = { version ="0.18.0", path = "../nannou_core", features = ["std", "serde"] }
nannou_mesh = { version ="0.18.0", path = "../nannou_mesh", features = ["serde1"] }
nannou_wgpu = { version ="0.18.0", path = "../nannou_wgpu", features = ["capturer"] }
noise = "0.7"
notosans = { version = "0.1", optional = true }
num_cpus = "1"
Expand Down
2 changes: 1 addition & 1 deletion nannou_audio/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nannou_audio"
version ="0.17.0"
version ="0.18.0"
authors = ["mitchmindtree <mitchell.nordine@gmail.com>"]
description = "The audio API for Nannou, the creative coding framework."
readme = "README.md"
Expand Down
4 changes: 2 additions & 2 deletions nannou_conrod/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nannou_conrod"
version = "0.17.0"
version ="0.18.0"
authors = ["mitchmindtree <mitchell.nordine@gmail.com>"]
description = "Simplifies creating conrod GUIs in nannou apps."
readme = "README.md"
Expand All @@ -13,7 +13,7 @@ edition = "2018"
conrod_core = "0.76"
conrod_wgpu = "0.76"
conrod_winit = "0.76"
nannou = { version = "0.17.0", path = "../nannou", default-features = false }
nannou = { version ="0.18.0", path = "../nannou", default-features = false }
# Must be synchronised with the version used in the nannou dependency.
# Required for the winit event conversion function macro to work.
winit = "0.25"
Expand Down
2 changes: 1 addition & 1 deletion nannou_core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nannou_core"
version ="0.17.0"
version ="0.18.0"
authors = ["mitchmindtree <mitchell.nordine@gmail.com>"]
description = "The core components of nannou - a creative coding framework for Rust. Ideal for libraries and headless/embedded applications that use nannou."
readme = "README.md"
Expand Down
4 changes: 2 additions & 2 deletions nannou_isf/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
name = "nannou_isf"
version ="0.1.0"
version = "0.1.0"
authors = ["mitchmindtree <mitchell.nordine@gmail.com>"]
edition = "2018"

[dependencies]
hotglsl = { git = "https://github.com/nannou-org/hotglsl", branch = "master" }
isf = { git = "https://github.com/nannou-org/isf", branch = "master" }
nannou = { version ="0.17.0", path = "../nannou", features = ["spirv"] }
nannou = { version ="0.18.0", path = "../nannou", features = ["spirv"] }
thiserror = "1"
threadpool = "1"
walkdir = "2"
2 changes: 1 addition & 1 deletion nannou_laser/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nannou_laser"
version ="0.17.0"
version ="0.18.0"
authors = ["mitchmindtree <mitchell.nordine@gmail.com>"]
description = "A cross-platform laser DAC detection and streaming API."
edition = "2018"
Expand Down
4 changes: 2 additions & 2 deletions nannou_mesh/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nannou_mesh"
version = "0.17.0"
version ="0.18.0"
authors = ["mitchmindtree <mail@mitchellnordine.com>"]
description = "The mesh abstraction shared between nannou's `Draw` and `Ui` abstractions."
readme = "README.md"
Expand All @@ -10,7 +10,7 @@ homepage = "https://nannou.cc"
edition = "2018"

[dependencies]
nannou_core = { version = "0.17.0", path = "../nannou_core" }
nannou_core = { version ="0.18.0", path = "../nannou_core" }
serde = { version = "1", optional = true, features = ["derive"] }

[features]
Expand Down
2 changes: 1 addition & 1 deletion nannou_new/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nannou_new"
version ="0.17.0"
version ="0.18.0"
authors = ["mitchmindtree <mitchell.nordine@gmail.com>"]
description = "A tool for easily starting Nannou projects."
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion nannou_osc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nannou_osc"
version ="0.17.0"
version ="0.18.0"
authors = ["mitchmindtree <mitchell.nordine@gmail.com>"]
description = "The OSC API for Nannou, the creative coding framework."
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion nannou_package/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nannou_package"
version ="0.17.0"
version ="0.18.0"
authors = ["mitchmindtree <mitchell.nordine@gmail.com>"]
description = "The build packaging tool for the Nannou Creative Coding Framework."
readme = "README.md"
Expand Down
4 changes: 2 additions & 2 deletions nannou_timeline/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nannou_timeline"
version ="0.17.0"
version ="0.18.0"
authors = ["mitchmindtree <mitchell.nordine@gmail.com>"]
description = "A timeline widget, compatible with all conrod GUI projects."
readme = "README.md"
Expand All @@ -27,6 +27,6 @@ serde1 = [
]

[dev-dependencies]
nannou = { version ="0.17.0", path = "../nannou" }
nannou = { version ="0.18.0", path = "../nannou" }
rand = "0.3.12"
serde_json = "1.0"
2 changes: 1 addition & 1 deletion nannou_wgpu/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nannou_wgpu"
version = "0.17.0"
version ="0.18.0"
authors = ["mitchmindtree <mitchell.nordine@gmail.com>"]
description = "Items related to wgpu and its integration in nannou - a creative coding framework for Rust."
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion nature_of_code/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ homepage = "https://github.com/nannou-org/nannou"
edition = "2018"

[dev-dependencies]
nannou = { version ="0.17.0", path = "../nannou" }
nannou = { version ="0.18.0", path = "../nannou" }

# Chapter 1 Vectors
[[example]]
Expand Down