Skip to content

Commit

Permalink
Updated Carthage to build an xcframework, combining iOS and macOS tog…
Browse files Browse the repository at this point in the history
…ether, since regular frameworks stopped working under Xcode 13. Also removed carthage.sh script, since Xcode 13 fixed the bug it was working around
  • Loading branch information
abbeycode committed Feb 17, 2022
1 parent d699d93 commit 1d88ca4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 22 deletions.
7 changes: 3 additions & 4 deletions Scripts/carthage-validate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,17 @@ rm -rf Carthage
echo "$REPO \"$COMMIT\"" > Cartfile


# Employing a workaround until Xcode 12 builds are fixed
source "${SCRIPTPATH}"/carthage.sh bootstrap --configuration Debug --verbose
carthage bootstrap --use-xcframeworks --configuration Debug --verbose
EXIT_CODE=$?

echo "Checking for build products..."

if [ ! -d "Carthage/Build/Mac/UnrarKit.framework" ]; then
if [ ! -d "Carthage/Build/UnrarKit.xcframework/macos-arm64_x86_64" ]; then
echo "No Mac library built"
EXIT_CODE=1
fi

if [ ! -d "Carthage/Build/iOS/UnrarKit.framework" ]; then
if [ ! -d "Carthage/Build/UnrarKit.xcframework/ios-arm64" ]; then
echo "No iOS library built"
EXIT_CODE=1
fi
Expand Down
18 changes: 0 additions & 18 deletions Scripts/carthage.sh

This file was deleted.

0 comments on commit 1d88ca4

Please sign in to comment.