Skip to content

Commit 3933fc4

Browse files
authored
Merge branch 'main' into mmbm-row-seq-expose-metadata
2 parents 68084f9 + 225c5c4 commit 3933fc4

File tree

8 files changed

+11
-1435
lines changed

8 files changed

+11
-1435
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
swift-image:
21-
- swift:5.8-jammy
2221
- swift:5.9-jammy
2322
- swift:5.10-noble
24-
- swiftlang/swift:nightly-6.0-jammy
23+
- swift:6.0-noble
2524
- swiftlang/swift:nightly-main-jammy
2625
container: ${{ matrix.swift-image }}
2726
runs-on: ubuntu-latest
@@ -48,13 +47,13 @@ jobs:
4847
fail-fast: false
4948
matrix:
5049
postgres-image:
51-
- postgres:16
52-
- postgres:14
50+
- postgres:17
51+
- postgres:15
5352
- postgres:12
5453
include:
55-
- postgres-image: postgres:16
54+
- postgres-image: postgres:17
5655
postgres-auth: scram-sha-256
57-
- postgres-image: postgres:14
56+
- postgres-image: postgres:15
5857
postgres-auth: md5
5958
- postgres-image: postgres:12
6059
postgres-auth: trust
@@ -134,11 +133,8 @@ jobs:
134133
# Only test one auth method on macOS, Linux tests will cover the others
135134
- scram-sha-256
136135
xcode-version:
137-
- '~14.3'
138136
- '~15'
139137
include:
140-
- xcode-version: '~14.3'
141-
macos-version: 'macos-13'
142138
- xcode-version: '~15'
143139
macos-version: 'macos-14'
144140
runs-on: ${{ matrix.macos-version }}
@@ -172,7 +168,7 @@ jobs:
172168
uses: actions/checkout@v4
173169
- name: Run all tests
174170
run: swift test
175-
171+
176172
api-breakage:
177173
if: github.event_name == 'pull_request'
178174
runs-on: ubuntu-latest

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.8
1+
// swift-tools-version:5.9
22
import PackageDescription
33

44
let swiftSettings: [SwiftSetting] = [

Sources/ConnectionPoolModule/ConnectionPool.swift

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -571,20 +571,6 @@ extension PoolConfiguration {
571571
}
572572
}
573573

574-
#if swift(<5.9)
575-
// This should be removed once we support Swift 5.9+ only
576-
extension AsyncStream {
577-
static func makeStream(
578-
of elementType: Element.Type = Element.self,
579-
bufferingPolicy limit: Continuation.BufferingPolicy = .unbounded
580-
) -> (stream: AsyncStream<Element>, continuation: AsyncStream<Element>.Continuation) {
581-
var continuation: AsyncStream<Element>.Continuation!
582-
let stream = AsyncStream<Element>(bufferingPolicy: limit) { continuation = $0 }
583-
return (stream: stream, continuation: continuation!)
584-
}
585-
}
586-
#endif
587-
588574
@usableFromInline
589575
protocol TaskGroupProtocol {
590576
// We need to call this `addTask_` because some Swift versions define this

Sources/ConnectionPoolModule/PoolStateMachine.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#if canImport(Darwin)
22
import Darwin
3-
#else
3+
#elseif canImport(Glibc)
44
import Glibc
5+
#elseif canImport(Musl)
6+
import Musl
57
#endif
68

79
@usableFromInline

Sources/PostgresNIO/New/NotificationListener.swift

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -140,19 +140,3 @@ final class NotificationListener: @unchecked Sendable {
140140
}
141141
}
142142
}
143-
144-
145-
#if compiler(<5.9)
146-
// Async stream API backfill
147-
extension AsyncThrowingStream {
148-
static func makeStream(
149-
of elementType: Element.Type = Element.self,
150-
throwing failureType: Failure.Type = Failure.self,
151-
bufferingPolicy limit: Continuation.BufferingPolicy = .unbounded
152-
) -> (stream: AsyncThrowingStream<Element, Failure>, continuation: AsyncThrowingStream<Element, Failure>.Continuation) where Failure == Error {
153-
var continuation: AsyncThrowingStream<Element, Failure>.Continuation!
154-
let stream = AsyncThrowingStream<Element, Failure>(bufferingPolicy: limit) { continuation = $0 }
155-
return (stream: stream, continuation: continuation!)
156-
}
157-
}
158-
#endif

0 commit comments

Comments
 (0)