File tree Expand file tree Collapse file tree 8 files changed +29
-28
lines changed Expand file tree Collapse file tree 8 files changed +29
-28
lines changed Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ let includeNIOSSL = ProcessInfo.processInfo.environment["GRPC_NO_NIO_SSL"] == ni
32
32
let packageDependencies : [ Package . Dependency ] = [
33
33
. package (
34
34
url: " https://github.com/apple/swift-nio.git " ,
35
- from: " 2.36.0 "
35
+ from: " 2.41.1 "
36
36
) ,
37
37
. package (
38
38
url: " https://github.com/apple/swift-nio-http2.git " ,
@@ -52,7 +52,7 @@ let packageDependencies: [Package.Dependency] = [
52
52
) ,
53
53
. package (
54
54
url: " https://github.com/apple/swift-log.git " ,
55
- from: " 1.4.0 "
55
+ from: " 1.4.4 "
56
56
) ,
57
57
. package (
58
58
url: " https://github.com/apple/swift-argument-parser.git " ,
Original file line number Diff line number Diff line change 15
15
*/
16
16
#if compiler(>=5.6)
17
17
18
- @ preconcurrency import Logging
18
+ import Logging
19
19
import NIOConcurrencyHelpers
20
20
import NIOHPACK
21
21
Original file line number Diff line number Diff line change 15
15
*/
16
16
import struct Foundation. UUID
17
17
18
- #if swift(>=5.6)
19
- @preconcurrency import Logging
20
- @preconcurrency import NIOCore
21
- #else
22
- import Logging
23
18
import NIOCore
24
- #endif // swift(>=5.6)
25
19
20
+ import Logging
26
21
import NIOHPACK
27
22
import NIOHTTP1
28
23
import NIOHTTP2
Original file line number Diff line number Diff line change 15
15
*/
16
16
#if swift(>=5.6)
17
17
@preconcurrency import Foundation
18
- @preconcurrency import Logging
19
- @preconcurrency import NIOCore
20
18
#else
21
19
import Foundation
22
- import Logging
23
- import NIOCore
24
20
#endif // swift(>=5.6)
25
21
22
+ import Logging
23
+ import NIOCore
26
24
import NIOHPACK
27
25
import NIOHTTP2
28
26
#if canImport(NIOSSL)
Original file line number Diff line number Diff line change 13
13
* See the License for the specific language governing permissions and
14
14
* limitations under the License.
15
15
*/
16
- #if swift(>=5.6)
17
- @preconcurrency import NIOCore
18
- #else
19
16
import NIOCore
20
- #endif // swift(>=5.6)
21
17
22
18
/// Provides keepalive pings.
23
19
///
Original file line number Diff line number Diff line change 13
13
* See the License for the specific language governing permissions and
14
14
* limitations under the License.
15
15
*/
16
- #if swift(>=5.6)
17
- @preconcurrency import Logging
18
- @preconcurrency import NIOCore
19
- #else
20
16
import Logging
21
17
import NIOCore
22
- #endif // swift(>=5.6)
23
18
import NIOPosix
24
19
25
20
public enum GRPCChannelPool {
Original file line number Diff line number Diff line change @@ -121,7 +121,13 @@ public protocol ClientBootstrapProtocol {
121
121
122
122
func connectTimeout( _ timeout: TimeAmount ) -> Self
123
123
func channelOption< T> ( _ option: T , value: T . Value ) -> Self where T: ChannelOption
124
+
125
+ #if swift(>=5.7)
126
+ @preconcurrency
127
+ func channelInitializer( _ handler: @escaping @Sendable ( Channel ) -> EventLoopFuture < Void > ) -> Self
128
+ #else
124
129
func channelInitializer( _ handler: @escaping ( Channel ) -> EventLoopFuture < Void > ) -> Self
130
+ #endif
125
131
}
126
132
127
133
extension ClientBootstrapProtocol {
@@ -149,10 +155,25 @@ public protocol ServerBootstrapProtocol {
149
155
func bind( unixDomainSocketPath: String ) -> EventLoopFuture < Channel >
150
156
func withBoundSocket( _ connectedSocket: NIOBSDSocket . Handle ) -> EventLoopFuture < Channel >
151
157
152
- func serverChannelInitializer( _ initializer: @escaping ( Channel ) -> EventLoopFuture < Void > ) -> Self
158
+ #if swift(>=5.7)
159
+ @preconcurrency
160
+ func serverChannelInitializer(
161
+ _ handler: @escaping @Sendable ( Channel ) -> EventLoopFuture < Void >
162
+ ) -> Self
163
+ #else
164
+ func serverChannelInitializer( _ handler: @escaping ( Channel ) -> EventLoopFuture < Void > ) -> Self
165
+ #endif
166
+
153
167
func serverChannelOption< T> ( _ option: T , value: T . Value ) -> Self where T: ChannelOption
154
168
155
- func childChannelInitializer( _ initializer: @escaping ( Channel ) -> EventLoopFuture < Void > ) -> Self
169
+ #if swift(>=5.7)
170
+ @preconcurrency
171
+ func childChannelInitializer( _ handler: @escaping @Sendable ( Channel ) -> EventLoopFuture < Void > )
172
+ -> Self
173
+ #else
174
+ func childChannelInitializer( _ handler: @escaping ( Channel ) -> EventLoopFuture < Void > ) -> Self
175
+ #endif
176
+
156
177
func childChannelOption< T> ( _ option: T , value: T . Value ) -> Self where T: ChannelOption
157
178
}
158
179
Original file line number Diff line number Diff line change 14
14
* limitations under the License.
15
15
*/
16
16
import Dispatch
17
- #if swift(>=5.6)
18
- @preconcurrency import NIOCore
19
- #else
20
17
import NIOCore
21
- #endif // swift(>=5.6)
22
18
23
19
/// A time limit for an RPC.
24
20
///
You can’t perform that action at this time.
0 commit comments