Fixes #597 Xcode 11 warnings (#598)

lucasderraugh · web-flow · commit bc8d3407ecc6 · 2019-10-13T15:50:08.000-07:00
diff --git a/GitUp/Application/Document.m b/GitUp/Application/Document.m
@@ -387,9 +387,7 @@ - (void)windowControllerDidLoadNib:(NSWindowController*)windowController {
 }
 
 // Override -updateChangeCount: which is trigged by NSUndoManager to do nothing and not mark document as updated
-- (void)updateChangeCount:(NSDocumentChangeType)change {
-  ;
-}
+- (void)updateChangeCount:(NSDocumentChangeType)change {}
 
 - (BOOL)presentError:(NSError*)error {
   if (error == nil) {
@@ -1507,9 +1505,7 @@ - (void)commitListViewControllerDidChangeSelection:(GICommitListViewController*)
 
 #pragma mark - GICommitViewControllerDelegate
 
-- (void)commitViewController:(GICommitViewController*)controller didCreateCommit:(GCCommit*)commit {
-  ;
-}
+- (void)commitViewController:(GICommitViewController*)controller didCreateCommit:(GCCommit*)commit {}
 
 #pragma mark - GICommitRewriterViewControllerDelegate
 
@@ -1629,7 +1625,7 @@ - (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
     if ([_windowMode isEqualToString:kWindowModeString_Map_QuickView] || [_windowMode isEqualToString:kWindowModeString_Map_Diff] || [_windowMode isEqualToString:kWindowModeString_Map_Rewrite] || [_windowMode isEqualToString:kWindowModeString_Map_Config] || [_windowMode isEqualToString:kWindowModeString_Map_Resolve]) {
       return NO;
     }
-    [(NSMenuItem*)item setState:([(NSMenuItem*)item tag] == _WindowModeIDFromString(_windowMode) ? NSOnState : NSOffState)];
+    [(NSMenuItem*)item setState:([(NSMenuItem*)item tag] == (NSInteger)(_WindowModeIDFromString(_windowMode)) ? NSOnState : NSOffState)];
     return YES;
   }
 
diff --git a/GitUpKit/Components/GICommitListViewController.h b/GitUpKit/Components/GICommitListViewController.h
@@ -23,10 +23,10 @@
 @end
 
 @interface GICommitListViewController : GIViewController
-@property(nonatomic, assign) id<GICommitListViewControllerDelegate> delegate;
+@property(nonatomic, weak) id<GICommitListViewControllerDelegate> delegate;
 @property(nonatomic, copy) NSArray* results;  // Can contain GCHistoryCommit, GCHistoryLocalBranch, GCHistoryRemoteBranch or GCHistoryTag
 @property(nonatomic, readonly) NSArray* commits;  // Converted results to GCHistoryCommits
-@property(nonatomic, assign) id selectedResult;
-@property(nonatomic, assign) GCHistoryCommit* selectedCommit;
+@property(nonatomic, weak) id selectedResult;
+@property(nonatomic, weak) GCHistoryCommit* selectedCommit;
 @property(nonatomic, copy) NSString* emptyLabel;
 @end
diff --git a/GitUpKit/Components/GIDiffContentsViewController.h b/GitUpKit/Components/GIDiffContentsViewController.h
@@ -33,7 +33,7 @@ extern NSString* const GIDiffContentsViewControllerUserDefaultKey_DiffViewMode;
 @end
 
 @interface GIDiffContentsViewController : GIViewController
-@property(nonatomic, assign) id<GIDiffContentsViewControllerDelegate> delegate;
+@property(nonatomic, weak) id<GIDiffContentsViewControllerDelegate> delegate;
 @property(nonatomic) BOOL showsUntrackedAsAdded;  // Default is NO
 @property(nonatomic, copy) NSString* emptyLabel;
 @property(nonatomic, strong) NSView* headerView;
diff --git a/GitUpKit/Components/GIDiffContentsViewController.m b/GitUpKit/Components/GIDiffContentsViewController.m
@@ -49,7 +49,7 @@ @interface GIEmptyDiffCellView : NSTableCellView
 @end
 
 @interface GITextDiffCellView : NSTableCellView
-@property(nonatomic, assign) GIDiffView* diffView;
+@property(nonatomic, weak) GIDiffView* diffView;
 @end
 
 @interface GIBinaryDiffCellView : NSTableCellView
@@ -71,7 +71,7 @@ - (NSTextField*)newSHA1TextField __attribute__((objc_method_family(none)));  //
 @end
 
 @interface GIContentsTableView : GITableView
-@property(nonatomic, assign) GIDiffContentsViewController* controller;
+@property(nonatomic, weak) GIDiffContentsViewController* controller;
 @end
 
 @interface GIDiffContentsViewController () <NSTableViewDataSource, GIDiffViewDelegate>
diff --git a/GitUpKit/Components/GIDiffFilesViewController.h b/GitUpKit/Components/GIDiffFilesViewController.h
@@ -31,7 +31,7 @@
 @end
 
 @interface GIDiffFilesViewController : GIViewController
-@property(nonatomic, assign) id<GIDiffFilesViewControllerDelegate> delegate;
+@property(nonatomic, weak) id<GIDiffFilesViewControllerDelegate> delegate;
 @property(nonatomic) BOOL showsUntrackedAsAdded;  // Default is NO
 @property(nonatomic, copy) NSString* emptyLabel;
 @property(nonatomic) BOOL allowsMultipleSelection;  // Default is NO
@@ -40,6 +40,6 @@
 @property(nonatomic, readonly) NSDictionary* conflicts;
 - (void)setDeltas:(NSArray*)deltas usingConflicts:(NSDictionary*)conflicts;
 
-@property(nonatomic, assign) GCDiffDelta* selectedDelta;
-@property(nonatomic, assign) NSArray* selectedDeltas;
+@property(nonatomic, weak) GCDiffDelta* selectedDelta;
+@property(nonatomic, weak) NSArray* selectedDeltas;
 @end
diff --git a/GitUpKit/Components/GIDiffFilesViewController.m b/GitUpKit/Components/GIDiffFilesViewController.m
@@ -29,7 +29,7 @@ @interface GIFileCellView : NSTableCellView
 @end
 
 @interface GIFilesTableView : GITableView
-@property(nonatomic, assign) GIDiffFilesViewController* controller;
+@property(nonatomic, weak) GIDiffFilesViewController* controller;
 @end
 
 @interface GIDiffFilesViewController () <NSFilePromiseProviderDelegate>
diff --git a/GitUpKit/Components/GISnapshotListViewController.h b/GitUpKit/Components/GISnapshotListViewController.h
@@ -24,6 +24,6 @@
 @end
 
 @interface GISnapshotListViewController : GIViewController
-@property(nonatomic, assign) id<GISnapshotListViewControllerDelegate> delegate;
+@property(nonatomic, weak) id<GISnapshotListViewControllerDelegate> delegate;
 @property(nonatomic, readonly) GCSnapshot* selectedSnapshot;
 @end
diff --git a/GitUpKit/Components/GIUnifiedReflogViewController.h b/GitUpKit/Components/GIUnifiedReflogViewController.h
@@ -24,6 +24,6 @@
 @end
 
 @interface GIUnifiedReflogViewController : GIViewController
-@property(nonatomic, assign) id<GIUnifiedReflogViewControllerDelegate> delegate;
+@property(nonatomic, weak) id<GIUnifiedReflogViewControllerDelegate> delegate;
 @property(nonatomic, readonly) GCReflogEntry* selectedReflogEntry;
 @end
diff --git a/GitUpKit/Core/GCCommitDatabase.m b/GitUpKit/Core/GCCommitDatabase.m
@@ -161,7 +161,7 @@ static int _CaseInsensitiveUTF8Compare(void* context, int length1, const void* b
   } else {
     result = 0;
   }
-  return result;
+  return (int)result;
 }
 
 - (BOOL)_initializeDatabase:(NSString*)path error:(NSError**)error {
diff --git a/GitUpKit/Core/GCHistory.h b/GitUpKit/Core/GCHistory.h
@@ -38,17 +38,17 @@ typedef NS_ENUM(NSUInteger, GCHistorySorting) {
 @end
 
 @interface GCHistoryTag : GCTag
-@property(nonatomic, readonly) GCHistoryCommit* commit;  // Cached at time of last history update and DOES NOT automatically update (use -lookupCommitForTag:annotation:error: instead)
+@property(nonatomic, weak, readonly) GCHistoryCommit* commit;  // Cached at time of last history update and DOES NOT automatically update (use -lookupCommitForTag:annotation:error: instead)
 @property(nonatomic, readonly) GCTagAnnotation* annotation;  // Cached at time of last history update and DOES NOT automatically update (use -lookupCommitForTag:annotation:error: instead)
 @end
 
 @interface GCHistoryLocalBranch : GCLocalBranch
-@property(nonatomic, readonly) GCHistoryCommit* tipCommit;  // Cached at time of last history update and DOES NOT automatically update (use -lookupTipCommitForBranch:error: instead)
-@property(nonatomic, readonly) GCBranch* upstream;  // Cached at time of last history update and DOES NOT automatically update (use -lookupUpstreamForLocalBranch:error: instead) - Will be a GCHistoryLocalBranch or GCHistoryRemoteBranch
+@property(nonatomic, weak, readonly) GCHistoryCommit* tipCommit;  // Cached at time of last history update and DOES NOT automatically update (use -lookupTipCommitForBranch:error: instead)
+@property(nonatomic, weak, readonly) GCBranch* upstream;  // Cached at time of last history update and DOES NOT automatically update (use -lookupUpstreamForLocalBranch:error: instead) - Will be a GCHistoryLocalBranch or GCHistoryRemoteBranch
 @end
 
 @interface GCHistoryRemoteBranch : GCRemoteBranch
-@property(nonatomic, readonly) GCHistoryCommit* tipCommit;  // Cached at time of last history update and DOES NOT automatically update (use -lookupTipCommitForBranch:error: instead)
+@property(nonatomic, weak, readonly) GCHistoryCommit* tipCommit;  // Cached at time of last history update and DOES NOT automatically update (use -lookupTipCommitForBranch:error: instead)
 @end
 
 @interface GCHistory : NSObject
@@ -58,8 +58,8 @@ typedef NS_ENUM(NSUInteger, GCHistorySorting) {
 @property(nonatomic, readonly) NSArray* allCommits;
 @property(nonatomic, readonly) NSArray* rootCommits;
 @property(nonatomic, readonly) NSArray* leafCommits;
-@property(nonatomic, readonly) GCHistoryCommit* HEADCommit;  // nil if HEAD is unborn
-@property(nonatomic, readonly) GCHistoryLocalBranch* HEADBranch;  // nil if HEAD is detached
+@property(nonatomic, weak, readonly) GCHistoryCommit* HEADCommit;  // nil if HEAD is unborn
+@property(nonatomic, weak, readonly) GCHistoryLocalBranch* HEADBranch;  // nil if HEAD is detached
 @property(nonatomic, readonly, getter=isHEADDetached) BOOL HEADDetached;  // Convenience method
 @property(nonatomic, readonly) NSArray* tags;  // Always sorted alphabetically
 @property(nonatomic, readonly) NSArray* localBranches;  // Always sorted alphabetically
diff --git a/GitUpKit/Core/GCHistory.m b/GitUpKit/Core/GCHistory.m
@@ -171,7 +171,7 @@ - (BOOL)hasReferences {
 @end
 
 @interface GCHistoryTag ()
-@property(nonatomic, assign) GCHistoryCommit* commit;
+@property(nonatomic, weak) GCHistoryCommit* commit;
 @property(nonatomic, strong) GCTagAnnotation* annotation;
 @end
 
@@ -186,15 +186,15 @@ - (void)dealloc {
 @end
 
 @interface GCHistoryLocalBranch ()
-@property(nonatomic, assign) GCHistoryCommit* tipCommit;
-@property(nonatomic, assign) GCBranch* upstream;
+@property(nonatomic, weak) GCHistoryCommit* tipCommit;
+@property(nonatomic, weak) GCBranch* upstream;
 @end
 
 @implementation GCHistoryLocalBranch
 @end
 
 @interface GCHistoryRemoteBranch ()
-@property(nonatomic, assign) GCHistoryCommit* tipCommit;
+@property(nonatomic, weak) GCHistoryCommit* tipCommit;
 @end
 
 @implementation GCHistoryRemoteBranch
@@ -211,8 +211,8 @@ @interface GCHistory ()
 @property(nonatomic, readonly) NSMutableArray* leaves;
 @property(nonatomic, readonly) CFMutableDictionaryRef lookup;
 @property(nonatomic, strong) NSSet* tips;
-@property(nonatomic, assign) GCHistoryCommit* HEADCommit;
-@property(nonatomic, assign) GCHistoryLocalBranch* HEADBranch;
+@property(nonatomic, weak) GCHistoryCommit* HEADCommit;
+@property(nonatomic, weak) GCHistoryLocalBranch* HEADBranch;
 @property(nonatomic, strong) NSData* md5;
 @end
 
diff --git a/GitUpKit/Core/GCLiveRepository.h b/GitUpKit/Core/GCLiveRepository.h
@@ -74,7 +74,7 @@ extern NSString* const GCLiveRepositoryAmendOperationReason;
 #if DEBUG
 + (NSUInteger)allocatedCount;  // For debugging only
 #endif
-@property(nonatomic, assign) id<GCLiveRepositoryDelegate> delegate;
+@property(nonatomic, weak) id<GCLiveRepositoryDelegate> delegate;
 
 - (void)notifyRepositoryChanged;  // Calling this method is required when manipulating the repository from this process as live-updates don't apply
 - (void)notifyWorkingDirectoryChanged;  // Calling this method is required when manipulating the working directory from this process as live-updates don't apply
diff --git a/GitUpKit/Core/GCRepository.h b/GitUpKit/Core/GCRepository.h
@@ -52,7 +52,7 @@ typedef NS_ENUM(NSUInteger, GCFileMode) {
 @end
 
 @interface GCRepository : NSObject
-@property(nonatomic, assign) id<GCRepositoryDelegate> delegate;
+@property(nonatomic, weak) id<GCRepositoryDelegate> delegate;
 @property(nonatomic, readonly) NSString* repositoryPath;
 @property(nonatomic, readonly) NSString* workingDirectoryPath;  // nil for a bare repository
 @property(nonatomic, readonly, getter=isReadOnly) BOOL readOnly;
diff --git a/GitUpKit/Interface/GIBranch.h b/GitUpKit/Interface/GIBranch.h
@@ -18,7 +18,7 @@
 @class GINode, GILine;
 
 @interface GIBranch : NSObject
-@property(nonatomic, readonly) GILine* mainLine;  // NOT RETAINED
+@property(nonatomic, weak, readonly) GILine* mainLine;  // NOT RETAINED
 
 // Computed properties
 @property(nonatomic, readonly) GINode* tipNode;
diff --git a/GitUpKit/Interface/GIDiffView.h b/GitUpKit/Interface/GIDiffView.h
@@ -26,7 +26,7 @@
 - (void)didFinishInitializing;  // For subclasses only
 - (void)didUpdatePatch;  // For subclasses only
 
-@property(nonatomic, assign) id<GIDiffViewDelegate> delegate;
+@property(nonatomic, weak) id<GIDiffViewDelegate> delegate;
 @property(nonatomic, strong) NSColor* backgroundColor;
 @property(nonatomic, strong) GCDiffPatch* patch;
 @property(nonatomic, readonly, getter=isEmpty) BOOL empty;
diff --git a/GitUpKit/Interface/GIGraphView.h b/GitUpKit/Interface/GIGraphView.h
@@ -24,13 +24,13 @@
 @end
 
 @interface GIGraphView : NSView <NSUserInterfaceValidations>
-@property(nonatomic, assign) id<GIGraphViewDelegate> delegate;
+@property(nonatomic, weak) id<GIGraphViewDelegate> delegate;
 @property(nonatomic, strong) GIGraph* graph;
 @property(nonatomic) BOOL showsTagLabels;
 @property(nonatomic) BOOL showsBranchLabels;
 
-@property(nonatomic, assign) GINode* selectedNode;  // Setting this property directly does not call the delegate
-@property(nonatomic, assign) GCHistoryCommit* selectedCommit;  // Convenience method that wraps @selectedNode
+@property(nonatomic, weak) GINode* selectedNode;  // Setting this property directly does not call the delegate
+@property(nonatomic, weak) GCHistoryCommit* selectedCommit;  // Convenience method that wraps @selectedNode
 
 @property(nonatomic, readonly) NSSize minSize;
 
diff --git a/GitUpKit/Interface/GIPrivate.h b/GitUpKit/Interface/GIPrivate.h
@@ -52,7 +52,7 @@ extern void GIComputeHighlightRanges(const char* deletedBytes, NSUInteger delete
 @end
 
 @interface GIBranch ()
-@property(nonatomic, assign) GILine* mainLine;
+@property(nonatomic, weak) GILine* mainLine;
 @end
 
 @interface GILayer ()
diff --git a/GitUpKit/Utilities/GIViewController.h b/GitUpKit/Utilities/GIViewController.h
@@ -18,7 +18,7 @@
 @class GIWindowController, GIViewController, GCLiveRepository, GCSnapshot;
 
 @interface GIView : NSView
-@property(nonatomic, readonly) GIViewController* viewController;
+@property(nonatomic, weak, readonly) GIViewController* viewController;
 @end
 
 @interface GIViewController : NSViewController <NSTextFieldDelegate, NSTextViewDelegate, NSTableViewDelegate>
diff --git a/GitUpKit/Utilities/GIViewController.m b/GitUpKit/Utilities/GIViewController.m
@@ -26,14 +26,12 @@
 #import "XLFacilityMacros.h"
 
 @interface GIView ()
-@property(nonatomic, assign) GIViewController* viewController;
+@property(nonatomic, weak) GIViewController* viewController;
 @end
 
 #define OVERRIDES_METHOD(m) (method_getImplementation(class_getInstanceMethod(self.class, @selector(m))) != method_getImplementation(class_getInstanceMethod([GIViewController class], @selector(m))))
 
-@implementation GIView {
-  __unsafe_unretained GIViewController* _viewController;  // This is required since redeclaring a read-only property as "assign" still makes it strong!
-}
+@implementation GIView
 
 - (void)resizeSubviewsWithOldSize:(NSSize)oldSize {
   [super resizeSubviewsWithOldSize:oldSize];
diff --git a/GitUpKit/Utilities/GIWindowController.h b/GitUpKit/Utilities/GIWindowController.h
@@ -37,7 +37,7 @@ typedef NS_ENUM(NSUInteger, GIOverlayStyle) {
 @end
 
 @interface GIWindowController : NSWindowController
-@property(nonatomic, assign) id<GIWindowControllerDelegate> delegate;
+@property(nonatomic, weak) id<GIWindowControllerDelegate> delegate;
 @property(strong) GIWindow* window;  // Redeclare superclass property
 
 @property(nonatomic, readonly, getter=isOverlayVisible) BOOL overlayVisible;
diff --git a/GitUpKit/Views/GICommitRewriterViewController.h b/GitUpKit/Views/GICommitRewriterViewController.h
@@ -24,7 +24,7 @@
 @end
 
 @interface GICommitRewriterViewController : GICommitViewController
-@property(nonatomic, assign) id<GICommitRewriterViewControllerDelegate> delegate;
+@property(nonatomic, weak) id<GICommitRewriterViewControllerDelegate> delegate;
 - (BOOL)startRewritingCommit:(GCHistoryCommit*)commit error:(NSError**)error;
 - (BOOL)finishRewritingCommitWithMessage:(NSString*)message error:(NSError**)error;
 - (BOOL)cancelRewritingCommit:(NSError**)error;
diff --git a/GitUpKit/Views/GICommitSplitterViewController.h b/GitUpKit/Views/GICommitSplitterViewController.h
@@ -24,7 +24,7 @@
 @end
 
 @interface GICommitSplitterViewController : GICommitViewController
-@property(nonatomic, assign) id<GICommitSplitterViewControllerDelegate> delegate;
+@property(nonatomic, weak) id<GICommitSplitterViewControllerDelegate> delegate;
 - (BOOL)startSplittingCommit:(GCHistoryCommit*)commit error:(NSError**)error;
 - (BOOL)finishSplittingCommitWithOldMessage:(NSString*)oldMessage newMessage:(NSString*)newMessage error:(NSError**)error;
 - (void)cancelSplittingCommit;
diff --git a/GitUpKit/Views/GICommitViewController.h b/GitUpKit/Views/GICommitViewController.h
@@ -25,7 +25,7 @@
 
 // Abstract base class
 @interface GICommitViewController : GIViewController
-@property(nonatomic, assign) id<GICommitViewControllerDelegate> delegate;
+@property(nonatomic, weak) id<GICommitViewControllerDelegate> delegate;
 @property(nonatomic, weak) IBOutlet NSTextField* infoTextField;
 @property(nonatomic, strong) IBOutlet GICommitMessageView* messageTextView;  // Does not support weak references
 @property(nonatomic, strong) IBOutlet GICommitMessageView* otherMessageTextView;  // Does not support weak references
diff --git a/GitUpKit/Views/GIConflictResolverViewController.h b/GitUpKit/Views/GIConflictResolverViewController.h
@@ -23,7 +23,7 @@
 @end
 
 @interface GIConflictResolverViewController : GIViewController
-@property(nonatomic, assign) id<GIConflictResolverViewControllerDelegate> delegate;
+@property(nonatomic, weak) id<GIConflictResolverViewControllerDelegate> delegate;
 @property(nonatomic, strong) GCCommit* ourCommit;
 @property(nonatomic, strong) GCCommit* theirCommit;
 @end
diff --git a/GitUpKit/Views/GIMapViewController.h b/GitUpKit/Views/GIMapViewController.h
@@ -30,7 +30,7 @@
 @end
 
 @interface GIMapViewController : GIViewController <NSUserInterfaceValidations>
-@property(nonatomic, assign) id<GIMapViewControllerDelegate> delegate;
+@property(nonatomic, weak) id<GIMapViewControllerDelegate> delegate;
 @property(nonatomic, readonly) GIGraph* graph;
 @property(nonatomic, readonly) GCHistoryCommit* selectedCommit;  // Nil if no commit is selected
 @property(nonatomic, strong) GCHistory* previewHistory;

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ static int _CaseInsensitiveUTF8Compare(void* context, int length1, const void* b`
`161`	`161`	`} else {`
`162`	`162`	`result = 0;`
`163`	`163`	`}`
`164`		`- return result;`
	`164`	`+ return (int)result;`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`- (BOOL)_initializeDatabase:(NSString)path error:(NSError*)error {`