From c49e81d6ec60d411f9d5cd9b748b8f86af154922 Mon Sep 17 00:00:00 2001
From: mustiikhalil <26250654+mustiikhalil@users.noreply.github.com>
Date: Tue, 4 Feb 2025 18:11:46 +0100
Subject: [PATCH] Adds swift 6 to the build matrix (#8414)

Bump min version of swift to be 5.9
---
 .bazelci/presubmit.yml                    | 4 ++--
 .github/workflows/build.yml               | 2 +-
 Package.swift                             | 2 +-
 benchmarks/swift/Package.swift            | 2 +-
 grpc/examples/swift/Greeter/Package.swift | 2 +-
 tests/swift/tests/Package.swift           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 5fa890e20..aa88684f1 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -10,7 +10,7 @@ tasks:
     bazel: ${{ bazel }}
     environment:
       CC: clang
-      SWIFT_VERSION: "5.8"
+      SWIFT_VERSION: "5.9"
       SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
       PATH: "$PATH:$SWIFT_HOME/usr/bin"
     shell_commands:
@@ -26,7 +26,7 @@ tasks:
     bazel: ${{ bazel }}
     environment:
       CC: clang
-      SWIFT_VERSION: "5.8"
+      SWIFT_VERSION: "5.9"
       SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
       PATH: "$PATH:$SWIFT_HOME/usr/bin"
     shell_commands:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 47d36965b..2a763167b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -495,7 +495,7 @@ jobs:
     name: Build Swift
     strategy:
       matrix:
-        swift: ["5.8", "5.9", "5.10"]
+        swift: ["5.9", "5.10", "6.0"]
     # Only 22.04 has swift at the moment https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md?plain=1#L30
     runs-on: ubuntu-22.04
     steps:
diff --git a/Package.swift b/Package.swift
index dd9d32be3..ad6f0e866 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.8
+// swift-tools-version:5.9
 /*
  * Copyright 2020 Google Inc. All rights reserved.
  *
diff --git a/benchmarks/swift/Package.swift b/benchmarks/swift/Package.swift
index 1a1dd09ee..4067daf66 100644
--- a/benchmarks/swift/Package.swift
+++ b/benchmarks/swift/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.8
+// swift-tools-version:5.9
 /*
  * Copyright 2020 Google Inc. All rights reserved.
  *
diff --git a/grpc/examples/swift/Greeter/Package.swift b/grpc/examples/swift/Greeter/Package.swift
index 5e6fb68cd..392c2798d 100644
--- a/grpc/examples/swift/Greeter/Package.swift
+++ b/grpc/examples/swift/Greeter/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.9
 /*
  * Copyright 2020 Google Inc. All rights reserved.
  *
diff --git a/tests/swift/tests/Package.swift b/tests/swift/tests/Package.swift
index 723d4fc72..d66380e04 100644
--- a/tests/swift/tests/Package.swift
+++ b/tests/swift/tests/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.8
+// swift-tools-version:5.9
 /*
  * Copyright 2020 Google Inc. All rights reserved.
  *