mirror of
https://github.com/google/flatbuffers.git
synced 2026-06-20 05:05:06 +00:00
[Swift] Migrate to swift 6.0 and Implements support gRPC v2 (#8983)
* Migrate to swift 6.0 & swift-gRPC 2.0 The following migrates to swift 6.0, and also migrate to swift-grpc 2.0 that uses swift-nio under the hood to provide nicer API and async await Adds sendable to enum & update @_implementationOnly imports to use internal imports * Address PR comments regarding misspelling & proper method naming.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
// swift-tools-version:5.10
|
||||
// swift-tools-version:6.0
|
||||
/*
|
||||
* Copyright 2020 Google Inc. All rights reserved.
|
||||
*
|
||||
@@ -36,14 +36,17 @@ let package = Package(
|
||||
.target(
|
||||
name: "FlatBuffers",
|
||||
dependencies: ["Common"],
|
||||
path: "swift/Sources/FlatBuffers"),
|
||||
path: "swift/Sources/FlatBuffers",
|
||||
swiftSettings: .settings),
|
||||
.target(
|
||||
name: "FlexBuffers",
|
||||
dependencies: ["Common"],
|
||||
path: "swift/Sources/FlexBuffers"),
|
||||
path: "swift/Sources/FlexBuffers",
|
||||
swiftSettings: .settings),
|
||||
.target(
|
||||
name: "Common",
|
||||
path: "swift/Sources/Common"),
|
||||
path: "swift/Sources/Common",
|
||||
swiftSettings: .settings),
|
||||
.testTarget(
|
||||
name: "FlatbuffersTests",
|
||||
dependencies: .dependencies,
|
||||
@@ -52,7 +55,14 @@ let package = Package(
|
||||
name: "FlexbuffersTests",
|
||||
dependencies: ["FlexBuffers"],
|
||||
path: "tests/swift/Tests/Flexbuffers"),
|
||||
])
|
||||
],
|
||||
swiftLanguageModes: [.v6])
|
||||
|
||||
extension Array where Element == SwiftSetting {
|
||||
static var settings: [SwiftSetting] {
|
||||
[.enableUpcomingFeature("ExistentialAny")]
|
||||
}
|
||||
}
|
||||
|
||||
extension Array where Element == Package.Dependency {
|
||||
static var dependencies: [Package.Dependency] {
|
||||
@@ -60,7 +70,12 @@ extension Array where Element == Package.Dependency {
|
||||
[]
|
||||
#else
|
||||
// Test only Dependency
|
||||
[.package(url: "https://github.com/grpc/grpc-swift.git", from: "1.4.1")]
|
||||
[
|
||||
.package(url: "https://github.com/grpc/grpc-swift-2.git", from: "2.0.0"),
|
||||
.package(
|
||||
url: "https://github.com/grpc/grpc-swift-nio-transport.git",
|
||||
from: "2.0.0"),
|
||||
]
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -72,7 +87,10 @@ extension Array where Element == PackageDescription.Target.Dependency {
|
||||
#else
|
||||
// Test only Dependency
|
||||
[
|
||||
.product(name: "GRPC", package: "grpc-swift"),
|
||||
.product(name: "GRPCCore", package: "grpc-swift-2"),
|
||||
.product(
|
||||
name: "GRPCNIOTransportHTTP2",
|
||||
package: "grpc-swift-nio-transport"),
|
||||
"FlatBuffers",
|
||||
]
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user