Skip to content

Commit 71594bf

Browse files
committed
Merge branch 'master' into selector-signal-interop
# Conflicts: # .travis.yml
2 parents 84aa0a4 + e932b77 commit 71594bf

File tree

106 files changed

+473
-317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+473
-317
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode8
2+
osx_image: xcode8.1
33
before_install: true
44
install: true
55
git:
@@ -56,8 +56,6 @@ matrix:
5656
env:
5757
- JOB=CARTHAGE-watchOS
5858
- script:
59-
- gem install cocoapods --pre
60-
- pod --version
6159
- pod repo update --silent
6260
- pod lib lint ReactiveObjC.podspec
6361
env:

ReactiveObjC.xcodeproj/project.pbxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2764,6 +2764,10 @@
27642764
TVOS_DEPLOYMENT_TARGET = 9.0;
27652765
VERSIONING_SYSTEM = "apple-generic";
27662766
VERSION_INFO_PREFIX = "";
2767+
WARNING_CFLAGS = (
2768+
"$(inherited)",
2769+
"-Wnullability-completeness",
2770+
);
27672771
WATCHOS_DEPLOYMENT_TARGET = 2.0;
27682772
};
27692773
name = Debug;
@@ -2783,6 +2787,10 @@
27832787
TVOS_DEPLOYMENT_TARGET = 9.0;
27842788
VERSIONING_SYSTEM = "apple-generic";
27852789
VERSION_INFO_PREFIX = "";
2790+
WARNING_CFLAGS = (
2791+
"$(inherited)",
2792+
"-Wnullability-completeness",
2793+
);
27862794
WATCHOS_DEPLOYMENT_TARGET = 2.0;
27872795
};
27882796
name = Release;
@@ -2913,6 +2921,10 @@
29132921
TVOS_DEPLOYMENT_TARGET = 9.0;
29142922
VERSIONING_SYSTEM = "apple-generic";
29152923
VERSION_INFO_PREFIX = "";
2924+
WARNING_CFLAGS = (
2925+
"$(inherited)",
2926+
"-Wnullability-completeness",
2927+
);
29162928
WATCHOS_DEPLOYMENT_TARGET = 2.0;
29172929
};
29182930
name = Profile;
@@ -2987,6 +2999,10 @@
29872999
TVOS_DEPLOYMENT_TARGET = 9.0;
29883000
VERSIONING_SYSTEM = "apple-generic";
29893001
VERSION_INFO_PREFIX = "";
3002+
WARNING_CFLAGS = (
3003+
"$(inherited)",
3004+
"-Wnullability-completeness",
3005+
);
29903006
WATCHOS_DEPLOYMENT_TARGET = 2.0;
29913007
};
29923008
name = Test;

ReactiveObjC/MKAnnotationView+RACSignalSupport.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
@class RACSignal<__covariant ValueType>;
1313
@class RACUnit;
1414

15+
NS_ASSUME_NONNULL_BEGIN
16+
1517
@interface MKAnnotationView (RACSignalSupport)
1618

1719
/// A signal which will send a RACUnit whenever -prepareForReuse is invoked upon
@@ -28,3 +30,5 @@
2830
@property (nonatomic, strong, readonly) RACSignal<RACUnit *> *rac_prepareForReuseSignal;
2931

3032
@end
33+
34+
NS_ASSUME_NONNULL_END

ReactiveObjC/NSArray+RACSequenceAdditions.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
@class RACSequence;
1212

13+
NS_ASSUME_NONNULL_BEGIN
14+
1315
@interface NSArray (RACSequenceAdditions)
1416

1517
/// Creates and returns a sequence corresponding to the receiver.
@@ -18,3 +20,5 @@
1820
@property (nonatomic, copy, readonly) RACSequence *rac_sequence;
1921

2022
@end
23+
24+
NS_ASSUME_NONNULL_END

ReactiveObjC/NSControl+RACCommandSupport.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,17 @@
1010

1111
@class RACCommand<__contravariant InputType, __covariant ValueType>;
1212

13+
NS_ASSUME_NONNULL_BEGIN
14+
1315
@interface NSControl (RACCommandSupport)
1416

1517
/// Sets the control's command. When the control is clicked, the command is
1618
/// executed with the sender of the event. The control's enabledness is bound
1719
/// to the command's `canExecute`.
1820
///
1921
/// Note: this will reset the control's target and action.
20-
@property (nonatomic, strong) RACCommand<__kindof NSControl *, id> *rac_command;
22+
@property (nonatomic, strong, nullable) RACCommand<__kindof NSControl *, id> *rac_command;
2123

2224
@end
25+
26+
NS_ASSUME_NONNULL_END

ReactiveObjC/NSControl+RACTextSignalSupport.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
@class RACSignal<__covariant ValueType>;
1212

13+
NS_ASSUME_NONNULL_BEGIN
14+
1315
@interface NSControl (RACTextSignalSupport)
1416

1517
/// Observes a text-based control for changes.
@@ -22,3 +24,5 @@
2224
- (RACSignal<NSString *> *)rac_textSignal;
2325

2426
@end
27+
28+
NS_ASSUME_NONNULL_END

ReactiveObjC/NSData+RACSupport.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@
1111
@class RACScheduler;
1212
@class RACSignal<__covariant ValueType>;
1313

14+
NS_ASSUME_NONNULL_BEGIN
15+
1416
@interface NSData (RACSupport)
1517

1618
// Read the data at the URL using -[NSData initWithContentsOfURL:options:error:].
1719
// Sends the data or the error.
1820
//
1921
// scheduler - cannot be nil.
20-
+ (RACSignal<NSData *> *)rac_readContentsOfURL:(NSURL *)URL options:(NSDataReadingOptions)options scheduler:(RACScheduler *)scheduler;
22+
+ (RACSignal<NSData *> *)rac_readContentsOfURL:(nullable NSURL *)URL options:(NSDataReadingOptions)options scheduler:(RACScheduler *)scheduler;
2123

2224
@end
25+
26+
NS_ASSUME_NONNULL_END

ReactiveObjC/NSDictionary+RACSequenceAdditions.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
@class RACSequence;
1212

13+
NS_ASSUME_NONNULL_BEGIN
14+
1315
@interface NSDictionary (RACSequenceAdditions)
1416

1517
/// Creates and returns a sequence of RACTuple key/value pairs. The key will be
@@ -29,3 +31,5 @@
2931
@property (nonatomic, copy, readonly) RACSequence *rac_valueSequence;
3032

3133
@end
34+
35+
NS_ASSUME_NONNULL_END

ReactiveObjC/NSEnumerator+RACSequenceAdditions.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
@class RACSequence;
1212

13+
NS_ASSUME_NONNULL_BEGIN
14+
1315
@interface NSEnumerator (RACSequenceAdditions)
1416

1517
/// Creates and returns a sequence corresponding to the receiver.
@@ -18,3 +20,5 @@
1820
@property (nonatomic, copy, readonly) RACSequence *rac_sequence;
1921

2022
@end
23+
24+
NS_ASSUME_NONNULL_END

ReactiveObjC/NSFileHandle+RACSupport.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@
1010

1111
@class RACSignal<__covariant ValueType>;
1212

13+
NS_ASSUME_NONNULL_BEGIN
14+
1315
@interface NSFileHandle (RACSupport)
1416

1517
// Read any available data in the background and send it. Completes when data
1618
// length is <= 0.
1719
- (RACSignal<NSData *> *)rac_readInBackground;
1820

1921
@end
22+
23+
NS_ASSUME_NONNULL_END

0 commit comments

Comments
 (0)