Sets Swift minimum version to 5.8 (#8228)

Updates copyright from 2023 to 2024 & formats code - updates formatting rules Updates CI to run with swift 5.8 Adds wasmer & updates command to run carton as a swift plugin Update bazelci to also accept swift 5.8 Adds swift 5.10 to the test matrix
2026-06-01 19:58:15 +00:00 · 2024-05-29 22:07:54 +02:00
parent 3b27f5396e
commit 75f05d6389
44 changed files with 89 additions and 192 deletions
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -5,7 +5,7 @@ platforms:
  ubuntu1804:
    environment:
      CC: clang
-      SWIFT_VERSION: "5.5.3"
+      SWIFT_VERSION: "5.8"
      SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
      PATH: "$PATH:$SWIFT_HOME/usr/bin"
    shell_commands:
@@ -19,7 +19,7 @@ platforms:
  ubuntu2004:
    environment:
      CC: clang
-      SWIFT_VERSION: "5.5.3"
+      SWIFT_VERSION: "5.8"
      SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
      PATH: "$PATH:$SWIFT_HOME/usr/bin"
    shell_commands:
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -486,10 +486,18 @@ jobs:

  build-swift:
    name: Build Swift
+    strategy:
+      matrix:
+        swift: ["5.8", "5.9", "5.10"]
    # 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:
    - uses: actions/checkout@v3
+    - uses: swift-actions/setup-swift@v2
+      with:
+        swift-version: ${{ matrix.swift }}
+    - name: Get swift version
+      run: swift --version
    - name: test
      working-directory: tests/swift/tests
      run: |
@@ -505,9 +513,12 @@ jobs:
      - uses: actions/checkout@v3
      - name: Setup Wasmer
        uses: wasmerio/setup-wasmer@v2
+      - uses: swiftwasm/setup-swiftwasm@v1
+        with:
+          swift-version: "wasm-5.9.2-RELEASE"
      - name: Test
        working-directory: tests/swift/Wasm.tests
-        run: carton test
+        run: swift run carton test

  build-ts:
    name: Build TS
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.8
 /*
 * Copyright 2020 Google Inc. All rights reserved.
 *
--- a/Package@swift-5.5.swift
+++ b/Package@swift-5.5.swift
@@ -1,37 +0,0 @@
-// swift-tools-version:5.5
-/*
- * Copyright 2020 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import PackageDescription
-
-let package = Package(
-  name: "FlatBuffers",
-  platforms: [
-    .iOS(.v11),
-    .macOS(.v10_14),
-  ],
-  products: [
-    .library(
-      name: "FlatBuffers",
-      targets: ["FlatBuffers"]),
-  ],
-  targets: [
-    .target(
-      name: "FlatBuffers",
-      dependencies: [],
-      path: "swift/Sources"),
-  ])
-
--- a/benchmarks/swift/Benchmarks/FlatbuffersBenchmarks/FlatbuffersBenchmarks.swift
+++ b/benchmarks/swift/Benchmarks/FlatbuffersBenchmarks/FlatbuffersBenchmarks.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/grpc/examples/swift/Greeter/Sources/client/main.swift
+++ b/grpc/examples/swift/Greeter/Sources/client/main.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/grpc/examples/swift/Greeter/Sources/server/main.swift
+++ b/grpc/examples/swift/Greeter/Sources/server/main.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/samples/sample_binary.swift
+++ b/samples/sample_binary.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/swift.swiftformat
+++ b/swift.swiftformat
@@ -6,7 +6,7 @@

 # options
 --self remove # redundantSelf
--importgrouping testable-bottom # sortedImports
+--importgrouping testable-bottom # sortImports
 --trimwhitespace always
 --indentcase false
 --ifdef no-indent #indent
@@ -17,7 +17,7 @@
 --typeattributes prev-line # wrapAttributes

 # rules
--rules wrap,todos,anyObjectProtocol,redundantParens,redundantReturn,redundantSelf,sortedImports,strongifiedSelf,trailingCommas,trailingSpace,wrapArguments,wrapMultilineStatementBraces,indent,wrapAttributes,void,fileHeader
+--rules wrap,todos,anyObjectProtocol,redundantParens,redundantReturn,redundantSelf,sortImports,strongifiedSelf,trailingCommas,trailingSpace,wrapArguments,wrapMultilineStatementBraces,indent,wrapAttributes,void,fileHeader
 --disable trailingclosures

 --exclude **/*_generated.swift
--- a/swift/Sources/FlatBuffers/ByteBuffer.swift
+++ b/swift/Sources/FlatBuffers/ByteBuffer.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// `ByteBuffer` is the interface that stores the data for a `Flatbuffers` object
 /// it allows users to write and read data directly from memory thus the use of its
@@ -133,7 +129,7 @@ public struct ByteBuffer {
    _writerSize = _storage.capacity
    allowReadingUnalignedBuffers = allowUnalignedBuffers
    b.withUnsafeMutableBytes { bufferPointer in
-      self._storage.copy(from: bufferPointer.baseAddress!, count: bytes.count)
+      _storage.copy(from: bufferPointer.baseAddress!, count: bytes.count)
    }
  }

@@ -151,7 +147,7 @@ public struct ByteBuffer {
    _writerSize = _storage.capacity
    allowReadingUnalignedBuffers = allowUnalignedBuffers
    b.withUnsafeMutableBytes { bufferPointer in
-      self._storage.copy(from: bufferPointer.baseAddress!, count: data.count)
+      _storage.copy(from: bufferPointer.baseAddress!, count: data.count)
    }
  }
  #endif
@@ -257,7 +253,7 @@ public struct ByteBuffer {
        _storage.memory.advanced(by: writerIndex &- ptr.count),
        UnsafeRawPointer(ptr.baseAddress!),
        ptr.count)
-      self._writerSize = self._writerSize &+ ptr.count
+      _writerSize = _writerSize &+ ptr.count
    }
  }

