Merge branch 'main' into fix-swift-package

IGListDiffKit.podspec

@@ -23,6 +23,7 @@ Pod::Spec.new do |s|
   s.source_files = 'Source/IGListDiffKit/**/*.{h,m,mm}'
   s.private_header_files = 'Source/IGListDiffKit/Internal/*.h'
 
+  s.resources = ['Source/PrivacyInfo.xcprivacy']
   s.requires_arc = true
 
   s.ios.deployment_target = '11.0'

IGListKit.podspec

@@ -35,6 +35,7 @@ Pod::Spec.new do |s|
 
   s.osx.source_files = 'Source/IGListKit/IGListKit.h'
 
+  s.resources = ['Source/PrivacyInfo.xcprivacy']
   s.requires_arc = true
 
   s.ios.deployment_target = '11.0'

IGListSwiftKit.podspec

@@ -28,6 +28,7 @@ Pod::Spec.new do |s|
     ]
   end
 
+  s.resources = ['Source/PrivacyInfo.xcprivacy']
   s.requires_arc = true
 
   s.swift_versions = ['4.0', '5.0', '5.1']

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.3
 import PackageDescription
 
 let package = Package(
@@ -20,17 +20,20 @@ let package = Package(
             name: "IGListDiffKit",
             path: "spm/Sources/IGListDiffKit",
             publicHeadersPath: "include"
+            resources: [.copy("PrivacyInfo.xcprivacy")]
         ),
         .target(
             name: "IGListKit",
             dependencies: ["IGListDiffKit"],
             path: "spm/Sources/IGListKit",
             publicHeadersPath: "include"
+            resources: [.copy("PrivacyInfo.xcprivacy")]
         ),
         .target(
             name: "IGListSwiftKit",
             dependencies: ["IGListKit"],
-            path: "Source/IGListSwiftKit"
+            path: "spm/Sources/IGListSwiftKit",
+            resources: [.copy("PrivacyInfo.xcprivacy")]
         ),
     ],
     cLanguageStandard: .c11,

Source/IGListDiffKit/IGListExperiments.h

@@ -21,7 +21,9 @@ typedef NS_OPTIONS (NSInteger, IGListExperiment) {
     /// Throw NSInternalInconsistencyException during an update
     IGListExperimentThrowOnInconsistencyException = 1 << 3,
     /// Test keeping a strong pointer to the collectionView.dataSource during a batch update to avoid a crash
-    IGListExperimentKeepPointerToCollectionViewDataSource = 1 << 4
+    IGListExperimentKeepPointerToCollectionViewDataSource = 1 << 4,
+    /// Test keeping disable all animation on updates
+    IGListExperimentDisableAnimationOnUpdates= 1 << 5
 };
 
 /**

Source/IGListKit/IGListAdapter.h

@@ -103,6 +103,7 @@ NS_SWIFT_NAME(ListAdapter)
  */
 @property (nonatomic, assign) IGListExperiment experiments;
 
