Skip to content

Commit db51e2b

Browse files
mdiepmdiep
authored
Merge pull request ReactiveCocoa#3182 from ReactiveCocoa/reactive-objc-and-bridge
Create ReactiveObjC.framework and ReactiveObjCBridge.framework
2 parents 9cb9fb7 + ad7a910 commit db51e2b

File tree

293 files changed

+6402
-2336
lines changed

Some content is hidden

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

293 files changed

+6402
-2336
lines changed

‎.travis.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,54 @@ matrix:
3232
- XCODE_SDK=watchsimulator
3333
- XCODE_ACTION=build
3434
- XCODE_DESTINATION="platform=watchOS Simulator,name=Apple Watch - 38mm"
35+
- xcode_scheme: ReactiveObjC-macOS
36+
xcode_workspace: ReactiveObjC.xcworkspace
37+
env:
38+
- XCODE_SDK=macosx
39+
- XCODE_ACTION="build test"
40+
- XCODE_DESTINATION="arch=x86_64"
41+
- xcode_scheme: ReactiveObjC-iOS
42+
xcode_workspace: ReactiveObjC.xcworkspace
43+
env:
44+
- XCODE_SDK=iphonesimulator
45+
- XCODE_ACTION="build-for-testing test-without-building"
46+
- XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 6s"
47+
- xcode_scheme: ReactiveObjC-tvOS
48+
xcode_workspace: ReactiveObjC.xcworkspace
49+
env:
50+
- XCODE_SDK=appletvsimulator
51+
- XCODE_ACTION="build-for-testing test-without-building"
52+
- XCODE_DESTINATION="platform=tvOS Simulator,name=Apple TV 1080p"
53+
- xcode_scheme: ReactiveObjC-watchOS
54+
xcode_workspace: ReactiveObjC.xcworkspace
55+
env:
56+
- XCODE_SDK=watchsimulator
57+
- XCODE_ACTION=build
58+
- XCODE_DESTINATION="platform=watchOS Simulator,name=Apple Watch - 38mm"
59+
- xcode_scheme: ReactiveObjCBridge-macOS
60+
xcode_workspace: ReactiveObjCBridge.xcworkspace
61+
env:
62+
- XCODE_SDK=macosx
63+
- XCODE_ACTION="build test"
64+
- XCODE_DESTINATION="arch=x86_64"
65+
- xcode_scheme: ReactiveObjCBridge-iOS
66+
xcode_workspace: ReactiveObjCBridge.xcworkspace
67+
env:
68+
- XCODE_SDK=iphonesimulator
69+
- XCODE_ACTION="build-for-testing test-without-building"
70+
- XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 6s"
71+
- xcode_scheme: ReactiveObjCBridge-tvOS
72+
xcode_workspace: ReactiveObjCBridge.xcworkspace
73+
env:
74+
- XCODE_SDK=appletvsimulator
75+
- XCODE_ACTION="build-for-testing test-without-building"
76+
- XCODE_DESTINATION="platform=tvOS Simulator,name=Apple TV 1080p"
77+
- xcode_scheme: ReactiveObjCBridge-watchOS
78+
xcode_workspace: ReactiveObjCBridge.xcworkspace
79+
env:
80+
- XCODE_SDK=watchsimulator
81+
- XCODE_ACTION=build
82+
- XCODE_DESTINATION="platform=watchOS Simulator,name=Apple Watch - 38mm"
3583
- script:
3684
- brew update
3785
- brew outdated carthage || brew upgrade carthage

‎Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "Quick/Nimble" "fcc28b23f57b30382e5f182c238674694d7174cb"
1+
github "Quick/Nimble" "db706fc1d7130f6ac96c56aaf0e635fa3217fe57"
22
github "Quick/Quick" "8f2bc636ecfa2cc20696f62548b38d4ab943e299"
33
github "antitypical/Result" "3.0.0"
44
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"

‎Carthage/Checkouts/Nimble

‎ReactiveCocoa.xcodeproj/project.pbxproj

Lines changed: 9 additions & 1923 deletions
Large diffs are not rendered by default.

‎ReactiveCocoa/Swift/CocoaAction.swift renamed to ‎ReactiveCocoa/CocoaAction.swift

File renamed without changes.

‎ReactiveCocoa/Swift/DynamicProperty.swift renamed to ‎ReactiveCocoa/DynamicProperty.swift

