Skip to content

Commit 626c105

Browse files
committed
Fixing nullability specifiers for Xcode 7 beta 4+, must use XCode7 beta 5+ for generics.
1 parent 02cfb6f commit 626c105

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

FirebaseUI.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
D8124F431B72B347003441AD /* FirebaseTableViewDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B6ACEE1B583C33005CDDB2 /* FirebaseTableViewDataSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
2727
D8124F441B72C94E003441AD /* Firebase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8124F401B72A90C003441AD /* Firebase.framework */; };
2828
D8784C401B719F280025587E /* FirebaseArrayDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = D8784C3F1B719F280025587E /* FirebaseArrayDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
29+
D87E4ABA1B7D832D00A53633 /* FirebaseUI.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B6ACEB1B583C33005CDDB2 /* FirebaseUI.h */; settings = {ATTRIBUTES = (Public, ); }; };
2930
D8B6ACE51B58383C005CDDB2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8C579BB1B5837DF00899F86 /* UIKit.framework */; };
3031
D8B6ACE71B583877005CDDB2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8B6ACE61B583877005CDDB2 /* Foundation.framework */; };
3132
D8B6ACF31B583C41005CDDB2 /* FirebaseArray.m in Sources */ = {isa = PBXBuildFile; fileRef = D8B6ACEF1B583C41005CDDB2 /* FirebaseArray.m */; };
3233
D8B6ACF61B583C41005CDDB2 /* FirebaseDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D8B6ACF21B583C41005CDDB2 /* FirebaseDataSource.m */; };
33-
D8B6ACF81B583D3E005CDDB2 /* FirebaseUI.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B6ACEB1B583C33005CDDB2 /* FirebaseUI.h */; settings = {ATTRIBUTES = (Public, ); }; };
3434
D8B6ACF91B583D3E005CDDB2 /* FirebaseDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B6ACED1B583C33005CDDB2 /* FirebaseDataSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
3535
D8B6ACFB1B583D48005CDDB2 /* FirebaseArray.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B6ACEC1B583C33005CDDB2 /* FirebaseArray.h */; settings = {ATTRIBUTES = (Public, ); }; };
3636
D8DA10F11B7AC50400D00954 /* FirebaseCollectionViewDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = D8DA10F01B7AC50400D00954 /* FirebaseCollectionViewDataSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -50,7 +50,7 @@
5050
/* Begin PBXCopyFilesBuildPhase section */
5151
D8C579A41B57349000899F86 /* CopyFiles */ = {
5252
isa = PBXCopyFilesBuildPhase;
53-
buildActionMask = 2147483647;
53+
buildActionMask = 12;
5454
dstPath = "include/$(PRODUCT_NAME)";
5555
dstSubfolderSpec = 16;
5656
files = (
@@ -157,7 +157,7 @@
157157
isa = PBXHeadersBuildPhase;
158158
buildActionMask = 2147483647;
159159
files = (
160-
D8B6ACF81B583D3E005CDDB2 /* FirebaseUI.h in Headers */,
160+
D87E4ABA1B7D832D00A53633 /* FirebaseUI.h in Headers */,
161161
D8B6ACF91B583D3E005CDDB2 /* FirebaseDataSource.h in Headers */,
162162
D8784C401B719F280025587E /* FirebaseArrayDelegate.h in Headers */,
163163
D8124F431B72B347003441AD /* FirebaseTableViewDataSource.h in Headers */,

FirebaseUI/API/FirebaseCollectionViewDataSource.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
/**
5656
* The callback to populate a subclass of UICollectionViewCell with an object provided by the datasource.
5757
*/
58-
@property (strong, nonatomic, nonnull) void(^populateCell)(__nonnull __kindof UICollectionViewCell *cell, __nonnull __kindof NSObject *object);
58+
@property (strong, nonatomic, nonnull) void(^populateCell)(__kindof UICollectionViewCell * _Nonnull cell, __kindof NSObject * _Nonnull object);
5959

6060
/**
6161
* Initialize an instance of FirebaseCollectionViewDataSource that populates UICollectionViewCells with FDataSnapshots.
@@ -122,6 +122,6 @@
122122
* This method populates the fields of a UICollectionViewCell or subclass given an FDataSnapshot (or custom model object).
123123
* @param callback A block which returns an initialized UICollectionViewCell (or subclass) and the corresponding object to populate the cell with.
124124
*/
125-
- (void)populateCellWithBlock:(nonnull void(^)(__nonnull __kindof UICollectionViewCell *cell, __nonnull __kindof NSObject *object))callback;
125+
- (void)populateCellWithBlock:(nonnull void(^)( __kindof UICollectionViewCell * _Nonnull cell, __kindof NSObject * _Nonnull object))callback;
126126

127127
@end

FirebaseUI/API/FirebaseTableViewDataSource.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
/**
5656
* The callback to populate a subclass of UITableViewCell with an object provided by the datasource.
5757
*/
58-
@property (strong, nonatomic, nonnull) void(^populateCell)(__nonnull __kindof UITableViewCell *cell, __nonnull __kindof NSObject *object);
58+
@property (strong, nonatomic, nonnull) void(^populateCell)(__kindof UITableViewCell * _Nonnull cell, __kindof NSObject * _Nonnull object);
5959

6060
/**
6161
* Initialize an instance of FirebaseTableViewDataSource that populates UITableViewCells with FDataSnapshots.
@@ -122,7 +122,7 @@
122122
* This method populates the fields of a UITableViewCell or subclass given a model object (or FDataSnapshot).
123123
* @param callback A block which returns an initialized UITableViewCell (or subclass) and the corresponding object to populate the cell with.
124124
*/
125-
- (void)populateCellWithBlock:(nonnull void(^)(__nonnull __kindof UITableViewCell *cell, __nonnull __kindof NSObject *object))callback;
125+
- (void)populateCellWithBlock:(nonnull void(^)(__kindof UITableViewCell * _Nonnull cell, __kindof NSObject * _Nonnull object))callback;
126126

127127
@end
128128

FirebaseUI/Implementation/FirebaseCollectionViewDataSource.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ -(NSInteger)collectionView:(nonnull UICollectionView *)collectionView numberOfIt
154154
return [self.array count];
155155
}
156156

157-
- (void)populateCellWithBlock:(nonnull void(^)(__nonnull __kindof UICollectionViewCell *cell, __nonnull __kindof NSObject *object))callback;
157+
- (void)populateCellWithBlock:(nonnull void(^)( __kindof UICollectionViewCell * _Nonnull cell, __kindof NSObject * _Nonnull object))callback;
158158
{
159159
self.populateCell = callback;
160160
}

FirebaseUI/Implementation/FirebaseTableViewDataSource.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
160160
return [self.array count];
161161
}
162162

163-
- (void)populateCellWithBlock:(nonnull void(^)(__nonnull __kindof UITableViewCell *cell, __nonnull __kindof NSObject *object))callback;
163+
- (void)populateCellWithBlock:(nonnull void(^)( __kindof UITableViewCell * _Nonnull cell, __kindof NSObject * _Nonnull object))callback;
164164
{
165165
self.populateCell = callback;
166166
}

0 commit comments

Comments
 (0)