Skip to content

Commit dc34e57

Browse files
committed
Remove v2 code from v1
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 dc34e57

File tree

411 files changed

+11
-85024
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
-85024
lines changed

.github/workflows/ci.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,12 @@ jobs:
124124
include:
125125
- image: swiftlang/swift:nightly-jammy
126126
swift-tools-version: '6.0'
127-
supports-v2: true
128127
- image: swift:6.0-jammy
129128
swift-tools-version: '6.0'
130-
supports-v2: true
131129
- image: swift:5.10.1-noble
132130
swift-tools-version: '5.10'
133-
supports-v2: false
134131
- image: swift:5.9-jammy
135132
swift-tools-version: '5.9'
136-
supports-v2: false
137133
name: Integration Tests on ${{ matrix.image }}
138134
runs-on: ubuntu-latest
139135
container:
@@ -144,9 +140,6 @@ jobs:
144140
run: apt update && apt install -y protobuf-compiler
145141
- name: SwiftPM plugin test (v1)
146142
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"
150143
- name: Build without NIOSSL
151144
run: swift build
152145
env:

Examples/v2/echo/Echo.swift

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

0 commit comments

Comments
 (0)