Bump minimum to macOS 11.5

lucasderraugh · lucasderraugh · commit 83e4c19b5e56 · 2025-10-02T10:56:05.000-04:00
diff --git a/GitUp/Application/Base.lproj/Document.xib b/GitUp/Application/Base.lproj/Document.xib
diff --git a/GitUp/Application/Document.m b/GitUp/Application/Document.m
@@ -47,9 +47,7 @@
 
 #define kMaxProgressRefreshRate 10.0  // Hz
 
-#define kNavigateMinWidth 174.0
 #define kNavigateSegmentWidth 34.0
-#define kTitleMaxWidth HUGE_VALF
 #define kSearchFieldCompactWidth 180.0
 #define kSearchFieldExpandedWidth 238.0
 
@@ -64,7 +62,7 @@ @interface Document () <NSToolbarDelegate, NSTextFieldDelegate, GCLiveRepository
 @property(nonatomic) IBOutlet GICustomToolbarItem* navigateItem;
 @property(nonatomic) IBOutlet GICustomToolbarItem* titleItem;
 @property(nonatomic) IBOutlet NSToolbarItem* snapshotsItem;
-@property(nonatomic) IBOutlet NSToolbarItem<GISearchToolbarItem>* searchItem;
+@property(nonatomic) IBOutlet NSSearchToolbarItem* searchItem;
 @end
 
 static NSDictionary* _helpPlist = nil;
