Skip to content

Commit 0329ecc

Browse files
authored
Remove v2 code from v1 (#2110)
Motivation: There's a bug in SwiftPM which prohibits the Xcode build system from being used if a dependency explicitly declares which Swift language mode is being used, regardless of its value. A number of users are running into this problem, and while it's not a gRPC Swift bug we can work around the issue by removing the v2 code from the v1 branch and removing the Swift 6 specific manifest. Modifications: - Remove all v2 code - Remove workarounds in the SwiftPM build plugin which avoid deprecation warnings. It turns out that the guard was incorrect anyway: the API isn't guarded by the compiler version, but the package tools version. Result: Possible to build v1 with SwiftPM using the Xcode build system.
1 parent b5023df commit 0329ecc

File tree

411 files changed

+11
-85033
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

411 files changed

+11
-85033
lines changed

.github/workflows/ci.yaml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -108,32 +108,19 @@ jobs:
108108
run: ./Performance/allocations/test-allocation-counts.sh
109109
env: ${{ matrix.env }}
110110
timeout-minutes: 20
111-
- name: Install jemalloc for benchmarking
112-
if: ${{ matrix.swift-version == '6.0' || matrix.swift-version == 'main' }}
113-
run: apt update && apt-get install -y libjemalloc-dev
114-
timeout-minutes: 20
115-
- name: Run Benchmarks
116-
if: ${{ matrix.swift-version == '6.0' || matrix.swift-version == 'main' }}
117-
working-directory: ./Performance/Benchmarks
118-
run: swift package benchmark baseline check --no-progress --check-absolute-path Thresholds/${{ matrix.swift-version }}/
119-
timeout-minutes: 20
120111
integration-tests:
121112
strategy:
122113
fail-fast: false
123114
matrix:
124115
include:
125116
- image: swiftlang/swift:nightly-jammy
126117
swift-tools-version: '6.0'
127-
supports-v2: true
128118
- image: swift:6.0-jammy
129119
swift-tools-version: '6.0'
130-
supports-v2: true
131120
- image: swift:5.10.1-noble
132121
swift-tools-version: '5.10'
133-
supports-v2: false
134122
- image: swift:5.9-jammy
135123
swift-tools-version: '5.9'
136-
supports-v2: false
137124
name: Integration Tests on ${{ matrix.image }}
138125
runs-on: ubuntu-latest
139126
container:
@@ -144,9 +131,6 @@ jobs:
144131
run: apt update && apt install -y protobuf-compiler
145132
- name: SwiftPM plugin test (v1)
146133
run: ./scripts/run-plugin-tests.sh ${{ matrix.swift-tools-version }} "v1"
147-
- name: SwiftPM plugin test (v2)
148-
if: ${{ matrix.supports-v2 }}
149-
run: ./scripts/run-plugin-tests.sh ${{ matrix.swift-tools-version }} "v2"
150134
- name: Build without NIOSSL
151135
run: swift build
152136
env:

Examples/v2/echo/Echo.swift

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)