From 7150dfb5c4e8479b1eba54f3770edb458d075542 Mon Sep 17 00:00:00 2001 From: mustiikhalil <26250654+mustiikhalil@users.noreply.github.com> Date: Sat, 15 Nov 2025 00:07:49 +0100 Subject: [PATCH] [Swift] Bump minimum supported version of swift to 5.10 (#8758) --- .bazelci/presubmit.yml | 4 ++-- .github/workflows/build.yml | 2 +- FlatBuffers.podspec | 2 +- Package.swift | 2 +- benchmarks/swift/Package.swift | 2 +- grpc/examples/swift/Greeter/Package.swift | 2 +- swift/Sources/FlatBuffers/FlatBufferBuilder.swift | 2 +- swift/Sources/FlatBuffers/_InternalByteBuffer.swift | 2 +- tests/swift/Wasm.tests/Package.swift | 2 +- tests/swift/fuzzer/Package.swift | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index aa88684f1..7c07ba61e 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -10,7 +10,7 @@ tasks: bazel: ${{ bazel }} environment: CC: clang - SWIFT_VERSION: "5.9" + SWIFT_VERSION: "5.10" 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.9" + SWIFT_VERSION: "5.10" 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 0d6e6e614..5f098cd4a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -503,7 +503,7 @@ jobs: name: Test Swift strategy: matrix: - swift: ["5.9", "5.10", "6.1"] + swift: ["5.10", "6.1", "6.2"] # 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/FlatBuffers.podspec b/FlatBuffers.podspec index 95e04b8aa..4c7568395 100644 --- a/FlatBuffers.podspec +++ b/FlatBuffers.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '11.0' s.osx.deployment_target = '10.14' - s.swift_version = '5.0' + s.swift_version = '5.10' s.source_files = 'swift/Sources/Flatbuffers/*.swift' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' diff --git a/Package.swift b/Package.swift index 0d2b5a351..4f60a8c74 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.9 +// swift-tools-version:5.10 /* * Copyright 2020 Google Inc. All rights reserved. * diff --git a/benchmarks/swift/Package.swift b/benchmarks/swift/Package.swift index 4067daf66..118732987 100644 --- a/benchmarks/swift/Package.swift +++ b/benchmarks/swift/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.9 +// swift-tools-version:5.10 /* * Copyright 2020 Google Inc. All rights reserved. * diff --git a/grpc/examples/swift/Greeter/Package.swift b/grpc/examples/swift/Greeter/Package.swift index 9fd6cab83..664f2a0cd 100644 --- a/grpc/examples/swift/Greeter/Package.swift +++ b/grpc/examples/swift/Greeter/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.9 +// swift-tools-version:5.10 /* * Copyright 2020 Google Inc. All rights reserved. * diff --git a/swift/Sources/FlatBuffers/FlatBufferBuilder.swift b/swift/Sources/FlatBuffers/FlatBufferBuilder.swift index 9b1450ee3..9e778d225 100644 --- a/swift/Sources/FlatBuffers/FlatBufferBuilder.swift +++ b/swift/Sources/FlatBuffers/FlatBufferBuilder.swift @@ -480,7 +480,7 @@ public struct FlatBufferBuilder { return endVector(len: size) } - #if swift(>=5.0) && !os(WASI) + #if !os(WASI) @inline(__always) /// Creates a vector of bytes in the buffer. /// diff --git a/swift/Sources/FlatBuffers/_InternalByteBuffer.swift b/swift/Sources/FlatBuffers/_InternalByteBuffer.swift index 543a2831e..8dced85b4 100644 --- a/swift/Sources/FlatBuffers/_InternalByteBuffer.swift +++ b/swift/Sources/FlatBuffers/_InternalByteBuffer.swift @@ -143,7 +143,7 @@ struct _InternalByteBuffer { /// Adds a `ContiguousBytes` to buffer memory /// - Parameter value: bytes to copy - #if swift(>=5.0) && !os(WASI) + #if !os(WASI) @inline(__always) @usableFromInline mutating func push(bytes: ContiguousBytes) { diff --git a/tests/swift/Wasm.tests/Package.swift b/tests/swift/Wasm.tests/Package.swift index a7573d6c7..9bdf1f11b 100644 --- a/tests/swift/Wasm.tests/Package.swift +++ b/tests/swift/Wasm.tests/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.9 +// swift-tools-version:5.10 /* * Copyright 2020 Google Inc. All rights reserved. * diff --git a/tests/swift/fuzzer/Package.swift b/tests/swift/fuzzer/Package.swift index 1d34d0254..79fe836c4 100644 --- a/tests/swift/fuzzer/Package.swift +++ b/tests/swift/fuzzer/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.9 +// swift-tools-version:5.10 /* * Copyright 2020 Google Inc. All rights reserved. *