Merge pull request #401 from apivideo/fix/swift_alamofire_5.10

fix(swift5): fix compile error from Alamofire 5.10
apivideo · Oct 21, 2024 · f8fec1a · f8fec1a
2 parents 68cd621 + 99961b4
commit f8fec1a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 33 deletions.
diff --git a/templates/swift5/libraries/alamofire/AlamofireImplementations.mustache b/templates/swift5/libraries/alamofire/AlamofireImplementations.mustache
@@ -413,6 +413,8 @@ extension JSONDataEncoding: ParameterEncoding {
     public func encode(_ urlRequest: URLRequestConvertible, with parameters: Parameters?) throws -> URLRequest {
         let urlRequest = try urlRequest.asURLRequest()
 
-        return encode(urlRequest, with: parameters)
+        // Alamofire 5.10 changed type of Parameters so that it is no longer equivalent to [String: Any]
+        // cast this type so that the call to encode is not recursive
+        return encode(urlRequest, with: parameters as [String: Any]?)
     }
 }
diff --git a/templates/swift5/statics/client/.github/workflows/build.yml b/templates/swift5/statics/client/.github/workflows/build.yml
@@ -28,24 +28,10 @@ jobs:
         uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: latest-stable
-      - name: Set Default Scheme
-        run: |
-          scheme_list=$(xcodebuild -list -json | tr -d "\n")
-          default=$(echo $scheme_list | ruby -e "require 'json'; puts JSON.parse(STDIN.gets)['workspace']['schemes'][0]")
-          echo $default | cat >default
-          echo Using default scheme: $default
       - name: Build Package with xcodebuild
-        env:
-          scheme: ${{ 'default' }}
-        run: |
-          if [ $scheme = default ]; then scheme=$(cat default); fi
-          xcodebuild -scheme $scheme  -destination 'platform=iOS Simulator,name=iPhone 16'
+        run: xcodebuild -scheme ApiVideoClient -destination 'platform=iOS Simulator,name=iPhone 16'
       - name: Build Example
-        env:
-          scheme: ${{ 'default' }}
-        run: |
-          if [ $scheme = default ]; then scheme=$(cat default); fi
-          xcodebuild clean build -project Example/Example.xcodeproj -scheme $scheme -sdk iphoneos
+        run: xcodebuild clean build -project Example/Example.xcodeproj -scheme ApiVideoClient -sdk iphoneos
 
   cocoapods:
     name: Verify cocopods podspec

diff --git a/templates/swift5/statics/uploader/.github/workflows/build.yml b/templates/swift5/statics/uploader/.github/workflows/build.yml
@@ -28,24 +28,10 @@ jobs:
         uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: latest-stable
-      - name: Set Default Scheme
-        run: |
-          scheme_list=$(xcodebuild -list -json | tr -d "\n")
-          default=$(echo $scheme_list | ruby -e "require 'json'; puts JSON.parse(STDIN.gets)['workspace']['schemes'][0]")
-          echo $default | cat >default
-          echo Using default scheme: $default
       - name: Build Package with xcodebuild
-        env:
-          scheme: ${{ 'default' }}
-        run: |
-          if [ $scheme = default ]; then scheme=$(cat default); fi
-          xcodebuild -scheme $scheme  -destination 'platform=iOS Simulator,name=iPhone 16'
+        run: xcodebuild -scheme ApiVideoUploader -destination 'platform=iOS Simulator,name=iPhone 16'
       - name: Build Example
-        env:
-          scheme: ${{ 'default' }}
-        run: |
-          if [ $scheme = default ]; then scheme=$(cat default); fi
-          xcodebuild clean build -project Example/Example.xcodeproj -scheme $scheme -sdk iphoneos
+        run: xcodebuild clean build -project Example/Example.xcodeproj -scheme ApiVideoUploader -sdk iphoneos
 
   cocoapods:
     name: Verify cocopods podspec