diff --git a/Scripts/archive-carthage.sh b/Scripts/archive-carthage.sh index b4f5239..8168ad2 100755 --- a/Scripts/archive-carthage.sh +++ b/Scripts/archive-carthage.sh @@ -4,9 +4,9 @@ set -ev # Archives the Carthage packages, and prints the name of the archive -# Employing a workaround until Xcode 12 builds are fixed -SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" -source "${SCRIPTPATH}"/carthage.sh build --no-skip-current -source "${SCRIPTPATH}"/carthage.sh archive +carthage build --use-xcframeworks --no-skip-current -export ARCHIVE_PATH="UnrarKit.framework.zip" \ No newline at end of file +# This is currently broken, combined with the --use-xcframeworks option above, as of Carthage 0.38.0 on 2/17/2021 +carthage archive + +export ARCHIVE_PATH="UnrarKit.xcframework.zip" \ No newline at end of file diff --git a/Scripts/carthage-validate.sh b/Scripts/carthage-validate.sh index a2a50b1..cc54b4a 100755 --- a/Scripts/carthage-validate.sh +++ b/Scripts/carthage-validate.sh @@ -5,9 +5,6 @@ carthage --version REPO="github \"$TRAVIS_REPO_SLUG\"" COMMIT=$TRAVIS_COMMIT -# Only necessary for workaround below -SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" - if [ -z ${TRAVIS+x} ]; then REPO="git \"`pwd`\"" COMMIT=`git log -1 --oneline | cut -f1 -d' '`