From 793adb79acaacb05794a4e7cd40a96a606dc6e20 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 31 Oct 2023 12:46:37 +0000
Subject: [PATCH 1/3] Update default bundle to codeql-bundle-v2.15.2

---
 lib/defaults.json | 8 ++++----
 src/defaults.json | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/defaults.json b/lib/defaults.json
index 977a88f963..0314f5c13c 100644
--- a/lib/defaults.json
+++ b/lib/defaults.json
@@ -1,6 +1,6 @@
 {
-    "bundleVersion": "codeql-bundle-v2.15.1",
-    "cliVersion": "2.15.1",
-    "priorBundleVersion": "codeql-bundle-v2.15.0",
-    "priorCliVersion": "2.15.0"
+    "bundleVersion": "codeql-bundle-v2.15.2",
+    "cliVersion": "2.15.2",
+    "priorBundleVersion": "codeql-bundle-v2.15.1",
+    "priorCliVersion": "2.15.1"
 }
diff --git a/src/defaults.json b/src/defaults.json
index 52ce5f7957..5ccbf00d85 100644
--- a/src/defaults.json
+++ b/src/defaults.json
@@ -1,6 +1,6 @@
 {
-  "bundleVersion": "codeql-bundle-v2.15.1",
-  "cliVersion": "2.15.1",
-  "priorBundleVersion": "codeql-bundle-v2.15.0",
-  "priorCliVersion": "2.15.0"
+  "bundleVersion": "codeql-bundle-v2.15.2",
+  "cliVersion": "2.15.2",
+  "priorBundleVersion": "codeql-bundle-v2.15.1",
+  "priorCliVersion": "2.15.1"
 }

From 45a6ff466080ea064fbc13693befd8fbb2863a0f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 31 Oct 2023 12:46:42 +0000
Subject: [PATCH 2/3] Add changelog note

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e4d144b5c..78d9a61f99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
 
 ## [UNRELEASED]
 
-No user facing changes.
+- Update default CodeQL bundle version to 2.15.2. [#1978](https://github.com/github/codeql-action/pull/1978)
 
 ## 2.22.5 - 27 Oct 2023
 

From 59252d9bfb0e66fde481d0102f2920f096385899 Mon Sep 17 00:00:00 2001
From: Chris Smowton <smowton@github.com>
Date: Mon, 13 Nov 2023 11:33:19 +0000
Subject: [PATCH 3/3] Update setup-swift deficiency compensation

---
 .github/actions/setup-swift/action.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/actions/setup-swift/action.yml b/.github/actions/setup-swift/action.yml
index 74355b1586..c35f798209 100644
--- a/.github/actions/setup-swift/action.yml
+++ b/.github/actions/setup-swift/action.yml
@@ -24,9 +24,11 @@ runs:
             VERSION="5.7.0"
           elif [ $VERSION = "5.8" ]; then
             VERSION="5.8.0"
-          # setup-swift does not yet support v5.8.1 Remove this when it does.
-          elif [ $VERSION = "5.8.1" ]; then
-            VERSION="5.8.0"
+          elif [ $VERSION = "5.9" ]; then
+            VERSION="5.9.0"
+          # setup-swift does not yet support v5.9.1 Remove this when it does.
+          elif [ $VERSION = "5.9.1" ]; then
+            VERSION="5.9.0"
           fi 
         fi
         echo "version=$VERSION" | tee -a $GITHUB_OUTPUT