File renamed without changes.

‎ReactiveCocoa/Swift/NSObject+KeyValueObserving.swift renamed to ‎ReactiveCocoa/NSObject+KeyValueObserving.swift

File renamed without changes.

‎ReactiveCocoa/Swift/NSObject+Lifetime.swift renamed to ‎ReactiveCocoa/NSObject+Lifetime.swift

File renamed without changes.

‎ReactiveCocoa/Objective-C/ReactiveCocoa-Bridging-Header.h

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎ReactiveCocoa/ReactiveCocoa.h

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -13,83 +13,3 @@ FOUNDATION_EXPORT double ReactiveCocoaVersionNumber;
1313

1414
//! Project version string for ReactiveCocoa.
1515
FOUNDATION_EXPORT const unsigned char ReactiveCocoaVersionString[];
16-
17-
#import <ReactiveCocoa/EXTKeyPathCoding.h>
18-
#import <ReactiveCocoa/EXTScope.h>
19-
#import <ReactiveCocoa/NSArray+RACSequenceAdditions.h>
20-
#import <ReactiveCocoa/NSData+RACSupport.h>
21-
#import <ReactiveCocoa/NSDictionary+RACSequenceAdditions.h>
22-
#import <ReactiveCocoa/NSEnumerator+RACSequenceAdditions.h>
23-
#import <ReactiveCocoa/NSFileHandle+RACSupport.h>
24-
#import <ReactiveCocoa/NSNotificationCenter+RACSupport.h>
25-
#import <ReactiveCocoa/NSObject+RACDeallocating.h>
26-
#import <ReactiveCocoa/NSObject+RACLifting.h>
27-
#import <ReactiveCocoa/NSObject+RACPropertySubscribing.h>
28-
#import <ReactiveCocoa/NSObject+RACSelectorSignal.h>
29-
#import <ReactiveCocoa/NSOrderedSet+RACSequenceAdditions.h>
30-
#import <ReactiveCocoa/NSSet+RACSequenceAdditions.h>
31-
#import <ReactiveCocoa/NSString+RACSequenceAdditions.h>
32-
#import <ReactiveCocoa/NSString+RACSupport.h>
33-
#import <ReactiveCocoa/NSIndexSet+RACSequenceAdditions.h>
34-
#import <ReactiveCocoa/NSUserDefaults+RACSupport.h>
35-
#import <ReactiveCocoa/RACBehaviorSubject.h>
36-
#import <ReactiveCocoa/RACChannel.h>
37-
#import <ReactiveCocoa/RACCommand.h>
38-
#import <ReactiveCocoa/RACCompoundDisposable.h>
39-
#import <ReactiveCocoa/RACDelegateProxy.h>
40-
#import <ReactiveCocoa/RACDisposable.h>
41-
#import <ReactiveCocoa/RACEvent.h>
42-
#import <ReactiveCocoa/RACGroupedSignal.h>
43-
#import <ReactiveCocoa/RACKVOChannel.h>
44-
#import <ReactiveCocoa/RACMulticastConnection.h>
45-
#import <ReactiveCocoa/RACQueueScheduler.h>
46-
#import <ReactiveCocoa/RACQueueScheduler+Subclass.h>
47-
#import <ReactiveCocoa/RACReplaySubject.h>
48-
#import <ReactiveCocoa/RACScheduler.h>
49-
#import <ReactiveCocoa/RACScheduler+Subclass.h>
50-
#import <ReactiveCocoa/RACScopedDisposable.h>
51-
#import <ReactiveCocoa/RACSequence.h>
52-
#import <ReactiveCocoa/RACSerialDisposable.h>
53-
#import <ReactiveCocoa/RACSignal+Operations.h>
54-
#import <ReactiveCocoa/RACSignal.h>
55-
#import <ReactiveCocoa/RACStream.h>
56-
#import <ReactiveCocoa/RACSubject.h>
57-
#import <ReactiveCocoa/RACSubscriber.h>
58-
#import <ReactiveCocoa/RACSubscriptingAssignmentTrampoline.h>
59-
#import <ReactiveCocoa/RACTargetQueueScheduler.h>
60-
#import <ReactiveCocoa/RACTestScheduler.h>
61-
#import <ReactiveCocoa/RACTuple.h>
62-
#import <ReactiveCocoa/RACUnit.h>
63-
64-
#if TARGET_OS_WATCH
65-
#elif TARGET_OS_IOS || TARGET_OS_TV
66-
#import <ReactiveCocoa/UIBarButtonItem+RACCommandSupport.h>
67-
#import <ReactiveCocoa/UIButton+RACCommandSupport.h>
68-
#import <ReactiveCocoa/UICollectionReusableView+RACSignalSupport.h>
69-
#import <ReactiveCocoa/UIControl+RACSignalSupport.h>
70-
#import <ReactiveCocoa/UIGestureRecognizer+RACSignalSupport.h>
71-
#import <ReactiveCocoa/UISegmentedControl+RACSignalSupport.h>
72-
#import <ReactiveCocoa/UITableViewCell+RACSignalSupport.h>
73-
#import <ReactiveCocoa/UITableViewHeaderFooterView+RACSignalSupport.h>
74-
#import <ReactiveCocoa/UITextField+RACSignalSupport.h>
75-
#import <ReactiveCocoa/UITextView+RACSignalSupport.h>
76-
77-
#if TARGET_OS_IOS
78-
#import <ReactiveCocoa/NSURLConnection+RACSupport.h>
79-
#import <ReactiveCocoa/UIStepper+RACSignalSupport.h>
80-
#import <ReactiveCocoa/UIDatePicker+RACSignalSupport.h>
81-
#import <ReactiveCocoa/UIAlertView+RACSignalSupport.h>
82-
#import <ReactiveCocoa/UIActionSheet+RACSignalSupport.h>
83-
#import <ReactiveCocoa/MKAnnotationView+RACSignalSupport.h>
84-
#import <ReactiveCocoa/UIImagePickerController+RACSignalSupport.h>
85-
#import <ReactiveCocoa/UIRefreshControl+RACCommandSupport.h>
86-
#import <ReactiveCocoa/UISlider+RACSignalSupport.h>
87-
#import <ReactiveCocoa/UISwitch+RACSignalSupport.h>
88-
#endif
89-
#elif TARGET_OS_MAC
90-
#import <ReactiveCocoa/NSControl+RACCommandSupport.h>
91-
#import <ReactiveCocoa/NSControl+RACTextSignalSupport.h>
92-
#import <ReactiveCocoa/NSObject+RACAppKitBindings.h>
93-
#import <ReactiveCocoa/NSText+RACSignalSupport.h>
94-
#import <ReactiveCocoa/NSURLConnection+RACSupport.h>
95-
#endif

