From 88a2cd7b9751379bb84898258d08779a115031a8 Mon Sep 17 00:00:00 2001 From: Ian Ynda-Hummel Date: Thu, 19 Sep 2024 21:37:03 -0400 Subject: [PATCH] Amethyst 0.21.2 (#1652) --- Amethyst.xcodeproj/project.pbxproj | 8 ++++---- Amethyst/Model/Window.swift | 4 ++-- fastlane/README.md | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Amethyst.xcodeproj/project.pbxproj b/Amethyst.xcodeproj/project.pbxproj index be0ffa93..461626d2 100644 --- a/Amethyst.xcodeproj/project.pbxproj +++ b/Amethyst.xcodeproj/project.pbxproj @@ -1010,7 +1010,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 110; + CURRENT_PROJECT_VERSION = 112; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; @@ -1030,7 +1030,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 0.21.0; + MARKETING_VERSION = 0.21.2; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++14"; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"DEBUG\""; @@ -1052,7 +1052,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 110; + CURRENT_PROJECT_VERSION = 112; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 82P2XLB4UH; @@ -1072,7 +1072,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 0.21.0; + MARKETING_VERSION = 0.21.2; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++14"; ONLY_ACTIVE_ARCH = NO; diff --git a/Amethyst/Model/Window.swift b/Amethyst/Model/Window.swift index cdb0cadd..994762c8 100644 --- a/Amethyst/Model/Window.swift +++ b/Amethyst/Model/Window.swift @@ -374,10 +374,10 @@ extension AXWindow: WindowType { func move(toSpace spaceID: CGSSpaceID) { let osVersion = ProcessInfo.processInfo.operatingSystemVersion - if ((osVersion.majorVersion >= 15) || + if (osVersion.majorVersion >= 15) || (osVersion.majorVersion == 14 && osVersion.minorVersion >= 5) || (osVersion.majorVersion == 13 && osVersion.minorVersion >= 6) || - (osVersion.majorVersion == 12 && osVersion.minorVersion >= 7)){ + (osVersion.majorVersion == 12 && osVersion.minorVersion >= 7) { /* See: - https://github.com/ianyh/Amethyst/issues/1643 diff --git a/fastlane/README.md b/fastlane/README.md index af526d89..d975bdb3 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -16,7 +16,7 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do ### mac ```sh -fastlane mac +[bundle exec] fastlane mac ```