Merge pull request #4687 from toggl-open-source/update/mac-build-setting

Update macOS build settings

.github/workflows/main.yml

@@ -9,8 +9,11 @@ on:
 
 jobs:
   macos:
-    runs-on: macOS-latest
+    runs-on: macos-11.0
     steps:
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '12.2'
     - uses: actions/checkout@v2
       with:
         fetch-depth: 1
@@ -115,8 +118,11 @@ jobs:
         bash ./dist/osx/build.sh update_release
 
   macos-cmake:
-    runs-on: macOS-latest
+    runs-on: macos-11.0
     steps:
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '12.2'
     - uses: actions/checkout@v2
       with:
         fetch-depth: 1

README.md

@@ -70,7 +70,7 @@ _By default the app builds for testing server. To use the compiled app with live
 
 ## macOS
 ### Requirements
-- macOS 10.15+, Xcode 12.0+ and Swift 5+
+- macOS 11+, Xcode 12.2+ and Swift 5+
 - Install Bundler
 ```bash
 $ sudo gem install bundler

src/lib/osx/TogglDesktopLibrary.xcodeproj/project.pbxproj

@@ -851,6 +851,7 @@
 		C55DA5AB17F06A3B00B42178 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = x86_64;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CLANG_CXX_LIBRARY = "compiler-default";
 				CODE_SIGN_IDENTITY = "Mac Developer";

src/ui/osx/TogglDesktop/TogglDesktop.xcodeproj/project.pbxproj

@@ -3775,6 +3775,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = B671ACF75B3267B013176BD7 /* Pods-TogglDesktop.release.xcconfig */;
 			buildSettings = {
+				ARCHS = x86_64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_CXX_LIBRARY = "compiler-default";
@@ -4033,6 +4034,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 4BCB2D1F3BD02A806D947C18 /* Pods-TogglDesktop-AppStore.release.xcconfig */;
 			buildSettings = {
+				ARCHS = x86_64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_CXX_LIBRARY = "compiler-default";
 				CLANG_ENABLE_MODULES = YES;