From 65c9f3058b115d9a982d63de7bb4c57be88ddf6e Mon Sep 17 00:00:00 2001 From: Lucas Derraugh Date: Tue, 9 Jun 2026 22:22:58 -0400 Subject: [PATCH 1/2] Bump to macOS 12.4 min target Uses angle bracket notation for public framework imports --- .../Base.lproj/WelcomeWindowController.xib | 2 +- GitUp/Application/Document.m | 1 - GitUp/GitUp.xcodeproj/project.pbxproj | 4 +- .../Components/GICommitListViewController.h | 2 +- .../Components/GICommitListViewController.m | 6 +- .../Components/GIDiffContentsViewController.h | 4 +- .../Components/GIDiffContentsViewController.m | 8 +-- .../Components/GIDiffFilesViewController.h | 4 +- .../Components/GIDiffFilesViewController.m | 4 +- .../Components/GISnapshotListViewController.h | 2 +- .../Components/GISnapshotListViewController.m | 8 +-- .../GIUnifiedReflogViewController.h | 2 +- .../GIUnifiedReflogViewController.m | 4 +- GitUpKit/Core/GCBranch-Tests.m | 2 +- GitUpKit/Core/GCBranch.h | 4 +- GitUpKit/Core/GCCommit-Tests.m | 2 +- GitUpKit/Core/GCCommit.h | 4 +- GitUpKit/Core/GCCommitDatabase-Tests.m | 2 +- GitUpKit/Core/GCCore.h | 60 +++++++++---------- GitUpKit/Core/GCDiff-Tests.m | 4 +- GitUpKit/Core/GCDiff.h | 2 +- GitUpKit/Core/GCFoundation-Tests.m | 2 +- GitUpKit/Core/GCFunctions.h | 2 +- GitUpKit/Core/GCHistory-Tests.m | 4 +- GitUpKit/Core/GCHistory.h | 8 +-- GitUpKit/Core/GCIndex.h | 2 +- GitUpKit/Core/GCLiveRepository+Conflicts.m | 6 +- GitUpKit/Core/GCLiveRepository-Tests.m | 10 ++-- GitUpKit/Core/GCLiveRepository.h | 8 +-- GitUpKit/Core/GCOrderedSet-Tests.m | 4 +- GitUpKit/Core/GCPrivate.h | 2 +- GitUpKit/Core/GCReference.h | 2 +- GitUpKit/Core/GCReferenceTransform.h | 2 +- GitUpKit/Core/GCRemote-Tests.m | 2 +- GitUpKit/Core/GCRemote.h | 2 +- GitUpKit/Core/GCRepository+Bare-Tests.m | 2 +- GitUpKit/Core/GCRepository+Bare.h | 2 +- GitUpKit/Core/GCRepository+Config-Tests.m | 2 +- GitUpKit/Core/GCRepository+Config.h | 2 +- GitUpKit/Core/GCRepository+HEAD-Tests.m | 6 +- GitUpKit/Core/GCRepository+HEAD.h | 2 +- GitUpKit/Core/GCRepository+Mock-Tests.m | 2 +- GitUpKit/Core/GCRepository+Mock.h | 2 +- GitUpKit/Core/GCRepository+Reflog-Tests.m | 2 +- GitUpKit/Core/GCRepository+Reflog.h | 2 +- GitUpKit/Core/GCRepository+Reset-Tests.m | 2 +- GitUpKit/Core/GCRepository+Reset.h | 2 +- GitUpKit/Core/GCRepository+Status-Tests.m | 4 +- GitUpKit/Core/GCRepository+Status.h | 2 +- GitUpKit/Core/GCRepository-Tests.m | 2 +- GitUpKit/Core/GCSQLiteRepository-Tests.m | 2 +- GitUpKit/Core/GCSQLiteRepository.h | 2 +- GitUpKit/Core/GCSnapshot-Tests.m | 2 +- GitUpKit/Core/GCSnapshot.h | 2 +- GitUpKit/Core/GCStash-Tests.m | 4 +- GitUpKit/Core/GCStash.h | 2 +- GitUpKit/Core/GCSubmodule-Tests.m | 4 +- GitUpKit/Core/GCSubmodule.h | 2 +- GitUpKit/Core/GCTag-Tests.m | 2 +- GitUpKit/Core/GCTag.h | 6 +- GitUpKit/Core/GCTestCase.m | 4 +- GitUpKit/Extensions/GCHistory+Rewrite-Tests.m | 6 +- GitUpKit/Extensions/GCHistory+Rewrite.h | 2 +- GitUpKit/Extensions/GCHistory+Rewrite.m | 2 +- .../Extensions/GCLiveRepository+Utilities.m | 2 +- .../Extensions/GCRepository+Index-Tests.m | 4 +- GitUpKit/Extensions/GCRepository+Index.h | 2 +- GitUpKit/Extensions/GCRepository+Index.m | 2 +- .../Extensions/GCRepository+Utilities-Tests.m | 6 +- GitUpKit/Extensions/GCRepository+Utilities.h | 2 +- GitUpKit/Extensions/GCRepository+Utilities.m | 4 +- GitUpKit/Interface/GIDiffView.m | 2 +- GitUpKit/Interface/GIFunctions-Tests.m | 2 +- GitUpKit/Interface/GIGraph-Tests.m | 2 +- GitUpKit/Interface/GIImageDiffView.m | 2 +- GitUpKit/Interface/GIInterface.h | 28 ++++----- GitUpKit/Interface/GIPrivate.h | 2 +- GitUpKit/Interface/GISplitDiffView.h | 2 +- GitUpKit/Interface/GISplitDiffView.m | 2 +- GitUpKit/Interface/GIUnifiedDiffView.h | 2 +- GitUpKit/Interface/GIUnifiedDiffView.m | 2 +- GitUpKit/Utilities/GIAppKit.m | 4 +- GitUpKit/Utilities/GIColorView.m | 2 +- GitUpKit/Utilities/GICustomToolbarItem.m | 2 +- GitUpKit/Utilities/GILaunchServicesLocator.m | 2 +- GitUpKit/Utilities/GILinkButton.m | 2 +- GitUpKit/Utilities/GIModalView.m | 2 +- .../Utilities/GIViewController+Utilities.h | 4 +- .../Utilities/GIViewController+Utilities.m | 16 ++--- GitUpKit/Utilities/GIViewController.h | 2 +- GitUpKit/Utilities/GIViewController.m | 6 +- GitUpKit/Utilities/GIWindowController.h | 2 +- GitUpKit/Utilities/GIWindowController.m | 10 ++-- GitUpKit/Utilities/NSBundle+GitUpKit.m | 2 +- GitUpKit/Utilities/NSColor+GINamedColors.h | 2 +- .../Views/GIAdvancedCommitViewController.h | 2 +- .../Views/GIAdvancedCommitViewController.m | 18 +++--- .../Views/GICommitRewriterViewController.h | 4 +- .../Views/GICommitRewriterViewController.m | 16 ++--- .../Views/GICommitSplitterViewController.h | 4 +- .../Views/GICommitSplitterViewController.m | 18 +++--- GitUpKit/Views/GICommitViewController.h | 4 +- GitUpKit/Views/GICommitViewController.m | 4 +- GitUpKit/Views/GIConfigViewController.h | 2 +- GitUpKit/Views/GIConfigViewController.m | 6 +- .../Views/GIConflictResolverViewController.h | 2 +- .../Views/GIConflictResolverViewController.m | 10 ++-- GitUpKit/Views/GIDiffViewController.h | 2 +- GitUpKit/Views/GIDiffViewController.m | 8 +-- .../Views/GIMapViewController+Operations.h | 2 +- .../Views/GIMapViewController+Operations.m | 8 +-- GitUpKit/Views/GIMapViewController.h | 6 +- GitUpKit/Views/GIMapViewController.m | 12 ++-- GitUpKit/Views/GIQuickViewController.h | 2 +- GitUpKit/Views/GIQuickViewController.m | 10 ++-- .../Views/GIRemappingExplanationPopover.m | 2 +- GitUpKit/Views/GISimpleCommitViewController.h | 2 +- GitUpKit/Views/GISimpleCommitViewController.m | 16 ++--- GitUpKit/Views/GIStashListViewController.h | 2 +- GitUpKit/Views/GIStashListViewController.m | 8 +-- 120 files changed, 280 insertions(+), 281 deletions(-) diff --git a/GitUp/Application/Base.lproj/WelcomeWindowController.xib b/GitUp/Application/Base.lproj/WelcomeWindowController.xib index 2b8da48fc..4ebde2fcf 100644 --- a/GitUp/Application/Base.lproj/WelcomeWindowController.xib +++ b/GitUp/Application/Base.lproj/WelcomeWindowController.xib @@ -1,7 +1,7 @@ - + diff --git a/GitUp/Application/Document.m b/GitUp/Application/Document.m index 33333588a..bff6a91a5 100644 --- a/GitUp/Application/Document.m +++ b/GitUp/Application/Document.m @@ -47,7 +47,6 @@ #define kMaxProgressRefreshRate 10.0 // Hz -#define kNavigateSegmentWidth 34.0 #define kSearchFieldCompactWidth 190.0 #define kSearchFieldExpandedWidth 238.0 diff --git a/GitUp/GitUp.xcodeproj/project.pbxproj b/GitUp/GitUp.xcodeproj/project.pbxproj index 6acaef1f5..2da02a5d9 100644 --- a/GitUp/GitUp.xcodeproj/project.pbxproj +++ b/GitUp/GitUp.xcodeproj/project.pbxproj @@ -660,7 +660,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.5; + MACOSX_DEPLOYMENT_TARGET = 12.4; MARKETING_VERSION = 1.5.0; PRODUCT_BUNDLE_IDENTIFIER = "co.gitup.mac-debug"; PRODUCT_NAME = GitUp; @@ -680,7 +680,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.5; + MACOSX_DEPLOYMENT_TARGET = 12.4; MARKETING_VERSION = 1.5.0; PRODUCT_BUNDLE_IDENTIFIER = co.gitup.mac; PRODUCT_NAME = GitUp; diff --git a/GitUpKit/Components/GICommitListViewController.h b/GitUpKit/Components/GICommitListViewController.h index 9dc56ffa8..725f299ce 100644 --- a/GitUpKit/Components/GICommitListViewController.h +++ b/GitUpKit/Components/GICommitListViewController.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIViewController.h" +#import @class GICommitListViewController, GCHistoryCommit; diff --git a/GitUpKit/Components/GICommitListViewController.m b/GitUpKit/Components/GICommitListViewController.m index 11cffeb88..4bd11c529 100644 --- a/GitUpKit/Components/GICommitListViewController.m +++ b/GitUpKit/Components/GICommitListViewController.m @@ -17,10 +17,10 @@ #error This file requires ARC #endif -#import "GICommitListViewController.h" +#import -#import "GCLiveRepository+Utilities.h" -#import "GIInterface.h" +#import +#import #import "XLFacilityMacros.h" @interface GICommitListViewController () diff --git a/GitUpKit/Components/GIDiffContentsViewController.h b/GitUpKit/Components/GIDiffContentsViewController.h index 32624ec29..f6d139721 100644 --- a/GitUpKit/Components/GIDiffContentsViewController.h +++ b/GitUpKit/Components/GIDiffContentsViewController.h @@ -13,9 +13,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIViewController.h" +#import -#import "GCDiff.h" +#import extern NSString* const GIDiffContentsViewControllerUserDefaultKey_DiffViewMode; // Integer (-1, 0 or 1) diff --git a/GitUpKit/Components/GIDiffContentsViewController.m b/GitUpKit/Components/GIDiffContentsViewController.m index 27860689c..4dee71302 100644 --- a/GitUpKit/Components/GIDiffContentsViewController.m +++ b/GitUpKit/Components/GIDiffContentsViewController.m @@ -17,11 +17,11 @@ #error This file requires ARC #endif -#import "GIDiffContentsViewController.h" +#import -#import "GIInterface.h" -#import "GIViewController+Utilities.h" -#import "GCRepository+Index.h" +#import +#import +#import #import "XLFacilityMacros.h" // Units ems: a multiple of the font point size, so the width threshold is 100 * 10 = 1000 for a 10 point font. diff --git a/GitUpKit/Components/GIDiffFilesViewController.h b/GitUpKit/Components/GIDiffFilesViewController.h index 6e2320062..c38111fe5 100644 --- a/GitUpKit/Components/GIDiffFilesViewController.h +++ b/GitUpKit/Components/GIDiffFilesViewController.h @@ -13,9 +13,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIViewController.h" +#import -#import "GCDiff.h" +#import @class GIDiffFilesViewController; diff --git a/GitUpKit/Components/GIDiffFilesViewController.m b/GitUpKit/Components/GIDiffFilesViewController.m index bab11a8b2..92b043dc9 100644 --- a/GitUpKit/Components/GIDiffFilesViewController.m +++ b/GitUpKit/Components/GIDiffFilesViewController.m @@ -17,9 +17,9 @@ #error This file requires ARC #endif -#import "GIDiffFilesViewController.h" +#import -#import "GIInterface.h" +#import #import "XLFacilityMacros.h" static const NSPasteboardType GIPasteboardTypeFileRowIndex = @"co.gitup.mac.file-row-index"; diff --git a/GitUpKit/Components/GISnapshotListViewController.h b/GitUpKit/Components/GISnapshotListViewController.h index bfb43a8bb..7dd6b6743 100644 --- a/GitUpKit/Components/GISnapshotListViewController.h +++ b/GitUpKit/Components/GISnapshotListViewController.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIViewController.h" +#import @class GISnapshotListViewController, GCSnapshot; diff --git a/GitUpKit/Components/GISnapshotListViewController.m b/GitUpKit/Components/GISnapshotListViewController.m index 4962ea481..718c304e6 100644 --- a/GitUpKit/Components/GISnapshotListViewController.m +++ b/GitUpKit/Components/GISnapshotListViewController.m @@ -17,11 +17,11 @@ #error This file requires ARC #endif -#import "GISnapshotListViewController.h" -#import "GIWindowController.h" +#import +#import -#import "GIInterface.h" -#import "GCRepository+Utilities.h" +#import +#import #import "XLFacilityMacros.h" @interface GISnapshotListViewController () diff --git a/GitUpKit/Components/GIUnifiedReflogViewController.h b/GitUpKit/Components/GIUnifiedReflogViewController.h index 285f775bb..e235f0a7d 100644 --- a/GitUpKit/Components/GIUnifiedReflogViewController.h +++ b/GitUpKit/Components/GIUnifiedReflogViewController.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIViewController.h" +#import @class GIUnifiedReflogViewController, GCReflogEntry, GCCommit; diff --git a/GitUpKit/Components/GIUnifiedReflogViewController.m b/GitUpKit/Components/GIUnifiedReflogViewController.m index 2484f5e47..eb0d7ff10 100644 --- a/GitUpKit/Components/GIUnifiedReflogViewController.m +++ b/GitUpKit/Components/GIUnifiedReflogViewController.m @@ -17,9 +17,9 @@ #error This file requires ARC #endif -#import "GIUnifiedReflogViewController.h" +#import -#import "GIInterface.h" +#import #import "XLFacilityMacros.h" @interface GIUnifiedReflogViewController () diff --git a/GitUpKit/Core/GCBranch-Tests.m b/GitUpKit/Core/GCBranch-Tests.m index 41430f6b1..70418ef99 100644 --- a/GitUpKit/Core/GCBranch-Tests.m +++ b/GitUpKit/Core/GCBranch-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import @implementation GCMultipleCommitsRepositoryTests (GCBranch) diff --git a/GitUpKit/Core/GCBranch.h b/GitUpKit/Core/GCBranch.h index fadf4a798..e5ab1bd1a 100644 --- a/GitUpKit/Core/GCBranch.h +++ b/GitUpKit/Core/GCBranch.h @@ -13,8 +13,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCReference.h" -#import "GCRepository.h" +#import +#import @class GCCommit; diff --git a/GitUpKit/Core/GCCommit-Tests.m b/GitUpKit/Core/GCCommit-Tests.m index ff4fc3dea..7e6f5fb10 100644 --- a/GitUpKit/Core/GCCommit-Tests.m +++ b/GitUpKit/Core/GCCommit-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import @implementation GCSingleCommitRepositoryTests (GCCommit) diff --git a/GitUpKit/Core/GCCommit.h b/GitUpKit/Core/GCCommit.h index 61a6c15ca..e39adfa76 100644 --- a/GitUpKit/Core/GCCommit.h +++ b/GitUpKit/Core/GCCommit.h @@ -13,8 +13,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCObject.h" -#import "GCRepository.h" +#import +#import @interface GCCommit : GCObject @property(nonatomic, readonly) NSString* message; diff --git a/GitUpKit/Core/GCCommitDatabase-Tests.m b/GitUpKit/Core/GCCommitDatabase-Tests.m index 63188fc95..27e094faf 100644 --- a/GitUpKit/Core/GCCommitDatabase-Tests.m +++ b/GitUpKit/Core/GCCommitDatabase-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import @implementation GCMultipleCommitsRepositoryTests (GCCommitDatabase) diff --git a/GitUpKit/Core/GCCore.h b/GitUpKit/Core/GCCore.h index 29e2bebdd..c6a010769 100644 --- a/GitUpKit/Core/GCCore.h +++ b/GitUpKit/Core/GCCore.h @@ -13,35 +13,35 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCBranch.h" -#import "GCCommit.h" -#import "GCCommitDatabase.h" -#import "GCDiff.h" -#import "GCError.h" -#import "GCFoundation.h" -#import "GCFunctions.h" -#import "GCHistory.h" -#import "GCIndex.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import #if !TARGET_OS_IPHONE -#import "GCLiveRepository.h" +#import #endif -#import "GCMacros.h" -#import "GCObject.h" -#import "GCOrderedSet.h" -#import "GCReference.h" -#import "GCSnapshot.h" -#import "GCReferenceTransform.h" -#import "GCReflogMessages.h" -#import "GCRemote.h" -#import "GCRepository.h" -#import "GCRepository+Bare.h" -#import "GCRepository+Config.h" -#import "GCRepository+HEAD.h" -#import "GCRepository+Mock.h" -#import "GCRepository+Reflog.h" -#import "GCRepository+Reset.h" -#import "GCRepository+Status.h" -#import "GCSQLiteRepository.h" -#import "GCStash.h" -#import "GCSubmodule.h" -#import "GCTag.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import diff --git a/GitUpKit/Core/GCDiff-Tests.m b/GitUpKit/Core/GCDiff-Tests.m index e60713d5d..34585691d 100644 --- a/GitUpKit/Core/GCDiff-Tests.m +++ b/GitUpKit/Core/GCDiff-Tests.m @@ -17,8 +17,8 @@ #error This file requires ARC #endif -#import "GCTestCase.h" -#import "GCRepository+Index.h" +#import +#import @implementation GCSingleCommitRepositoryTests (GCRepository_Diffs) diff --git a/GitUpKit/Core/GCDiff.h b/GitUpKit/Core/GCDiff.h index 857f56492..d488f6f8e 100644 --- a/GitUpKit/Core/GCDiff.h +++ b/GitUpKit/Core/GCDiff.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository.h" +#import typedef NS_ENUM(NSUInteger, GCDiffType) { kGCDiffType_WorkingDirectoryWithCommit = 0, diff --git a/GitUpKit/Core/GCFoundation-Tests.m b/GitUpKit/Core/GCFoundation-Tests.m index 0bc0b5512..2fb761cba 100644 --- a/GitUpKit/Core/GCFoundation-Tests.m +++ b/GitUpKit/Core/GCFoundation-Tests.m @@ -14,7 +14,7 @@ // along with this program. If not, see . #import -#import "GCFoundation.h" +#import @interface GCFoundation_Tests : XCTestCase diff --git a/GitUpKit/Core/GCFunctions.h b/GitUpKit/Core/GCFunctions.h index 78bddb353..becb0cd7c 100644 --- a/GitUpKit/Core/GCFunctions.h +++ b/GitUpKit/Core/GCFunctions.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCError.h" +#import #define GC_SET_ERROR(code, ...) \ do { \ diff --git a/GitUpKit/Core/GCHistory-Tests.m b/GitUpKit/Core/GCHistory-Tests.m index fa68b7a76..2f26dd956 100644 --- a/GitUpKit/Core/GCHistory-Tests.m +++ b/GitUpKit/Core/GCHistory-Tests.m @@ -17,8 +17,8 @@ #error This file requires ARC #endif -#import "GCTestCase.h" -#import "GCRepository+Index.h" +#import +#import @implementation GCSQLiteRepositoryTests (GCHistory) diff --git a/GitUpKit/Core/GCHistory.h b/GitUpKit/Core/GCHistory.h index ca63be6b8..1f055ad47 100644 --- a/GitUpKit/Core/GCHistory.h +++ b/GitUpKit/Core/GCHistory.h @@ -13,10 +13,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository.h" -#import "GCCommit.h" -#import "GCTag.h" -#import "GCBranch.h" +#import +#import +#import +#import typedef NS_ENUM(NSUInteger, GCHistorySorting) { kGCHistorySorting_None = 0, diff --git a/GitUpKit/Core/GCIndex.h b/GitUpKit/Core/GCIndex.h index d247bbecb..9a6ee43e9 100644 --- a/GitUpKit/Core/GCIndex.h +++ b/GitUpKit/Core/GCIndex.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCDiff.h" +#import // The cases "Both Deleted", "Added by Us" and "Added by Them" are not possible in practice as they are automatically resolved by the trivial merge machinery // http://permalink.gmane.org/gmane.comp.version-control.git/245661 diff --git a/GitUpKit/Core/GCLiveRepository+Conflicts.m b/GitUpKit/Core/GCLiveRepository+Conflicts.m index f6ccf7dae..ecbe6cf7b 100644 --- a/GitUpKit/Core/GCLiveRepository+Conflicts.m +++ b/GitUpKit/Core/GCLiveRepository+Conflicts.m @@ -5,10 +5,10 @@ // Created by Felix Lapalme on 2024-04-13. // -#import "GCLiveRepository+Conflicts.h" +#import -#import "GCRepository+Utilities.h" -#import "GCRepository+HEAD.h" +#import +#import @implementation GCLiveRepository (Conflicts) diff --git a/GitUpKit/Core/GCLiveRepository-Tests.m b/GitUpKit/Core/GCLiveRepository-Tests.m index 0f584646e..9bee8168c 100644 --- a/GitUpKit/Core/GCLiveRepository-Tests.m +++ b/GitUpKit/Core/GCLiveRepository-Tests.m @@ -6,11 +6,11 @@ // #import -#import "GCTestCase.h" -#import "GCHistory+Rewrite.h" -#import "GCRepository+Index.h" -#import "GCLiveRepository+Conflicts.h" -#import "GIViewController+Utilities.h" +#import +#import +#import +#import +#import // block based object that conforms to GCMergeConflictResolver @interface GCBlockConflictResolver : NSObject diff --git a/GitUpKit/Core/GCLiveRepository.h b/GitUpKit/Core/GCLiveRepository.h index fa9bef963..227540177 100644 --- a/GitUpKit/Core/GCLiveRepository.h +++ b/GitUpKit/Core/GCLiveRepository.h @@ -13,10 +13,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository+Status.h" -#import "GCHistory.h" -#import "GCSnapshot.h" -#import "GCCommitDatabase.h" +#import +#import +#import +#import typedef NS_ENUM(NSUInteger, GCLiveRepositoryStatusMode) { kGCLiveRepositoryStatusMode_Disabled = 0, diff --git a/GitUpKit/Core/GCOrderedSet-Tests.m b/GitUpKit/Core/GCOrderedSet-Tests.m index 8025dac3b..331eb1b5e 100644 --- a/GitUpKit/Core/GCOrderedSet-Tests.m +++ b/GitUpKit/Core/GCOrderedSet-Tests.m @@ -13,8 +13,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCTestCase.h" -#import "GCOrderedSet.h" +#import +#import @implementation GCMultipleCommitsRepositoryTests (GCOrderedSetTests) diff --git a/GitUpKit/Core/GCPrivate.h b/GitUpKit/Core/GCPrivate.h index fae088539..b05b63bc1 100644 --- a/GitUpKit/Core/GCPrivate.h +++ b/GitUpKit/Core/GCPrivate.h @@ -29,7 +29,7 @@ #import #pragma clang diagnostic pop -#import "GCCore.h" +#import #import "XLFacilityMacros.h" diff --git a/GitUpKit/Core/GCReference.h b/GitUpKit/Core/GCReference.h index e65596661..94e66849d 100644 --- a/GitUpKit/Core/GCReference.h +++ b/GitUpKit/Core/GCReference.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository.h" +#import @interface GCReference : NSObject @property(nonatomic, readonly) GCRepository* repository; // NOT RETAINED diff --git a/GitUpKit/Core/GCReferenceTransform.h b/GitUpKit/Core/GCReferenceTransform.h index 558f70792..ce579ef73 100644 --- a/GitUpKit/Core/GCReferenceTransform.h +++ b/GitUpKit/Core/GCReferenceTransform.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository.h" +#import @class GCObject, GCCommit; diff --git a/GitUpKit/Core/GCRemote-Tests.m b/GitUpKit/Core/GCRemote-Tests.m index 63ac769b8..b0a916801 100644 --- a/GitUpKit/Core/GCRemote-Tests.m +++ b/GitUpKit/Core/GCRemote-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import @implementation GCSingleCommitRepositoryTests (GCRemote) diff --git a/GitUpKit/Core/GCRemote.h b/GitUpKit/Core/GCRemote.h index 32a9b8b44..b978d1f88 100644 --- a/GitUpKit/Core/GCRemote.h +++ b/GitUpKit/Core/GCRemote.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository.h" +#import typedef NS_ENUM(NSUInteger, GCFetchTagMode) { kGCFetchTagMode_Automatic = 0, diff --git a/GitUpKit/Core/GCRepository+Bare-Tests.m b/GitUpKit/Core/GCRepository+Bare-Tests.m index 85a55c19a..e538d3c06 100644 --- a/GitUpKit/Core/GCRepository+Bare-Tests.m +++ b/GitUpKit/Core/GCRepository+Bare-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import @implementation GCSingleCommitRepositoryTests (GCRepository_Bare) diff --git a/GitUpKit/Core/GCRepository+Bare.h b/GitUpKit/Core/GCRepository+Bare.h index 008c646f5..24f43ee21 100644 --- a/GitUpKit/Core/GCRepository+Bare.h +++ b/GitUpKit/Core/GCRepository+Bare.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository.h" +#import typedef NS_ENUM(NSUInteger, GCMergeAnalysisResult) { kGCMergeAnalysisResult_Unknown = 0, diff --git a/GitUpKit/Core/GCRepository+Config-Tests.m b/GitUpKit/Core/GCRepository+Config-Tests.m index 0c4eb8c28..7adcd0a8d 100644 --- a/GitUpKit/Core/GCRepository+Config-Tests.m +++ b/GitUpKit/Core/GCRepository+Config-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import @implementation GCEmptyRepositoryTests (GCConfig) diff --git a/GitUpKit/Core/GCRepository+Config.h b/GitUpKit/Core/GCRepository+Config.h index 99923a753..0d3b1a9a6 100644 --- a/GitUpKit/Core/GCRepository+Config.h +++ b/GitUpKit/Core/GCRepository+Config.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository.h" +#import typedef NS_ENUM(NSUInteger, GCConfigLevel) { kGCConfigLevel_System = 0, // $(prefix)/etc/gitconfig: system-wide configuration file diff --git a/GitUpKit/Core/GCRepository+HEAD-Tests.m b/GitUpKit/Core/GCRepository+HEAD-Tests.m index cb85f4f3a..6d4fc8eb4 100644 --- a/GitUpKit/Core/GCRepository+HEAD-Tests.m +++ b/GitUpKit/Core/GCRepository+HEAD-Tests.m @@ -17,9 +17,9 @@ #error This file requires ARC #endif -#import "GCTestCase.h" -#import "GCRepository+Utilities.h" -#import "GCRepository+Index.h" +#import +#import +#import @implementation GCEmptyRepositoryTests (GCRepository_HEAD) diff --git a/GitUpKit/Core/GCRepository+HEAD.h b/GitUpKit/Core/GCRepository+HEAD.h index 70cda2164..5fe2d79f4 100644 --- a/GitUpKit/Core/GCRepository+HEAD.h +++ b/GitUpKit/Core/GCRepository+HEAD.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository.h" +#import typedef NS_OPTIONS(NSUInteger, GCCheckoutOptions) { kGCCheckoutOption_Force = (1 << 0), diff --git a/GitUpKit/Core/GCRepository+Mock-Tests.m b/GitUpKit/Core/GCRepository+Mock-Tests.m index d8d1b5912..0309828eb 100644 --- a/GitUpKit/Core/GCRepository+Mock-Tests.m +++ b/GitUpKit/Core/GCRepository+Mock-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import @implementation GCEmptyRepositoryTests (GCRepository_Mock) diff --git a/GitUpKit/Core/GCRepository+Mock.h b/GitUpKit/Core/GCRepository+Mock.h index 406f2cd1f..8acf916bd 100644 --- a/GitUpKit/Core/GCRepository+Mock.h +++ b/GitUpKit/Core/GCRepository+Mock.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository.h" +#import /* The notation for a mock commit hierarchy is described using a simple plain text format: diff --git a/GitUpKit/Core/GCRepository+Reflog-Tests.m b/GitUpKit/Core/GCRepository+Reflog-Tests.m index 5ac0f41ba..4b64b1f5d 100644 --- a/GitUpKit/Core/GCRepository+Reflog-Tests.m +++ b/GitUpKit/Core/GCRepository+Reflog-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import @implementation GCMultipleCommitsRepositoryTests (GCRepository_Reflog) diff --git a/GitUpKit/Core/GCRepository+Reflog.h b/GitUpKit/Core/GCRepository+Reflog.h index ace0fd22d..931fef23e 100644 --- a/GitUpKit/Core/GCRepository+Reflog.h +++ b/GitUpKit/Core/GCRepository+Reflog.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository.h" +#import @class GCCommit; diff --git a/GitUpKit/Core/GCRepository+Reset-Tests.m b/GitUpKit/Core/GCRepository+Reset-Tests.m index 83ad8f7df..764237f93 100644 --- a/GitUpKit/Core/GCRepository+Reset-Tests.m +++ b/GitUpKit/Core/GCRepository+Reset-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import // We only test resetting to commit since resetting to HEAD or tag is the same implementation codepath @implementation GCSingleCommitRepositoryTests (GCRepository_Reset) diff --git a/GitUpKit/Core/GCRepository+Reset.h b/GitUpKit/Core/GCRepository+Reset.h index 2828434ef..356d20aea 100644 --- a/GitUpKit/Core/GCRepository+Reset.h +++ b/GitUpKit/Core/GCRepository+Reset.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCDiff.h" +#import typedef NS_ENUM(NSUInteger, GCResetMode) { kGCResetMode_Soft = 0, diff --git a/GitUpKit/Core/GCRepository+Status-Tests.m b/GitUpKit/Core/GCRepository+Status-Tests.m index 330953025..bd4e7ebdc 100644 --- a/GitUpKit/Core/GCRepository+Status-Tests.m +++ b/GitUpKit/Core/GCRepository+Status-Tests.m @@ -17,8 +17,8 @@ #error This file requires ARC #endif -#import "GCTestCase.h" -#import "GCRepository+Index.h" +#import +#import @implementation GCSingleCommitRepositoryTests (GCRepository_Status) diff --git a/GitUpKit/Core/GCRepository+Status.h b/GitUpKit/Core/GCRepository+Status.h index 3ba9ed74b..e2f7c850f 100644 --- a/GitUpKit/Core/GCRepository+Status.h +++ b/GitUpKit/Core/GCRepository+Status.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository.h" +#import typedef NS_OPTIONS(NSUInteger, GCCleanCheckOptions) { kGCCleanCheckOption_IgnoreState = (1 << 0), diff --git a/GitUpKit/Core/GCRepository-Tests.m b/GitUpKit/Core/GCRepository-Tests.m index e2b823b17..44ef7d710 100644 --- a/GitUpKit/Core/GCRepository-Tests.m +++ b/GitUpKit/Core/GCRepository-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import @implementation GCTests (GCRepository) diff --git a/GitUpKit/Core/GCSQLiteRepository-Tests.m b/GitUpKit/Core/GCSQLiteRepository-Tests.m index 5ccc86b7f..2b93f09fb 100644 --- a/GitUpKit/Core/GCSQLiteRepository-Tests.m +++ b/GitUpKit/Core/GCSQLiteRepository-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import @implementation GCSQLiteRepositoryTests (GCSQLiteRepository) diff --git a/GitUpKit/Core/GCSQLiteRepository.h b/GitUpKit/Core/GCSQLiteRepository.h index e8b82081d..f35b9472d 100644 --- a/GitUpKit/Core/GCSQLiteRepository.h +++ b/GitUpKit/Core/GCSQLiteRepository.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository.h" +#import @interface GCSQLiteRepository : GCRepository - (instancetype)initWithDatabase:(NSString*)databasePath error:(NSError**)error; diff --git a/GitUpKit/Core/GCSnapshot-Tests.m b/GitUpKit/Core/GCSnapshot-Tests.m index 8902cd65b..28bfb5bd7 100644 --- a/GitUpKit/Core/GCSnapshot-Tests.m +++ b/GitUpKit/Core/GCSnapshot-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import @implementation GCEmptyRepositoryTests (GCSnapshot) diff --git a/GitUpKit/Core/GCSnapshot.h b/GitUpKit/Core/GCSnapshot.h index 640a8d402..abba2eb11 100644 --- a/GitUpKit/Core/GCSnapshot.h +++ b/GitUpKit/Core/GCSnapshot.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository.h" +#import typedef NS_OPTIONS(NSUInteger, GCSnapshotOptions) { kGCSnapshotOption_IncludeHEAD = (1 << 0), diff --git a/GitUpKit/Core/GCStash-Tests.m b/GitUpKit/Core/GCStash-Tests.m index b21e1623c..4d22d8552 100644 --- a/GitUpKit/Core/GCStash-Tests.m +++ b/GitUpKit/Core/GCStash-Tests.m @@ -17,8 +17,8 @@ #error This file requires ARC #endif -#import "GCTestCase.h" -#import "GCRepository+Index.h" +#import +#import // TODO: Test stash file list and content diff @implementation GCSingleCommitRepositoryTests (GCStash) diff --git a/GitUpKit/Core/GCStash.h b/GitUpKit/Core/GCStash.h index 3c537c27f..9b996b429 100644 --- a/GitUpKit/Core/GCStash.h +++ b/GitUpKit/Core/GCStash.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCCommit.h" +#import @interface GCStash : GCCommit @property(nonatomic, readonly) GCCommit* baseCommit; diff --git a/GitUpKit/Core/GCSubmodule-Tests.m b/GitUpKit/Core/GCSubmodule-Tests.m index f2bbee4aa..e0e2f1a95 100644 --- a/GitUpKit/Core/GCSubmodule-Tests.m +++ b/GitUpKit/Core/GCSubmodule-Tests.m @@ -17,8 +17,8 @@ #error This file requires ARC #endif -#import "GCTestCase.h" -#import "GCRepository+Index.h" +#import +#import @implementation GCTests (GCSubmodule) diff --git a/GitUpKit/Core/GCSubmodule.h b/GitUpKit/Core/GCSubmodule.h index a1ed30bcd..264608e5e 100644 --- a/GitUpKit/Core/GCSubmodule.h +++ b/GitUpKit/Core/GCSubmodule.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCRepository.h" +#import typedef NS_ENUM(NSUInteger, GCSubmoduleIgnoreMode) { kGCSubmoduleIgnoreMode_None = 0, // Default in Git diff --git a/GitUpKit/Core/GCTag-Tests.m b/GitUpKit/Core/GCTag-Tests.m index 3c0489fdc..2ec51424d 100644 --- a/GitUpKit/Core/GCTag-Tests.m +++ b/GitUpKit/Core/GCTag-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import @implementation GCSingleCommitRepositoryTests (GCTag) diff --git a/GitUpKit/Core/GCTag.h b/GitUpKit/Core/GCTag.h index 189bb7ce8..799d32e9c 100644 --- a/GitUpKit/Core/GCTag.h +++ b/GitUpKit/Core/GCTag.h @@ -13,9 +13,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCObject.h" -#import "GCReference.h" -#import "GCRepository.h" +#import +#import +#import @class GCCommit; diff --git a/GitUpKit/Core/GCTestCase.m b/GitUpKit/Core/GCTestCase.m index 07857ad2c..dbc9253e4 100644 --- a/GitUpKit/Core/GCTestCase.m +++ b/GitUpKit/Core/GCTestCase.m @@ -19,8 +19,8 @@ #import -#import "GCTestCase.h" -#import "GCRepository+Index.h" +#import +#import #define kGitCLTPath @"/usr/bin/git" diff --git a/GitUpKit/Extensions/GCHistory+Rewrite-Tests.m b/GitUpKit/Extensions/GCHistory+Rewrite-Tests.m index 2f4ac1d95..e8f752631 100644 --- a/GitUpKit/Extensions/GCHistory+Rewrite-Tests.m +++ b/GitUpKit/Extensions/GCHistory+Rewrite-Tests.m @@ -17,9 +17,9 @@ #error This file requires ARC #endif -#import "GCTestCase.h" -#import "GCHistory+Rewrite.h" -#import "GCRepository+Utilities.h" +#import +#import +#import // TODO: Test updating detached HEAD and references @implementation GCSingleCommitRepositoryTests (GCHistory_Rewrite) diff --git a/GitUpKit/Extensions/GCHistory+Rewrite.h b/GitUpKit/Extensions/GCHistory+Rewrite.h index d984c9a5d..deecb1b1c 100644 --- a/GitUpKit/Extensions/GCHistory+Rewrite.h +++ b/GitUpKit/Extensions/GCHistory+Rewrite.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCCore.h" +#import @interface GCHistory (Rewrite) - (BOOL)isCommitOnAnyLocalBranch:(GCHistoryCommit*)commit; diff --git a/GitUpKit/Extensions/GCHistory+Rewrite.m b/GitUpKit/Extensions/GCHistory+Rewrite.m index 3968d3766..7e57daa79 100644 --- a/GitUpKit/Extensions/GCHistory+Rewrite.m +++ b/GitUpKit/Extensions/GCHistory+Rewrite.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCHistory+Rewrite.h" +#import #import "XLFacilityMacros.h" diff --git a/GitUpKit/Extensions/GCLiveRepository+Utilities.m b/GitUpKit/Extensions/GCLiveRepository+Utilities.m index b6a899e5a..06d22b7b9 100644 --- a/GitUpKit/Extensions/GCLiveRepository+Utilities.m +++ b/GitUpKit/Extensions/GCLiveRepository+Utilities.m @@ -5,7 +5,7 @@ // Created by Lucas Derraugh on 8/2/19. // -#import "GCLiveRepository+Utilities.h" +#import @implementation GCLiveRepository (Utilities) diff --git a/GitUpKit/Extensions/GCRepository+Index-Tests.m b/GitUpKit/Extensions/GCRepository+Index-Tests.m index b22841da5..7541db5f5 100644 --- a/GitUpKit/Extensions/GCRepository+Index-Tests.m +++ b/GitUpKit/Extensions/GCRepository+Index-Tests.m @@ -17,8 +17,8 @@ #error This file requires ARC #endif -#import "GCTestCase.h" -#import "GCRepository+Index.h" +#import +#import @implementation GCSingleCommitRepositoryTests (GCRepository_Index) diff --git a/GitUpKit/Extensions/GCRepository+Index.h b/GitUpKit/Extensions/GCRepository+Index.h index f62103962..5a414d81a 100644 --- a/GitUpKit/Extensions/GCRepository+Index.h +++ b/GitUpKit/Extensions/GCRepository+Index.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCCore.h" +#import @interface GCRepository (Index) - (BOOL)resetIndexToHEAD:(NSError**)error; // Like git reset --mixed HEAD but does not update reflog diff --git a/GitUpKit/Extensions/GCRepository+Index.m b/GitUpKit/Extensions/GCRepository+Index.m index 58c835275..7aab65932 100644 --- a/GitUpKit/Extensions/GCRepository+Index.m +++ b/GitUpKit/Extensions/GCRepository+Index.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCRepository+Index.h" +#import #import "XLFacilityMacros.h" diff --git a/GitUpKit/Extensions/GCRepository+Utilities-Tests.m b/GitUpKit/Extensions/GCRepository+Utilities-Tests.m index 438ba724a..9a7beba30 100644 --- a/GitUpKit/Extensions/GCRepository+Utilities-Tests.m +++ b/GitUpKit/Extensions/GCRepository+Utilities-Tests.m @@ -17,9 +17,9 @@ #error This file requires ARC #endif -#import "GCTestCase.h" -#import "GCRepository+Utilities.h" -#import "GCRepository+Index.h" +#import +#import +#import // TODO: Test -fetchDefaultRemoteBranchesFromAllRemotes: // TODO: Test -fetchAllTagsFromAllRemotes: diff --git a/GitUpKit/Extensions/GCRepository+Utilities.h b/GitUpKit/Extensions/GCRepository+Utilities.h index fa902d0a7..317f7488f 100644 --- a/GitUpKit/Extensions/GCRepository+Utilities.h +++ b/GitUpKit/Extensions/GCRepository+Utilities.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GCCore.h" +#import typedef NS_ENUM(NSUInteger, GCHostingService) { kGCHostingService_Unknown = 0, diff --git a/GitUpKit/Extensions/GCRepository+Utilities.m b/GitUpKit/Extensions/GCRepository+Utilities.m index 68c6ba57b..153ed7df7 100644 --- a/GitUpKit/Extensions/GCRepository+Utilities.m +++ b/GitUpKit/Extensions/GCRepository+Utilities.m @@ -19,8 +19,8 @@ #import -#import "GCRepository+Utilities.h" -#import "GCRepository+Index.h" +#import +#import #import "XLFacilityMacros.h" diff --git a/GitUpKit/Interface/GIDiffView.m b/GitUpKit/Interface/GIDiffView.m index 29fe6df7e..37a83fca4 100644 --- a/GitUpKit/Interface/GIDiffView.m +++ b/GitUpKit/Interface/GIDiffView.m @@ -18,7 +18,7 @@ #endif #import "GIPrivate.h" -#import "GIAppKit.h" +#import #define kTextLineHeightPadding 3 #define kTextLineDescentAdjustment 1 diff --git a/GitUpKit/Interface/GIFunctions-Tests.m b/GitUpKit/Interface/GIFunctions-Tests.m index ebf8dbbf8..1ba05c0ee 100644 --- a/GitUpKit/Interface/GIFunctions-Tests.m +++ b/GitUpKit/Interface/GIFunctions-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import #import "GIPrivate.h" @implementation GCTests (GIFunctions) diff --git a/GitUpKit/Interface/GIGraph-Tests.m b/GitUpKit/Interface/GIGraph-Tests.m index 26d748ae9..bce3c9190 100644 --- a/GitUpKit/Interface/GIGraph-Tests.m +++ b/GitUpKit/Interface/GIGraph-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GCTestCase.h" +#import #import "GIPrivate.h" #define kNotationSeparator @"##### NOTATION #####\n\n" diff --git a/GitUpKit/Interface/GIImageDiffView.m b/GitUpKit/Interface/GIImageDiffView.m index 91317220e..150533588 100644 --- a/GitUpKit/Interface/GIImageDiffView.m +++ b/GitUpKit/Interface/GIImageDiffView.m @@ -3,7 +3,7 @@ #endif #import "GIPrivate.h" -#import "GILaunchServicesLocator.h" +#import #import #import diff --git a/GitUpKit/Interface/GIInterface.h b/GitUpKit/Interface/GIInterface.h index b97c36462..1bf340243 100644 --- a/GitUpKit/Interface/GIInterface.h +++ b/GitUpKit/Interface/GIInterface.h @@ -23,21 +23,21 @@ #endif #endif -#import "GCCore.h" +#import -#import "GIBranch.h" -#import "GIConstants.h" -#import "GIFunctions.h" -#import "GIGraph.h" -#import "GILayer.h" -#import "GILine.h" -#import "GINode.h" +#import +#import +#import +#import +#import +#import +#import #if __GI_HAS_APPKIT__ -#import "GIDiffView.h" -#import "GIGraphView.h" -#import "GISplitDiffView.h" -#import "GIUnifiedDiffView.h" -#import "NSColor+GINamedColors.h" -#import "GIImageDiffView.h" +#import +#import +#import +#import +#import +#import #endif diff --git a/GitUpKit/Interface/GIPrivate.h b/GitUpKit/Interface/GIPrivate.h index da17a35d6..b4a89ff20 100644 --- a/GitUpKit/Interface/GIPrivate.h +++ b/GitUpKit/Interface/GIPrivate.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIInterface.h" +#import #import "XLFacilityMacros.h" #import "NSBundle+GitUpKit.h" diff --git a/GitUpKit/Interface/GISplitDiffView.h b/GitUpKit/Interface/GISplitDiffView.h index 74a9c8a04..3f6823ac8 100644 --- a/GitUpKit/Interface/GISplitDiffView.h +++ b/GitUpKit/Interface/GISplitDiffView.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIDiffView.h" +#import @interface GISplitDiffView : GIDiffView @end diff --git a/GitUpKit/Interface/GISplitDiffView.m b/GitUpKit/Interface/GISplitDiffView.m index 3ffedc555..924d0d730 100644 --- a/GitUpKit/Interface/GISplitDiffView.m +++ b/GitUpKit/Interface/GISplitDiffView.m @@ -18,7 +18,7 @@ #endif #import "GIPrivate.h" -#import "GIAppKit.h" +#import #define kTextBottomPadding 0 diff --git a/GitUpKit/Interface/GIUnifiedDiffView.h b/GitUpKit/Interface/GIUnifiedDiffView.h index 6d363b4fb..1efff633b 100644 --- a/GitUpKit/Interface/GIUnifiedDiffView.h +++ b/GitUpKit/Interface/GIUnifiedDiffView.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIDiffView.h" +#import @interface GIUnifiedDiffView : GIDiffView @end diff --git a/GitUpKit/Interface/GIUnifiedDiffView.m b/GitUpKit/Interface/GIUnifiedDiffView.m index 7a15e3f88..ff3fb7c88 100644 --- a/GitUpKit/Interface/GIUnifiedDiffView.m +++ b/GitUpKit/Interface/GIUnifiedDiffView.m @@ -18,7 +18,7 @@ #endif #import "GIPrivate.h" -#import "GIAppKit.h" +#import #define kTextBottomPadding 0 diff --git a/GitUpKit/Utilities/GIAppKit.m b/GitUpKit/Utilities/GIAppKit.m index 8d47c4cb7..f5f9009f6 100644 --- a/GitUpKit/Utilities/GIAppKit.m +++ b/GitUpKit/Utilities/GIAppKit.m @@ -19,8 +19,8 @@ #import -#import "GIAppKit.h" -#import "GIConstants.h" +#import +#import #import "NSColor+GINamedColors.h" #import "XLFacilityMacros.h" diff --git a/GitUpKit/Utilities/GIColorView.m b/GitUpKit/Utilities/GIColorView.m index 5022cdc3e..5330ab63a 100644 --- a/GitUpKit/Utilities/GIColorView.m +++ b/GitUpKit/Utilities/GIColorView.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GIColorView.h" +#import @implementation GIColorView diff --git a/GitUpKit/Utilities/GICustomToolbarItem.m b/GitUpKit/Utilities/GICustomToolbarItem.m index 922e423d0..51aa0ec71 100644 --- a/GitUpKit/Utilities/GICustomToolbarItem.m +++ b/GitUpKit/Utilities/GICustomToolbarItem.m @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GICustomToolbarItem.h" +#import @implementation GICustomToolbarItem diff --git a/GitUpKit/Utilities/GILaunchServicesLocator.m b/GitUpKit/Utilities/GILaunchServicesLocator.m index 087bfce36..bb8aa445c 100644 --- a/GitUpKit/Utilities/GILaunchServicesLocator.m +++ b/GitUpKit/Utilities/GILaunchServicesLocator.m @@ -5,7 +5,7 @@ // Created by Dmitry Lobanov on 08.10.2019. // -#import "GILaunchServicesLocator.h" +#import #import "XLFacilityMacros.h" // Settings diff --git a/GitUpKit/Utilities/GILinkButton.m b/GitUpKit/Utilities/GILinkButton.m index 8cf4d2c59..c52c66465 100644 --- a/GitUpKit/Utilities/GILinkButton.m +++ b/GitUpKit/Utilities/GILinkButton.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import "GILinkButton.h" +#import @implementation GILinkButton { BOOL _highlighted; diff --git a/GitUpKit/Utilities/GIModalView.m b/GitUpKit/Utilities/GIModalView.m index 0793410da..60cf1ef96 100644 --- a/GitUpKit/Utilities/GIModalView.m +++ b/GitUpKit/Utilities/GIModalView.m @@ -20,7 +20,7 @@ #import #import -#import "GIModalView.h" +#import #import "XLFacilityMacros.h" #import "NSColor+GINamedColors.h" diff --git a/GitUpKit/Utilities/GIViewController+Utilities.h b/GitUpKit/Utilities/GIViewController+Utilities.h index d7a6cc147..55a4a1374 100644 --- a/GitUpKit/Utilities/GIViewController+Utilities.h +++ b/GitUpKit/Utilities/GIViewController+Utilities.h @@ -13,8 +13,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIViewController.h" -#import "GILaunchServicesLocator.h" +#import +#import @protocol GCMergeConflictResolver; diff --git a/GitUpKit/Utilities/GIViewController+Utilities.m b/GitUpKit/Utilities/GIViewController+Utilities.m index 96bb290af..8d015767d 100644 --- a/GitUpKit/Utilities/GIViewController+Utilities.m +++ b/GitUpKit/Utilities/GIViewController+Utilities.m @@ -17,14 +17,14 @@ #error This file requires ARC #endif -#import "GIViewController+Utilities.h" -#import "GIWindowController.h" - -#import "GCCore.h" -#import "GCRepository+Index.h" -#import "GCRepository+Utilities.h" -#import "GCLiveRepository+Conflicts.h" -#import "GIAppKit.h" +#import +#import + +#import +#import +#import +#import +#import #import "XLFacilityMacros.h" #define kOpenDiffPath @"/usr/bin/opendiff" diff --git a/GitUpKit/Utilities/GIViewController.h b/GitUpKit/Utilities/GIViewController.h index 82a1deb9a..41d064c3d 100644 --- a/GitUpKit/Utilities/GIViewController.h +++ b/GitUpKit/Utilities/GIViewController.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIAppKit.h" +#import @class GIWindowController, GIViewController, GCLiveRepository, GCSnapshot; diff --git a/GitUpKit/Utilities/GIViewController.m b/GitUpKit/Utilities/GIViewController.m index 6975cbff8..d09febde0 100644 --- a/GitUpKit/Utilities/GIViewController.m +++ b/GitUpKit/Utilities/GIViewController.m @@ -19,10 +19,10 @@ #import -#import "GIViewController.h" -#import "GIWindowController.h" +#import +#import -#import "GIInterface.h" +#import #import "XLFacilityMacros.h" @interface GIView () diff --git a/GitUpKit/Utilities/GIWindowController.h b/GitUpKit/Utilities/GIWindowController.h index f0a55c5c7..86f660246 100644 --- a/GitUpKit/Utilities/GIWindowController.h +++ b/GitUpKit/Utilities/GIWindowController.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIViewController.h" +#import typedef NS_ENUM(NSUInteger, GIOverlayStyle) { kGIOverlayStyle_Help = 0, diff --git a/GitUpKit/Utilities/GIWindowController.m b/GitUpKit/Utilities/GIWindowController.m index c86e7466a..6481b9818 100644 --- a/GitUpKit/Utilities/GIWindowController.m +++ b/GitUpKit/Utilities/GIWindowController.m @@ -19,13 +19,13 @@ #import -#import "GIWindowController.h" -#import "GIModalView.h" -#import "GIColorView.h" -#import "GIConstants.h" +#import +#import +#import +#import #import "XLFacilityMacros.h" -#import "GIGraphView.h" +#import #define kOverlayAnimationInDuration 0.2 // seconds #define kOverlayAnimationOutDuration 0.15 // seconds diff --git a/GitUpKit/Utilities/NSBundle+GitUpKit.m b/GitUpKit/Utilities/NSBundle+GitUpKit.m index 8e988ac30..5f57e5702 100644 --- a/GitUpKit/Utilities/NSBundle+GitUpKit.m +++ b/GitUpKit/Utilities/NSBundle+GitUpKit.m @@ -14,7 +14,7 @@ // along with this program. If not, see . #import "NSBundle+GitUpKit.h" -#import "GIBranch.h" // just any class included on all platforms +#import // just any class included on all platforms @implementation NSBundle (GitUpKit) diff --git a/GitUpKit/Utilities/NSColor+GINamedColors.h b/GitUpKit/Utilities/NSColor+GINamedColors.h index 469a51c60..c2a975b4b 100644 --- a/GitUpKit/Utilities/NSColor+GINamedColors.h +++ b/GitUpKit/Utilities/NSColor+GINamedColors.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIAppKit.h" +#import @interface NSColor (GINamedColors) diff --git a/GitUpKit/Views/GIAdvancedCommitViewController.h b/GitUpKit/Views/GIAdvancedCommitViewController.h index 9994335de..b3d460849 100644 --- a/GitUpKit/Views/GIAdvancedCommitViewController.h +++ b/GitUpKit/Views/GIAdvancedCommitViewController.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GICommitViewController.h" +#import @interface GIAdvancedCommitViewController : GICommitViewController @end diff --git a/GitUpKit/Views/GIAdvancedCommitViewController.m b/GitUpKit/Views/GIAdvancedCommitViewController.m index 75dfd4f21..7ccfc03bf 100644 --- a/GitUpKit/Views/GIAdvancedCommitViewController.m +++ b/GitUpKit/Views/GIAdvancedCommitViewController.m @@ -17,15 +17,15 @@ #error This file requires ARC #endif -#import "GIAdvancedCommitViewController.h" -#import "GIDiffFilesViewController.h" -#import "GIDiffContentsViewController.h" -#import "GIRemappingExplanationPopover.h" -#import "GIViewController+Utilities.h" - -#import "GIColorView.h" -#import "GIInterface.h" -#import "GIWindowController.h" +#import +#import +#import +#import +#import + +#import +#import +#import #import "XLFacilityMacros.h" @interface GIAdvancedCommitViewController () diff --git a/GitUpKit/Views/GICommitRewriterViewController.h b/GitUpKit/Views/GICommitRewriterViewController.h index b75c39083..340f0f0b1 100644 --- a/GitUpKit/Views/GICommitRewriterViewController.h +++ b/GitUpKit/Views/GICommitRewriterViewController.h @@ -13,8 +13,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GICommitViewController.h" -#import "GIViewController+Utilities.h" +#import +#import @class GICommitRewriterViewController, GCHistoryCommit; diff --git a/GitUpKit/Views/GICommitRewriterViewController.m b/GitUpKit/Views/GICommitRewriterViewController.m index 18d0b4dd4..ab0f1fe84 100644 --- a/GitUpKit/Views/GICommitRewriterViewController.m +++ b/GitUpKit/Views/GICommitRewriterViewController.m @@ -17,14 +17,14 @@ #error This file requires ARC #endif -#import "GICommitRewriterViewController.h" -#import "GIDiffContentsViewController.h" -#import "GIDiffFilesViewController.h" -#import "GIWindowController.h" - -#import "GIInterface.h" -#import "GCRepository+Utilities.h" -#import "GCHistory+Rewrite.h" +#import +#import +#import +#import + +#import +#import +#import #import "XLFacilityMacros.h" @interface GICommitRewriterViewController () diff --git a/GitUpKit/Views/GICommitSplitterViewController.h b/GitUpKit/Views/GICommitSplitterViewController.h index f2c24658d..9d2c5c3d0 100644 --- a/GitUpKit/Views/GICommitSplitterViewController.h +++ b/GitUpKit/Views/GICommitSplitterViewController.h @@ -13,8 +13,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GISimpleCommitViewController.h" -#import "GIViewController+Utilities.h" +#import +#import @class GICommitSplitterViewController, GCHistoryCommit; diff --git a/GitUpKit/Views/GICommitSplitterViewController.m b/GitUpKit/Views/GICommitSplitterViewController.m index 2dc8860a6..f4b75614b 100644 --- a/GitUpKit/Views/GICommitSplitterViewController.m +++ b/GitUpKit/Views/GICommitSplitterViewController.m @@ -17,15 +17,15 @@ #error This file requires ARC #endif -#import "GICommitSplitterViewController.h" -#import "GIDiffFilesViewController.h" -#import "GIDiffContentsViewController.h" - -#import "GCCore.h" -#import "GIColorView.h" -#import "GIInterface.h" -#import "GCHistory+Rewrite.h" -#import "GIWindowController.h" +#import +#import +#import + +#import +#import +#import +#import +#import #import "XLFacilityMacros.h" #define kGCDefaultMaxDiffContextLines 3 diff --git a/GitUpKit/Views/GICommitViewController.h b/GitUpKit/Views/GICommitViewController.h index f302b381b..8e4def723 100644 --- a/GitUpKit/Views/GICommitViewController.h +++ b/GitUpKit/Views/GICommitViewController.h @@ -13,9 +13,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIViewController.h" +#import -#import "GCDiff.h" +#import @class GICommitViewController, GCCommit, GCSubmodule, GCIndexConflict, GICommitMessageView; diff --git a/GitUpKit/Views/GICommitViewController.m b/GitUpKit/Views/GICommitViewController.m index e8b4c1904..d0e7186f7 100644 --- a/GitUpKit/Views/GICommitViewController.m +++ b/GitUpKit/Views/GICommitViewController.m @@ -17,9 +17,9 @@ #error This file requires ARC #endif -#import "GICommitViewController.h" +#import -#import "GIInterface.h" +#import #import "XLFacilityMacros.h" @implementation GICommitViewController { diff --git a/GitUpKit/Views/GIConfigViewController.h b/GitUpKit/Views/GIConfigViewController.h index a468a100d..c407c584d 100644 --- a/GitUpKit/Views/GIConfigViewController.h +++ b/GitUpKit/Views/GIConfigViewController.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIViewController.h" +#import @interface GIConfigViewController : GIViewController @end diff --git a/GitUpKit/Views/GIConfigViewController.m b/GitUpKit/Views/GIConfigViewController.m index 84538451a..75e195d6e 100644 --- a/GitUpKit/Views/GIConfigViewController.m +++ b/GitUpKit/Views/GIConfigViewController.m @@ -17,10 +17,10 @@ #error This file requires ARC #endif -#import "GIConfigViewController.h" -#import "GIWindowController.h" +#import +#import -#import "GIInterface.h" +#import #import "XLFacilityMacros.h" @interface GIConfigViewController () diff --git a/GitUpKit/Views/GIConflictResolverViewController.h b/GitUpKit/Views/GIConflictResolverViewController.h index 5a10f9fa6..34cacebf7 100644 --- a/GitUpKit/Views/GIConflictResolverViewController.h +++ b/GitUpKit/Views/GIConflictResolverViewController.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIViewController.h" +#import @class GCCommit, GIConflictResolverViewController; diff --git a/GitUpKit/Views/GIConflictResolverViewController.m b/GitUpKit/Views/GIConflictResolverViewController.m index f94e3b52f..f967fcf5f 100644 --- a/GitUpKit/Views/GIConflictResolverViewController.m +++ b/GitUpKit/Views/GIConflictResolverViewController.m @@ -17,12 +17,12 @@ #error This file requires ARC #endif -#import "GIConflictResolverViewController.h" -#import "GIDiffContentsViewController.h" -#import "GIDiffFilesViewController.h" -#import "GIViewController+Utilities.h" +#import +#import +#import +#import -#import "GIInterface.h" +#import #import "XLFacilityMacros.h" @interface GIConflictResolverViewController () diff --git a/GitUpKit/Views/GIDiffViewController.h b/GitUpKit/Views/GIDiffViewController.h index 4565ca17c..599eca5f7 100644 --- a/GitUpKit/Views/GIDiffViewController.h +++ b/GitUpKit/Views/GIDiffViewController.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIViewController.h" +#import @class GCCommit; diff --git a/GitUpKit/Views/GIDiffViewController.m b/GitUpKit/Views/GIDiffViewController.m index c1a987fe7..9d20c12dd 100644 --- a/GitUpKit/Views/GIDiffViewController.m +++ b/GitUpKit/Views/GIDiffViewController.m @@ -17,11 +17,11 @@ #error This file requires ARC #endif -#import "GIDiffViewController.h" -#import "GIDiffContentsViewController.h" -#import "GIDiffFilesViewController.h" +#import +#import +#import -#import "GIInterface.h" +#import #import "XLFacilityMacros.h" @interface GIDiffViewController () diff --git a/GitUpKit/Views/GIMapViewController+Operations.h b/GitUpKit/Views/GIMapViewController+Operations.h index 8263b3fcc..1b6df0c9a 100644 --- a/GitUpKit/Views/GIMapViewController+Operations.h +++ b/GitUpKit/Views/GIMapViewController+Operations.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIMapViewController.h" +#import @class GCBranch, GCLocalBranch, GCHistoryLocalBranch, GCHistoryRemoteBranch, GCHistoryTag, GCRemote; diff --git a/GitUpKit/Views/GIMapViewController+Operations.m b/GitUpKit/Views/GIMapViewController+Operations.m index 6e5ee9b27..3af3f45f0 100644 --- a/GitUpKit/Views/GIMapViewController+Operations.m +++ b/GitUpKit/Views/GIMapViewController+Operations.m @@ -17,11 +17,11 @@ #error This file requires ARC #endif -#import "GIMapViewController+Operations.h" +#import -#import "GIWindowController.h" -#import "GCRepository+Utilities.h" -#import "GCHistory+Rewrite.h" +#import +#import +#import #import "XLFacilityMacros.h" #define kUserDefaultsPrefix @"GIMapViewController_" diff --git a/GitUpKit/Views/GIMapViewController.h b/GitUpKit/Views/GIMapViewController.h index a4dd210da..589fda740 100644 --- a/GitUpKit/Views/GIMapViewController.h +++ b/GitUpKit/Views/GIMapViewController.h @@ -13,10 +13,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIViewController+Utilities.h" +#import -#import "GCLiveRepository+Conflicts.h" -#import "GCRepository.h" +#import +#import @class GIMapViewController, GIGraph, GINode, GCHistory, GCHistoryCommit, GCCommit; diff --git a/GitUpKit/Views/GIMapViewController.m b/GitUpKit/Views/GIMapViewController.m index f40ddc5f5..69efaed93 100644 --- a/GitUpKit/Views/GIMapViewController.m +++ b/GitUpKit/Views/GIMapViewController.m @@ -17,13 +17,13 @@ #error This file requires ARC #endif -#import "GIMapViewController+Operations.h" +#import -#import "GIWindowController.h" -#import "GIInterface.h" -#import "GCLiveRepository+Utilities.h" -#import "GCRepository+Utilities.h" -#import "GCHistory+Rewrite.h" +#import +#import +#import +#import +#import #import "XLFacilityMacros.h" #import "NSBundle+GitUpKit.h" diff --git a/GitUpKit/Views/GIQuickViewController.h b/GitUpKit/Views/GIQuickViewController.h index a8c08f792..1eb1adb68 100644 --- a/GitUpKit/Views/GIQuickViewController.h +++ b/GitUpKit/Views/GIQuickViewController.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIViewController.h" +#import @class GCHistoryCommit; diff --git a/GitUpKit/Views/GIQuickViewController.m b/GitUpKit/Views/GIQuickViewController.m index 2c162a165..a4fec32a3 100644 --- a/GitUpKit/Views/GIQuickViewController.m +++ b/GitUpKit/Views/GIQuickViewController.m @@ -17,12 +17,12 @@ #error This file requires ARC #endif -#import "GIQuickViewController.h" -#import "GIDiffContentsViewController.h" -#import "GIDiffFilesViewController.h" -#import "GIViewController+Utilities.h" +#import +#import +#import +#import -#import "GIInterface.h" +#import #import "XLFacilityMacros.h" @interface GIQuickViewController () diff --git a/GitUpKit/Views/GIRemappingExplanationPopover.m b/GitUpKit/Views/GIRemappingExplanationPopover.m index 8dffde5e8..1eec0642e 100644 --- a/GitUpKit/Views/GIRemappingExplanationPopover.m +++ b/GitUpKit/Views/GIRemappingExplanationPopover.m @@ -5,7 +5,7 @@ // Created by Lucas Derraugh on 3/3/24. // -#import "GIRemappingExplanationPopover.h" +#import static NSString* const GIRemappingExplanationShownUserDefaultKey = @"GIRemappingExplanationShownUserDefaultKey"; diff --git a/GitUpKit/Views/GISimpleCommitViewController.h b/GitUpKit/Views/GISimpleCommitViewController.h index bdeae4fcb..b281edbba 100644 --- a/GitUpKit/Views/GISimpleCommitViewController.h +++ b/GitUpKit/Views/GISimpleCommitViewController.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GICommitViewController.h" +#import @interface GISimpleCommitViewController : GICommitViewController @end diff --git a/GitUpKit/Views/GISimpleCommitViewController.m b/GitUpKit/Views/GISimpleCommitViewController.m index 19b566340..3c9b828e1 100644 --- a/GitUpKit/Views/GISimpleCommitViewController.m +++ b/GitUpKit/Views/GISimpleCommitViewController.m @@ -17,14 +17,14 @@ #error This file requires ARC #endif -#import "GISimpleCommitViewController.h" -#import "GIDiffContentsViewController.h" -#import "GIDiffFilesViewController.h" -#import "GIRemappingExplanationPopover.h" -#import "GIViewController+Utilities.h" - -#import "GIInterface.h" -#import "GCRepository+Utilities.h" +#import +#import +#import +#import +#import + +#import +#import #import "XLFacilityMacros.h" @interface GISimpleCommitViewController () diff --git a/GitUpKit/Views/GIStashListViewController.h b/GitUpKit/Views/GIStashListViewController.h index a28150db6..87f11e0d1 100644 --- a/GitUpKit/Views/GIStashListViewController.h +++ b/GitUpKit/Views/GIStashListViewController.h @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import "GIViewController.h" +#import @interface GIStashListViewController : GIViewController @end diff --git a/GitUpKit/Views/GIStashListViewController.m b/GitUpKit/Views/GIStashListViewController.m index 20e449a0b..c58e5fbce 100644 --- a/GitUpKit/Views/GIStashListViewController.m +++ b/GitUpKit/Views/GIStashListViewController.m @@ -17,11 +17,11 @@ #error This file requires ARC #endif -#import "GIStashListViewController.h" -#import "GIDiffContentsViewController.h" -#import "GIWindowController.h" +#import +#import +#import -#import "GIInterface.h" +#import #import "XLFacilityMacros.h" #define kUserDefaultsPrefix @"GIStashListViewController_" From a00306d93eb57786cbefa1d5f1af2c5f06f33434 Mon Sep 17 00:00:00 2001 From: Lucas Derraugh Date: Tue, 9 Jun 2026 22:27:41 -0400 Subject: [PATCH 2/2] Fix test cases --- GitUpKit/Core/GCBranch-Tests.m | 2 +- GitUpKit/Core/GCCommit-Tests.m | 2 +- GitUpKit/Core/GCCommitDatabase-Tests.m | 2 +- GitUpKit/Core/GCDiff-Tests.m | 2 +- GitUpKit/Core/GCHistory-Tests.m | 2 +- GitUpKit/Core/GCLiveRepository-Tests.m | 2 +- GitUpKit/Core/GCOrderedSet-Tests.m | 2 +- GitUpKit/Core/GCRemote-Tests.m | 2 +- GitUpKit/Core/GCRepository+Bare-Tests.m | 2 +- GitUpKit/Core/GCRepository+Config-Tests.m | 2 +- GitUpKit/Core/GCRepository+HEAD-Tests.m | 2 +- GitUpKit/Core/GCRepository+Mock-Tests.m | 2 +- GitUpKit/Core/GCRepository+Reflog-Tests.m | 2 +- GitUpKit/Core/GCRepository+Reset-Tests.m | 2 +- GitUpKit/Core/GCRepository+Status-Tests.m | 2 +- GitUpKit/Core/GCRepository-Tests.m | 2 +- GitUpKit/Core/GCSQLiteRepository-Tests.m | 2 +- GitUpKit/Core/GCSnapshot-Tests.m | 2 +- GitUpKit/Core/GCStash-Tests.m | 2 +- GitUpKit/Core/GCSubmodule-Tests.m | 2 +- GitUpKit/Core/GCTag-Tests.m | 2 +- GitUpKit/Core/GCTestCase.m | 2 +- GitUpKit/Extensions/GCHistory+Rewrite-Tests.m | 2 +- GitUpKit/Extensions/GCRepository+Index-Tests.m | 2 +- GitUpKit/Extensions/GCRepository+Utilities-Tests.m | 2 +- GitUpKit/Interface/GIFunctions-Tests.m | 2 +- GitUpKit/Interface/GIGraph-Tests.m | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/GitUpKit/Core/GCBranch-Tests.m b/GitUpKit/Core/GCBranch-Tests.m index 70418ef99..41430f6b1 100644 --- a/GitUpKit/Core/GCBranch-Tests.m +++ b/GitUpKit/Core/GCBranch-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" @implementation GCMultipleCommitsRepositoryTests (GCBranch) diff --git a/GitUpKit/Core/GCCommit-Tests.m b/GitUpKit/Core/GCCommit-Tests.m index 7e6f5fb10..ff4fc3dea 100644 --- a/GitUpKit/Core/GCCommit-Tests.m +++ b/GitUpKit/Core/GCCommit-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" @implementation GCSingleCommitRepositoryTests (GCCommit) diff --git a/GitUpKit/Core/GCCommitDatabase-Tests.m b/GitUpKit/Core/GCCommitDatabase-Tests.m index 27e094faf..63188fc95 100644 --- a/GitUpKit/Core/GCCommitDatabase-Tests.m +++ b/GitUpKit/Core/GCCommitDatabase-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" @implementation GCMultipleCommitsRepositoryTests (GCCommitDatabase) diff --git a/GitUpKit/Core/GCDiff-Tests.m b/GitUpKit/Core/GCDiff-Tests.m index 34585691d..4e84780bf 100644 --- a/GitUpKit/Core/GCDiff-Tests.m +++ b/GitUpKit/Core/GCDiff-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" #import @implementation GCSingleCommitRepositoryTests (GCRepository_Diffs) diff --git a/GitUpKit/Core/GCHistory-Tests.m b/GitUpKit/Core/GCHistory-Tests.m index 2f26dd956..e2a6beed2 100644 --- a/GitUpKit/Core/GCHistory-Tests.m +++ b/GitUpKit/Core/GCHistory-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" #import @implementation GCSQLiteRepositoryTests (GCHistory) diff --git a/GitUpKit/Core/GCLiveRepository-Tests.m b/GitUpKit/Core/GCLiveRepository-Tests.m index 9bee8168c..07680a343 100644 --- a/GitUpKit/Core/GCLiveRepository-Tests.m +++ b/GitUpKit/Core/GCLiveRepository-Tests.m @@ -6,7 +6,7 @@ // #import -#import +#import "GCTestCase.h" #import #import #import diff --git a/GitUpKit/Core/GCOrderedSet-Tests.m b/GitUpKit/Core/GCOrderedSet-Tests.m index 331eb1b5e..f150054ff 100644 --- a/GitUpKit/Core/GCOrderedSet-Tests.m +++ b/GitUpKit/Core/GCOrderedSet-Tests.m @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#import +#import "GCTestCase.h" #import @implementation GCMultipleCommitsRepositoryTests (GCOrderedSetTests) diff --git a/GitUpKit/Core/GCRemote-Tests.m b/GitUpKit/Core/GCRemote-Tests.m index b0a916801..63ac769b8 100644 --- a/GitUpKit/Core/GCRemote-Tests.m +++ b/GitUpKit/Core/GCRemote-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" @implementation GCSingleCommitRepositoryTests (GCRemote) diff --git a/GitUpKit/Core/GCRepository+Bare-Tests.m b/GitUpKit/Core/GCRepository+Bare-Tests.m index e538d3c06..85a55c19a 100644 --- a/GitUpKit/Core/GCRepository+Bare-Tests.m +++ b/GitUpKit/Core/GCRepository+Bare-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" @implementation GCSingleCommitRepositoryTests (GCRepository_Bare) diff --git a/GitUpKit/Core/GCRepository+Config-Tests.m b/GitUpKit/Core/GCRepository+Config-Tests.m index 7adcd0a8d..0c4eb8c28 100644 --- a/GitUpKit/Core/GCRepository+Config-Tests.m +++ b/GitUpKit/Core/GCRepository+Config-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" @implementation GCEmptyRepositoryTests (GCConfig) diff --git a/GitUpKit/Core/GCRepository+HEAD-Tests.m b/GitUpKit/Core/GCRepository+HEAD-Tests.m index 6d4fc8eb4..fdfcc2111 100644 --- a/GitUpKit/Core/GCRepository+HEAD-Tests.m +++ b/GitUpKit/Core/GCRepository+HEAD-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" #import #import diff --git a/GitUpKit/Core/GCRepository+Mock-Tests.m b/GitUpKit/Core/GCRepository+Mock-Tests.m index 0309828eb..d8d1b5912 100644 --- a/GitUpKit/Core/GCRepository+Mock-Tests.m +++ b/GitUpKit/Core/GCRepository+Mock-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" @implementation GCEmptyRepositoryTests (GCRepository_Mock) diff --git a/GitUpKit/Core/GCRepository+Reflog-Tests.m b/GitUpKit/Core/GCRepository+Reflog-Tests.m index 4b64b1f5d..5ac0f41ba 100644 --- a/GitUpKit/Core/GCRepository+Reflog-Tests.m +++ b/GitUpKit/Core/GCRepository+Reflog-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" @implementation GCMultipleCommitsRepositoryTests (GCRepository_Reflog) diff --git a/GitUpKit/Core/GCRepository+Reset-Tests.m b/GitUpKit/Core/GCRepository+Reset-Tests.m index 764237f93..83ad8f7df 100644 --- a/GitUpKit/Core/GCRepository+Reset-Tests.m +++ b/GitUpKit/Core/GCRepository+Reset-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" // We only test resetting to commit since resetting to HEAD or tag is the same implementation codepath @implementation GCSingleCommitRepositoryTests (GCRepository_Reset) diff --git a/GitUpKit/Core/GCRepository+Status-Tests.m b/GitUpKit/Core/GCRepository+Status-Tests.m index bd4e7ebdc..1562ce6fa 100644 --- a/GitUpKit/Core/GCRepository+Status-Tests.m +++ b/GitUpKit/Core/GCRepository+Status-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" #import @implementation GCSingleCommitRepositoryTests (GCRepository_Status) diff --git a/GitUpKit/Core/GCRepository-Tests.m b/GitUpKit/Core/GCRepository-Tests.m index 44ef7d710..e2b823b17 100644 --- a/GitUpKit/Core/GCRepository-Tests.m +++ b/GitUpKit/Core/GCRepository-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" @implementation GCTests (GCRepository) diff --git a/GitUpKit/Core/GCSQLiteRepository-Tests.m b/GitUpKit/Core/GCSQLiteRepository-Tests.m index 2b93f09fb..5ccc86b7f 100644 --- a/GitUpKit/Core/GCSQLiteRepository-Tests.m +++ b/GitUpKit/Core/GCSQLiteRepository-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" @implementation GCSQLiteRepositoryTests (GCSQLiteRepository) diff --git a/GitUpKit/Core/GCSnapshot-Tests.m b/GitUpKit/Core/GCSnapshot-Tests.m index 28bfb5bd7..8902cd65b 100644 --- a/GitUpKit/Core/GCSnapshot-Tests.m +++ b/GitUpKit/Core/GCSnapshot-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" @implementation GCEmptyRepositoryTests (GCSnapshot) diff --git a/GitUpKit/Core/GCStash-Tests.m b/GitUpKit/Core/GCStash-Tests.m index 4d22d8552..fe3290e4d 100644 --- a/GitUpKit/Core/GCStash-Tests.m +++ b/GitUpKit/Core/GCStash-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" #import // TODO: Test stash file list and content diff diff --git a/GitUpKit/Core/GCSubmodule-Tests.m b/GitUpKit/Core/GCSubmodule-Tests.m index e0e2f1a95..e524aa80f 100644 --- a/GitUpKit/Core/GCSubmodule-Tests.m +++ b/GitUpKit/Core/GCSubmodule-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" #import @implementation GCTests (GCSubmodule) diff --git a/GitUpKit/Core/GCTag-Tests.m b/GitUpKit/Core/GCTag-Tests.m index 2ec51424d..3c0489fdc 100644 --- a/GitUpKit/Core/GCTag-Tests.m +++ b/GitUpKit/Core/GCTag-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" @implementation GCSingleCommitRepositoryTests (GCTag) diff --git a/GitUpKit/Core/GCTestCase.m b/GitUpKit/Core/GCTestCase.m index dbc9253e4..054da4eee 100644 --- a/GitUpKit/Core/GCTestCase.m +++ b/GitUpKit/Core/GCTestCase.m @@ -19,7 +19,7 @@ #import -#import +#import "GCTestCase.h" #import #define kGitCLTPath @"/usr/bin/git" diff --git a/GitUpKit/Extensions/GCHistory+Rewrite-Tests.m b/GitUpKit/Extensions/GCHistory+Rewrite-Tests.m index e8f752631..f2d029d87 100644 --- a/GitUpKit/Extensions/GCHistory+Rewrite-Tests.m +++ b/GitUpKit/Extensions/GCHistory+Rewrite-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" #import #import diff --git a/GitUpKit/Extensions/GCRepository+Index-Tests.m b/GitUpKit/Extensions/GCRepository+Index-Tests.m index 7541db5f5..e22197c8d 100644 --- a/GitUpKit/Extensions/GCRepository+Index-Tests.m +++ b/GitUpKit/Extensions/GCRepository+Index-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" #import @implementation GCSingleCommitRepositoryTests (GCRepository_Index) diff --git a/GitUpKit/Extensions/GCRepository+Utilities-Tests.m b/GitUpKit/Extensions/GCRepository+Utilities-Tests.m index 9a7beba30..3a6a0b3c7 100644 --- a/GitUpKit/Extensions/GCRepository+Utilities-Tests.m +++ b/GitUpKit/Extensions/GCRepository+Utilities-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" #import #import diff --git a/GitUpKit/Interface/GIFunctions-Tests.m b/GitUpKit/Interface/GIFunctions-Tests.m index 1ba05c0ee..ebf8dbbf8 100644 --- a/GitUpKit/Interface/GIFunctions-Tests.m +++ b/GitUpKit/Interface/GIFunctions-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" #import "GIPrivate.h" @implementation GCTests (GIFunctions) diff --git a/GitUpKit/Interface/GIGraph-Tests.m b/GitUpKit/Interface/GIGraph-Tests.m index bce3c9190..26d748ae9 100644 --- a/GitUpKit/Interface/GIGraph-Tests.m +++ b/GitUpKit/Interface/GIGraph-Tests.m @@ -17,7 +17,7 @@ #error This file requires ARC #endif -#import +#import "GCTestCase.h" #import "GIPrivate.h" #define kNotationSeparator @"##### NOTATION #####\n\n"