Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
with:
linux_5_9_enabled: false
linux_5_10_enabled: false
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -warnings-as-errors"
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -warnings-as-errors"
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"

construct-plugin-tests-matrix:
name: Construct plugin tests matrix
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
with:
linux_5_9_enabled: false
linux_5_10_enabled: false
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -warnings-as-errors"
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -warnings-as-errors"
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"

construct-plugin-tests-matrix:
name: Construct plugin tests matrix
Expand Down
12 changes: 6 additions & 6 deletions Tests/GRPCProtobufCodeGenTests/ProtobufCodeGenParserTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ struct ProtobufCodeGenParserTests {
let codeGen: CodeGenerationRequest

init() throws {
let descriptor = try #require(try Self.fileDescriptor)
let descriptor = try Self.fileDescriptor
self.codeGen = try parseDescriptor(descriptor)
}

Expand Down Expand Up @@ -73,7 +73,7 @@ struct ProtobufCodeGenParserTests {
let service: GRPCCodeGen.ServiceDescriptor

init() throws {
let request = try parseDescriptor(try #require(try TestService.fileDescriptor))
let request = try parseDescriptor(try TestService.fileDescriptor)
try #require(request.services.count == 1)
self.service = try #require(request.services.first)
}
Expand All @@ -91,7 +91,7 @@ struct ProtobufCodeGenParserTests {
let bidiStreaming: GRPCCodeGen.MethodDescriptor

init() throws {
let request = try parseDescriptor(try #require(try TestService.fileDescriptor))
let request = try parseDescriptor(try TestService.fileDescriptor)
#expect(request.services.count == 1)
let service = try #require(request.services.first)

Expand Down Expand Up @@ -158,7 +158,7 @@ struct ProtobufCodeGenParserTests {
let codeGen: CodeGenerationRequest

init() throws {
let descriptor = try #require(try Self.fileDescriptor)
let descriptor = try Self.fileDescriptor
self.codeGen = try parseDescriptor(descriptor)
}

Expand Down Expand Up @@ -215,7 +215,7 @@ struct ProtobufCodeGenParserTests {
let service: GRPCCodeGen.ServiceDescriptor

init() throws {
let descriptor = try #require(try Self.fileDescriptor)
let descriptor = try Self.fileDescriptor
self.codeGen = try parseDescriptor(descriptor)
self.service = try #require(self.codeGen.services.first)
}
Expand All @@ -234,7 +234,7 @@ struct ProtobufCodeGenParserTests {
let codeGen: CodeGenerationRequest

init() throws {
let descriptor = try #require(try Self.fileDescriptor)
let descriptor = try Self.fileDescriptor
self.codeGen = try parseDescriptor(descriptor)
}

Expand Down
2 changes: 1 addition & 1 deletion Tests/GRPCProtobufCodeGenTests/Utilities.swift
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ private func loadDescriptorSet(
)

let url = try #require(maybeURL)
let data = try #require(try Data(contentsOf: url))
let data = try Data(contentsOf: url)
let descriptorSet = try Google_Protobuf_FileDescriptorSet(serializedBytes: data)
return DescriptorSet(proto: descriptorSet)
}
Expand Down
Loading