iOS 7 Support.

Author: kzaher

RxBlocking/RxBlocking.xcodeproj/project.pbxproj

@@ -20,7 +20,7 @@
 		C8CDD79B1B52ADC00043F0C5 /* RxBlocking.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxBlocking.h; sourceTree = "<group>"; };
 		C8CDD7B71B52AEC70043F0C5 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RxSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C8CDD7C41B52AF290043F0C5 /* RxBlocking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxBlocking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		C8CDD7CC1B52B1E80043F0C5 /* Observable+Blocking.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+Blocking.swift"; sourceTree = "<group>"; };
+		C8CDD7CC1B52B1E80043F0C5 /* Observable+Blocking.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "Observable+Blocking.swift"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */

RxBlocking/RxBlocking/Observable+Blocking.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 public func toArray<E>(source: Observable<E>)
     -> RxResult<[E]> {

RxCocoa/RxCocoa.xcodeproj/project.pbxproj

@@ -7,7 +7,9 @@
 //
 
 import CoreLocation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 
 extension CLLocationManager {

RxCocoa/RxCocoa/Common/CLLocationManager+Rx.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 var delegateAssociatedTag: UInt8 = 0
 var dataSourceAssociatedTag: UInt8 = 0

RxCocoa/RxCocoa/Common/DelegateProxy.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 // `DelegateProxyType` protocol enables using both normal delegates and Rx observables with
 // views that can have only one delegate/datasource registered.

RxCocoa/RxCocoa/Common/DelegateProxyType.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 #if os(iOS)
     import UIKit

RxCocoa/RxCocoa/Common/Observables/Implementations/ControlTarget.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 class KVOObservable<Element> : Producer<Element?>
                              , KVOObservableProtocol {

RxCocoa/RxCocoa/Common/Observables/Implementations/KVOObservable.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 protocol KVOObservableProtocol {
     var target: AnyObject { get }

RxCocoa/RxCocoa/Common/Observables/Implementations/KVOObserver.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 extension NSNotificationCenter {
     public func rx_notification(name: String, object: AnyObject?) -> Observable<NSNotification> {

RxCocoa/RxCocoa/Common/Observables/NSNotificationCenter+Rx.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 import CoreGraphics
 
 // rx_observe + CoreGraphics

RxCocoa/RxCocoa/Common/Observables/NSObject+Rx+CoreGraphics.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 #if !DISABLE_SWIZZLING
 var deallocatingSubjectTriggerContext: UInt8 = 0

RxCocoa/RxCocoa/Common/Observables/NSObject+Rx.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 func escapeTerminalString(value: String) -> String {
     return value.stringByReplacingOccurrencesOfString("\"", withString: "\\\"", options: NSStringCompareOptions.allZeros, range: nil)

RxCocoa/RxCocoa/Common/Observables/NSURLSession+Rx.swift

@@ -7,7 +7,9 @@
 //
 
 import CoreLocation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 class RxCLLocationManagerDelegateProxy : DelegateProxy
                                        , CLLocationManagerDelegate

RxCocoa/RxCocoa/Common/Proxies/RxCLLocationManagerDelegateProxy.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 #if os(iOS)
     import UIKit
 #endif
@@ -44,19 +46,10 @@ func rxError(errorCode: RxCocoaError, message: String, userInfo: NSDictionary) -
     return NSError(domain: RxCocoaErrorDomain, code: Int(errorCode.rawValue), userInfo: resultInfo)
 }
 
-func removingObserverFailed() {
-    rxFatalError("Removing observer for key failed")
-}
-
 func handleVoidObserverResult(result: RxResult<Void>) {
     handleObserverResult(result)
 }
 
-func rxFatalError(lastMessage: String) {
-    // The temptation to comment this line is great, but please don't, it's for your own good. The choice is yours.
-    fatalError(lastMessage)
-}
-
 func bindingErrorToInterface(error: ErrorType) {
 #if DEBUG
     rxFatalError("Binding error to UI: \(error)")
@@ -74,11 +67,6 @@ func rxPossiblyFatalError(error: String) {
 #endif
 }
 
-func rxFatalErrorAndDontReturn<T>(lastMessage: String) -> T {
-    rxFatalError(lastMessage)
-    return (nil as T!)!
-}
-
 func rxAbstractMethodWithMessage<T>(message: String) -> T {
     return rxFatalErrorAndDontReturn(message)
 }
@@ -133,6 +121,18 @@ let delegateNotSet = "Delegate not set"
 // }
 
 
+func rxFatalErrorAndDontReturn<T>(lastMessage: String) -> T {
+    rxFatalError(lastMessage)
+    return (nil as T!)!
+}
+
+#if !RX_NO_MODULE
+
+func rxFatalError(lastMessage: String) {
+    // The temptation to comment this line is great, but please don't, it's for your own good. The choice is yours.
+    fatalError(lastMessage)
+}
+
 extension NSObject {
     func rx_synchronized<T>(@noescape action: () -> T) -> T {
         objc_sync_enter(self)
@@ -141,3 +141,9 @@ extension NSObject {
         return result
     }
 }
+
+func removingObserverFailed() {
+    rxFatalError("Removing observer for key failed")
+}
+    
+#endif

RxCocoa/RxCocoa/Common/RxCocoa.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 class RxTarget : NSObject
                , Disposable {

RxCocoa/RxCocoa/Common/RxTarget.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 import Cocoa
 
 extension NSButton {

RxCocoa/RxCocoa/OSX/NSButton+Rx.swift

@@ -8,7 +8,9 @@
 
 import Foundation
 import Cocoa
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 extension NSControl {
 

RxCocoa/RxCocoa/OSX/NSControl+Rx.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 import Cocoa
 
 extension NSImageView {

RxCocoa/RxCocoa/OSX/NSImageView+Rx.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 import Cocoa
 
 extension NSSlider {

RxCocoa/RxCocoa/OSX/NSSlider+Rx.swift

@@ -8,7 +8,9 @@
 
 import Foundation
 import Cocoa
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 class RxTextFieldDelegate : DelegateProxy
                           , NSTextFieldDelegate

RxCocoa/RxCocoa/OSX/NSTextField+Rx.swift

@@ -8,7 +8,9 @@
 
 import Foundation
 import CoreData
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 enum CoreDataEntityEvent : Printable {
 

RxCocoa/RxCocoa/iOS/CoreDataEntityEvent.swift

@@ -8,7 +8,9 @@
 
 import Foundation
 import UIKit
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 // objc monkey business
 class _RxCollectionViewReactiveArrayDataSource: NSObject, UICollectionViewDataSource {

RxCocoa/RxCocoa/iOS/DataSources/RxCollectionViewReactiveArrayDataSource.swift

@@ -8,7 +8,9 @@
 
 import Foundation
 import UIKit
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 // objc monkey business
 class _RxTableViewReactiveArrayDataSource: NSObject, UITableViewDataSource {

RxCocoa/RxCocoa/iOS/DataSources/RxTableViewReactiveArrayDataSource.swift

@@ -8,7 +8,9 @@
 
 import Foundation
 import CoreData
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 class FetchResultControllerSectionObserver: NSObject, NSFetchedResultsControllerDelegate, Disposable {
     typealias Observer = ObserverOf<[NSFetchedResultsSectionInfo]>

RxCocoa/RxCocoa/iOS/NSManagedObjectContext+Rx.swift

@@ -8,7 +8,9 @@
 
 import Foundation
 import UIKit
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 // Please take a look at `DelegateProxyType.swift`
 public protocol RxCollectionViewDataSourceType /*: UICollectionViewDataSource*/ {

RxCocoa/RxCocoa/iOS/Protocols/RxCollectionViewDataSourceType.swift

@@ -8,7 +8,9 @@
 
 import Foundation
 import UIKit
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 // Please take a look at `DelegateProxyType.swift`
 public protocol RxTableViewDataSourceType /*: UITableViewDataSource*/ {

RxCocoa/RxCocoa/iOS/Protocols/RxTableViewDataSourceType.swift

@@ -7,7 +7,9 @@
 //
 
 import UIKit
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 class RxActionSheetDelegateProxy : DelegateProxy
                                  , UIActionSheetDelegate

RxCocoa/RxCocoa/iOS/Proxies/RxActionSheetDelegateProxy.swift

@@ -7,7 +7,9 @@
 //
 
 import UIKit
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 class RxAlertViewDelegateProxy : DelegateProxy
                                  , UIAlertViewDelegate

RxCocoa/RxCocoa/iOS/Proxies/RxAlertViewDelegateProxy.swift

@@ -8,7 +8,9 @@
 
 import Foundation
 import UIKit
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 let collectionViewDataSourceNotSet = CollectionViewDataSourceNotSet()
 

RxCocoa/RxCocoa/iOS/Proxies/RxCollectionViewDataSourceProxy.swift

@@ -8,7 +8,9 @@
 
 import Foundation
 import UIKit
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 // Please take a look at `DelegateProxyType.swift`
 class RxCollectionViewDelegateProxy : RxScrollViewDelegateProxy

RxCocoa/RxCocoa/iOS/Proxies/RxCollectionViewDelegateProxy.swift

@@ -7,7 +7,9 @@
 //
 
 import Foundation
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 import UIKit
 
 // Please take a look at `DelegateProxyType.swift`

RxCocoa/RxCocoa/iOS/Proxies/RxScrollViewDelegateProxy.swift

@@ -8,7 +8,9 @@
 
 import Foundation
 import UIKit
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 class RxSearchBarDelegateProxy : DelegateProxy
                                , UISearchBarDelegate

RxCocoa/RxCocoa/iOS/Proxies/RxSearchBarDelegateProxy.swift

@@ -8,7 +8,9 @@
 
 import Foundation
 import UIKit
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 let tableViewDataSourceNotSet = TableViewDataSourceNotSet()
 

RxCocoa/RxCocoa/iOS/Proxies/RxTableViewDataSourceProxy.swift

@@ -8,7 +8,9 @@
 
 import Foundation
 import UIKit
+#if !RX_NO_MODULE
 import RxSwift
+#endif
 
 // Please take a look at `DelegateProxyType.swift`
 class RxTableViewDelegateProxy : RxScrollViewDelegateProxy