@@ -271,7 +267,7 @@ public struct ByteBuffer {
      _storage.memory
        .advanced(by: writerIndex &- ptr.count)
        .copyMemory(from: ptr.baseAddress!, byteCount: ptr.count)
-      self._writerSize = self._writerSize &+ ptr.count
+      _writerSize = _writerSize &+ ptr.count
    }
  }

@@ -287,7 +283,7 @@ public struct ByteBuffer {
        _storage.memory.advanced(by: writerIndex &- ptr.count),
        UnsafeRawPointer(ptr.baseAddress!),
        ptr.count)
-      self._writerSize = self._writerSize &+ ptr.count
+      _writerSize = _writerSize &+ ptr.count
    }
  }
  #endif
@@ -306,7 +302,7 @@ public struct ByteBuffer {
        _storage.memory.advanced(by: writerIndex &- size),
        $0.baseAddress!,
        size)
-      self._writerSize = self._writerSize &+ size
+      _writerSize = _writerSize &+ size
    }
  }

@@ -324,7 +320,7 @@ public struct ByteBuffer {
        _storage.memory.advanced(by: writerIndex &- len),
        $0.baseAddress!,
        len)
-      self._writerSize = self._writerSize &+ len
+      _writerSize = _writerSize &+ len
    }
  }

