Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3d34228

Browse files
authored
Fix package manifest (vapor#262)
* ExistentialAny should not be used in a Package.swift before 5.9 * Minor tidy of CI and DocC catalog
1 parent 9d12f46 commit 3d34228

File tree

4 files changed

+70
-22
lines changed

4 files changed

+70
-22
lines changed

‎.github/workflows/test.yml‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ env:
2323
POSTGRES_PASSWORD_B: 'test_password'
2424

2525
jobs:
26-
# Check for API breakage versus main
2726
api-breakage:
2827
if: ${{ github.event_name == 'pull_request' && !(github.event.pull_request.draft || false) }}
2928
runs-on: ubuntu-latest
@@ -76,26 +75,26 @@ jobs:
7675
with:
7776
codecov_token: ${{ secrets.CODECOV_TOKEN }}
7877

79-
gh-codeql:
80-
if: ${{ false && !(github.event.pull_request.draft || false) }}
81-
runs-on: ubuntu-latest
82-
container:
83-
image: swift:5.10-jammy
84-
permissions: { actions: write, contents: read, security-events: write }
85-
timeout-minutes: 60
86-
steps:
87-
- name: Check out code
88-
uses: actions/checkout@v4
89-
- name: Mark repo safe in non-fake global config
90-
run: |
91-
git config --global --add safe.directory "${GITHUB_WORKSPACE}"
92-
- name: Initialize CodeQL
93-
uses: github/codeql-action/init@v3
94-
with: { languages: swift }
95-
- name: Perform build
96-
run: swift build
97-
- name: Run CodeQL analyze
98-
uses: github/codeql-action/analyze@v3
78+
# gh-codeql:
79+
# if: ${{ !(github.event.pull_request.draft || false) }}
80+
# runs-on: ubuntu-latest
81+
# container:
82+
# image: swift:5.10-jammy
83+
# permissions: { actions: write, contents: read, security-events: write }
84+
# timeout-minutes: 60
85+
# steps:
86+
# - name: Check out code
87+
# uses: actions/checkout@v4
88+
# - name: Mark repo safe in non-fake global config
89+
# run: |
90+
# git config --global --add safe.directory "${GITHUB_WORKSPACE}"
91+
# - name: Initialize CodeQL
92+
# uses: github/codeql-action/init@v3
93+
# with: { languages: swift }
94+
# - name: Perform build
95+
# run: swift build
96+
# - name: Run CodeQL analyze
97+
# uses: github/codeql-action/analyze@v3
9998

10099
linux-unit:
101100
if: ${{ !(github.event.pull_request.draft || false) }}

‎Package.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ let package = Package(
4141
)
4242

4343
var swiftSettings: [SwiftSetting] { [
44-
.enableUpcomingFeature("ExistentialAny"),
4544
.enableUpcomingFeature("ConciseMagicFile"),
4645
.enableUpcomingFeature("ForwardTrailingClosures"),
4746
.enableUpcomingFeature("DisableOutwardActorInference"),

‎Package@swift-5.9.swift‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
// swift-tools-version:5.9
2+
import PackageDescription
3+
4+
let package = Package(
5+
name: "postgres-kit",
6+
platforms: [
7+
.macOS(.v10_15),
8+
.iOS(.v13),
9+
.watchOS(.v6),
10+
.tvOS(.v13),
11+
],
12+
products: [
13+
.library(name: "PostgresKit", targets: ["PostgresKit"]),
14+
],
15+
dependencies: [
16+
.package(url: "https://github.com/vapor/postgres-nio.git", from: "1.20.2"),
17+
.package(url: "https://github.com/vapor/sql-kit.git", from: "3.28.0"),
18+
.package(url: "https://github.com/vapor/async-kit.git", from: "1.19.0"),
19+
.package(url: "https://github.com/apple/swift-atomics.git", from: "1.2.0")
20+
],
21+
targets: [
22+
.target(
23+
name: "PostgresKit",
24+
dependencies: [
25+
.product(name: "AsyncKit", package: "async-kit"),
26+
.product(name: "PostgresNIO", package: "postgres-nio"),
27+
.product(name: "SQLKit", package: "sql-kit"),
28+
.product(name: "Atomics", package: "swift-atomics"),
29+
],
30+
swiftSettings: swiftSettings
31+
),
32+
.testTarget(
33+
name: "PostgresKitTests",
34+
dependencies: [
35+
.target(name: "PostgresKit"),
36+
.product(name: "SQLKitBenchmark", package: "sql-kit"),
37+
],
38+
swiftSettings: swiftSettings
39+
),
40+
]
41+
)
42+
43+
var swiftSettings: [SwiftSetting] { [
44+
.enableUpcomingFeature("ExistentialAny"),
45+
.enableUpcomingFeature("ConciseMagicFile"),
46+
.enableUpcomingFeature("ForwardTrailingClosures"),
47+
.enableUpcomingFeature("DisableOutwardActorInference"),
48+
.enableUpcomingFeature("StrictConcurrency"),
49+
.enableExperimentalFeature("StrictConcurrency=complete"),
50+
] }

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /