From 4ce2bf886b6a9333c3214f59885e19803c8e9f7e Mon Sep 17 00:00:00 2001 From: Ian Ynda-Hummel Date: Mon, 19 Feb 2024 21:12:12 -0500 Subject: [PATCH 1/7] Amethyst 0.21.0 Beta --- Amethyst.xcodeproj/project.pbxproj | 15 +++-- Gemfile.lock | 95 +++++++++++++++--------------- 2 files changed, 54 insertions(+), 56 deletions(-) diff --git a/Amethyst.xcodeproj/project.pbxproj b/Amethyst.xcodeproj/project.pbxproj index 444d6f2d..4efe01d8 100644 --- a/Amethyst.xcodeproj/project.pbxproj +++ b/Amethyst.xcodeproj/project.pbxproj @@ -664,7 +664,6 @@ TargetAttributes = { 402DB6DD1742E41A00D1C936 = { LastSwiftMigration = 1010; - ProvisioningStyle = Automatic; }; 40D95B461C6E2ED800AAF433 = { CreatedOnToolsVersion = 7.2.1; @@ -1007,13 +1006,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Amethyst/AmethystDebug.entitlements; - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 108; + CURRENT_PROJECT_VERSION = 109; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 82P2XLB4UH; ENABLE_HARDENED_RUNTIME = YES; ENABLE_MODULE_VERIFIER = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -1030,7 +1029,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 0.20.0; + MARKETING_VERSION = 0.21.0b; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++14"; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"DEBUG\""; @@ -1049,10 +1048,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Amethyst/Amethyst.entitlements; - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 108; + CURRENT_PROJECT_VERSION = 109; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 82P2XLB4UH; @@ -1072,7 +1071,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 0.20.0; + MARKETING_VERSION = 0.21.0b; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++14"; ONLY_ACTIVE_ARCH = NO; diff --git a/Gemfile.lock b/Gemfile.lock index 7a7b41ab..52ebebbd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,29 +1,33 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.6) + CFPropertyList (3.0.7) + base64 + nkf rexml - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) atomos (0.1.3) - aws-eventstream (1.2.0) - aws-partitions (1.808.0) - aws-sdk-core (3.180.3) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.893.0) + aws-sdk-core (3.191.2) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) + base64 jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.71.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-kms (1.77.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.132.1) - aws-sdk-core (~> 3, >= 3.179.0) + aws-sdk-s3 (1.143.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.0) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) + base64 (0.2.0) claide (1.1.0) colored (1.2) colored2 (3.1.2) @@ -32,11 +36,10 @@ GEM declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20240107) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.100.0) + excon (0.109.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -65,8 +68,8 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.7) - fastlane (2.214.0) + fastimage (2.3.0) + fastlane (2.219.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -85,20 +88,22 @@ GEM gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) google-cloud-storage (~> 1.31) highline (~> 2.0) + http-cookie (~> 1.0.5) json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) - optparse (~> 0.1.1) + optparse (>= 0.1.1) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) simctl (~> 1.6.3) terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (>= 1.4.5, < 2.0.0) + terminal-table (~> 3) tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) @@ -106,9 +111,9 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.48.0) + google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.1) + google-apis-core (0.11.3) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -116,31 +121,29 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.a) rexml - webrick google-apis-iamcredentials_v1 (0.17.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-playcustomapp_v1 (0.13.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.19.0) - google-apis-core (>= 0.9.0, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.6.1) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.1) - google-cloud-storage (1.44.0) + google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.19.0) + google-apis-storage_v1 (~> 0.31.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.7.0) + googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) @@ -149,20 +152,20 @@ GEM domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.6.2) - json (2.6.3) + json (2.7.1) jwt (2.7.1) - memoist (0.16.2) mini_magick (4.12.0) mini_mime (1.1.5) multi_json (1.15.0) - multipart-post (2.3.0) + multipart-post (2.4.0) nanaimo (0.3.0) naturally (2.2.1) - optparse (0.1.1) + nkf (0.2.0) + optparse (0.4.0) os (1.1.4) - plist (3.7.0) - public_suffix (5.0.3) - rake (13.0.6) + plist (3.7.1) + public_suffix (5.0.4) + rake (13.1.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -173,7 +176,7 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.3) - signet (0.17.0) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -182,21 +185,17 @@ GEM CFPropertyList naturally terminal-notifier (2.0.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) trailblazer-option (0.1.2) tty-cursor (0.7.1) - tty-screen (0.8.1) + tty-screen (0.8.2) tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (1.8.0) - webrick (1.8.1) + unicode-display_width (2.5.0) word_wrap (1.0.0) - xcodeproj (1.22.0) + xcodeproj (1.24.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) From d206b77fa5a82d777562e4399e4c50f5de6a65bb Mon Sep 17 00:00:00 2001 From: Ian Ynda-Hummel Date: Mon, 19 Feb 2024 21:34:10 -0500 Subject: [PATCH 2/7] Remove the team from Debug for tests --- Amethyst.xcodeproj/project.pbxproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Amethyst.xcodeproj/project.pbxproj b/Amethyst.xcodeproj/project.pbxproj index 4efe01d8..58bff40c 100644 --- a/Amethyst.xcodeproj/project.pbxproj +++ b/Amethyst.xcodeproj/project.pbxproj @@ -1007,12 +1007,13 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Amethyst/AmethystDebug.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 109; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 82P2XLB4UH; + DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; ENABLE_MODULE_VERIFIER = YES; FRAMEWORK_SEARCH_PATHS = ( From e45fbdde6834009fb474c6e9f1a49989f5a8c5ed Mon Sep 17 00:00:00 2001 From: Ian Ynda-Hummel Date: Mon, 13 May 2024 20:27:55 -0400 Subject: [PATCH 3/7] 0.21.0 final --- Amethyst.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Amethyst.xcodeproj/project.pbxproj b/Amethyst.xcodeproj/project.pbxproj index 58bff40c..be0ffa93 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 = 109; + CURRENT_PROJECT_VERSION = 110; 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.0b; + MARKETING_VERSION = 0.21.0; 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 = 109; + CURRENT_PROJECT_VERSION = 110; 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.0b; + MARKETING_VERSION = 0.21.0; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++14"; ONLY_ACTIVE_ARCH = NO; From 23df7fbbc2e9f48354a80898cc17ea1315a728a3 Mon Sep 17 00:00:00 2001 From: Ian Ynda-Hummel Date: Mon, 27 May 2024 20:18:44 -0400 Subject: [PATCH 4/7] Apply yabai's fix for moving windows between spaces in macOS 14.5 (#1648) --- .../xcshareddata/swiftpm/Package.resolved | 3 +- Amethyst/Model/Window.swift | 36 +++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/Amethyst.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Amethyst.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8acf1ea6..3d16718f 100644 --- a/Amethyst.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Amethyst.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,4 +1,5 @@ { + "originHash" : "43f1b1e9bfd866a37b073557f24d496c85ab3a7508ae523528cda0c3afb30aa9", "pins" : [ { "identity" : "cartography", @@ -127,5 +128,5 @@ } } ], - "version" : 2 + "version" : 3 } diff --git a/Amethyst/Model/Window.swift b/Amethyst/Model/Window.swift index 70a37f9a..fb019409 100644 --- a/Amethyst/Model/Window.swift +++ b/Amethyst/Model/Window.swift @@ -22,6 +22,12 @@ func SLPSPostEventRecordTo(_ psn: inout ProcessSerialNumber, _ bytes: inout UInt @_silgen_name("SLSMoveWindowsToManagedSpace") func SLSMoveWindowsToManagedSpace(_ cid: Int32, _ window_ids: CFArray, _ sid: Int) +@_silgen_name("SLSSpaceSetCompatID") +func SLSSpaceSetCompatID(_ cid: Int32, _ sid: Int, _ workspace: Int32) -> CGError + +@_silgen_name("SLSSetWindowListWorkspace") +func SLSSetWindowListWorkspace(_ cid: Int32, _ window_ids: UnsafePointer, _ window_count: Int32, _ workspace: Int32) -> CGError + let kCPSUserGenerated: UInt32 = 0x200 let kCPSNoWindows: UInt32 = 0x400 // swiftlint:enable identifier_name @@ -292,7 +298,7 @@ extension AXWindow: WindowType { What a mess. See: https://github.com/Hammerspoon/hammerspoon/issues/370#issuecomment-545545468 */ @discardableResult override func focus() -> Bool { - var pid = self.pid() + let pid = self.pid() var wid = self.cgID() var psn = ProcessSerialNumber() let status = GetProcessForPID(pid, &psn) @@ -367,6 +373,32 @@ extension AXWindow: WindowType { } func move(toSpace spaceID: CGSSpaceID) { - SLSMoveWindowsToManagedSpace(CGSMainConnectionID(), [cgID()] as CFArray, spaceID) + if ProcessInfo.processInfo.isOperatingSystemAtLeast(OperatingSystemVersion(majorVersion: 14, minorVersion: 5, patchVersion: 0)) { + /* + See: + - https://github.com/ianyh/Amethyst/issues/1643 + - https://github.com/koekeishiya/yabai/issues/2240 + - https://github.com/koekeishiya/yabai/commit/98bbdbd1363f27d35f09338cded0de1ec010d830 + */ + var error: CGError = .success + + error = SLSSpaceSetCompatID(CGSMainConnectionID(), spaceID, 0x79616265) + defer { _ = SLSSpaceSetCompatID(CGSMainConnectionID(), spaceID, 0x0) } + guard error == .success else { + log.error("failed to set compat aside id: \(error)") + return + } + + var id = cgID() + error = withUnsafeMutablePointer(to: &id, { pointer -> CGError in + return SLSSetWindowListWorkspace(CGSMainConnectionID(), pointer, 1, 0x79616265) + }) + guard error == .success else { + log.error("failed to throw window: \(error)") + return + } + } else { + SLSMoveWindowsToManagedSpace(CGSMainConnectionID(), [cgID()] as CFArray, spaceID) + } } } From c24e62d1a82fae11203b37b03730ee2dd909b850 Mon Sep 17 00:00:00 2001 From: Ian Ynda-Hummel Date: Mon, 27 May 2024 20:30:47 -0400 Subject: [PATCH 5/7] 0.21.1 --- Amethyst.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Amethyst.xcodeproj/project.pbxproj b/Amethyst.xcodeproj/project.pbxproj index be0ffa93..4357efa0 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 = 111; 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.1; 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 = 111; 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.1; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++14"; ONLY_ACTIVE_ARCH = NO; From 08720ebf52ba664de3b893d007c7b4f02599e48f Mon Sep 17 00:00:00 2001 From: Ian Ynda-Hummel Date: Thu, 19 Sep 2024 21:21:06 -0400 Subject: [PATCH 6/7] Bump version again --- Amethyst.xcodeproj/project.pbxproj | 4 ++-- Amethyst/Model/Window.swift | 4 ++-- fastlane/README.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Amethyst.xcodeproj/project.pbxproj b/Amethyst.xcodeproj/project.pbxproj index 4357efa0..38a14e37 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 = 111; + CURRENT_PROJECT_VERSION = 112; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; @@ -1052,7 +1052,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 111; + CURRENT_PROJECT_VERSION = 112; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 82P2XLB4UH; 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 ``` From 917f2b1a0a4b8d9241bc9bf58fbdbb7b900984af Mon Sep 17 00:00:00 2001 From: Ian Ynda-Hummel Date: Thu, 19 Sep 2024 21:29:03 -0400 Subject: [PATCH 7/7] Bump to 0.21.2 --- Amethyst.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Amethyst.xcodeproj/project.pbxproj b/Amethyst.xcodeproj/project.pbxproj index 38a14e37..461626d2 100644 --- a/Amethyst.xcodeproj/project.pbxproj +++ b/Amethyst.xcodeproj/project.pbxproj @@ -1030,7 +1030,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 0.21.1; + 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\""; @@ -1072,7 +1072,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 0.21.1; + 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;