From 84a4cf6103d88093563d659986b3a064bf8a8b60 Mon Sep 17 00:00:00 2001 From: Go Takagi <15936908+shimastripe@users.noreply.github.com> Date: Sat, 7 May 2022 14:28:26 +0900 Subject: [PATCH 1/2] Fix macOS-latest xcode path --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 869cec2..b0939be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,8 +39,7 @@ jobs: name: Carthage runs-on: macOS-latest env: - # Carthage is broken in Xcode 12 and above https://github.com/Carthage/Carthage/blob/master/Documentation/Xcode12Workaround.md - DEVELOPER_DIR: /Applications/Xcode_11.7.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer steps: - uses: actions/checkout@v2 - name: carthage @@ -48,7 +47,7 @@ jobs: swift-package-manager: runs-on: macos-latest env: - DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer steps: - name: Checkout uses: actions/checkout@v2 From d9c5663aa4ed1d73423701239d3c4d7f18af3691 Mon Sep 17 00:00:00 2001 From: Go Takagi <15936908+shimastripe@users.noreply.github.com> Date: Sat, 7 May 2022 14:28:10 +0900 Subject: [PATCH 2/2] Use xcframework option in Carthage --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c41fa1b..d7b8905 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,7 @@ XCODE_MAJOR_VERSION=$(shell xcodebuild -version | HEAD -n 1 | sed -E 's/Xcode ([ .PHONY: all cocoapods test analyze carthage spm carthage: - if [ ${XCODE_MAJOR_VERSION} -gt 11 ] ; then \ - echo "Carthage no longer works in Xcode 12 https://github.com/Carthage/Carthage/blob/master/Documentation/Xcode12Workaround.md"; \ - exit 1; \ - fi - carthage build --no-skip-current + carthage build --no-skip-current --use-xcframeworks cocoapods: pod lib lint