@@ -300,18 +298,7 @@ - (void)windowControllerDidLoadNib:(NSWindowController*)windowController {
 
   NSSegmentedControl* modeControl = (NSSegmentedControl*)_navigateItem.primaryControl;
   NSSegmentedControl* navigateControl = (NSSegmentedControl*)_navigateItem.secondaryControl;
-  if (@available(macOS 11, *)) {
-    // Fully custom symbols not available before 11.0.
-    [modeControl setImage:[NSImage imageNamed:@"circle.2.line.diagonal"] forSegment:kWindowModeID_Map];
-  } else {
-    _mainWindow.titleVisibility = NSWindowTitleHidden;
-    [modeControl setWidth:kNavigateSegmentWidth forSegment:kWindowModeID_Map];
-    [modeControl setWidth:kNavigateSegmentWidth forSegment:kWindowModeID_Commit];
-    [modeControl setWidth:kNavigateSegmentWidth forSegment:kWindowModeID_Stashes];
-    [navigateControl setWidth:kNavigateSegmentWidth forSegment:kNavigationAction_Exit];
-    [navigateControl setWidth:kNavigateSegmentWidth forSegment:kNavigationAction_Next];
-    [navigateControl setWidth:kNavigateSegmentWidth forSegment:kNavigationAction_Previous];
-  }
+  [modeControl setImage:[NSImage imageNamed:@"circle.2.line.diagonal"] forSegment:kWindowModeID_Map];
 
   NSLayoutConstraint* searchFieldPreferredWidth = [_searchItem.searchField.widthAnchor constraintEqualToConstant:kSearchFieldCompactWidth];
   searchFieldPreferredWidth.priority = NSLayoutPriorityDefaultHigh - 20;
@@ -619,9 +606,7 @@ - (void)_updateTitleBar {
   NSString* countText = [NSString stringWithFormat:NSLocalizedString(@"%@", nil), _FormatCommitCount(_numberFormatter, totalCount)];
   _titleItem.primaryControl.stringValue = _windowController.window.title;
   _titleItem.secondaryControl.stringValue = countText;
-  if (@available(macOS 11.0, *)) {
-    _windowController.window.subtitle = countText;
-  }
+  _windowController.window.subtitle = countText;
 }
 
 static NSString* _StringFromRepositoryState(GCRepositoryState state) {
@@ -1146,11 +1131,7 @@ - (void)restoreStateWithCoder:(NSCoder*)coder {
 #pragma mark - NSToolbarDelegate
 
 - (NSArray*)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar {
-  if (@available(macOS 11, *)) {
-    return @[ _navigateItem.itemIdentifier, NSToolbarFlexibleSpaceItemIdentifier, _snapshotsItem.itemIdentifier, _searchItem.itemIdentifier ];
-  } else {
-    return @[ _navigateItem.itemIdentifier, NSToolbarSpaceItemIdentifier, _titleItem.itemIdentifier, NSToolbarFlexibleSpaceItemIdentifier, _snapshotsItem.itemIdentifier, _searchItem.itemIdentifier ];
-  }
+  return @[ _navigateItem.itemIdentifier, NSToolbarFlexibleSpaceItemIdentifier, _snapshotsItem.itemIdentifier, _searchItem.itemIdentifier ];
 }
 
 #pragma mark - NSTextFieldDelegate
@@ -1662,9 +1643,7 @@ - (IBAction)resetHard:(id)sender {
   alert.informativeText = NSLocalizedString(@"Any operation in progress (merge, rebase, etc...) will be aborted, and any uncommitted change, including in submodules, will be discarded.\n\nThis action cannot be undone.", nil);
   alert.accessoryView = _resetView;
   NSButton* reset = [alert addButtonWithTitle:NSLocalizedString(@"Reset", nil)];
-  if (@available(macOS 11, *)) {
-    reset.hasDestructiveAction = YES;
-  }
+  reset.hasDestructiveAction = YES;
   [alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];
   [alert beginSheetModalForWindow:_mainWindow
                 completionHandler:^(NSInteger returnCode) {
diff --git a/GitUp/GitUp.xcodeproj/project.pbxproj b/GitUp/GitUp.xcodeproj/project.pbxproj
@@ -659,7 +659,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				MARKETING_VERSION = 1.4.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "co.gitup.mac-debug";
 				PRODUCT_NAME = GitUp;
@@ -679,7 +679,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				MARKETING_VERSION = 1.4.3;
 				PRODUCT_BUNDLE_IDENTIFIER = co.gitup.mac;
 				PRODUCT_NAME = GitUp;
diff --git a/GitUpKit/Components/GIDiffFilesViewController.m b/GitUpKit/Components/GIDiffFilesViewController.m
@@ -39,7 +39,6 @@ @interface GIDiffFilesViewController () <NSFilePromiseProviderDelegate>
 @end
 
 /// Allows augmenting a file promise with custom intra-app data.
-API_AVAILABLE(macos(10.12))
 @interface GIDiffFileProvider : NSFilePromiseProvider
 @property(strong) id<NSPasteboardWriting> overridePasteboardWriter;
 @end
@@ -339,7 +338,7 @@ - (NSString*)_SHA1ForDelta:(GCDiffDelta*)delta {
   }
 }
 
-- (NSString*)filePromiseProvider:(NSFilePromiseProvider*)filePromiseProvider fileNameForType:(NSString*)fileType API_AVAILABLE(macos(10.12)) {
+- (NSString*)filePromiseProvider:(NSFilePromiseProvider*)filePromiseProvider fileNameForType:(NSString*)fileType {
   GCDiffDelta* delta = filePromiseProvider.userInfo;
   NSString* SHA1 = [[self _SHA1ForDelta:delta] substringToIndex:7];
   NSString* basename = delta.canonicalPath.stringByDeletingPathExtension.lastPathComponent;
@@ -348,7 +347,7 @@ - (NSString*)filePromiseProvider:(NSFilePromiseProvider*)filePromiseProvider fil
   return filename;
 }
 
-- (void)filePromiseProvider:(NSFilePromiseProvider*)filePromiseProvider writePromiseToURL:(NSURL*)url completionHandler:(void (^)(NSError* errorOrNil))completionHandler API_AVAILABLE(macos(10.12)) {
+- (void)filePromiseProvider:(NSFilePromiseProvider*)filePromiseProvider writePromiseToURL:(NSURL*)url completionHandler:(void (^)(NSError* errorOrNil))completionHandler {
   GCDiffDelta* delta = filePromiseProvider.userInfo;
   NSString* SHA1 = [self _SHA1ForDelta:delta];
   NSError* error;
diff --git a/GitUpKit/Core/GCRepository.h b/GitUpKit/Core/GCRepository.h
@@ -68,6 +68,7 @@ typedef NS_ENUM(NSUInteger, GCFileMode) {
 
 - (BOOL)checkPathNotIgnored:(NSString*)path error:(NSError**)error;
 
+- (NSURL*)absoluteURLForFile:(NSString*)path;
 - (NSString*)absolutePathForFile:(NSString*)path;
 
 - (BOOL)safeDeleteFile:(NSString*)path error:(NSError**)error;  // Moves file to Trash (OS X only)
diff --git a/GitUpKit/Core/GCRepository.m b/GitUpKit/Core/GCRepository.m
@@ -263,6 +263,11 @@ - (BOOL)checkPathNotIgnored:(NSString*)path error:(NSError**)error {
   return YES;
 }
 
+- (NSURL*)absoluteURLForFile:(NSString*)path {
+  NSString* absolutePath = [self absolutePathForFile:path];
+  return [NSURL fileURLWithPath:absolutePath];
+}
+
 - (NSString*)absolutePathForFile:(NSString*)path {
   XLOG_CHECK(_workingDirectoryPath && path.length);
   return [_workingDirectoryPath stringByAppendingPathComponent:path];
diff --git a/GitUpKit/GitUpKit.xcodeproj/project.pbxproj b/GitUpKit/GitUpKit.xcodeproj/project.pbxproj
@@ -1632,7 +1632,7 @@
 					"$(inherited)",
 					"$(SDKROOT)/usr/lib/system",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				PRODUCT_BUNDLE_IDENTIFIER = co.gitup.kit;
 				PRODUCT_NAME = GitUpKit;
 				SDKROOT = macosx;
@@ -1657,7 +1657,7 @@
 					"$(inherited)",
 					"$(SDKROOT)/usr/lib/system",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				PRODUCT_BUNDLE_IDENTIFIER = co.gitup.kit;
 				PRODUCT_NAME = GitUpKit;
 				SDKROOT = macosx;
diff --git a/GitUpKit/Interface/GIGraphView.m b/GitUpKit/Interface/GIGraphView.m
@@ -1375,9 +1375,9 @@ static void _DrawSelectedNode(CGContextRef context, CGFloat x, CGFloat y, GINode
   // Draw label
 
   if (isFirstResponder) {
-    CGContextSetFillColorWithColor(context, [[NSColor alternateSelectedControlColor] CGColor]);  // NSTableView focused highlight color
+    CGContextSetFillColorWithColor(context, NSColor.selectedContentBackgroundColor.CGColor);  // NSTableView focused highlight color
   } else {
-    CGContextSetFillColorWithColor(context, [[NSColor secondarySelectedControlColor] CGColor]);  // NSTableView unfocused highlight color
+    CGContextSetFillColorWithColor(context, NSColor.unemphasizedSelectedContentBackgroundColor.CGColor);  // NSTableView unfocused highlight color
   }
   CGContextAddPath(context, labelPath);
   CGContextFillPath(context);
diff --git a/GitUpKit/Interface/GISplitDiffView.m b/GitUpKit/Interface/GISplitDiffView.m
@@ -357,7 +357,7 @@ - (void)drawRect:(NSRect)dirtyRect {
   if (_lines.count) {
     drawHorizontalSeparator(0.5);
 
-    NSColor* selectedColor = self.window.keyWindow && (self.window.firstResponder == self) ? [NSColor selectedControlColor] : [NSColor secondarySelectedControlColor];
+    NSColor* selectedColor = self.window.keyWindow && (self.window.firstResponder == self) ? NSColor.selectedControlColor : NSColor.unemphasizedSelectedContentBackgroundColor;
     CGContextSetTextMatrix(context, CGAffineTransformIdentity);
     NSUInteger count = _lines.count;
     NSUInteger start = MIN(MAX(count - (dirtyRect.origin.y + dirtyRect.size.height - kTextBottomPadding) / self.lineHeight, 0), count);
diff --git a/GitUpKit/Interface/GIUnifiedDiffView.m b/GitUpKit/Interface/GIUnifiedDiffView.m
@@ -277,7 +277,7 @@ - (void)drawRect:(NSRect)dirtyRect {
   if (_frame) {
     drawHorizontalSeparator(0.5);
 
-    NSColor* selectedColor = self.window.keyWindow && (self.window.firstResponder == self) ? [NSColor selectedControlColor] : [NSColor secondarySelectedControlColor];
+    NSColor* selectedColor = self.window.keyWindow && (self.window.firstResponder == self) ? NSColor.selectedControlColor : NSColor.unemphasizedSelectedContentBackgroundColor;
     CGContextSetTextMatrix(context, CGAffineTransformIdentity);
     CFArrayRef lines = CTFrameGetLines(_frame);
     CFIndex count = CFArrayGetCount(lines);
diff --git a/GitUpKit/Utilities/GICustomToolbarItem.h b/GitUpKit/Utilities/GICustomToolbarItem.h
@@ -22,18 +22,3 @@
 @property(nonatomic, weak) IBOutlet NSControl* secondaryControl;
 + (void)validateAsUserInterfaceItem:(id)item;
 @end
-
-// The search toolbar item will respond to at least these methods, even
-// before macOS 11.
-@protocol GISearchToolbarItem <NSObject>
-@property(nonatomic, readonly) NSSearchField* searchField;
-- (void)beginSearchInteraction;
-@end
-
-// Use as the custom class for an `NSSearchToolbarItem` in a nib.
-// It is automatically decoded as `NSSearchToolbarItem` when available.
-@interface GISearchToolbarItem : GICustomToolbarItem <GISearchToolbarItem>
-@end
-
-@interface NSSearchToolbarItem (GICustomToolbarItem) <GISearchToolbarItem>
-@end
diff --git a/GitUpKit/Utilities/GICustomToolbarItem.m b/GitUpKit/Utilities/GICustomToolbarItem.m
@@ -15,10 +15,6 @@
 
 #import "GICustomToolbarItem.h"
 
-API_AVAILABLE(macos(11))
-@interface GINSSearchToolbarItem : NSSearchToolbarItem
-@end
-
 @implementation GICustomToolbarItem
 
 - (void)setEnabled:(BOOL)enabled {
@@ -50,36 +46,3 @@ + (void)validateAsUserInterfaceItem:(id)sender {
 }
 
 @end
-
-// MARK: -
-
-@implementation GISearchToolbarItem
-
-+ (id)allocWithZone:(NSZone*)zone {
-  if (@available(macOS 11, *)) {
-    return (id)[GINSSearchToolbarItem allocWithZone:zone];
-  } else {
-    return [super allocWithZone:zone];
-  }
-}
-
-- (NSSearchField*)searchField {
-  if (![self.view isKindOfClass:NSSearchField.self]) return nil;
-  return (NSSearchField*)self.view;
-}
-
-- (void)beginSearchInteraction {
-  [self.searchField selectText:nil];
-}
-
-@end
-
-// MARK: -
-
-@implementation GINSSearchToolbarItem
-
-- (void)validate {
-  [GICustomToolbarItem validateAsUserInterfaceItem:self];
-}
-
-@end
diff --git a/GitUpKit/Utilities/GIViewController+Utilities.m b/GitUpKit/Utilities/GIViewController+Utilities.m
@@ -303,11 +303,11 @@ - (void)restoreFile:(NSString*)path toCommit:(GCCommit*)commit {
 }
 
 - (void)openFileWithDefaultEditor:(NSString*)path {
-  [[NSWorkspace sharedWorkspace] openFile:[self.repository absolutePathForFile:path]];  // This will silently fail if the file doesn't exist in the working directory
+  [[NSWorkspace sharedWorkspace] openURL:[self.repository absoluteURLForFile:path]];  // This will silently fail if the file doesn't exist in the working directory
 }
 
 - (void)showFileInFinder:(NSString*)path {
-  [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:@[ [NSURL fileURLWithPath:[self.repository absolutePathForFile:path]] ]];
+  [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:@[ [self.repository absoluteURLForFile:path] ]];
 }
 
 - (void)openSubmoduleWithApp:(NSString*)path {
diff --git a/GitUpKit/Utilities/GIViewController.m b/GitUpKit/Utilities/GIViewController.m
@@ -235,9 +235,7 @@ - (void)confirmUserActionWithAlertType:(GIAlertType)type
     NSButton* defaultButton = [alert addButtonWithTitle:button];
     if (type == kGIAlertType_Danger) {
       defaultButton.keyEquivalent = @"";
-      if (@available(macOS 11, *)) {
-        defaultButton.hasDestructiveAction = YES;
-      }
+      defaultButton.hasDestructiveAction = YES;
     }
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];
     [self presentAlert:alert
