From 594475fe0d6a69f1d54e1783e9892514e1c492ae Mon Sep 17 00:00:00 2001 From: kane-liu Date: Tue, 21 Jun 2022 17:55:24 +0900 Subject: [PATCH 1/2] Update swift-grpc to 1.5.0 --- Package.resolved | 29 +++++++++++++++++++---------- Package.swift | 2 +- gRPC-Client-Swift.podspec | 4 ++-- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/Package.resolved b/Package.resolved index 2687ebb..0a35c48 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/grpc/grpc-swift.git", "state": { "branch": null, - "revision": "640b0ef1d0be63bda0ada86786cfda678ab2aae9", - "version": "1.0.0-alpha.19" + "revision": "580ba36aec6d96c4e93365e0e55197832853d9ea", + "version": "1.5.0" } }, { @@ -24,8 +24,17 @@ "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "96db8838be60fcbb993fa738e1120fb7f4b99c43", - "version": "2.22.1" + "revision": "124119f0bb12384cef35aa041d7c3a686108722d", + "version": "2.40.0" + } + }, + { + "package": "swift-nio-extras", + "repositoryURL": "https://github.com/apple/swift-nio-extras.git", + "state": { + "branch": null, + "revision": "a75e92bde3683241c15df3dd905b7a6dcac4d551", + "version": "1.12.1" } }, { @@ -33,8 +42,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-http2.git", "state": { "branch": null, - "revision": "c7ad256b3e6f8d1da1e5d7ffc495d8fe2461f818", - "version": "1.14.2" + "revision": "108ac15087ea9b79abb6f6742699cf31de0e8772", + "version": "1.22.0" } }, { @@ -42,8 +51,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-ssl.git", "state": { "branch": null, - "revision": "d381bc53edd9de88a75480a2b969bfc26d61ee76", - "version": "2.8.0" + "revision": "42436a25ff32c390465567f5c089a9a8ce8d7baf", + "version": "2.20.0" } }, { @@ -51,8 +60,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git", "state": { "branch": null, - "revision": "f9a95e9bbb4ed70dd6e1e25d65c46e37187f7730", - "version": "1.7.0" + "revision": "2cb54f91ddafc90832c5fa247faf5798d0a7c204", + "version": "1.13.0" } }, { diff --git a/Package.swift b/Package.swift index 148a39a..28326a1 100644 --- a/Package.swift +++ b/Package.swift @@ -29,7 +29,7 @@ let package = Package( .package( name: "grpc-swift", url: "https://github.com/grpc/grpc-swift.git", - .exact("1.0.0-alpha.19") + .exact("1.5.0") ) ], targets: [ diff --git a/gRPC-Client-Swift.podspec b/gRPC-Client-Swift.podspec index 34a844c..4de79bd 100644 --- a/gRPC-Client-Swift.podspec +++ b/gRPC-Client-Swift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'gRPC-Client-Swift' - s.version = '1.0.0-alpha.8' + s.version = '1.0.0' s.swift_version = '5.0' s.license = { :type => 'MIT', :file => 'LICENSE' } s.summary = 'Client-side library that depends on SwiftGRPC which is a library of gRPC written in Swift.' @@ -13,5 +13,5 @@ Pod::Spec.new do |s| s.osx.deployment_target = '10.12' s.source_files = 'Sources/GRPCClient/**/*.{h,swift}' s.module_name = 'GRPCClient' - s.dependency 'gRPC-Swift', '1.0.0-alpha.19' + s.dependency 'gRPC-Swift', '1.5.0' end From cd67b5dd7e09d2cdfb66530d3f4e64f6760bba93 Mon Sep 17 00:00:00 2001 From: kane-liu Date: Tue, 21 Jun 2022 18:02:47 +0900 Subject: [PATCH 2/2] Change GPRCStatus from class to struct --- Sources/GRPCClient/StreamingError.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/GRPCClient/StreamingError.swift b/Sources/GRPCClient/StreamingError.swift index 4dbad32..28854e8 100644 --- a/Sources/GRPCClient/StreamingError.swift +++ b/Sources/GRPCClient/StreamingError.swift @@ -1,4 +1,4 @@ -import class GRPC.GRPCStatus +import struct GRPC.GRPCStatus public enum StreamingError: Error { case callCreationError(Error)