From fc4fffea41f5b682198edfc72eca536d33fd848c Mon Sep 17 00:00:00 2001 From: mustiikhalil Date: Tue, 9 Mar 2021 10:56:06 +0300 Subject: [PATCH] Bump grpc to 1.0.0 (#6507) Adds void to keywords --- grpc/examples/swift/Greeter/Package.swift | 2 +- src/idl_gen_swift.cpp | 1 + tests/FlatBuffers.Test.Swift/Package.swift | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/grpc/examples/swift/Greeter/Package.swift b/grpc/examples/swift/Greeter/Package.swift index 385b56f..5e6fb68 100644 --- a/grpc/examples/swift/Greeter/Package.swift +++ b/grpc/examples/swift/Greeter/Package.swift @@ -25,7 +25,7 @@ let package = Package( ], dependencies: [ .package(path: "../../../../swift"), - .package(url: "https://github.com/grpc/grpc-swift.git", .exact("1.0.0-alpha.24")), + .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.0.0"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. diff --git a/src/idl_gen_swift.cpp b/src/idl_gen_swift.cpp index 91f47ff..984b6aa 100644 --- a/src/idl_gen_swift.cpp +++ b/src/idl_gen_swift.cpp @@ -127,6 +127,7 @@ class SwiftGenerator : public BaseGenerator { "unowned", "weak", "willSet", + "Void", nullptr, }; for (auto kw = keywords; *kw; kw++) keywords_.insert(*kw); diff --git a/tests/FlatBuffers.Test.Swift/Package.swift b/tests/FlatBuffers.Test.Swift/Package.swift index ee8e9d6..ec36de3 100644 --- a/tests/FlatBuffers.Test.Swift/Package.swift +++ b/tests/FlatBuffers.Test.Swift/Package.swift @@ -25,7 +25,7 @@ let package = Package( ], dependencies: [ .package(path: "../../swift/"), - .package(url: "https://github.com/grpc/grpc-swift.git", .exact("1.0.0-alpha.24")), + .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.0.0"), ], targets: [ .target(name: "SwiftFlatBuffers"), -- 2.7.4