Update project settings and fix errors

Summary: Updated the main project lib settings for iOS 11, fixed all errors (which are from warnings-as-errors). - [x] All tests pass. Demo project builds and runs. - [x] I added an entry to the `CHANGELOG.md` for any breaking changes, enhancements, or bug fixes. Closes #942 Differential Revision: D6161473 Pulled By: rnystrom fbshipit-source-id: 1fd51d8805f9c6483942b44d750b2756efde9376
Instagram · Oct 26, 2017 · a6f264f · a6f264f
1 parent 22af003
commit a6f264f
Show file tree

Hide file tree

Showing 11 changed files with 114 additions and 85 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,8 +9,11 @@ The changelog for `IGListKit`. Also see the [releases](https://github.com/instag
 
 - Added `-[IGListSectionController didHighlightItemAtIndex:]` and `-[IGListSectionController didUnhighlightItemAtIndex:]` APIs to support `UICollectionView` cell highlighting. [Kevin Delannoy](https://github.com/delannoyk) [(#933)](https://github.com/Instagram/IGListKit/pull/933)
 
+
 - Added a new listener API to be notified when `IGListAdapter` finishes updating. Add listeners via `-[IGListAdapter addUpdateListener:]` with objects conforming to the new `IGListAdapterUpdateListener` protocol. [Ryan Nystrom](https://github.com/rnystrom) [(tbd)](https://github.com/Instagram/IGListKit/pull/tbd)
 
+- Updated project settings for iOS 11. [Ryan Nystrom](https://github.com/rnystrom) [(#942)](https://github.com/Instagram/IGListKit/pull/942)
+
 ### Fixes
 
 - Weakly reference the `UICollectionView` in coalescence so that it can be released if the rest of system is destroyed. [Ryan Nystrom](https://github.com/rnystrom) [(#tbd)](https://github.com/Instagram/IGListKit/pull/tbd)

diff --git a/IGListKit.xcodeproj/project.pbxproj b/IGListKit.xcodeproj/project.pbxproj
diff --git a/IGListKit.xcodeproj/xcshareddata/xcschemes/IGListKit-macOS.xcscheme b/IGListKit.xcodeproj/xcshareddata/xcschemes/IGListKit-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/IGListKit.xcodeproj/xcshareddata/xcschemes/IGListKit-tvOS.xcscheme b/IGListKit.xcodeproj/xcshareddata/xcschemes/IGListKit-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/IGListKit.xcodeproj/xcshareddata/xcschemes/IGListKit.xcscheme b/IGListKit.xcodeproj/xcshareddata/xcschemes/IGListKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
       <Testables>
@@ -56,6 +57,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Source/IGListAdapter.m b/Source/IGListAdapter.m
@@ -19,7 +19,7 @@
 @implementation IGListAdapter {
     NSMapTable<UICollectionReusableView *, IGListSectionController *> *_viewSectionControllerMap;
     // An array of blocks to execute once batch updates are finished
-    NSMutableArray<void (^)()> *_queuedCompletionBlocks;
+    NSMutableArray<void (^)(void)> *_queuedCompletionBlocks;
     NSHashTable<id<IGListAdapterUpdateListener>> *_updateListeners;
 }
 
@@ -735,7 +735,7 @@ - (void)removeMapForView:(UICollectionReusableView *)view {
     [_viewSectionControllerMap removeObjectForKey:view];
 }
 
-- (void)deferBlockBetweenBatchUpdates:(void (^)())block {
+- (void)deferBlockBetweenBatchUpdates:(void (^)(void))block {
     IGAssertMainThread();
     if (_queuedCompletionBlocks == nil) {
         block();
@@ -749,7 +749,7 @@ - (void)enterBatchUpdates {
 }
 
 - (void)exitBatchUpdates {
-    for (void (^block)() in _queuedCompletionBlocks) {
+    for (void (^block)(void) in _queuedCompletionBlocks) {
         block();
     }
     _queuedCompletionBlocks = nil;

diff --git a/Source/IGListAdapterUpdater.m b/Source/IGListAdapterUpdater.m
@@ -53,7 +53,7 @@ - (void)performReloadDataWithCollectionView:(UICollectionView *)collectionView {
     }
 
     id<IGListAdapterUpdaterDelegate> delegate = self.delegate;
-    void (^reloadUpdates)() = self.reloadUpdates;
+    void (^reloadUpdates)(void) = self.reloadUpdates;
     IGListBatchUpdates *batchUpdates = self.batchUpdates;
     NSMutableArray *completionBlocks = [self.completionBlocks mutableCopy];
 
@@ -115,7 +115,7 @@ - (void)performBatchUpdatesWithCollectionView:(UICollectionView *)collectionView
     // clean up all state so that new updates can be coalesced while the current update is in flight
     [self cleanStateBeforeUpdates];
 
-    void (^executeUpdateBlocks)() = ^{
+    void (^executeUpdateBlocks)(void) = ^{
         self.state = IGListBatchUpdateStateExecutingBatchUpdateBlock;
 
         // run the update block so that the adapter can set its items. this makes sure that just before the update is
@@ -148,7 +148,7 @@ - (void)performBatchUpdatesWithCollectionView:(UICollectionView *)collectionView
         }
     };
 
-    void (^reloadDataFallback)() = ^{
+    void (^reloadDataFallback)(void) = ^{
         executeUpdateBlocks();
         [self cleanStateAfterUpdates];
         [self performBatchUpdatesItemBlockApplied];
@@ -171,7 +171,7 @@ - (void)performBatchUpdatesWithCollectionView:(UICollectionView *)collectionView
 
     const IGListExperiment experiments = self.experiments;
 
-    IGListIndexSetResult *(^performDiff)() = ^{
+    IGListIndexSetResult *(^performDiff)(void) = ^{
         return IGListDiffExperiment(fromObjects, toObjects, IGListDiffEquality, experiments);
     };
 
@@ -446,7 +446,7 @@ - (void)performUpdateWithCollectionView:(UICollectionView *)collectionView
 
 - (void)performUpdateWithCollectionView:(UICollectionView *)collectionView
                                animated:(BOOL)animated
-                            itemUpdates:(void (^)())itemUpdates
+                            itemUpdates:(void (^)(void))itemUpdates
                              completion:(void (^)(BOOL))completion {
     IGAssertMainThread();
     IGParameterAssert(collectionView != nil);

diff --git a/Source/IGListUpdatingDelegate.h b/Source/IGListUpdatingDelegate.h
@@ -31,11 +31,11 @@ typedef void (^IGListObjectTransitionBlock)(NSArray *toObjects);
 
 /// A block that contains all of the updates.
 NS_SWIFT_NAME(ListItemUpdateBlock)
-typedef void (^IGListItemUpdateBlock)();
+typedef void (^IGListItemUpdateBlock)(void);
 
 /// A block to be called when an adapter reloads the collection view.
 NS_SWIFT_NAME(ListReloadUpdateBlock)
-typedef void (^IGListReloadUpdateBlock)();
+typedef void (^IGListReloadUpdateBlock)(void);
 
 /**
  Implement this protocol in order to handle both section and row based update events. Implementation should forward or

diff --git a/Source/Internal/IGListBatchUpdates.h b/Source/Internal/IGListBatchUpdates.h
@@ -23,7 +23,7 @@ IGLK_SUBCLASSING_RESTRICTED
 @property (nonatomic, strong, readonly) NSMutableArray<IGListReloadIndexPath *> *itemReloads;
 @property (nonatomic, strong, readonly) NSMutableArray<IGListMoveIndexPath *> *itemMoves;
 
-@property (nonatomic, strong, readonly) NSMutableArray<void (^)()> *itemUpdateBlocks;
+@property (nonatomic, strong, readonly) NSMutableArray<void (^)(void)> *itemUpdateBlocks;
 @property (nonatomic, strong, readonly) NSMutableArray<void (^)(BOOL)> *itemCompletionBlocks;
 
 - (BOOL)hasChanges;

diff --git a/Tests/IGListAdapterUpdaterTests.m b/Tests/IGListAdapterUpdaterTests.m
@@ -10,6 +10,8 @@
 #import <XCTest/XCTest.h>
 #import <OCMock/OCMock.h>
 
+#import <IGListKit/IGListKit.h>
+
 #import "IGListAdapterUpdaterInternal.h"
 #import "IGListTestUICollectionViewDataSource.h"
 
@@ -245,7 +247,7 @@ - (void)test_whenUpdatesAreReentrant_thatUpdatesExecuteSerially {
     __block NSInteger completionCounter = 0;
 
     XCTestExpectation *expectation1 = genExpectation;
-    void (^preUpdateBlock)() = ^{
+    void (^preUpdateBlock)(void) = ^{
         NSArray *anotherTo = @[
                                [IGSectionObject sectionWithObjects:@[]],
                                [IGSectionObject sectionWithObjects:@[]],
@@ -318,7 +320,7 @@ - (void)test_whenQueueingItemUpdates_withBatchUpdate_thatItemUpdateBlockExecutes
 }
 
 - (void)test_whenItemsMoveAndUpdate_thatCollectionViewWorks {
-    NSArray *from = @[
+    NSArray<IGSectionObject *> *from = @[
                       [IGSectionObject sectionWithObjects:@[]],
                       [IGSectionObject sectionWithObjects:@[]],
                       [IGSectionObject sectionWithObjects:@[]],

diff --git a/Tests/Objects/IGTestDelegateController.h b/Tests/Objects/IGTestDelegateController.h
@@ -19,7 +19,7 @@
 
 @property (nonatomic, assign) CGFloat height;
 
-@property (nonatomic, copy) void (^itemUpdateBlock)();
+@property (nonatomic, copy) void (^itemUpdateBlock)(void);
 @property (nonatomic, copy) void (^cellConfigureBlock)(IGTestDelegateController *);
 @property (nonatomic, assign, readonly) NSInteger updateCount;