[APP-1961] Xcode 13 compatibility (#169)

iZettle · Aug 11, 2021 · 3f281d6 · 3f281d6
1 parent 8411d2f
commit 3f281d6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,7 +9,7 @@ anchors:
   - &test_output_folder test_output
   - &default_executor
     macos:
-      xcode: "12.5.0"
+      xcode: "13.0.0"
 
 env:
   global:
@@ -137,13 +137,13 @@ jobs:
       - store_test_results:
           path: swiftlint.html
 
-  test-xcode11-ios13:
+  test-xcode12-ios14:
     macos:
-      xcode: "11.7.0"
+      xcode: "12.5.0"
     steps:
       - test_main_project
 
-  test-xcode12-ios14:
+  test-xcode13-ios15:
     <<: *default_executor
     steps:
       - test_main_project
@@ -166,8 +166,8 @@ workflows:
     jobs:
       - swiftlint:
           version: 0.39.2
-      - test-xcode11-ios13
       - test-xcode12-ios14
+      - test-xcode13-ios15
       - test-example-messages
       - test-example-demo
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 3.2.0
+
+- Xcode 13.0 compatibility
+
 # 3.1.1
 
 - Xcode 12.5 compatibility

diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "iZettle/Flow" "1.9.1"
+github "iZettle/Flow" "1.10.0"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "iZettle/Flow" "1.9.1"
+github "iZettle/Flow" "1.10.0"
diff --git a/Form.xcodeproj/project.pbxproj b/Form.xcodeproj/project.pbxproj
@@ -857,7 +857,7 @@
 				INFOPLIST_FILE = Form/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 3.1.1;
+				MARKETING_VERSION = 3.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Form;
 				PRODUCT_NAME = Form;
 				SKIP_INSTALL = YES;
@@ -878,7 +878,7 @@
 				INFOPLIST_FILE = Form/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 3.1.1;
+				MARKETING_VERSION = 3.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Form;
 				PRODUCT_NAME = Form;
 				SKIP_INSTALL = YES;

diff --git a/carthage.sh b/carthage.sh
@@ -8,9 +8,15 @@ set -euo pipefail
 xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
 trap 'rm -f "$xcconfig"' INT TERM HUP EXIT
 
-# For Xcode 12 (beta 3+) make sure EXCLUDED_ARCHS is set to arm architectures otherwise
+# 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"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "iZettle/Flow" "1.9.1"
		github "iZettle/Flow" "1.10.0"