Skip to content

Commit 1ac3ba6

Browse files
committed
Bump minimum supported version of swift
1 parent 5998472 commit 1ac3ba6

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

.bazelci/presubmit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ tasks:
1010
bazel: ${{ bazel }}
1111
environment:
1212
CC: clang
13-
SWIFT_VERSION: "5.9"
13+
SWIFT_VERSION: "5.10"
1414
SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
1515
PATH: "$PATH:$SWIFT_HOME/usr/bin"
1616
shell_commands:
@@ -26,7 +26,7 @@ tasks:
2626
bazel: ${{ bazel }}
2727
environment:
2828
CC: clang
29-
SWIFT_VERSION: "5.9"
29+
SWIFT_VERSION: "5.10"
3030
SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
3131
PATH: "$PATH:$SWIFT_HOME/usr/bin"
3232
shell_commands:

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ jobs:
503503
name: Test Swift
504504
strategy:
505505
matrix:
506-
swift: ["5.9", "5.10", "6.1"]
506+
swift: ["5.10", "6.1", "6.2"]
507507
# Only 22.04 has swift at the moment https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md?plain=1#L30
508508
runs-on: ubuntu-22.04
509509
steps:

FlatBuffers.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
1616
s.ios.deployment_target = '11.0'
1717
s.osx.deployment_target = '10.14'
1818

19-
s.swift_version = '5.0'
19+
s.swift_version = '5.10'
2020
s.source_files = 'swift/Sources/Flatbuffers/*.swift'
2121
s.pod_target_xcconfig = {
2222
'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES'

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.9
1+
// swift-tools-version:5.10
22
/*
33
* Copyright 2020 Google Inc. All rights reserved.
44
*

benchmarks/swift/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.9
1+
// swift-tools-version:5.10
22
/*
33
* Copyright 2020 Google Inc. All rights reserved.
44
*

grpc/examples/swift/Greeter/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.9
1+
// swift-tools-version:5.10
22
/*
33
* Copyright 2020 Google Inc. All rights reserved.
44
*

swift/Sources/FlatBuffers/FlatBufferBuilder.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ public struct FlatBufferBuilder {
478478
return endVector(len: size)
479479
}
480480

481-
#if swift(>=5.0) && !os(WASI)
481+
#if !os(WASI)
482482
@inline(__always)
483483
/// Creates a vector of bytes in the buffer.
484484
///

swift/Sources/FlatBuffers/_InternalByteBuffer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ struct _InternalByteBuffer {
143143

144144
/// Adds a `ContiguousBytes` to buffer memory
145145
/// - Parameter value: bytes to copy
146-
#if swift(>=5.0) && !os(WASI)
146+
#if !os(WASI)
147147
@inline(__always)
148148
@usableFromInline
149149
mutating func push(bytes: ContiguousBytes) {

tests/swift/Wasm.tests/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.9
1+
// swift-tools-version:5.10
22
/*
33
* Copyright 2020 Google Inc. All rights reserved.
44
*

tests/swift/fuzzer/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.9
1+
// swift-tools-version:5.10
22
/*
33
* Copyright 2020 Google Inc. All rights reserved.
44
*

0 commit comments

Comments
 (0)