Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1
defaults: &defaults
macos:
xcode: 12.5.1
xcode: 14.2.0
parallelism: 1
shell: /bin/bash --login
environment:
Expand All @@ -21,13 +21,13 @@ jobs:
- v{{ .Environment.CACHE_VERSION }}-carthage-no-swiftlint-deps-{{ checksum "Cartfile.resolved" }}
- run:
name: Set Ruby Version
command: echo "ruby-2.4" > ~/.ruby-version
command: echo "ruby-2.7.7" > ~/.ruby-version
- run:
name: Carthage checkout
command: carthage checkout
- run:
name: Test Carthage Build before installing SwiftLint
command: scripts/carthage.sh build --no-skip-current --cache-builds --no-use-binaries --verbose
command: scripts/carthage.sh build --no-skip-current --cache-builds --no-use-binaries --verbose
- save_cache:
key: v{{ .Environment.CACHE_VERSION }}-carthage-no-swiftlint-deps-{{ checksum "Cartfile.resolved" }}
paths:
Expand All @@ -43,10 +43,10 @@ jobs:
- v{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-dep-{{ checksum "Cartfile.resolved" }}
- run:
name: Set Ruby Version
command: echo "ruby-2.4" > ~/.ruby-version
command: echo "ruby-2.7.7" > ~/.ruby-version
- run:
name: Install Swiftlint
command: git clone [email protected]:realm/SwiftLint.git && cd SwiftLint && git submodule update --init --recursive && make install && cd ../
command: brew install swiftlint
- run:
name: Add Python directory to PATH
command: echo 'export PATH=~/Library/Python/2.7/bin:$PATH' >> $BASH_ENV
Expand Down
8 changes: 4 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ end

def device_names
return {
ios: "iPhone 8",
tvos: "Apple TV 4K (at 1080p) (2nd generation)"
ios: "iPhone 14",
tvos: "Apple TV 4K (3rd generation) (at 1080p)"
}
end

def device_os
return {
ios: "14.5",
tvos: "14.5"
ios: "16.2",
tvos: "16.2"
}
end

Expand Down
8 changes: 7 additions & 1 deletion scripts/carthage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ 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.
echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig

CURRENT_XCODE_VERSION="$(xcodebuild -version | grep "Xcode" | cut -d' ' -f2 | cut -d'.' -f1)00"
CURRENT_XCODE_BUILD=$(xcodebuild -version | grep "Build version" | cut -d' ' -f3)

echo "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_${CURRENT_XCODE_VERSION}__BUILD_${CURRENT_XCODE_BUILD} = arm64 arm64e armv7 armv7s armv6 armv8" >> $xcconfig

echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_'${CURRENT_XCODE_VERSION}' = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_$(XCODE_VERSION_MAJOR)__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"
Expand Down