Merge pull request #31 from AckeeCZ/update_xcode

Update Xcode to 12.4

Author: olejnjak

.github/workflows/deploy.yml

@@ -6,30 +6,31 @@ on:
     - '*'
 
 jobs:
-  carthage:
-    name: Upload Carthage binary 
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: AckeeCZ/[email protected]
-      - uses: actions/cache@v1
-        with:
-          path: Carthage
-          key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
-          restore-keys: |
-            ${{ runner.os }}-carthage-
-      - name: Build
-        run: carthage build --no-skip-current --cache-builds
-      - name: Archive
-        run: carthage archive Reqres
-      - uses: xresloader/upload-to-github-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          file: Reqres.framework.zip
-          tags: true
-          draft: false
+  # Just comment out for now, uncomment when Carthage supports archives with XCFrameworks
+  # carthage:
+  #   name: Upload Carthage binary 
+  #   runs-on: macos-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - uses: AckeeCZ/[email protected]
+  #     - uses: actions/cache@v1
+  #       with:
+  #         path: Carthage
+  #         key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
+  #         restore-keys: |
+  #           ${{ runner.os }}-carthage-
+  #     - name: Build
+  #       run: carthage build --no-skip-current --cache-builds
+  #     - name: Archive
+  #       run: carthage archive Reqres
+  #     - uses: xresloader/upload-to-github-release@v1
+  #       if: startsWith(github.ref, 'refs/tags/')
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #       with:
+  #         file: Reqres.framework.zip
+  #         tags: true
+  #         draft: false
   cocoapods:
     name: Push podspec to Cocoapods trunk
     runs-on: macos-latest

.github/workflows/tests.yml

@@ -18,6 +18,6 @@ jobs:
       - name: Install Carthage dependencies
         env:
           GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: carthage bootstrap --platform iOS --cache-builds
+        run: carthage bootstrap --platform iOS --cache-builds --use-xcframeworks
       - name: Run tests
         run: set -o pipefail && xcodebuild test -scheme Reqres -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 11 Pro Max,OS=latest' ONLY_ACTIVE_ARCH=YES | xcpretty

.github/xcode-version

@@ -1 +1 @@
-11.6
+12.4

CHANGELOG.md

@@ -11,7 +11,10 @@
 
 ### Added
 <!--- - <description> (#<PR_number, kudos to @<author>) --->
-- Run SwiftLint on build if installed locally ([#29](https://github.com/AckeeCZ/ACKategories/pull/29), kudos to @olejnjak)
+- Run SwiftLint on build if installed locally ([#29](https://github.com/AckeeCZ/Reqres/pull/29), kudos to @olejnjak)
+
+### Changed
+- Use Xcode 12.4 on CI ([#31](https://github.com/AckeeCZ/Reqres/pull/31), kudos to @olejnjak)
 
 ## 3.1.1