From 43844c76c6d04b05c06ada99170dcf52f1156794 Mon Sep 17 00:00:00 2001 From: Joel Fischer Date: Mon, 2 May 2022 15:41:45 -0400 Subject: [PATCH] Update tests to use Nimble 10.0 --- Cartfile.private | 2 +- Cartfile.resolved | 2 +- carthage-build.sh | 21 --------------------- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100755 carthage-build.sh diff --git a/Cartfile.private b/Cartfile.private index f1371a295..7c03e900b 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "Quick/Quick" ~> 5.0 -github "Quick/Nimble" ~> 9.0 +github "Quick/Nimble" ~> 10.0 github "erikdoe/ocmock" ~> 3.7 diff --git a/Cartfile.resolved b/Cartfile.resolved index 6cccb200f..f27b58aad 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ -github "Quick/Nimble" "v9.2.1" +github "Quick/Nimble" "v10.0.0" github "Quick/Quick" "v5.0.1" github "erikdoe/ocmock" "v3.9.1" diff --git a/carthage-build.sh b/carthage-build.sh deleted file mode 100755 index c50df1cba..000000000 --- a/carthage-build.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -# carthage-build.sh -# Usage example: ./carthage-build.sh --platform iOS - -set -euo pipefail - -xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX) -trap 'rm -f "$xcconfig"' INT TERM HUP EXIT - -# For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise -# the build will fail on lipo due to duplicate architectures. - -CURRENT_XCODE_VERSION=$(xcodebuild -version | grep "Build version" | cut -d' ' -f3) -echo "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$CURRENT_XCODE_VERSION = arm64 arm64e armv7 armv7s armv6 armv8" >> $xcconfig - -echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$(XCODE_PRODUCT_BUILD_VERSION))' >> $xcconfig -echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig - -export XCODE_XCCONFIG_FILE="$xcconfig" -carthage "$@" \ No newline at end of file