Skip to content

Commit 8a5278a

Browse files
glbrnttglbrntt
authored
Update generated code (#46)
Motivation: grpc-swift 2.2.0 added availability annotations to generated code. The CI job checking generated code is now failing.. Modifications: Regenerate Result: CI passes
1 parent 481feec commit 8a5278a

File tree

5 files changed

+55
-1
lines changed

5 files changed

+55
-1
lines changed

‎Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ let products: [Product] = [
4343
let dependencies: [Package.Dependency] = [
4444
.package(
4545
url: "https://github.com/grpc/grpc-swift.git",
46-
from: "2.0.0"
46+
from: "2.2.0"
4747
),
4848
.package(
4949
url: "https://github.com/grpc/grpc-swift-protobuf.git",

‎Sources/GRPCHealthService/Generated/health.grpc.swift‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ internal import GRPCProtobuf
3131
// MARK: - grpc.health.v1.Health
3232

3333
/// Namespace containing generated types for the "grpc.health.v1.Health" service.
34+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
3435
package enum Grpc_Health_V1_Health {
3536
/// Service descriptor for the "grpc.health.v1.Health" service.
3637
package static let descriptor = GRPCCore.ServiceDescriptor(fullyQualifiedService: "grpc.health.v1.Health")
@@ -68,13 +69,15 @@ package enum Grpc_Health_V1_Health {
6869
}
6970
}
7071

72+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
7173
extension GRPCCore.ServiceDescriptor {
7274
/// Service descriptor for the "grpc.health.v1.Health" service.
7375
package static let grpc_health_v1_Health = GRPCCore.ServiceDescriptor(fullyQualifiedService: "grpc.health.v1.Health")
7476
}
7577

7678
// MARK: grpc.health.v1.Health (server)
7779

80+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
7881
extension Grpc_Health_V1_Health {
7982
/// Streaming variant of the service protocol for the "grpc.health.v1.Health" service.
8083
///
@@ -299,6 +302,7 @@ extension Grpc_Health_V1_Health {
299302
}
300303

301304
// Default implementation of 'registerMethods(with:)'.
305+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
302306
extension Grpc_Health_V1_Health.StreamingServiceProtocol {
303307
package func registerMethods<Transport>(with router: inout GRPCCore.RPCRouter<Transport>) where Transport: GRPCCore.ServerTransport {
304308
router.registerHandler(
@@ -327,6 +331,7 @@ extension Grpc_Health_V1_Health.StreamingServiceProtocol {
327331
}
328332

329333
// Default implementation of streaming methods from 'StreamingServiceProtocol'.
334+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
330335
extension Grpc_Health_V1_Health.ServiceProtocol {
331336
package func check(
332337
request: GRPCCore.StreamingServerRequest<Grpc_Health_V1_HealthCheckRequest>,
@@ -352,6 +357,7 @@ extension Grpc_Health_V1_Health.ServiceProtocol {
352357
}
353358

354359
// Default implementation of methods from 'ServiceProtocol'.
360+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
355361
extension Grpc_Health_V1_Health.SimpleServiceProtocol {
356362
package func check(
357363
request: GRPCCore.ServerRequest<Grpc_Health_V1_HealthCheckRequest>,
@@ -386,6 +392,7 @@ extension Grpc_Health_V1_Health.SimpleServiceProtocol {
386392

387393
// MARK: grpc.health.v1.Health (client)
388394

395+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
389396
extension Grpc_Health_V1_Health {
390397
/// Generated client protocol for the "grpc.health.v1.Health" service.
391398
///
@@ -580,6 +587,7 @@ extension Grpc_Health_V1_Health {
580587
}
581588

582589
// Helpers providing default arguments to 'ClientProtocol' methods.
590+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
583591
extension Grpc_Health_V1_Health.ClientProtocol {
584592
/// Call the "Check" method.
585593
///
@@ -661,6 +669,7 @@ extension Grpc_Health_V1_Health.ClientProtocol {
661669
}
662670

663671
// Helpers providing sugared APIs for 'ClientProtocol' methods.
672+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
664673
extension Grpc_Health_V1_Health.ClientProtocol {
665674
/// Call the "Check" method.
666675
///

‎Sources/GRPCInteropTests/Generated/empty_service.grpc.swift‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ internal import GRPCProtobuf
2828
// MARK: - grpc.testing.EmptyService
2929

3030
/// Namespace containing generated types for the "grpc.testing.EmptyService" service.
31+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
3132
public enum Grpc_Testing_EmptyService {
3233
/// Service descriptor for the "grpc.testing.EmptyService" service.
3334
public static let descriptor = GRPCCore.ServiceDescriptor(fullyQualifiedService: "grpc.testing.EmptyService")
@@ -38,13 +39,15 @@ public enum Grpc_Testing_EmptyService {
3839
}
3940
}
4041

42+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
4143
extension GRPCCore.ServiceDescriptor {
4244
/// Service descriptor for the "grpc.testing.EmptyService" service.
4345
public static let grpc_testing_EmptyService = GRPCCore.ServiceDescriptor(fullyQualifiedService: "grpc.testing.EmptyService")
4446
}
4547

4648
// MARK: grpc.testing.EmptyService (server)
4749

50+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
4851
extension Grpc_Testing_EmptyService {
4952
/// Streaming variant of the service protocol for the "grpc.testing.EmptyService" service.
5053
///
@@ -91,20 +94,24 @@ extension Grpc_Testing_EmptyService {
9194
}
9295

9396
// Default implementation of 'registerMethods(with:)'.
97+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
9498
extension Grpc_Testing_EmptyService.StreamingServiceProtocol {
9599
public func registerMethods<Transport>(with router: inout GRPCCore.RPCRouter<Transport>) where Transport: GRPCCore.ServerTransport {}
96100
}
97101

98102
// Default implementation of streaming methods from 'StreamingServiceProtocol'.
103+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
99104
extension Grpc_Testing_EmptyService.ServiceProtocol {
100105
}
101106

102107
// Default implementation of methods from 'ServiceProtocol'.
108+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
103109
extension Grpc_Testing_EmptyService.SimpleServiceProtocol {
104110
}
105111

106112
// MARK: grpc.testing.EmptyService (client)
107113

114+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
108115
extension Grpc_Testing_EmptyService {
109116
/// Generated client protocol for the "grpc.testing.EmptyService" service.
110117
///
@@ -141,9 +148,11 @@ extension Grpc_Testing_EmptyService {
141148
}
142149

143150
// Helpers providing default arguments to 'ClientProtocol' methods.
151+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
144152
extension Grpc_Testing_EmptyService.ClientProtocol {
145153
}
146154

147155
// Helpers providing sugared APIs for 'ClientProtocol' methods.
156+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
148157
extension Grpc_Testing_EmptyService.ClientProtocol {
149158
}

‎Sources/GRPCInteropTests/Generated/test.grpc.swift‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ internal import GRPCProtobuf
3131
// MARK: - grpc.testing.TestService
3232

3333
/// Namespace containing generated types for the "grpc.testing.TestService" service.
34+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
3435
public enum Grpc_Testing_TestService {
3536
/// Service descriptor for the "grpc.testing.TestService" service.
3637
public static let descriptor = GRPCCore.ServiceDescriptor(fullyQualifiedService: "grpc.testing.TestService")
@@ -146,13 +147,15 @@ public enum Grpc_Testing_TestService {
146147
}
147148
}
148149

150+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
149151
extension GRPCCore.ServiceDescriptor {
150152
/// Service descriptor for the "grpc.testing.TestService" service.
151153
public static let grpc_testing_TestService = GRPCCore.ServiceDescriptor(fullyQualifiedService: "grpc.testing.TestService")
152154
}
153155

154156
// MARK: grpc.testing.TestService (server)
155157

158+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
156159
extension Grpc_Testing_TestService {
157160
/// Streaming variant of the service protocol for the "grpc.testing.TestService" service.
158161
///
@@ -664,6 +667,7 @@ extension Grpc_Testing_TestService {
664667
}
665668

666669
// Default implementation of 'registerMethods(with:)'.
670+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
667671
extension Grpc_Testing_TestService.StreamingServiceProtocol {
668672
public func registerMethods<Transport>(with router: inout GRPCCore.RPCRouter<Transport>) where Transport: GRPCCore.ServerTransport {
669673
router.registerHandler(
@@ -758,6 +762,7 @@ extension Grpc_Testing_TestService.StreamingServiceProtocol {
758762
}
759763

760764
// Default implementation of streaming methods from 'StreamingServiceProtocol'.
765+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
761766
extension Grpc_Testing_TestService.ServiceProtocol {
762767
public func emptyCall(
763768
request: GRPCCore.StreamingServerRequest<Grpc_Testing_Empty>,
@@ -827,6 +832,7 @@ extension Grpc_Testing_TestService.ServiceProtocol {
827832
}
828833

829834
// Default implementation of methods from 'ServiceProtocol'.
835+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
830836
extension Grpc_Testing_TestService.SimpleServiceProtocol {
831837
public func emptyCall(
832838
request: GRPCCore.ServerRequest<Grpc_Testing_Empty>,
@@ -947,6 +953,7 @@ extension Grpc_Testing_TestService.SimpleServiceProtocol {
947953

948954
// MARK: grpc.testing.TestService (client)
949955

956+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
950957
extension Grpc_Testing_TestService {
951958
/// Generated client protocol for the "grpc.testing.TestService" service.
952959
///
@@ -1453,6 +1460,7 @@ extension Grpc_Testing_TestService {
14531460
}
14541461

14551462
// Helpers providing default arguments to 'ClientProtocol' methods.
1463+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
14561464
extension Grpc_Testing_TestService.ClientProtocol {
14571465
/// Call the "EmptyCall" method.
14581466
///
@@ -1692,6 +1700,7 @@ extension Grpc_Testing_TestService.ClientProtocol {
16921700
}
16931701

16941702
// Helpers providing sugared APIs for 'ClientProtocol' methods.
1703+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
16951704
extension Grpc_Testing_TestService.ClientProtocol {
16961705
/// Call the "EmptyCall" method.
16971706
///
@@ -1968,6 +1977,7 @@ extension Grpc_Testing_TestService.ClientProtocol {
19681977
// MARK: - grpc.testing.UnimplementedService
19691978

19701979
/// Namespace containing generated types for the "grpc.testing.UnimplementedService" service.
1980+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
19711981
public enum Grpc_Testing_UnimplementedService {
19721982
/// Service descriptor for the "grpc.testing.UnimplementedService" service.
19731983
public static let descriptor = GRPCCore.ServiceDescriptor(fullyQualifiedService: "grpc.testing.UnimplementedService")
@@ -1992,13 +2002,15 @@ public enum Grpc_Testing_UnimplementedService {
19922002
}
19932003
}
19942004

2005+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
19952006
extension GRPCCore.ServiceDescriptor {
19962007
/// Service descriptor for the "grpc.testing.UnimplementedService" service.
19972008
public static let grpc_testing_UnimplementedService = GRPCCore.ServiceDescriptor(fullyQualifiedService: "grpc.testing.UnimplementedService")
19982009
}
19992010

20002011
// MARK: grpc.testing.UnimplementedService (server)
20012012

2013+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
20022014
extension Grpc_Testing_UnimplementedService {
20032015
/// Streaming variant of the service protocol for the "grpc.testing.UnimplementedService" service.
20042016
///
@@ -2099,6 +2111,7 @@ extension Grpc_Testing_UnimplementedService {
20992111
}
21002112

21012113
// Default implementation of 'registerMethods(with:)'.
2114+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
21022115
extension Grpc_Testing_UnimplementedService.StreamingServiceProtocol {
21032116
public func registerMethods<Transport>(with router: inout GRPCCore.RPCRouter<Transport>) where Transport: GRPCCore.ServerTransport {
21042117
router.registerHandler(
@@ -2116,6 +2129,7 @@ extension Grpc_Testing_UnimplementedService.StreamingServiceProtocol {
21162129
}
21172130

21182131
// Default implementation of streaming methods from 'StreamingServiceProtocol'.
2132+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
21192133
extension Grpc_Testing_UnimplementedService.ServiceProtocol {
21202134
public func unimplementedCall(
21212135
request: GRPCCore.StreamingServerRequest<Grpc_Testing_Empty>,
@@ -2130,6 +2144,7 @@ extension Grpc_Testing_UnimplementedService.ServiceProtocol {
21302144
}
21312145

21322146
// Default implementation of methods from 'ServiceProtocol'.
2147+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
21332148
extension Grpc_Testing_UnimplementedService.SimpleServiceProtocol {
21342149
public func unimplementedCall(
21352150
request: GRPCCore.ServerRequest<Grpc_Testing_Empty>,
@@ -2147,6 +2162,7 @@ extension Grpc_Testing_UnimplementedService.SimpleServiceProtocol {
21472162

21482163
// MARK: grpc.testing.UnimplementedService (client)
21492164

2165+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
21502166
extension Grpc_Testing_UnimplementedService {
21512167
/// Generated client protocol for the "grpc.testing.UnimplementedService" service.
21522168
///
@@ -2240,6 +2256,7 @@ extension Grpc_Testing_UnimplementedService {
22402256
}
22412257

22422258
// Helpers providing default arguments to 'ClientProtocol' methods.
2259+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
22432260
extension Grpc_Testing_UnimplementedService.ClientProtocol {
22442261
/// Call the "UnimplementedCall" method.
22452262
///
@@ -2272,6 +2289,7 @@ extension Grpc_Testing_UnimplementedService.ClientProtocol {
22722289
}
22732290

22742291
// Helpers providing sugared APIs for 'ClientProtocol' methods.
2292+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
22752293
extension Grpc_Testing_UnimplementedService.ClientProtocol {
22762294
/// Call the "UnimplementedCall" method.
22772295
///
@@ -2310,6 +2328,7 @@ extension Grpc_Testing_UnimplementedService.ClientProtocol {
23102328
// MARK: - grpc.testing.ReconnectService
23112329

23122330
/// Namespace containing generated types for the "grpc.testing.ReconnectService" service.
2331+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
23132332
public enum Grpc_Testing_ReconnectService {
23142333
/// Service descriptor for the "grpc.testing.ReconnectService" service.
23152334
public static let descriptor = GRPCCore.ServiceDescriptor(fullyQualifiedService: "grpc.testing.ReconnectService")
@@ -2347,13 +2366,15 @@ public enum Grpc_Testing_ReconnectService {
23472366
}
23482367
}
23492368

2369+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
23502370
extension GRPCCore.ServiceDescriptor {
23512371
/// Service descriptor for the "grpc.testing.ReconnectService" service.
23522372
public static let grpc_testing_ReconnectService = GRPCCore.ServiceDescriptor(fullyQualifiedService: "grpc.testing.ReconnectService")
23532373
}
23542374

23552375
// MARK: grpc.testing.ReconnectService (server)
23562376

2377+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
23572378
extension Grpc_Testing_ReconnectService {
23582379
/// Streaming variant of the service protocol for the "grpc.testing.ReconnectService" service.
23592380
///
@@ -2481,6 +2502,7 @@ extension Grpc_Testing_ReconnectService {
24812502
}
24822503

24832504
// Default implementation of 'registerMethods(with:)'.
2505+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
24842506
extension Grpc_Testing_ReconnectService.StreamingServiceProtocol {
24852507
public func registerMethods<Transport>(with router: inout GRPCCore.RPCRouter<Transport>) where Transport: GRPCCore.ServerTransport {
24862508
router.registerHandler(
@@ -2509,6 +2531,7 @@ extension Grpc_Testing_ReconnectService.StreamingServiceProtocol {
25092531
}
25102532

25112533
// Default implementation of streaming methods from 'StreamingServiceProtocol'.
2534+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
25122535
extension Grpc_Testing_ReconnectService.ServiceProtocol {
25132536
public func start(
25142537
request: GRPCCore.StreamingServerRequest<Grpc_Testing_ReconnectParams>,
@@ -2534,6 +2557,7 @@ extension Grpc_Testing_ReconnectService.ServiceProtocol {
25342557
}
25352558

25362559
// Default implementation of methods from 'ServiceProtocol'.
2560+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
25372561
extension Grpc_Testing_ReconnectService.SimpleServiceProtocol {
25382562
public func start(
25392563
request: GRPCCore.ServerRequest<Grpc_Testing_ReconnectParams>,
@@ -2564,6 +2588,7 @@ extension Grpc_Testing_ReconnectService.SimpleServiceProtocol {
25642588

25652589
// MARK: grpc.testing.ReconnectService (client)
25662590

2591+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
25672592
extension Grpc_Testing_ReconnectService {
25682593
/// Generated client protocol for the "grpc.testing.ReconnectService" service.
25692594
///
@@ -2696,6 +2721,7 @@ extension Grpc_Testing_ReconnectService {
26962721
}
26972722

26982723
// Helpers providing default arguments to 'ClientProtocol' methods.
2724+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
26992725
extension Grpc_Testing_ReconnectService.ClientProtocol {
27002726
/// Call the "Start" method.
27012727
///
@@ -2749,6 +2775,7 @@ extension Grpc_Testing_ReconnectService.ClientProtocol {
27492775
}
27502776

27512777
// Helpers providing sugared APIs for 'ClientProtocol' methods.
2778+
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
27522779
extension Grpc_Testing_ReconnectService.ClientProtocol {
27532780
/// Call the "Start" method.
27542781
///

0 commit comments

Comments
 (0)