@@ -429,11 +425,9 @@ public struct ByteBuffer {
  ///   - position: the index of the object in the buffer
  @inline(__always)
  public func read<T>(def: T.Type, position: Int) -> T {
-    #if swift(>=5.7)
    if allowReadingUnalignedBuffers {
      return _storage.memory.advanced(by: position).loadUnaligned(as: T.self)
    }
-    #endif
    return _storage.memory.advanced(by: position).load(as: T.self)
  }

@@ -538,7 +532,8 @@ extension ByteBuffer: CustomDebugStringConvertible {
  public var debugDescription: String {
    """
    buffer located at: \(_storage.memory), with capacity of \(_storage.capacity)
-    { writerSize: \(_writerSize), readerSize: \(reader), writerIndex: \(writerIndex) }
+    { writerSize: \(_writerSize), readerSize: \(reader), writerIndex: \(
+      writerIndex) }
    """
  }
 }
--- a/swift/Sources/FlatBuffers/Constants.swift
+++ b/swift/Sources/FlatBuffers/Constants.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,15 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
-#if os(Linux)
-import CoreFoundation
-#else
 import Foundation
-#endif
-#else
-import SwiftOverlayShims
-#endif

 /// A boolean to see if the system is littleEndian
 let isLitteEndian: Bool = {
--- a/swift/Sources/FlatBuffers/Enum.swift
+++ b/swift/Sources/FlatBuffers/Enum.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// Enum is a protocol that all flatbuffers enums should conform to
 /// Since it allows us to get the actual `ByteSize` and `Value` from
--- a/swift/Sources/FlatBuffers/FlatBufferBuilder.swift
+++ b/swift/Sources/FlatBuffers/FlatBufferBuilder.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// ``FlatBufferBuilder`` builds a `FlatBuffer` through manipulating its internal state.
 ///
@@ -836,7 +832,8 @@ extension FlatBufferBuilder: CustomDebugStringConvertible {
    buffer debug:
    \(_bb)
    builder debug:
-    { finished: \(finished), serializeDefaults: \(serializeDefaults), isNested: \(isNested) }
+    { finished: \(finished), serializeDefaults: \(
+      serializeDefaults), isNested: \(isNested) }
    """
  }

--- a/swift/Sources/FlatBuffers/FlatBufferObject.swift
+++ b/swift/Sources/FlatBuffers/FlatBufferObject.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// NativeStruct is a protocol that indicates if the struct is a native `swift` struct
 /// since now we will be serializing native structs into the buffer.
--- a/swift/Sources/FlatBuffers/FlatBuffersUtils.swift
+++ b/swift/Sources/FlatBuffers/FlatBuffersUtils.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// FlatBuffersUtils hosts some utility functions that might be useful
 public enum FlatBuffersUtils {
--- a/swift/Sources/FlatBuffers/FlatbuffersErrors.swift
+++ b/swift/Sources/FlatBuffers/FlatbuffersErrors.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// Collection of thrown from the Flatbuffer verifier
 public enum FlatbuffersErrors: Error, Equatable {
--- a/swift/Sources/FlatBuffers/Int+extension.swift
+++ b/swift/Sources/FlatBuffers/Int+extension.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 extension Int {

--- a/swift/Sources/FlatBuffers/Message.swift
+++ b/swift/Sources/FlatBuffers/Message.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// FlatBufferGRPCMessage protocol that should allow us to invoke
 /// initializers directly from the GRPC generated code
--- a/swift/Sources/FlatBuffers/Mutable.swift
+++ b/swift/Sources/FlatBuffers/Mutable.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,17 +14,13 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// Mutable is a protocol that allows us to mutate Scalar values within a ``ByteBuffer``
 public protocol Mutable {
  /// makes Flatbuffer accessed within the Protocol
  var bb: ByteBuffer { get }
-  /// makes position of the ``Table``/``struct`` accessed within the Protocol
+  /// makes position of the ``Table``/``Struct`` accessed within the Protocol
  var postion: Int32 { get }
 }

--- a/swift/Sources/FlatBuffers/NativeObject.swift
+++ b/swift/Sources/FlatBuffers/NativeObject.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// NativeObject is a protocol that all of the `Object-API` generated code should be
 /// conforming to since it allows developers the ease of use to pack and unpack their
--- a/swift/Sources/FlatBuffers/Offset.swift
+++ b/swift/Sources/FlatBuffers/Offset.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// Offset object for all the Objects that are written into the buffer
 public struct Offset {
--- a/swift/Sources/FlatBuffers/Root.swift
+++ b/swift/Sources/FlatBuffers/Root.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// Takes in a prefixed sized buffer, where the prefixed size would be skipped.
 /// And would verify that the buffer passed is a valid `Flatbuffers` Object.
@@ -74,7 +70,8 @@ public func getCheckedPrefixedSizeRoot<T: FlatBufferObject & Verifiable>(
 ///
 /// ``getPrefixedSizeCheckedRoot(byteBuffer:options:)`` would skip the first Bytes in
 /// the ``ByteBuffer`` and then calls ``getRoot(byteBuffer:)``
-public func getPrefixedSizeRoot<T: FlatBufferObject>(byteBuffer: inout ByteBuffer)
+public func getPrefixedSizeRoot<T: FlatBufferObject>(
+  byteBuffer: inout ByteBuffer)
  -> T
 {
  byteBuffer.skipPrefix()
--- a/swift/Sources/FlatBuffers/String+extension.swift
+++ b/swift/Sources/FlatBuffers/String+extension.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 extension String: Verifiable {

--- a/swift/Sources/FlatBuffers/Struct.swift
+++ b/swift/Sources/FlatBuffers/Struct.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// Struct is a representation of a mutable `Flatbuffers` struct
 /// since native structs are value types and cant be mutated
--- a/swift/Sources/FlatBuffers/Table.swift
+++ b/swift/Sources/FlatBuffers/Table.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// `Table` is a Flatbuffers object that can read,
 /// mutate scalar fields within a valid flatbuffers buffer
--- a/swift/Sources/FlatBuffers/TableVerifier.swift
+++ b/swift/Sources/FlatBuffers/TableVerifier.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// `TableVerifier` verifies a table object is within a provided memory.
 /// It checks if all the objects for a specific generated table, are within
--- a/swift/Sources/FlatBuffers/VeriferOptions.swift
+++ b/swift/Sources/FlatBuffers/VeriferOptions.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// `VerifierOptions` is a set of options to verify a flatbuffer
 public struct VerifierOptions {
--- a/swift/Sources/FlatBuffers/Verifiable.swift
+++ b/swift/Sources/FlatBuffers/Verifiable.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// Verifiable is a protocol all swift flatbuffers object should conform to,
 /// since swift is similar to `cpp` and `rust` where the data is read directly
--- a/swift/Sources/FlatBuffers/Verifier.swift
+++ b/swift/Sources/FlatBuffers/Verifier.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
 * limitations under the License.
 */

-#if !os(WASI)
 import Foundation
-#else
-import SwiftOverlayShims
-#endif

 /// Verifier that check if the buffer passed into it is a valid,
 /// safe, aligned Flatbuffers object since swift read from `unsafeMemory`
--- a/tests/swift/Wasm.tests/.swift-version
+++ b/tests/swift/Wasm.tests/.swift-version
@@ -1 +0,0 @@
-wasm-5.7-SNAPSHOT-2022-09-24-a
--- a/tests/swift/Wasm.tests/Package.swift
+++ b/tests/swift/Wasm.tests/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.9
 /*
 * Copyright 2020 Google Inc. All rights reserved.
 *
@@ -24,11 +24,13 @@ let package = Package(
  ],
  dependencies: [
    .package(path: "../../.."),
+    .package(url: "https://github.com/swiftwasm/carton", exact: "1.0.1"),
  ],
  targets: [
-    .target(
-      name: "Wasm"),
+    .target(name: "Wasm"),
    .testTarget(
      name: "FlatBuffers.Test.Swift.WasmTests",
-      dependencies: ["FlatBuffers"]),
+      dependencies: [
+        .product(name: "FlatBuffers", package: "flatbuffers"),
+      ]),
  ])
--- a/tests/swift/Wasm.tests/Sources/Wasm/Wasm.swift
+++ b/tests/swift/Wasm.tests/Sources/Wasm/Wasm.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/swift/Wasm.tests/Tests/FlatBuffers.Test.Swift.WasmTests/FlatBuffersMonsterWriterTests.swift
+++ b/tests/swift/Wasm.tests/Tests/FlatBuffers.Test.Swift.WasmTests/FlatBuffersMonsterWriterTests.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/swift/tests/Package.swift
+++ b/tests/swift/tests/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.8
 /*
 * Copyright 2020 Google Inc. All rights reserved.
 *
@@ -28,10 +28,15 @@ let package = Package(
    .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.4.1"),
  ],
  targets: [
-    .target(
+    .executableTarget(
      name: "SwiftFlatBuffers",
-      dependencies: ["FlatBuffers"]),
+      dependencies: [
+        .product(name: "FlatBuffers", package: "flatbuffers"),
+      ]),
    .testTarget(
      name: "FlatBuffers.Test.SwiftTests",
-      dependencies: ["FlatBuffers", "GRPC"]),
+      dependencies: [
+        .product(name: "FlatBuffers", package: "flatbuffers"),
+        .product(name: "GRPC", package: "grpc-swift"),
+      ]),
  ])
--- a/tests/swift/tests/Sources/SwiftFlatBuffers/main.swift
+++ b/tests/swift/tests/Sources/SwiftFlatBuffers/main.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersMonsterWriterTests.swift
+++ b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersMonsterWriterTests.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersNanInfTests.swift
+++ b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersNanInfTests.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersStructsTests.swift
+++ b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersStructsTests.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersTests.swift
+++ b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersTests.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersUnionTests.swift
+++ b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersUnionTests.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersVectorsTests.swift
+++ b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatBuffersVectorsTests.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersDoubleTests.swift
+++ b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersDoubleTests.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersMoreDefaults.swift
+++ b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersMoreDefaults.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersVerifierTests.swift
+++ b/tests/swift/tests/Tests/FlatBuffers.Test.SwiftTests/FlatbuffersVerifierTests.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc. All rights reserved.
+ * Copyright 2024 Google Inc. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.