+
 /**
  Initializes a new `IGListAdapter` object.
 

Source/IGListKit/IGListAdapter.m

@@ -13,11 +13,12 @@
 #import <IGListDiffKit/IGListAssert.h>
 #endif
 #import "IGListAdapterUpdater.h"
-#import "IGListSupplementaryViewSource.h"
 
 #import "IGListArrayUtilsInternal.h"
 #import "IGListDebugger.h"
+#import "IGListDefaultExperiments.h"
 #import "IGListSectionControllerInternal.h"
+#import "IGListSupplementaryViewSource.h"
 #import "IGListTransitionData.h"
 #import "IGListUpdatingDelegate.h"
 #import "UICollectionViewLayout+InteractiveReordering.h"
@@ -64,6 +65,8 @@ - (instancetype)initWithUpdater:(id <IGListUpdatingDelegate>)updater
         _updater = updater;
         _viewController = viewController;
 
+        _experiments = IGListDefaultExperiments();
+
         [IGListDebugger trackAdapter:self];
     }
     return self;
@@ -414,7 +417,7 @@ - (void)performUpdatesAnimated:(BOOL)animated completion:(IGListUpdaterCompletio
             [strongSelf _updateWithData:data];
         }
     };
-
+    const BOOL shouldAnimateUpdates =  animated && !IGListExperimentEnabled(self.experiments, IGListExperimentDisableAnimationOnUpdates);
     IGListUpdaterCompletion outerCompletionBlock = ^(BOOL finished){
         __typeof__(self) strongSelf = weakSelf;
         if (strongSelf == nil) {
@@ -424,7 +427,7 @@ - (void)performUpdatesAnimated:(BOOL)animated completion:(IGListUpdaterCompletio
 
         // release the previous items
         strongSelf.previousSectionMap = nil;
-        [strongSelf _notifyDidUpdate:IGListAdapterUpdateTypePerformUpdates animated:animated];
+        [strongSelf _notifyDidUpdate:IGListAdapterUpdateTypePerformUpdates animated:shouldAnimateUpdates];
         IGLK_BLOCK_CALL_SAFE(completion,finished);
         [strongSelf _exitBatchUpdates];
     };
@@ -686,7 +689,7 @@ - (IGListTransitionData *)_generateTransitionDataWithObjects:(NSArray *)objects
                     dataSource, object);
             return;
         }
-        
+
         if ([sectionController isMemberOfClass:[IGListSectionController class]]) {
             // If IGListSectionController is not subclassed, it could be a side effect of a problem. For example, nothing stops
             // dataSource from returning a plain IGListSectionController if it doesn't recognize the object type, instead of throwing.
@@ -1367,7 +1370,7 @@ - (void)insertInSectionController:(IGListSectionController *)sectionController a
 
     NSArray *indexPaths = [self indexPathsFromSectionController:sectionController indexes:indexes usePreviousIfInUpdateBlock:NO];
     [self.updater insertItemsIntoCollectionView:collectionView indexPaths:indexPaths];
-    
+
     if (![self isInDataUpdateBlock]) {
         [self _updateBackgroundView];
     }
@@ -1386,7 +1389,7 @@ - (void)deleteInSectionController:(IGListSectionController *)sectionController a
 
     NSArray *indexPaths = [self indexPathsFromSectionController:sectionController indexes:indexes usePreviousIfInUpdateBlock:YES];
     [self.updater deleteItemsFromCollectionView:collectionView indexPaths:indexPaths];
-    
+
     if (![self isInDataUpdateBlock]) {
         [self _updateBackgroundView];
     }

Source/IGListKit/IGListAdapterUpdater.m

@@ -14,6 +14,7 @@
 #endif
 
 #import "IGListAdapterUpdaterHelpers.h"
+#import "IGListDefaultExperiments.h"
 #import "IGListIndexSetResultInternal.h"
 #import "IGListMoveIndexPathInternal.h"
 #import "IGListReloadIndexPath.h"
@@ -37,6 +38,7 @@ - (instancetype)init {
     if (self = [super init]) {
         _transactionBuilder = [IGListUpdateTransactionBuilder new];
         _allowsReloadingOnTooManyUpdates = YES;
+        _experiments = IGListDefaultExperiments();
     }
     return self;
 }

Source/IGListKit/Internal/IGListDefaultExperiments.h

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+
+#if __has_include(<IGListDiffKit/IGListDiffKit.h>)
+#import <IGListDiffKit/IGListExperiments.h>
+#else
+#import "IGListExperiments.h"
+#endif
+
+/// Provides a list of experiments that are enabled by default in IGListKit.
+static inline IGListExperiment IGListDefaultExperiments(void) {
+    return IGListExperimentThrowOnInconsistencyException;
+}

Source/PrivacyInfo.xcprivacy

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!--
+    Copyright (c) Meta Platforms, Inc. and affiliates.
+
+    This source code is licensed under the MIT license found in the
+    LICENSE file in the root directory of this source tree.
+-->
+<plist version="1.0">
+    <dict>
+        <key>NSPrivacyAccessedAPITypes</key>
+        <array/>
+        <key>NSPrivacyCollectedDataTypes</key>
+        <array/>
+        <key>NSPrivacyTracking</key>
+        <false/>
+        <key>NSPrivacyTrackingDomains</key>
+        <array/>
+    </dict>
+</plist>

Tests/IGListAdapterE2ETests.m

@@ -2647,6 +2647,8 @@ - (void)test_whenSectionControllerNotSubclassed_thatDoesNotCrash {
     // doesn't crash, because it doesn't seem to return attributes where the size is zero.
     self.collectionView.collectionViewLayout = [IGListTestCollectionViewLayout new];
 
+    XCTExpectFailureWithOptions(@"When IGListSectionController isn't subclassed, expect an assertion failure, but avoid a crash.",
+                                [XCTExpectedFailureOptions nonStrictOptions]);
     [self setupWithObjects:@[kIGTestDelegateDataSourceNoSectionControllerSubclass]];
 
     XCTestExpectation *expectation = genExpectation;

scripts/generate_spm_sources_layout.sh

@@ -204,19 +204,78 @@ function generate_ig_list_kit() {
     generate_ig_list_kit_spm_sources
 }
 
+#### IGListSwiftKit
+SPM_IG_LIST_SWIFT_KIT_SOURCES_PATH="spm/Sources/IGListSwiftKit"
+
+function generate_ig_list_swift_kit_spm_sources() {
+    echo "Generate symbolic links for all public implementations. *.swift"
+    echo "Generated under ${SPM_IG_LIST_SWIFT_KIT_SOURCES_PATH}"
+
+    sources_list=$(
+        find "Source/IGListSwiftKit" \
+        -type f -name "*.swift" \
+        -not -path "spm/*" | sed "s| \([^/]\)|:\1|g")
+
+    SRC_ROOT=$(pwd)
+    cd $SPM_IG_LIST_SWIFT_KIT_SOURCES_PATH
+
+    for source_file in $sources_list; do
+        file_to_link=$(echo $source_file | sed "s|:| |g")
+
+        ln -s ../../../$file_to_link
+
+    done
+
+    cd $SRC_ROOT
+
+    echo "      Done"
+    echo ""
+}
+
+function generate_ig_list_swift_kit() {
+    generate_ig_list_swift_kit_spm_sources
+}
+
+function generate_ig_privacy_manifest_spm() {
+    echo "Generate symbolic links for privacy manifest"
+
+    directories=(${SPM_IG_LIST_KIT_SOURCES_PATH} 
+                    ${SPM_IG_LIST_DIFF_KIT_SOURCES_PATH} 
+                    ${SPM_IG_LIST_SWIFT_KIT_SOURCES_PATH})
+    manifest_file="Source/PrivacyInfo.xcprivacy"
+    SRC_ROOT=$(pwd)
+
+    for directory in ${directories[@]}; do
+        echo "Generated under ${directory}"
+        cd ${directory}
+        file_to_link=$(echo $manifest_file | sed "s|:| |g")
+        ln -s ../../../$file_to_link
+        cd $SRC_ROOT
+    done
+
+    echo "      Done"
+    echo ""
+}
+
 # Delete all symbolik links from `spm` folder
 function cleanup() {
     rm -rf $SPM_IG_LIST_DIFF_KIT_PUBLIC_HEADERS_PATH/*.*
     rm -rf $SPM_IG_LIST_DIFF_KIT_SOURCES_PATH/*.*
     #IGListKit
     rm -rf $SPM_IG_LIST_KIT_PUBLIC_HEADERS_PATH/*.*
     rm -rf $SPM_IG_LIST_KIT_SOURCES_PATH/*.*
+    #IGListSwiftKit
+    rm -rf $SPM_IG_LIST_SWIFT_KIT_SOURCES_PATH/*.*
 }
 
 ########## SPM generator pipeline #############
 #1
 cleanup
 #2
 generate_ig_list_diff_kit
-# #3
+#3
 generate_ig_list_kit
+#4
+generate_ig_list_swift_kit
+#5
+generate_ig_privacy_manifest_spm

spm/Sources/IGListDiffKit/PrivacyInfo.xcprivacy

@@ -0,0 +1 @@
+../../../Source/PrivacyInfo.xcprivacy

spm/Sources/IGListKit/IGListDefaultExperiments.h

@@ -0,0 +1 @@
+../../../Source/IGListKit/Internal/IGListDefaultExperiments.h

spm/Sources/IGListKit/PrivacyInfo.xcprivacy

@@ -0,0 +1 @@
+../../../Source/PrivacyInfo.xcprivacy

spm/Sources/IGListSwiftKit/IGListCollectionContext+Refinements.swift

@@ -0,0 +1 @@
+../../../Source/IGListSwiftKit/IGListCollectionContext+Refinements.swift

spm/Sources/IGListSwiftKit/IGListSingleSectionController+Refinements.swift

@@ -0,0 +1 @@
+../../../Source/IGListSwiftKit/IGListSingleSectionController+Refinements.swift

spm/Sources/IGListSwiftKit/ListIdentifiable.swift

@@ -0,0 +1 @@
+../../../Source/IGListSwiftKit/ListIdentifiable.swift

spm/Sources/IGListSwiftKit/ListValueSectionController.swift

@@ -0,0 +1 @@
+../../../Source/IGListSwiftKit/ListValueSectionController.swift

spm/Sources/IGListSwiftKit/PrivacyInfo.xcprivacy

@@ -0,0 +1 @@
+../../../Source/PrivacyInfo.xcprivacy