From 027ed83be02178e0abef237fe71775582b820d20 Mon Sep 17 00:00:00 2001 From: Andrii Nester Date: Mon, 16 Nov 2020 20:12:01 +0200 Subject: [PATCH 1/4] Set settings to build only for Intel architecture (mac) --- src/lib/osx/TogglDesktopLibrary.xcodeproj/project.pbxproj | 1 + src/ui/osx/TogglDesktop/TogglDesktop.xcodeproj/project.pbxproj | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/lib/osx/TogglDesktopLibrary.xcodeproj/project.pbxproj b/src/lib/osx/TogglDesktopLibrary.xcodeproj/project.pbxproj index 64033afef6..aefb7593a3 100644 --- a/src/lib/osx/TogglDesktopLibrary.xcodeproj/project.pbxproj +++ b/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"; diff --git a/src/ui/osx/TogglDesktop/TogglDesktop.xcodeproj/project.pbxproj b/src/ui/osx/TogglDesktop/TogglDesktop.xcodeproj/project.pbxproj index 131c242284..48c4c72ec6 100644 --- a/src/ui/osx/TogglDesktop/TogglDesktop.xcodeproj/project.pbxproj +++ b/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; From dc0098b6ee5aaab67a6bede66328a85ab739b879 Mon Sep 17 00:00:00 2001 From: Andrii Nester Date: Tue, 17 Nov 2020 14:22:38 +0200 Subject: [PATCH 2/4] Update GH Actions to run on Big Sur (mac) --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 893d55d8f8..ab7e8caa95 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ on: jobs: macos: - runs-on: macOS-latest + runs-on: macos-11.0 steps: - uses: actions/checkout@v2 with: @@ -115,7 +115,7 @@ jobs: bash ./dist/osx/build.sh update_release macos-cmake: - runs-on: macOS-latest + runs-on: macos-11.0 steps: - uses: actions/checkout@v2 with: From 9f5f3eaabbba524e08cc04a0b970c43e63953e7e Mon Sep 17 00:00:00 2001 From: Andrii Nester Date: Tue, 17 Nov 2020 16:25:05 +0200 Subject: [PATCH 3/4] Set Xcode version for GH Actions (mac) --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ab7e8caa95..1e1b508bde 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,6 +11,9 @@ jobs: macos: 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 @@ -117,6 +120,9 @@ jobs: macos-cmake: 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 From 76f5f3a9df9b98e249c61bd95da16b7bce5940ac Mon Sep 17 00:00:00 2001 From: Andrii Nester Date: Wed, 18 Nov 2020 10:18:25 +0200 Subject: [PATCH 4/4] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 132816a260..0194bc65ba 100644 --- a/README.md +++ b/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