Skip to content

Commit 823df0d

Browse files
Merge pull request #97 from apivideo/fix/swift_alamofire_5.10
fix(swift5): fix compile error from Alamofire 5.10
2 parents 178b0ac + d12fdf6 commit 823df0d

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,10 @@ jobs:
2828
uses: maxim-lobanov/setup-xcode@v1
2929
with:
3030
xcode-version: latest-stable
31-
- name: Set Default Scheme
32-
run: |
33-
scheme_list=$(xcodebuild -list -json | tr -d "\n")
34-
default=$(echo $scheme_list | ruby -e "require 'json'; puts JSON.parse(STDIN.gets)['workspace']['schemes'][0]")
35-
echo $default | cat >default
36-
echo Using default scheme: $default
3731
- name: Build Package with xcodebuild
38-
env:
39-
scheme: ${{ 'default' }}
40-
run: |
41-
if [ $scheme = default ]; then scheme=$(cat default); fi
42-
xcodebuild -scheme $scheme -destination 'platform=iOS Simulator,name=iPhone 16'
32+
run: xcodebuild -scheme ApiVideoClient -destination 'platform=iOS Simulator,name=iPhone 16'
4333
- name: Build Example
44-
env:
45-
scheme: ${{ 'default' }}
46-
run: |
47-
if [ $scheme = default ]; then scheme=$(cat default); fi
48-
xcodebuild clean build -project Example/Example.xcodeproj -scheme $scheme -sdk iphoneos
34+
run: xcodebuild clean build -project Example/Example.xcodeproj -scheme ApiVideoClient -sdk iphoneos
4935

5036
cocoapods:
5137
name: Verify cocopods podspec
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9d05425d4fb2c3a73804ed5a27232eda6751260b0947f6b4c736cc96df300103
1+
6f374764cf476ad001123c84953d1980aaf6bc352573020d111594ab74058bf6

Sources/AlamofireImplementations.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,8 @@ extension JSONDataEncoding: ParameterEncoding {
413413
public func encode(_ urlRequest: URLRequestConvertible, with parameters: Parameters?) throws -> URLRequest {
414414
let urlRequest = try urlRequest.asURLRequest()
415415

416-
return encode(urlRequest, with: parameters)
416+
// Alamofire 5.10 changed type of Parameters so that it is no longer equivalent to [String: Any]
417+
// cast this type so that the call to encode is not recursive
418+
return encode(urlRequest, with: parameters as [String: Any]?)
417419
}
418420
}

0 commit comments

Comments
 (0)