‎ReactiveCocoaTests/Swift/CocoaActionSpec.swift renamed to ‎ReactiveCocoaTests/CocoaActionSpec.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ class CocoaActionSpec: QuickSpec {
3535

3636
let cocoaAction = action.unsafeCocoaAction
3737
cocoaAction
38-
.rac_values(forKeyPath: #keyPath(CocoaAction.isEnabled), observer: nil)
39-
.toSignalProducer()
38+
.values(forKeyPath: #keyPath(CocoaAction.isEnabled))
4039
.map { $0! as! Bool }
4140
.start(Observer(next: { values.append($0) }))
4241

@@ -54,8 +53,7 @@ class CocoaActionSpec: QuickSpec {
5453

5554
let cocoaAction = action.unsafeCocoaAction
5655
cocoaAction
57-
.rac_values(forKeyPath: #keyPath(CocoaAction.isExecuting), observer: nil)
58-
.toSignalProducer()
56+
.values(forKeyPath: #keyPath(CocoaAction.isExecuting))
5957
.map { $0! as! Bool }
6058
.start(Observer(next: { values.append($0) }))
6159

‎ReactiveCocoaTests/Swift/DynamicPropertySpec.swift renamed to ‎ReactiveCocoaTests/DynamicPropertySpec.swift

File renamed without changes.

‎ReactiveCocoaTests/Swift/KeyValueObservingSpec.swift renamed to ‎ReactiveCocoaTests/KeyValueObservingSpec.swift

File renamed without changes.

‎ReactiveCocoaTests/Swift/SignalProducerNimbleMatchers.swift renamed to ‎ReactiveCocoaTests/SignalProducerNimbleMatchers.swift

File renamed without changes.

‎ReactiveCocoaTests/Swift/TestError.swift renamed to ‎ReactiveCocoaTests/TestError.swift

File renamed without changes.

0 commit comments

Comments
 (0)