Fix the SPM build errors caused by removal of unprefixed headers (#1644)

TimOliver · TimOliver · commit 10fbfd9b80ed · 2025-12-10T17:18:43.000+09:00
Summary: It looks like D86316341 caused the GitHub unit tests to stop passing since SPM relies on IGListKit and IGListDiffKit being in the same directory so there are no module imports. This diff adds the same `__has_include` conditional checking so our internal and external module configurations will both work. Pull Request resolved: #1644 Test Plan: The external tests are working again. As long as the internal tests also pass, we should be good! {F1983488354} Reviewed By: m3rlin45 Differential Revision: D86943807 Pulled By: TimOliver fbshipit-source-id: c741acbb1f8425e92834daec720d4be3b3c264da
diff --git a/IGListKit.xcodeproj/project.pbxproj b/IGListKit.xcodeproj/project.pbxproj
@@ -1031,6 +1031,7 @@
 		7A02CEC6236150C400B49FAE /* IGListKit */ = {
 			isa = PBXGroup;
 			children = (
+				7A02CF632361511700B49FAE /* Internal */,
 				7A02CECA2361510F00B49FAE /* IGListAdapter.h */,
 				7A02CEE82361511000B49FAE /* IGListAdapter.m */,
 				7A02CEDF2361511000B49FAE /* IGListAdapterDataSource.h */,
@@ -1078,7 +1079,6 @@
 				7A02CED82361511000B49FAE /* IGListTransitionDelegate.h */,
 				7A02CEDD2361511000B49FAE /* IGListUpdatingDelegate.h */,
 				7A02CEC92361510F00B49FAE /* IGListWorkingRangeDelegate.h */,
-				7A02CF632361511700B49FAE /* Internal */,
 				A46A1D292D80213D00CB9157 /* UIViewController+IGListAdapter.h */,
 				A46A1D2A2D80213D00CB9157 /* UIViewController+IGListAdapter.m */,
 			);
diff --git a/Source/IGListDiffKit/IGListBatchUpdateData.h b/Source/IGListDiffKit/IGListBatchUpdateData.h
@@ -7,9 +7,15 @@
 
 #import <Foundation/Foundation.h>
 
+#if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
+#import "IGListMacros.h"
+#import "IGListMoveIndex.h"
+#import "IGListMoveIndexPath.h"
+#else
 #import <IGListDiffKit/IGListMacros.h>
 #import <IGListDiffKit/IGListMoveIndex.h>
 #import <IGListDiffKit/IGListMoveIndexPath.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Source/IGListDiffKit/IGListDiff.h b/Source/IGListDiffKit/IGListDiff.h
@@ -7,9 +7,15 @@
 
 #import <Foundation/Foundation.h>
 
+#if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
+#import "IGListDiffable.h"
+#import "IGListIndexPathResult.h"
+#import "IGListIndexSetResult.h"
+#else
 #import <IGListDiffKit/IGListDiffable.h>
 #import <IGListDiffKit/IGListIndexPathResult.h>
 #import <IGListDiffKit/IGListIndexSetResult.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Source/IGListDiffKit/IGListDiffKit.h b/Source/IGListDiffKit/IGListDiffKit.h
@@ -5,7 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
+#import "IGListCompatibility.h"
+#else
 #import <IGListDiffKit/IGListCompatibility.h>
+#endif
 
 /**
  * Project version number for IGListKit.
@@ -17,6 +21,19 @@ FOUNDATION_EXPORT double IGListKitVersionNumber;
  */
 FOUNDATION_EXPORT const unsigned char IGListKitVersionString[];
 
+#if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
+#import "IGListAssert.h"
+#import "IGListBatchUpdateData.h"
+#import "IGListDiff.h"
+#import "IGListDiffable.h"
+#import "IGListExperiments.h"
+#import "IGListIndexPathResult.h"
+#import "IGListIndexSetResult.h"
+#import "IGListMoveIndex.h"
+#import "IGListMoveIndexPath.h"
+#import "NSNumber+IGListDiffable.h"
+#import "NSString+IGListDiffable.h"
+#else
 #import <IGListDiffKit/IGListAssert.h>
 #import <IGListDiffKit/IGListBatchUpdateData.h>
 #import <IGListDiffKit/IGListDiff.h>
@@ -28,3 +45,4 @@ FOUNDATION_EXPORT const unsigned char IGListKitVersionString[];
 #import <IGListDiffKit/IGListMoveIndexPath.h>
 #import <IGListDiffKit/NSNumber+IGListDiffable.h>
 #import <IGListDiffKit/NSString+IGListDiffable.h>
+#endif
diff --git a/Source/IGListDiffKit/IGListExperiments.h b/Source/IGListDiffKit/IGListExperiments.h
@@ -7,7 +7,11 @@
 
 #import <Foundation/Foundation.h>
 
+#if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
+#import "IGListDiff.h"
+#else
 #import <IGListDiffKit/IGListDiff.h>
+#endif
 
 /**
  Bitmask-able options used for pre-release feature testing.
diff --git a/Source/IGListDiffKit/IGListIndexPathResult.h b/Source/IGListDiffKit/IGListIndexPathResult.h
@@ -7,7 +7,11 @@
 
 #import <Foundation/Foundation.h>
 
+#if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
+#import "IGListMoveIndexPath.h"
+#else
 #import <IGListDiffKit/IGListMoveIndexPath.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Source/IGListDiffKit/IGListIndexSetResult.h b/Source/IGListDiffKit/IGListIndexSetResult.h
@@ -7,7 +7,11 @@
 
 #import <Foundation/Foundation.h>
 
+#if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
+#import "IGListMoveIndex.h"
+#else
 #import <IGListDiffKit/IGListMoveIndex.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Source/IGListDiffKit/NSNumber+IGListDiffable.h b/Source/IGListDiffKit/NSNumber+IGListDiffable.h
@@ -7,7 +7,12 @@
 
 #import <Foundation/Foundation.h>
 
+#if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
+#import "IGListDiffable.h"
+#else
 #import <IGListDiffKit/IGListDiffable.h>
+#endif
+
 /**
  This category provides default `IGListDiffable` conformance for `NSNumber`.
  */
diff --git a/Source/IGListDiffKit/NSString+IGListDiffable.h b/Source/IGListDiffKit/NSString+IGListDiffable.h
@@ -7,7 +7,11 @@
 
 #import <Foundation/Foundation.h>
 
+#if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
+#import "IGListDiffable.h"
+#else
 #import <IGListDiffKit/IGListDiffable.h>
+#endif
 
 /**
  This category provides default `IGListDiffable` conformance for `NSString`.
diff --git a/Source/IGListKit/IGListAdapter.h b/Source/IGListKit/IGListAdapter.h
@@ -8,18 +8,26 @@
 #import <UIKit/UIKit.h>
 
 #if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
-#import <IGListKit/IGListExperiments.h>
-#import <IGListKit/IGListMacros.h>
+#import "IGListExperiments.h"
+#import "IGListMacros.h"
 #else
 #import <IGListDiffKit/IGListExperiments.h>
 #import <IGListDiffKit/IGListMacros.h>
 #endif
 
+#if !__has_include(<IGListKit/IGListKit.h>)
+#import "IGListAdapterDataSource.h"
+#import "IGListAdapterDelegate.h"
+#import "IGListAdapterMoveDelegate.h"
+#import "IGListAdapterPerformanceDelegate.h"
+#import "IGListAdapterUpdateListener.h"
+#else
 #import <IGListKit/IGListAdapterDataSource.h>
 #import <IGListKit/IGListAdapterDelegate.h>
 #import <IGListKit/IGListAdapterMoveDelegate.h>
 #import <IGListKit/IGListAdapterPerformanceDelegate.h>
 #import <IGListKit/IGListAdapterUpdateListener.h>
+#endif
 
 @protocol IGListUpdatingDelegate;
 
diff --git a/Source/IGListKit/IGListAdapterDataSource.h b/Source/IGListKit/IGListAdapterDataSource.h
@@ -8,7 +8,7 @@
 #import <UIKit/UIKit.h>
 
 #if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
-#import <IGListKit/IGListDiffable.h>
+#import "IGListDiffable.h"
 #else
 #import <IGListDiffKit/IGListDiffable.h>
 #endif
diff --git a/Source/IGListKit/IGListAdapterDelegateAnnouncer.h b/Source/IGListKit/IGListAdapterDelegateAnnouncer.h
@@ -7,7 +7,11 @@
 
 #import <Foundation/Foundation.h>
 
+#if !__has_include(<IGListKit/IGListKit.h>)
+#import "IGListAdapterDelegate.h"
+#else
 #import <IGListKit/IGListAdapterDelegate.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Source/IGListKit/IGListAdapterUpdater.h b/Source/IGListKit/IGListAdapterUpdater.h
@@ -7,15 +7,21 @@
 
 #import <UIKit/UIKit.h>
 
-#if __has_include(<IGListDiffKit/IGListDiffKit.h>)
+#if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
+#import "IGListMacros.h"
+#import "IGListExperiments.h"
+#else
 #import <IGListDiffKit/IGListMacros.h>
 #import <IGListDiffKit/IGListExperiments.h>
-#else
-#import <IGListKit/IGListMacros.h>
-#import <IGListKit/IGListExperiments.h>
 #endif
+
+#if !__has_include(<IGListKit/IGListKit.h>)
+#import "IGListUpdatingDelegate.h"
+#import "IGListAdapterUpdaterDelegate.h"
+#else
 #import <IGListKit/IGListUpdatingDelegate.h>
 #import <IGListKit/IGListAdapterUpdaterDelegate.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Source/IGListKit/IGListAdapterUpdaterDelegate.h b/Source/IGListKit/IGListAdapterUpdaterDelegate.h
@@ -8,7 +8,7 @@
 #import <UIKit/UIKit.h>
 
 #if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
-#import <IGListKit/IGListBatchUpdateData.h>
+#import "IGListBatchUpdateData.h"
 #else
 #import <IGListDiffKit/IGListBatchUpdateData.h>
 #endif
diff --git a/Source/IGListKit/IGListBatchContext.h b/Source/IGListKit/IGListBatchContext.h
@@ -9,8 +9,6 @@
 
 @class IGListSectionController;
 
-
-
 NS_ASSUME_NONNULL_BEGIN
 
 /**
diff --git a/Source/IGListKit/IGListBindingSectionController.h b/Source/IGListKit/IGListBindingSectionController.h
@@ -8,14 +8,20 @@
 #import <Foundation/Foundation.h>
 
 #if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
-#import <IGListKit/IGListMacros.h>
+#import "IGListMacros.h"
 #else
 #import <IGListDiffKit/IGListMacros.h>
 #endif
 
+#if !__has_include(<IGListKit/IGListKit.h>)
+#import "IGListBindingSectionControllerDataSource.h"
+#import "IGListBindingSectionControllerSelectionDelegate.h"
+#import "IGListSectionController.h"
+#else
 #import <IGListKit/IGListBindingSectionControllerDataSource.h>
 #import <IGListKit/IGListBindingSectionControllerSelectionDelegate.h>
 #import <IGListKit/IGListSectionController.h>
+#endif
 
 @protocol IGListDiffable;
 
diff --git a/Source/IGListKit/IGListBindingSingleSectionController.h b/Source/IGListKit/IGListBindingSingleSectionController.h
@@ -7,7 +7,11 @@
 
 #import <UIKit/UIKit.h>
 
+#if !__has_include(<IGListKit/IGListKit.h>)
+#import "IGListSectionController.h"
+#else
 #import <IGListKit/IGListSectionController.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Source/IGListKit/IGListCollectionContext.h b/Source/IGListKit/IGListCollectionContext.h
@@ -8,12 +8,18 @@
 #import <UIKit/UIKit.h>
 
 #if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
-#import <IGListKit/IGListExperiments.h>
+#import "IGListExperiments.h"
 #else
 #import <IGListDiffKit/IGListExperiments.h>
 #endif
+
+#if !__has_include(<IGListKit/IGListKit.h>)
+#import "IGListBatchContext.h"
+#import "IGListCollectionScrollingTraits.h"
+#else
 #import <IGListKit/IGListBatchContext.h>
 #import <IGListKit/IGListCollectionScrollingTraits.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Source/IGListKit/IGListCollectionViewLayout.h b/Source/IGListKit/IGListCollectionViewLayout.h
@@ -8,12 +8,16 @@
 #import <UIKit/UIKit.h>
 
 #if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
-#import <IGListKit/IGListMacros.h>
+#import "IGListMacros.h"
 #else
 #import <IGListDiffKit/IGListMacros.h>
 #endif
 
+#if !__has_include(<IGListKit/IGListKit.h>)
+#import "IGListCollectionViewLayoutCompatible.h"
+#else
 #import <IGListKit/IGListCollectionViewLayoutCompatible.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Source/IGListKit/IGListDisplayDelegate.h b/Source/IGListKit/IGListDisplayDelegate.h
@@ -10,8 +10,6 @@
 @class IGListAdapter;
 @class IGListSectionController;
 
-
-
 NS_ASSUME_NONNULL_BEGIN
 
 /**
diff --git a/Source/IGListKit/IGListGenericSectionController.h b/Source/IGListKit/IGListGenericSectionController.h
@@ -5,7 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#if !__has_include(<IGListKit/IGListKit.h>)
+#import "IGListSectionController.h"
+#else
 #import <IGListKit/IGListSectionController.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Source/IGListKit/IGListKit.h b/Source/IGListKit/IGListKit.h
diff --git a/Source/IGListKit/IGListReloadDataUpdater.h b/Source/IGListKit/IGListReloadDataUpdater.h
diff --git a/Source/IGListKit/IGListScrollDelegate.h b/Source/IGListKit/IGListScrollDelegate.h
diff --git a/Source/IGListKit/IGListSectionController.h b/Source/IGListKit/IGListSectionController.h
diff --git a/Source/IGListKit/IGListSingleSectionController.h b/Source/IGListKit/IGListSingleSectionController.h
diff --git a/Source/IGListKit/IGListTransitionData.h b/Source/IGListKit/IGListTransitionData.h
diff --git a/Source/IGListKit/IGListWorkingRangeDelegate.h b/Source/IGListKit/IGListWorkingRangeDelegate.h
