From f22009ee7697a3278f2426e794ae10a469e4f4c3 Mon Sep 17 00:00:00 2001
From: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
Date: Wed, 15 Nov 2023 16:26:43 -0500
Subject: [PATCH] Bump versions and changelog

---
 CHANGELOG.md         | 18 ++++++++++++++++++
 Cargo.lock           |  4 ++--
 naga/Cargo.toml      |  2 +-
 wgpu-core/Cargo.toml |  2 +-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 725f72b991..32ba1b7b3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,24 @@ Bottom level categories:
 
 ## Unreleased
 
+## v0.18.1 (2023-11-15)
+
+(naga version 0.14.1)
+
+### Bug Fixes
+
+#### General
+- Fix panic in `Surface::configure` in debug builds. By @cwfitzgerald in [#4635](https://github.com/gfx-rs/wgpu/pull/4635)
+- Fix crash when all the following are true: By @teoxoy in #[#4642](https://github.com/gfx-rs/wgpu/pull/4642)
+  - Passing a naga module directly to `Device::create_shader_module`.
+  - `InstanceFlags::DEBUG` is enabled.
+
+#### DX12 
+- Always use HLSL 2018 when using DXC to compile HLSL shaders. By @daxpedda in [#4629](https://github.com/gfx-rs/wgpu/pull/4629)
+
+#### Metal
+- In Metal Shading Language output, fix issue where local variables were sometimes using variable names from previous functions. By @DJMcNab in [#4594](https://github.com/gfx-rs/wgpu/pull/4594)
+
 For naga changelogs at or before v0.14.0. See [naga's changelog](naga/CHANGELOG.md).
 
 ## v0.18.0 (2023-10-25)
diff --git a/Cargo.lock b/Cargo.lock
index a7bdbbe6b8..5649288b0b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2018,7 +2018,7 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "arbitrary",
  "bincode",
@@ -3799,7 +3799,7 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.18.0"
+version = "0.18.1"
 dependencies = [
  "arrayvec 0.7.4",
  "bit-vec",
diff --git a/naga/Cargo.toml b/naga/Cargo.toml
index 91ed49a5c6..882f87eb8f 100644
--- a/naga/Cargo.toml
+++ b/naga/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "naga"
-version = "0.14.0"
+version = "0.14.1"
 authors = ["Naga Developers"]
 edition = "2021"
 description = "Shader translation infrastructure"
diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml
index 6ad0bedf72..de13de7b39 100644
--- a/wgpu-core/Cargo.toml
+++ b/wgpu-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wgpu-core"
-version = "0.18.0"
+version = "0.18.1"
 authors = ["wgpu developers"]
 edition = "2021"
 description = "WebGPU core logic on wgpu-hal"