Skip to content

Commit f5b87e7

Browse files
authored
Depend on grpc-swift/main (#8)
## Motivation We should depend on `grpc-swift/main` for now to make sure that everything works cross-package. ## Modifications This PR changes `grpc-swift-extras` to depend on `main` for `grpc-swift`. It also fixes some tests as a result of adding the cancellation handler to the API. ## Result `grpc-swift-extras` builds with the latest `grpc-swift` changes.
1 parent 33fc5e5 commit f5b87e7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ let products: [Product] = [
3535
let dependencies: [Package.Dependency] = [
3636
.package(
3737
url: "https://github.com/grpc/grpc-swift.git",
38-
exact: "2.0.0-alpha.1"
38+
branch: "main"
3939
),
4040
.package(
4141
url: "https://github.com/grpc/grpc-swift-protobuf.git",

Tests/GRPCInterceptorsTests/TracingInterceptorTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ final class TracingInterceptorTests: XCTestCase {
175175
let single = ServerRequest(metadata: ["trace-id": "some-trace-id"], message: [UInt8]())
176176
let response = try await interceptor.intercept(
177177
request: .init(single: single),
178-
context: .init(descriptor: methodDescriptor)
178+
context: .init(descriptor: methodDescriptor, cancellation: .init())
179179
) { _, _ in
180180
StreamingServerResponse<String>(error: .init(code: .unknown, message: "Test error"))
181181
}
@@ -204,7 +204,7 @@ final class TracingInterceptorTests: XCTestCase {
204204
let single = ServerRequest(metadata: ["trace-id": "some-trace-id"], message: [UInt8]())
205205
let response = try await interceptor.intercept(
206206
request: .init(single: single),
207-
context: .init(descriptor: methodDescriptor)
207+
context: .init(descriptor: methodDescriptor, cancellation: .init())
208208
) { _, _ in
209209
{ [serviceContext = ServiceContext.current] in
210210
return StreamingServerResponse<String>(
@@ -269,7 +269,7 @@ final class TracingInterceptorTests: XCTestCase {
269269
let single = ServerRequest(metadata: ["trace-id": "some-trace-id"], message: [UInt8]())
270270
let response = try await interceptor.intercept(
271271
request: .init(single: single),
272-
context: .init(descriptor: methodDescriptor)
272+
context: .init(descriptor: methodDescriptor, cancellation: .init())
273273
) { _, _ in
274274
{ [serviceContext = ServiceContext.current] in
275275
return StreamingServerResponse<String>(

0 commit comments

Comments
 (0)