diff --git a/.jazzy.yml b/.jazzy.yml index 1545bfeac..ce38f73a3 100644 --- a/.jazzy.yml +++ b/.jazzy.yml @@ -265,7 +265,7 @@ custom_categories: - RxTableViewDelegateProxy - RxTextStorageDelegateProxy - RxTextViewDelegateProxy -- name: RxCocoa/OSX +- name: RxCocoa/macOS children: - NSButton+Rx - NSControl+Rx diff --git a/Documentation/API.md b/Documentation/API.md index b0eea31de..71b40b505 100644 --- a/Documentation/API.md +++ b/Documentation/API.md @@ -98,7 +98,7 @@ Creating new operators is also pretty straightforward. ## RxCocoa extensions -**iOS / OSX** +**iOS / macOS** ```swift diff --git a/Documentation/GettingStarted.md b/Documentation/GettingStarted.md index 2c186083d..d64c6e54f 100644 --- a/Documentation/GettingStarted.md +++ b/Documentation/GettingStarted.md @@ -590,7 +590,7 @@ Marble diagrams for all operators can be found on [ReactiveX.io](http://reactive Almost all operators are demonstrated in [Playgrounds](../Rx.playground). -To use playgrounds please open `Rx.xcworkspace`, build `RxSwift-OSX` scheme and then open playgrounds in `Rx.xcworkspace` tree view. +To use playgrounds please open `Rx.xcworkspace`, build `RxSwift-macOS` scheme and then open playgrounds in `Rx.xcworkspace` tree view. In case you need an operator, and don't know how to find it there a [decision tree of operators](http://reactivex.io/documentation/operators.html#tree). @@ -710,7 +710,7 @@ so please try not to do this. If you are unsure how exactly some of the operators work, [playgrounds](../Rx.playground) contain almost all of the operators already prepared with small examples that illustrate their behavior. -**To use playgrounds please open Rx.xcworkspace, build RxSwift-OSX scheme and then open playgrounds in Rx.xcworkspace tree view.** +**To use playgrounds please open Rx.xcworkspace, build RxSwift-macOS scheme and then open playgrounds in Rx.xcworkspace tree view.** **To view the results of the examples in the playgrounds, please open the `Assistant Editor`. You can open `Assistant Editor` by clicking on `View > Assistant Editor > Show Assistant Editor`** diff --git a/Platform/Platform.Darwin.swift b/Platform/Platform.Darwin.swift index c53486120..ae7792035 100644 --- a/Platform/Platform.Darwin.swift +++ b/Platform/Platform.Darwin.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Krunoslav Zaher. All rights reserved. // -#if os(OSX) || os(iOS) || os(tvOS) || os(watchOS) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) import Darwin import Foundation diff --git a/Rx.playground/Pages/Combining_Operators.xcplaygroundpage/Contents.swift b/Rx.playground/Pages/Combining_Operators.xcplaygroundpage/Contents.swift index 10f4ae1cb..86ebff6ab 100644 --- a/Rx.playground/Pages/Combining_Operators.xcplaygroundpage/Contents.swift +++ b/Rx.playground/Pages/Combining_Operators.xcplaygroundpage/Contents.swift @@ -1,7 +1,7 @@ /*: > # IMPORTANT: To use **Rx.playground**: 1. Open **Rx.xcworkspace**. - 1. Build the **RxSwift-OSX** scheme (**Product** → **Build**). + 1. Build the **RxSwift-macOS** scheme (**Product** → **Build**). 1. Open **Rx** playground in the **Project navigator**. 1. Show the Debug Area (**View** → **Debug Area** → **Show Debug Area**). ---- diff --git a/Rx.playground/Pages/Connectable_Operators.xcplaygroundpage/Contents.swift b/Rx.playground/Pages/Connectable_Operators.xcplaygroundpage/Contents.swift index 0107763ab..1fa22c701 100644 --- a/Rx.playground/Pages/Connectable_Operators.xcplaygroundpage/Contents.swift +++ b/Rx.playground/Pages/Connectable_Operators.xcplaygroundpage/Contents.swift @@ -1,7 +1,7 @@ /*: > # IMPORTANT: To use **Rx.playground**: 1. Open **Rx.xcworkspace**. - 1. Build the **RxSwift-OSX** scheme (**Product** → **Build**). + 1. Build the **RxSwift-macOS** scheme (**Product** → **Build**). 1. Open **Rx** playground in the **Project navigator**. 1. Show the Debug Area (**View** → **Debug Area** → **Show Debug Area**). ---- diff --git a/Rx.playground/Pages/Creating_and_Subscribing_to_Observables.xcplaygroundpage/Contents.swift b/Rx.playground/Pages/Creating_and_Subscribing_to_Observables.xcplaygroundpage/Contents.swift index 1bc9ce4ed..f37f3bc6d 100644 --- a/Rx.playground/Pages/Creating_and_Subscribing_to_Observables.xcplaygroundpage/Contents.swift +++ b/Rx.playground/Pages/Creating_and_Subscribing_to_Observables.xcplaygroundpage/Contents.swift @@ -1,7 +1,7 @@ /*: > # IMPORTANT: To use **Rx.playground**: 1. Open **Rx.xcworkspace**. - 1. Build the **RxSwift-OSX** scheme (**Product** → **Build**). + 1. Build the **RxSwift-macOS** scheme (**Product** → **Build**). 1. Open **Rx** playground in the **Project navigator**. 1. Show the Debug Area (**View** → **Debug Area** → **Show Debug Area**). ---- diff --git a/Rx.playground/Pages/Debugging_Operators.xcplaygroundpage/Contents.swift b/Rx.playground/Pages/Debugging_Operators.xcplaygroundpage/Contents.swift index bbac293ed..c507b5930 100644 --- a/Rx.playground/Pages/Debugging_Operators.xcplaygroundpage/Contents.swift +++ b/Rx.playground/Pages/Debugging_Operators.xcplaygroundpage/Contents.swift @@ -1,7 +1,7 @@ /*: > # IMPORTANT: To use **Rx.playground**: 1. Open **Rx.xcworkspace**. - 1. Build the **RxSwift-OSX** scheme (**Product** → **Build**). + 1. Build the **RxSwift-macOS** scheme (**Product** → **Build**). 1. Open **Rx** playground in the **Project navigator**. 1. Show the Debug Area (**View** → **Debug Area** → **Show Debug Area**). ---- diff --git a/Rx.playground/Pages/Error_Handling_Operators.xcplaygroundpage/Contents.swift b/Rx.playground/Pages/Error_Handling_Operators.xcplaygroundpage/Contents.swift index 7798808d9..5e832cdbc 100644 --- a/Rx.playground/Pages/Error_Handling_Operators.xcplaygroundpage/Contents.swift +++ b/Rx.playground/Pages/Error_Handling_Operators.xcplaygroundpage/Contents.swift @@ -1,7 +1,7 @@ /*: > # IMPORTANT: To use **Rx.playground**: 1. Open **Rx.xcworkspace**. - 1. Build the **RxSwift-OSX** scheme (**Product** → **Build**). + 1. Build the **RxSwift-macOS** scheme (**Product** → **Build**). 1. Open **Rx** playground in the **Project navigator**. 1. Show the Debug Area (**View** → **Debug Area** → **Show Debug Area**). ---- diff --git a/Rx.playground/Pages/Filtering_and_Conditional_Operators.xcplaygroundpage/Contents.swift b/Rx.playground/Pages/Filtering_and_Conditional_Operators.xcplaygroundpage/Contents.swift index e7188ed59..920204ef1 100644 --- a/Rx.playground/Pages/Filtering_and_Conditional_Operators.xcplaygroundpage/Contents.swift +++ b/Rx.playground/Pages/Filtering_and_Conditional_Operators.xcplaygroundpage/Contents.swift @@ -1,7 +1,7 @@ /*: > # IMPORTANT: To use **Rx.playground**: 1. Open **Rx.xcworkspace**. - 1. Build the **RxSwift-OSX** scheme (**Product** → **Build**). + 1. Build the **RxSwift-macOS** scheme (**Product** → **Build**). 1. Open **Rx** playground in the **Project navigator**. 1. Show the Debug Area (**View** → **Debug Area** → **Show Debug Area**). ---- diff --git a/Rx.playground/Pages/Introduction.xcplaygroundpage/Contents.swift b/Rx.playground/Pages/Introduction.xcplaygroundpage/Contents.swift index cfb844800..feb71de63 100644 --- a/Rx.playground/Pages/Introduction.xcplaygroundpage/Contents.swift +++ b/Rx.playground/Pages/Introduction.xcplaygroundpage/Contents.swift @@ -1,7 +1,7 @@ /*: > # IMPORTANT: To use **Rx.playground**: 1. Open **Rx.xcworkspace**. - 1. Build the **RxSwift-OSX** scheme (**Product** → **Build**). + 1. Build the **RxSwift-macOS** scheme (**Product** → **Build**). 1. Open **Rx** playground in the **Project navigator**. 1. Show the Debug Area (**View** → **Debug Area** → **Show Debug Area**). ---- diff --git a/Rx.playground/Pages/Mathematical_and_Aggregate_Operators.xcplaygroundpage/Contents.swift b/Rx.playground/Pages/Mathematical_and_Aggregate_Operators.xcplaygroundpage/Contents.swift index 1ba18090e..b463100a6 100644 --- a/Rx.playground/Pages/Mathematical_and_Aggregate_Operators.xcplaygroundpage/Contents.swift +++ b/Rx.playground/Pages/Mathematical_and_Aggregate_Operators.xcplaygroundpage/Contents.swift @@ -1,7 +1,7 @@ /*: > # IMPORTANT: To use **Rx.playground**: 1. Open **Rx.xcworkspace**. - 1. Build the **RxSwift-OSX** scheme (**Product** → **Build**). + 1. Build the **RxSwift-macOS** scheme (**Product** → **Build**). 1. Open **Rx** playground in the **Project navigator**. 1. Show the Debug Area (**View** → **Debug Area** → **Show Debug Area**). ---- diff --git a/Rx.playground/Pages/Transforming_Operators.xcplaygroundpage/Contents.swift b/Rx.playground/Pages/Transforming_Operators.xcplaygroundpage/Contents.swift index 4f19f208d..58ea59059 100644 --- a/Rx.playground/Pages/Transforming_Operators.xcplaygroundpage/Contents.swift +++ b/Rx.playground/Pages/Transforming_Operators.xcplaygroundpage/Contents.swift @@ -1,7 +1,7 @@ /*: > # IMPORTANT: To use **Rx.playground**: 1. Open **Rx.xcworkspace**. - 1. Build the **RxSwift-OSX** scheme (**Product** → **Build**). + 1. Build the **RxSwift-macOS** scheme (**Product** → **Build**). 1. Open **Rx** playground in the **Project navigator**. 1. Show the Debug Area (**View** → **Debug Area** → **Show Debug Area**). ---- diff --git a/Rx.playground/Pages/Working_with_Subjects.xcplaygroundpage/Contents.swift b/Rx.playground/Pages/Working_with_Subjects.xcplaygroundpage/Contents.swift index 6ed869c66..bd36dd7fa 100644 --- a/Rx.playground/Pages/Working_with_Subjects.xcplaygroundpage/Contents.swift +++ b/Rx.playground/Pages/Working_with_Subjects.xcplaygroundpage/Contents.swift @@ -1,7 +1,7 @@ /*: > # IMPORTANT: To use **Rx.playground**: 1. Open **Rx.xcworkspace**. - 1. Build the **RxSwift-OSX** scheme (**Product** → **Build**). + 1. Build the **RxSwift-macOS** scheme (**Product** → **Build**). 1. Open **Rx** playground in the **Project navigator**. 1. Show the Debug Area (**View** → **Debug Area** → **Show Debug Area**). ---- diff --git a/Rx.xcodeproj/project.pbxproj b/Rx.xcodeproj/project.pbxproj index 9e0979149..748708843 100644 --- a/Rx.xcodeproj/project.pbxproj +++ b/Rx.xcodeproj/project.pbxproj @@ -248,11 +248,6 @@ C8093EE41B8A732E0088E94D /* DelegateProxyType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E8C1B8A732E0088E94D /* DelegateProxyType.swift */; }; C8093EFD1B8A732E0088E94D /* RxTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E9C1B8A732E0088E94D /* RxTarget.swift */; }; C8093EFE1B8A732E0088E94D /* RxTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093E9C1B8A732E0088E94D /* RxTarget.swift */; }; - C8093F461B8A732E0088E94D /* NSButton+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093EC61B8A732E0088E94D /* NSButton+Rx.swift */; }; - C8093F481B8A732E0088E94D /* NSControl+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093EC71B8A732E0088E94D /* NSControl+Rx.swift */; }; - C8093F4A1B8A732E0088E94D /* NSImageView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093EC81B8A732E0088E94D /* NSImageView+Rx.swift */; }; - C8093F4C1B8A732E0088E94D /* NSSlider+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093EC91B8A732E0088E94D /* NSSlider+Rx.swift */; }; - C8093F4E1B8A732E0088E94D /* NSTextField+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093ECA1B8A732E0088E94D /* NSTextField+Rx.swift */; }; C8093F5E1B8A73A20088E94D /* ObservableConvertibleType+Blocking.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093F581B8A73A20088E94D /* ObservableConvertibleType+Blocking.swift */; }; C8093F5F1B8A73A20088E94D /* ObservableConvertibleType+Blocking.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093F581B8A73A20088E94D /* ObservableConvertibleType+Blocking.swift */; }; C80D338F1B91EF9E0014629D /* Observable+Bind.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80D338E1B91EF9E0014629D /* Observable+Bind.swift */; }; @@ -574,6 +569,12 @@ C86781891DB814AD00B2029A /* Bag+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86781871DB814AD00B2029A /* Bag+Rx.swift */; }; C867818A1DB814AD00B2029A /* Bag+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86781871DB814AD00B2029A /* Bag+Rx.swift */; }; C867818B1DB814AD00B2029A /* Bag+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86781871DB814AD00B2029A /* Bag+Rx.swift */; }; + C86781971DB823B500B2029A /* NSButton+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86781911DB823B500B2029A /* NSButton+Rx.swift */; }; + C867819C1DB823B500B2029A /* NSControl+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86781921DB823B500B2029A /* NSControl+Rx.swift */; }; + C86781A11DB823B500B2029A /* NSImageView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86781931DB823B500B2029A /* NSImageView+Rx.swift */; }; + C86781A61DB823B500B2029A /* NSSlider+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86781941DB823B500B2029A /* NSSlider+Rx.swift */; }; + C86781AB1DB823B500B2029A /* NSTextField+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86781951DB823B500B2029A /* NSTextField+Rx.swift */; }; + C86781B01DB823B500B2029A /* NSView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86781961DB823B500B2029A /* NSView+Rx.swift */; }; C86B0A561D735CCC005D8A16 /* Delay.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86B0A551D735CCC005D8A16 /* Delay.swift */; }; C86B0A571D735CCC005D8A16 /* Delay.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86B0A551D735CCC005D8A16 /* Delay.swift */; }; C86B0A581D735CCC005D8A16 /* Delay.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86B0A551D735CCC005D8A16 /* Delay.swift */; }; @@ -848,7 +849,6 @@ C8BCD3ED1C14B5FB005F1280 /* UIView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8BCD3EC1C14B5FB005F1280 /* UIView+Rx.swift */; }; C8BCD3EF1C14B5FB005F1280 /* UIView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8BCD3EC1C14B5FB005F1280 /* UIView+Rx.swift */; }; C8BCD3F01C14B5FB005F1280 /* UIView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8BCD3EC1C14B5FB005F1280 /* UIView+Rx.swift */; }; - C8BCD3F21C14B62B005F1280 /* NSView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8BCD3F11C14B62B005F1280 /* NSView+Rx.swift */; }; C8BCD3F41C14B6D1005F1280 /* NSLayoutConstraint+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8BCD3F31C14B6D1005F1280 /* NSLayoutConstraint+Rx.swift */; }; C8BCD3F51C14B6D1005F1280 /* NSLayoutConstraint+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8BCD3F31C14B6D1005F1280 /* NSLayoutConstraint+Rx.swift */; }; C8BCD3F61C14B6D1005F1280 /* NSLayoutConstraint+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8BCD3F31C14B6D1005F1280 /* NSLayoutConstraint+Rx.swift */; }; @@ -1534,11 +1534,6 @@ C8093E8C1B8A732E0088E94D /* DelegateProxyType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DelegateProxyType.swift; sourceTree = ""; }; C8093E9C1B8A732E0088E94D /* RxTarget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTarget.swift; sourceTree = ""; }; C8093E9D1B8A732E0088E94D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C8093EC61B8A732E0088E94D /* NSButton+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSButton+Rx.swift"; sourceTree = ""; }; - C8093EC71B8A732E0088E94D /* NSControl+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "NSControl+Rx.swift"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; - C8093EC81B8A732E0088E94D /* NSImageView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "NSImageView+Rx.swift"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; - C8093EC91B8A732E0088E94D /* NSSlider+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSSlider+Rx.swift"; sourceTree = ""; }; - C8093ECA1B8A732E0088E94D /* NSTextField+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "NSTextField+Rx.swift"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; C8093F581B8A73A20088E94D /* ObservableConvertibleType+Blocking.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ObservableConvertibleType+Blocking.swift"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; C8093F591B8A73A20088E94D /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; C80D338E1B91EF9E0014629D /* Observable+Bind.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "Observable+Bind.swift"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; @@ -1576,7 +1571,7 @@ C83508EB1C38706D0027C24C /* RXObjCRuntime+Testing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RXObjCRuntime+Testing.m"; sourceTree = ""; }; C83508EC1C38706D0027C24C /* RxObjCRuntimeState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxObjCRuntimeState.swift; sourceTree = ""; }; C83508ED1C38706D0027C24C /* RxTest-iOS-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RxTest-iOS-Bridging-Header.h"; sourceTree = ""; }; - C83508EE1C38706D0027C24C /* RxTest-OSX-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RxTest-OSX-Bridging-Header.h"; sourceTree = ""; }; + C83508EE1C38706D0027C24C /* RxTest-macOS-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RxTest-macOS-Bridging-Header.h"; sourceTree = ""; }; C83508EF1C38706D0027C24C /* RxTest-tvOS-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RxTest-tvOS-Bridging-Header.h"; sourceTree = ""; }; C83508F01C38706D0027C24C /* SentMessageTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SentMessageTest.swift; sourceTree = ""; }; C83508F11C38706D0027C24C /* UIView+RxTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+RxTests.swift"; sourceTree = ""; }; @@ -1619,7 +1614,7 @@ C835091B1C38706D0027C24C /* VariableTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VariableTest.swift; sourceTree = ""; }; C835091C1C38706D0027C24C /* VirtualSchedulerTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VirtualSchedulerTest.swift; sourceTree = ""; }; C83509841C38740E0027C24C /* AllTests-tvOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AllTests-tvOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - C83509941C38742C0027C24C /* AllTests-OSX.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AllTests-OSX.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + C83509941C38742C0027C24C /* AllTests-macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AllTests-macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; C8353CDB1DA19BA000BE3F5C /* MessageProcessingStage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageProcessingStage.swift; sourceTree = ""; }; C8353CDF1DA19BC500BE3F5C /* Foundation+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Foundation+Extensions.swift"; sourceTree = ""; }; C8353CE01DA19BC500BE3F5C /* Recorded+Timeless.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Recorded+Timeless.swift"; sourceTree = ""; }; @@ -1660,6 +1655,12 @@ C867816F1DB8129E00B2029A /* Queue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Queue.swift; sourceTree = ""; }; C86781821DB8143A00B2029A /* Bag.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bag.swift; sourceTree = ""; }; C86781871DB814AD00B2029A /* Bag+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Bag+Rx.swift"; sourceTree = ""; }; + C86781911DB823B500B2029A /* NSButton+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSButton+Rx.swift"; sourceTree = ""; }; + C86781921DB823B500B2029A /* NSControl+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSControl+Rx.swift"; sourceTree = ""; }; + C86781931DB823B500B2029A /* NSImageView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSImageView+Rx.swift"; sourceTree = ""; }; + C86781941DB823B500B2029A /* NSSlider+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSSlider+Rx.swift"; sourceTree = ""; }; + C86781951DB823B500B2029A /* NSTextField+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSTextField+Rx.swift"; sourceTree = ""; }; + C86781961DB823B500B2029A /* NSView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSView+Rx.swift"; sourceTree = ""; }; C86B0A551D735CCC005D8A16 /* Delay.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Delay.swift; sourceTree = ""; }; C86B1E211D42BF5200130546 /* SchedulerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SchedulerTests.swift; sourceTree = ""; }; C88253F11B8A752B00B02D69 /* RxCollectionViewReactiveArrayDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxCollectionViewReactiveArrayDataSource.swift; sourceTree = ""; }; @@ -1759,7 +1760,6 @@ C8B2908C1C94D6C500E923D0 /* UISearchBar+RxTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UISearchBar+RxTests.swift"; sourceTree = ""; }; C8BCD3C61C1468D4005F1280 /* ShareReplay1WhileConnected.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareReplay1WhileConnected.swift; sourceTree = ""; }; C8BCD3EC1C14B5FB005F1280 /* UIView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Rx.swift"; sourceTree = ""; }; - C8BCD3F11C14B62B005F1280 /* NSView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSView+Rx.swift"; sourceTree = ""; }; C8BCD3F31C14B6D1005F1280 /* NSLayoutConstraint+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSLayoutConstraint+Rx.swift"; sourceTree = ""; }; C8BF34C91C2E426800416CAE /* Platform.Darwin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Platform.Darwin.swift; sourceTree = ""; }; C8BF34CA1C2E426800416CAE /* Platform.Linux.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Platform.Linux.swift; sourceTree = ""; }; @@ -2156,7 +2156,7 @@ C8093E811B8A732E0088E94D /* Common */, C89AB1BC1DAAC3350065FBE6 /* Foundation */, C88253EE1B8A752B00B02D69 /* iOS */, - C8093EC51B8A732E0088E94D /* OSX */, + C86781901DB823B500B2029A /* macOS */, C89AB22B1DAAC3A60065FBE6 /* Runtime */, C8093E9D1B8A732E0088E94D /* Info.plist */, C89AB2261DAAC33F0065FBE6 /* RxCocoa.swift */, @@ -2180,19 +2180,6 @@ path = Common; sourceTree = ""; }; - C8093EC51B8A732E0088E94D /* OSX */ = { - isa = PBXGroup; - children = ( - C8093EC61B8A732E0088E94D /* NSButton+Rx.swift */, - C8093EC71B8A732E0088E94D /* NSControl+Rx.swift */, - C8093EC81B8A732E0088E94D /* NSImageView+Rx.swift */, - C8093EC91B8A732E0088E94D /* NSSlider+Rx.swift */, - C8093ECA1B8A732E0088E94D /* NSTextField+Rx.swift */, - C8BCD3F11C14B62B005F1280 /* NSView+Rx.swift */, - ); - path = OSX; - sourceTree = ""; - }; C8093F571B8A73A20088E94D /* RxBlocking */ = { isa = PBXGroup; children = ( @@ -2278,7 +2265,7 @@ C83508EB1C38706D0027C24C /* RXObjCRuntime+Testing.m */, C83508EC1C38706D0027C24C /* RxObjCRuntimeState.swift */, C83508ED1C38706D0027C24C /* RxTest-iOS-Bridging-Header.h */, - C83508EE1C38706D0027C24C /* RxTest-OSX-Bridging-Header.h */, + C83508EE1C38706D0027C24C /* RxTest-macOS-Bridging-Header.h */, C83508EF1C38706D0027C24C /* RxTest-tvOS-Bridging-Header.h */, C83508F01C38706D0027C24C /* SentMessageTest.swift */, C83508F11C38706D0027C24C /* UIView+RxTests.swift */, @@ -2448,6 +2435,19 @@ path = DataStructures; sourceTree = ""; }; + C86781901DB823B500B2029A /* macOS */ = { + isa = PBXGroup; + children = ( + C86781911DB823B500B2029A /* NSButton+Rx.swift */, + C86781921DB823B500B2029A /* NSControl+Rx.swift */, + C86781931DB823B500B2029A /* NSImageView+Rx.swift */, + C86781941DB823B500B2029A /* NSSlider+Rx.swift */, + C86781951DB823B500B2029A /* NSTextField+Rx.swift */, + C86781961DB823B500B2029A /* NSView+Rx.swift */, + ); + path = macOS; + sourceTree = ""; + }; C88253EE1B8A752B00B02D69 /* iOS */ = { isa = PBXGroup; children = ( @@ -2676,7 +2676,7 @@ C88FA53F1C25C4CC00CCFEA4 /* RxTest.framework */, C83508C31C386F6F0027C24C /* AllTests-iOS.xctest */, C83509841C38740E0027C24C /* AllTests-tvOS.xctest */, - C83509941C38742C0027C24C /* AllTests-OSX.xctest */, + C83509941C38742C0027C24C /* AllTests-macOS.xctest */, C85BA04B1C3878740075D68E /* PerformanceTests.app */, ); name = Products; @@ -2857,9 +2857,9 @@ productReference = C809396D1B8A71760088E94D /* RxCocoa.framework */; productType = "com.apple.product-type.framework"; }; - C809396F1B8A71840088E94D /* RxCocoa-OSX */ = { + C809396F1B8A71840088E94D /* RxCocoa-macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = C80939E31B8A71840088E94D /* Build configuration list for PBXNativeTarget "RxCocoa-OSX" */; + buildConfigurationList = C80939E31B8A71840088E94D /* Build configuration list for PBXNativeTarget "RxCocoa-macOS" */; buildPhases = ( C80939701B8A71840088E94D /* Sources */, C80939DD1B8A71840088E94D /* Frameworks */, @@ -2871,7 +2871,7 @@ dependencies = ( C872BD1E1BC052A200D7175E /* PBXTargetDependency */, ); - name = "RxCocoa-OSX"; + name = "RxCocoa-macOS"; productName = RxSwift; productReference = C80939E71B8A71840088E94D /* RxCocoa.framework */; productType = "com.apple.product-type.framework"; @@ -2895,9 +2895,9 @@ productReference = C8093BC71B8A71F00088E94D /* RxBlocking.framework */; productType = "com.apple.product-type.framework"; }; - C8093BC91B8A71FC0088E94D /* RxBlocking-OSX */ = { + C8093BC91B8A71FC0088E94D /* RxBlocking-macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = C8093C411B8A71FC0088E94D /* Build configuration list for PBXNativeTarget "RxBlocking-OSX" */; + buildConfigurationList = C8093C411B8A71FC0088E94D /* Build configuration list for PBXNativeTarget "RxBlocking-macOS" */; buildPhases = ( C8093BCA1B8A71FC0088E94D /* Sources */, C8093C371B8A71FC0088E94D /* Frameworks */, @@ -2909,7 +2909,7 @@ dependencies = ( C872BD261BC052BB00D7175E /* PBXTargetDependency */, ); - name = "RxBlocking-OSX"; + name = "RxBlocking-macOS"; productName = RxSwift; productReference = C8093C451B8A71FC0088E94D /* RxBlocking.framework */; productType = "com.apple.product-type.framework"; @@ -2956,9 +2956,9 @@ productReference = C83509841C38740E0027C24C /* AllTests-tvOS.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - C83509931C38742C0027C24C /* AllTests-OSX */ = { + C83509931C38742C0027C24C /* AllTests-macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = C835099C1C38742C0027C24C /* Build configuration list for PBXNativeTarget "AllTests-OSX" */; + buildConfigurationList = C835099C1C38742C0027C24C /* Build configuration list for PBXNativeTarget "AllTests-macOS" */; buildPhases = ( C83509901C38742C0027C24C /* Sources */, C83509911C38742C0027C24C /* Frameworks */, @@ -2972,9 +2972,9 @@ C84CB16F1C38769B00EB63CC /* PBXTargetDependency */, C84CB1711C38769B00EB63CC /* PBXTargetDependency */, ); - name = "AllTests-OSX"; + name = "AllTests-macOS"; productName = "AllTests-OSX"; - productReference = C83509941C38742C0027C24C /* AllTests-OSX.xctest */; + productReference = C83509941C38742C0027C24C /* AllTests-macOS.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; C85BA04A1C3878740075D68E /* PerformanceTests */ = { @@ -2998,9 +2998,9 @@ productReference = C85BA04B1C3878740075D68E /* PerformanceTests.app */; productType = "com.apple.product-type.application"; }; - C88BB81A1B07E5ED0064D411 /* RxSwift-OSX */ = { + C88BB81A1B07E5ED0064D411 /* RxSwift-macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = C88BB86E1B07E5ED0064D411 /* Build configuration list for PBXNativeTarget "RxSwift-OSX" */; + buildConfigurationList = C88BB86E1B07E5ED0064D411 /* Build configuration list for PBXNativeTarget "RxSwift-macOS" */; buildPhases = ( C88BB81B1B07E5ED0064D411 /* Sources */, C88BB8681B07E5ED0064D411 /* Frameworks */, @@ -3011,7 +3011,7 @@ ); dependencies = ( ); - name = "RxSwift-OSX"; + name = "RxSwift-macOS"; productName = RxSwift; productReference = C88BB8711B07E5ED0064D411 /* RxSwift.framework */; productType = "com.apple.product-type.framework"; @@ -3035,9 +3035,9 @@ productReference = C88FA50C1C25C44800CCFEA4 /* RxTest.framework */; productType = "com.apple.product-type.framework"; }; - C88FA50E1C25C4B500CCFEA4 /* RxTest-OSX */ = { + C88FA50E1C25C4B500CCFEA4 /* RxTest-macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = C88FA5191C25C4B500CCFEA4 /* Build configuration list for PBXNativeTarget "RxTest-OSX" */; + buildConfigurationList = C88FA5191C25C4B500CCFEA4 /* Build configuration list for PBXNativeTarget "RxTest-macOS" */; buildPhases = ( C88FA5111C25C4B500CCFEA4 /* Sources */, C88FA5161C25C4B500CCFEA4 /* Frameworks */, @@ -3049,7 +3049,7 @@ dependencies = ( C88FA50F1C25C4B500CCFEA4 /* PBXTargetDependency */, ); - name = "RxTest-OSX"; + name = "RxTest-macOS"; productName = RxSwift; productReference = C88FA51D1C25C4B500CCFEA4 /* RxTest.framework */; productType = "com.apple.product-type.framework"; @@ -3297,24 +3297,24 @@ projectRoot = ""; targets = ( C8A56AD61AD7424700B4673B /* RxSwift-iOS */, - C88BB81A1B07E5ED0064D411 /* RxSwift-OSX */, + C88BB81A1B07E5ED0064D411 /* RxSwift-macOS */, D2EA280B1BB9B5A200880ED3 /* RxSwift-tvOS */, C8F0BF901BBBFB8B001B112F /* RxSwift-watchOS */, C80938F51B8A71760088E94D /* RxCocoa-iOS */, - C809396F1B8A71840088E94D /* RxCocoa-OSX */, + C809396F1B8A71840088E94D /* RxCocoa-macOS */, D2138C741BB9BE9800339B5C /* RxCocoa-tvOS */, C8F0C0041BBBFBB9001B112F /* RxCocoa-watchOS */, C8093B4B1B8A71F00088E94D /* RxBlocking-iOS */, - C8093BC91B8A71FC0088E94D /* RxBlocking-OSX */, + C8093BC91B8A71FC0088E94D /* RxBlocking-macOS */, D2EBEB801BB9B99D003A27DC /* RxBlocking-tvOS */, C8F0C04D1BBBFBCE001B112F /* RxBlocking-watchOS */, C88FA4FD1C25C44800CCFEA4 /* RxTest-iOS */, - C88FA50E1C25C4B500CCFEA4 /* RxTest-OSX */, + C88FA50E1C25C4B500CCFEA4 /* RxTest-macOS */, C88FA51F1C25C4C000CCFEA4 /* RxTest-tvOS */, C88FA5301C25C4CC00CCFEA4 /* RxTest-watchOS */, C83508C21C386F6F0027C24C /* AllTests-iOS */, C83509831C38740E0027C24C /* AllTests-tvOS */, - C83509931C38742C0027C24C /* AllTests-OSX */, + C83509931C38742C0027C24C /* AllTests-macOS */, C85BA04A1C3878740075D68E /* PerformanceTests */, ); }; @@ -3565,14 +3565,12 @@ files = ( C89AB1C71DAAC3350065FBE6 /* ControlEvent.swift in Sources */, C89AB1F71DAAC3350065FBE6 /* SharedSequence.swift in Sources */, - C8093F4A1B8A732E0088E94D /* NSImageView+Rx.swift in Sources */, C89AB21B1DAAC3350065FBE6 /* NSObject+Rx+RawRepresentable.swift in Sources */, C89AB1CF1DAAC3350065FBE6 /* ControlEvent+Driver.swift in Sources */, C89AB1FF1DAAC3350065FBE6 /* UIBindingObserver.swift in Sources */, C8093EE41B8A732E0088E94D /* DelegateProxyType.swift in Sources */, + C86781AB1DB823B500B2029A /* NSTextField+Rx.swift in Sources */, C89AB1E31DAAC3350065FBE6 /* Variable+Driver.swift in Sources */, - C8093F481B8A732E0088E94D /* NSControl+Rx.swift in Sources */, - C8093F4E1B8A732E0088E94D /* NSTextField+Rx.swift in Sources */, C89AB1D31DAAC3350065FBE6 /* ControlProperty+Driver.swift in Sources */, C88F76821CE5341700D5A014 /* TextInput.swift in Sources */, C89AB1DF1DAAC3350065FBE6 /* ObservableConvertibleType+Driver.swift in Sources */, @@ -3582,26 +3580,28 @@ C89AB1A71DAAC25A0065FBE6 /* RxCocoaObjCRuntimeError+Extensions.swift in Sources */, C89AB2411DAAC3A60065FBE6 /* _RXDelegateProxy.m in Sources */, C89AB1FB1DAAC3350065FBE6 /* Variable+SharedSequence.swift in Sources */, + C867819C1DB823B500B2029A /* NSControl+Rx.swift in Sources */, C89AB2391DAAC3A60065FBE6 /* _RX.m in Sources */, C8093EFE1B8A732E0088E94D /* RxTarget.swift in Sources */, C89AB21F1DAAC3350065FBE6 /* NSObject+Rx.swift in Sources */, + C86781B01DB823B500B2029A /* NSView+Rx.swift in Sources */, C89AB1741DAAC1680065FBE6 /* ControlTarget.swift in Sources */, + C86781971DB823B500B2029A /* NSButton+Rx.swift in Sources */, C89AB2131DAAC3350065FBE6 /* NSNotificationCenter+Rx.swift in Sources */, C8BCD3F51C14B6D1005F1280 /* NSLayoutConstraint+Rx.swift in Sources */, C89AB2491DAAC3A60065FBE6 /* _RXKVOObserver.m in Sources */, - C8093F461B8A732E0088E94D /* NSButton+Rx.swift in Sources */, C89AB1E71DAAC3350065FBE6 /* ObservableConvertibleType+SharedSequence.swift in Sources */, C89AB2171DAAC3350065FBE6 /* NSObject+Rx+KVORepresentable.swift in Sources */, C89AB2071DAAC3350065FBE6 /* KVORepresentable+Swift.swift in Sources */, - C8BCD3F21C14B62B005F1280 /* NSView+Rx.swift in Sources */, C89AB1DB1DAAC3350065FBE6 /* Driver.swift in Sources */, C89AB1CB1DAAC3350065FBE6 /* ControlProperty.swift in Sources */, C89AB20F1DAAC3350065FBE6 /* Logging.swift in Sources */, C89AB2031DAAC3350065FBE6 /* KVORepresentable+CoreGraphics.swift in Sources */, C8093EE21B8A732E0088E94D /* DelegateProxy.swift in Sources */, C89AB1F31DAAC3350065FBE6 /* SharedSequence+Operators.swift in Sources */, + C86781A61DB823B500B2029A /* NSSlider+Rx.swift in Sources */, C89AB2231DAAC3350065FBE6 /* NSURLSession+Rx.swift in Sources */, - C8093F4C1B8A732E0088E94D /* NSSlider+Rx.swift in Sources */, + C86781A11DB823B500B2029A /* NSImageView+Rx.swift in Sources */, C89AB2281DAAC33F0065FBE6 /* RxCocoa.swift in Sources */, C8D132451C42D15E00B59FFF /* SectionedViewDataSourceType.swift in Sources */, C80D33901B91EF9E0014629D /* Observable+Bind.swift in Sources */, @@ -4828,42 +4828,42 @@ }; C84CB16B1C38769B00EB63CC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C88BB81A1B07E5ED0064D411 /* RxSwift-OSX */; + target = C88BB81A1B07E5ED0064D411 /* RxSwift-macOS */; targetProxy = C84CB16A1C38769B00EB63CC /* PBXContainerItemProxy */; }; C84CB16D1C38769B00EB63CC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C809396F1B8A71840088E94D /* RxCocoa-OSX */; + target = C809396F1B8A71840088E94D /* RxCocoa-macOS */; targetProxy = C84CB16C1C38769B00EB63CC /* PBXContainerItemProxy */; }; C84CB16F1C38769B00EB63CC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C8093BC91B8A71FC0088E94D /* RxBlocking-OSX */; + target = C8093BC91B8A71FC0088E94D /* RxBlocking-macOS */; targetProxy = C84CB16E1C38769B00EB63CC /* PBXContainerItemProxy */; }; C84CB1711C38769B00EB63CC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C88FA50E1C25C4B500CCFEA4 /* RxTest-OSX */; + target = C88FA50E1C25C4B500CCFEA4 /* RxTest-macOS */; targetProxy = C84CB1701C38769B00EB63CC /* PBXContainerItemProxy */; }; C85BA05C1C3878D00075D68E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C88BB81A1B07E5ED0064D411 /* RxSwift-OSX */; + target = C88BB81A1B07E5ED0064D411 /* RxSwift-macOS */; targetProxy = C85BA05B1C3878D00075D68E /* PBXContainerItemProxy */; }; C85BA05E1C3878D00075D68E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C809396F1B8A71840088E94D /* RxCocoa-OSX */; + target = C809396F1B8A71840088E94D /* RxCocoa-macOS */; targetProxy = C85BA05D1C3878D00075D68E /* PBXContainerItemProxy */; }; C85BA0601C3878D00075D68E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C8093BC91B8A71FC0088E94D /* RxBlocking-OSX */; + target = C8093BC91B8A71FC0088E94D /* RxBlocking-macOS */; targetProxy = C85BA05F1C3878D00075D68E /* PBXContainerItemProxy */; }; C85BA0621C3878D00075D68E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C88FA50E1C25C4B500CCFEA4 /* RxTest-OSX */; + target = C88FA50E1C25C4B500CCFEA4 /* RxTest-macOS */; targetProxy = C85BA0611C3878D00075D68E /* PBXContainerItemProxy */; }; C872BD1C1BC0529600D7175E /* PBXTargetDependency */ = { @@ -4873,7 +4873,7 @@ }; C872BD1E1BC052A200D7175E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C88BB81A1B07E5ED0064D411 /* RxSwift-OSX */; + target = C88BB81A1B07E5ED0064D411 /* RxSwift-macOS */; targetProxy = C872BD1D1BC052A200D7175E /* PBXContainerItemProxy */; }; C872BD201BC052A800D7175E /* PBXTargetDependency */ = { @@ -4893,7 +4893,7 @@ }; C872BD261BC052BB00D7175E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C88BB81A1B07E5ED0064D411 /* RxSwift-OSX */; + target = C88BB81A1B07E5ED0064D411 /* RxSwift-macOS */; targetProxy = C872BD251BC052BB00D7175E /* PBXContainerItemProxy */; }; C872BD281BC052BF00D7175E /* PBXTargetDependency */ = { @@ -4913,7 +4913,7 @@ }; C88FA50F1C25C4B500CCFEA4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C88BB81A1B07E5ED0064D411 /* RxSwift-OSX */; + target = C88BB81A1B07E5ED0064D411 /* RxSwift-macOS */; targetProxy = C88FA5101C25C4B500CCFEA4 /* PBXContainerItemProxy */; }; C88FA5201C25C4C000CCFEA4 /* PBXTargetDependency */ = { @@ -5254,10 +5254,10 @@ INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = "io.rx.AllTests-OSX"; + PRODUCT_BUNDLE_IDENTIFIER = "io.rx.AllTests-macOS"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_OBJC_BRIDGING_HEADER = "Tests/RxCocoaTests/RxTest-OSX-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "Tests/RxCocoaTests/RxTest-macOS-Bridging-Header.h"; }; name = Debug; }; @@ -5271,10 +5271,10 @@ INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = "io.rx.AllTests-OSX"; + PRODUCT_BUNDLE_IDENTIFIER = "io.rx.AllTests-macOS"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_OBJC_BRIDGING_HEADER = "Tests/RxCocoaTests/RxTest-OSX-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "Tests/RxCocoaTests/RxTest-macOS-Bridging-Header.h"; }; name = Release; }; @@ -5288,10 +5288,10 @@ INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = "io.rx.AllTests-OSX"; + PRODUCT_BUNDLE_IDENTIFIER = "io.rx.AllTests-macOS"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_OBJC_BRIDGING_HEADER = "Tests/RxCocoaTests/RxTest-OSX-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "Tests/RxCocoaTests/RxTest-macOS-Bridging-Header.h"; }; name = "Release-Tests"; }; @@ -6239,7 +6239,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C80939E31B8A71840088E94D /* Build configuration list for PBXNativeTarget "RxCocoa-OSX" */ = { + C80939E31B8A71840088E94D /* Build configuration list for PBXNativeTarget "RxCocoa-macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( C80939E41B8A71840088E94D /* Debug */, @@ -6259,7 +6259,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C8093C411B8A71FC0088E94D /* Build configuration list for PBXNativeTarget "RxBlocking-OSX" */ = { + C8093C411B8A71FC0088E94D /* Build configuration list for PBXNativeTarget "RxBlocking-macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( C8093C421B8A71FC0088E94D /* Debug */, @@ -6289,7 +6289,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C835099C1C38742C0027C24C /* Build configuration list for PBXNativeTarget "AllTests-OSX" */ = { + C835099C1C38742C0027C24C /* Build configuration list for PBXNativeTarget "AllTests-macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( C835099D1C38742C0027C24C /* Debug */, @@ -6309,7 +6309,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C88BB86E1B07E5ED0064D411 /* Build configuration list for PBXNativeTarget "RxSwift-OSX" */ = { + C88BB86E1B07E5ED0064D411 /* Build configuration list for PBXNativeTarget "RxSwift-macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( C88BB86F1B07E5ED0064D411 /* Debug */, @@ -6329,7 +6329,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C88FA5191C25C4B500CCFEA4 /* Build configuration list for PBXNativeTarget "RxTest-OSX" */ = { + C88FA5191C25C4B500CCFEA4 /* Build configuration list for PBXNativeTarget "RxTest-macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( C88FA51A1C25C4B500CCFEA4 /* Debug */, diff --git a/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-OSX.xcscheme b/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-macOS.xcscheme similarity index 94% rename from Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-OSX.xcscheme rename to Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-macOS.xcscheme index 9c0575725..34e7a23f8 100644 --- a/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-OSX.xcscheme +++ b/Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-macOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C8093BC91B8A71FC0088E94D" BuildableName = "RxBlocking.framework" - BlueprintName = "RxBlocking-OSX" + BlueprintName = "RxBlocking-macOS" ReferencedContainer = "container:Rx.xcodeproj"> @@ -47,7 +47,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C8093BC91B8A71FC0088E94D" BuildableName = "RxBlocking.framework" - BlueprintName = "RxBlocking-OSX" + BlueprintName = "RxBlocking-macOS" ReferencedContainer = "container:Rx.xcodeproj"> @@ -65,7 +65,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C8093BC91B8A71FC0088E94D" BuildableName = "RxBlocking.framework" - BlueprintName = "RxBlocking-OSX" + BlueprintName = "RxBlocking-macOS" ReferencedContainer = "container:Rx.xcodeproj"> diff --git a/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-OSX.xcscheme b/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-macOS.xcscheme similarity index 95% rename from Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-OSX.xcscheme rename to Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-macOS.xcscheme index 3dd2e7241..977e1c7b3 100644 --- a/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-OSX.xcscheme +++ b/Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-macOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C809396F1B8A71840088E94D" BuildableName = "RxCocoa.framework" - BlueprintName = "RxCocoa-OSX" + BlueprintName = "RxCocoa-macOS" ReferencedContainer = "container:Rx.xcodeproj"> @@ -47,7 +47,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C809396F1B8A71840088E94D" BuildableName = "RxCocoa.framework" - BlueprintName = "RxCocoa-OSX" + BlueprintName = "RxCocoa-macOS" ReferencedContainer = "container:Rx.xcodeproj"> @@ -65,7 +65,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C809396F1B8A71840088E94D" BuildableName = "RxCocoa.framework" - BlueprintName = "RxCocoa-OSX" + BlueprintName = "RxCocoa-macOS" ReferencedContainer = "container:Rx.xcodeproj"> diff --git a/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-OSX.xcscheme b/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-macOS.xcscheme similarity index 92% rename from Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-OSX.xcscheme rename to Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-macOS.xcscheme index 9e3c600f4..580d3a5b9 100644 --- a/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-OSX.xcscheme +++ b/Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-macOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C88BB81A1B07E5ED0064D411" BuildableName = "RxSwift.framework" - BlueprintName = "RxSwift-OSX" + BlueprintName = "RxSwift-macOS" ReferencedContainer = "container:Rx.xcodeproj"> @@ -33,8 +33,8 @@ @@ -44,7 +44,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C88BB81A1B07E5ED0064D411" BuildableName = "RxSwift.framework" - BlueprintName = "RxSwift-OSX" + BlueprintName = "RxSwift-macOS" ReferencedContainer = "container:Rx.xcodeproj"> @@ -66,7 +66,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C88BB81A1B07E5ED0064D411" BuildableName = "RxSwift.framework" - BlueprintName = "RxSwift-OSX" + BlueprintName = "RxSwift-macOS" ReferencedContainer = "container:Rx.xcodeproj"> @@ -84,7 +84,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C88BB81A1B07E5ED0064D411" BuildableName = "RxSwift.framework" - BlueprintName = "RxSwift-OSX" + BlueprintName = "RxSwift-macOS" ReferencedContainer = "container:Rx.xcodeproj"> diff --git a/Rx.xcodeproj/xcshareddata/xcschemes/RxTests-OSX.xcscheme b/Rx.xcodeproj/xcshareddata/xcschemes/RxTests-macOS.xcscheme similarity index 92% rename from Rx.xcodeproj/xcshareddata/xcschemes/RxTests-OSX.xcscheme rename to Rx.xcodeproj/xcshareddata/xcschemes/RxTests-macOS.xcscheme index 12da45176..afcea6022 100644 --- a/Rx.xcodeproj/xcshareddata/xcschemes/RxTests-OSX.xcscheme +++ b/Rx.xcodeproj/xcshareddata/xcschemes/RxTests-macOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C88FA50E1C25C4B500CCFEA4" BuildableName = "RxTest.framework" - BlueprintName = "RxTest-OSX" + BlueprintName = "RxTest-macOS" ReferencedContainer = "container:Rx.xcodeproj"> @@ -33,8 +33,8 @@ @@ -44,7 +44,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C88FA50E1C25C4B500CCFEA4" BuildableName = "RxTest.framework" - BlueprintName = "RxTest-OSX" + BlueprintName = "RxTest-macOS" ReferencedContainer = "container:Rx.xcodeproj"> @@ -66,7 +66,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C88FA50E1C25C4B500CCFEA4" BuildableName = "RxTest.framework" - BlueprintName = "RxTest-OSX" + BlueprintName = "RxTest-macOS" ReferencedContainer = "container:Rx.xcodeproj"> @@ -84,7 +84,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C88FA50E1C25C4B500CCFEA4" BuildableName = "RxTest.framework" - BlueprintName = "RxTest-OSX" + BlueprintName = "RxTest-macOS" ReferencedContainer = "container:Rx.xcodeproj"> diff --git a/RxCocoa.podspec b/RxCocoa.podspec index a9b957147..744ea042c 100644 --- a/RxCocoa.podspec +++ b/RxCocoa.podspec @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.exclude_files = 'RxCocoa/Platform/**/*.swift' s.ios.source_files = 'RxCocoa/iOS/**/*.swift' - s.osx.source_files = 'RxCocoa/OSX/**/*.swift' + s.osx.source_files = 'RxCocoa/macOS/**/*.swift' s.watchos.source_files = 'RxCocoa/iOS/**/*.swift' s.tvos.source_files = 'RxCocoa/iOS/**/*.swift' diff --git a/RxCocoa/Common/ControlTarget.swift b/RxCocoa/Common/ControlTarget.swift index 859c19742..42b7db9f5 100644 --- a/RxCocoa/Common/ControlTarget.swift +++ b/RxCocoa/Common/ControlTarget.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Krunoslav Zaher. All rights reserved. // -#if os(iOS) || os(tvOS) || os(OSX) +#if os(iOS) || os(tvOS) || os(macOS) import Foundation #if !RX_NO_MODULE @@ -18,7 +18,7 @@ import RxSwift typealias Control = UIKit.UIControl typealias ControlEvents = UIKit.UIControlEvents -#elseif os(OSX) +#elseif os(macOS) import Cocoa typealias Control = Cocoa.NSControl @@ -52,7 +52,7 @@ class ControlTarget: RxTarget { rxFatalError("Can't find method") } } -#elseif os(OSX) +#elseif os(macOS) init(control: Control, callback: @escaping Callback) { MainScheduler.ensureExecutingOnScheduler() @@ -81,7 +81,7 @@ class ControlTarget: RxTarget { super.dispose() #if os(iOS) || os(tvOS) self.control?.removeTarget(self, action: self.selector, for: self.controlEvents) -#elseif os(OSX) +#elseif os(macOS) self.control?.target = nil self.control?.action = nil #endif diff --git a/RxCocoa/Common/NSLayoutConstraint+Rx.swift b/RxCocoa/Common/NSLayoutConstraint+Rx.swift index 83ede7e5b..fa2894be3 100644 --- a/RxCocoa/Common/NSLayoutConstraint+Rx.swift +++ b/RxCocoa/Common/NSLayoutConstraint+Rx.swift @@ -10,7 +10,7 @@ import Foundation -#if os(OSX) +#if os(macOS) import Cocoa #else import UIKit @@ -20,7 +20,7 @@ import UIKit import RxSwift #endif -#if os(iOS) || os(OSX) || os(tvOS) +#if os(iOS) || os(macOS) || os(tvOS) extension Reactive where Base: NSLayoutConstraint { /** Bindable sink for `constant` property. diff --git a/RxCocoa/Common/TextInput.swift b/RxCocoa/Common/TextInput.swift index 2d8ed5140..81acc5092 100644 --- a/RxCocoa/Common/TextInput.swift +++ b/RxCocoa/Common/TextInput.swift @@ -61,7 +61,7 @@ import Foundation #endif -#if os(OSX) +#if os(macOS) import Cocoa /** diff --git a/RxCocoa/OSX/NSButton+Rx.swift b/RxCocoa/macOS/NSButton+Rx.swift similarity index 98% rename from RxCocoa/OSX/NSButton+Rx.swift rename to RxCocoa/macOS/NSButton+Rx.swift index 518c56e3a..091f8f29c 100644 --- a/RxCocoa/OSX/NSButton+Rx.swift +++ b/RxCocoa/macOS/NSButton+Rx.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Krunoslav Zaher. All rights reserved. // -#if os(OSX) +#if os(macOS) import Foundation #if !RX_NO_MODULE diff --git a/RxCocoa/OSX/NSControl+Rx.swift b/RxCocoa/macOS/NSControl+Rx.swift similarity index 99% rename from RxCocoa/OSX/NSControl+Rx.swift rename to RxCocoa/macOS/NSControl+Rx.swift index 600495e47..33f2104e6 100644 --- a/RxCocoa/OSX/NSControl+Rx.swift +++ b/RxCocoa/macOS/NSControl+Rx.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Krunoslav Zaher. All rights reserved. // -#if os(OSX) +#if os(macOS) import Foundation import Cocoa diff --git a/RxCocoa/OSX/NSImageView+Rx.swift b/RxCocoa/macOS/NSImageView+Rx.swift similarity index 99% rename from RxCocoa/OSX/NSImageView+Rx.swift rename to RxCocoa/macOS/NSImageView+Rx.swift index 9d54ca098..d5c8f6011 100644 --- a/RxCocoa/OSX/NSImageView+Rx.swift +++ b/RxCocoa/macOS/NSImageView+Rx.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Krunoslav Zaher. All rights reserved. // -#if os(OSX) +#if os(macOS) import Foundation #if !RX_NO_MODULE diff --git a/RxCocoa/OSX/NSSlider+Rx.swift b/RxCocoa/macOS/NSSlider+Rx.swift similarity index 97% rename from RxCocoa/OSX/NSSlider+Rx.swift rename to RxCocoa/macOS/NSSlider+Rx.swift index 1adde4c81..f40404338 100644 --- a/RxCocoa/OSX/NSSlider+Rx.swift +++ b/RxCocoa/macOS/NSSlider+Rx.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Krunoslav Zaher. All rights reserved. // -#if os(OSX) +#if os(macOS) import Foundation #if !RX_NO_MODULE diff --git a/RxCocoa/OSX/NSTextField+Rx.swift b/RxCocoa/macOS/NSTextField+Rx.swift similarity index 99% rename from RxCocoa/OSX/NSTextField+Rx.swift rename to RxCocoa/macOS/NSTextField+Rx.swift index f9fb82bb8..7e7216e29 100644 --- a/RxCocoa/OSX/NSTextField+Rx.swift +++ b/RxCocoa/macOS/NSTextField+Rx.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Krunoslav Zaher. All rights reserved. // -#if os(OSX) +#if os(macOS) import Foundation import Cocoa diff --git a/RxCocoa/OSX/NSView+Rx.swift b/RxCocoa/macOS/NSView+Rx.swift similarity index 98% rename from RxCocoa/OSX/NSView+Rx.swift rename to RxCocoa/macOS/NSView+Rx.swift index 8628acacd..162acf3b5 100644 --- a/RxCocoa/OSX/NSView+Rx.swift +++ b/RxCocoa/macOS/NSView+Rx.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Krunoslav Zaher. All rights reserved. // -#if os(OSX) +#if os(macOS) import Foundation import Cocoa diff --git a/RxExample/Extensions/CLLocationManager+Rx.swift b/RxExample/Extensions/CLLocationManager+Rx.swift index 5cd9158f5..eb603f14f 100644 --- a/RxExample/Extensions/CLLocationManager+Rx.swift +++ b/RxExample/Extensions/CLLocationManager+Rx.swift @@ -45,7 +45,7 @@ extension Reactive where Base: CLLocationManager { } } - #if os(iOS) || os(OSX) + #if os(iOS) || os(macOS) /** Reactive wrapper for `delegate` message. */ @@ -117,7 +117,7 @@ extension Reactive where Base: CLLocationManager { #endif - #if os(iOS) || os(OSX) + #if os(iOS) || os(macOS) /** Reactive wrapper for `delegate` message. diff --git a/RxExample/RxExample-iOSTests/CLLocationManager+RxTests.swift b/RxExample/RxExample-iOSTests/CLLocationManager+RxTests.swift index da54ebc31..388db6bba 100644 --- a/RxExample/RxExample-iOSTests/CLLocationManager+RxTests.swift +++ b/RxExample/RxExample-iOSTests/CLLocationManager+RxTests.swift @@ -62,7 +62,7 @@ extension CLLocationManagerTests { XCTAssertTrue(completed) } - #if os(iOS) || os(OSX) + #if os(iOS) || os(macOS) func testDidFinishDeferredUpdatesWithError() { var completed = false @@ -216,7 +216,7 @@ extension CLLocationManagerTests { #endif - #if os(iOS) || os(OSX) + #if os(iOS) || os(macOS) func testDidDetermineStateForRegion() { var completed = false diff --git a/RxExample/RxExample.xcodeproj/project.pbxproj b/RxExample/RxExample.xcodeproj/project.pbxproj index a3aa44877..ab498ce54 100644 --- a/RxExample/RxExample.xcodeproj/project.pbxproj +++ b/RxExample/RxExample.xcodeproj/project.pbxproj @@ -74,7 +74,7 @@ C849EF951C319E9D0048AC4A /* GithubSignupViewModel2.swift in Sources */ = {isa = PBXBuildFile; fileRef = C849EF851C3195180048AC4A /* GithubSignupViewModel2.swift */; }; C849EF961C31A3240048AC4A /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8A468EB1B8A8BC900BF917B /* RxSwift.framework */; }; C849EF971C31A3270048AC4A /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8A468ED1B8A8BCC00BF917B /* RxCocoa.framework */; }; - C849EF981C31A3340048AC4A /* RxTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8864C5A1C275A200073016D /* RxTests.framework */; }; + C849EF981C31A3340048AC4A /* RxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8864C5A1C275A200073016D /* RxTest.framework */; }; C849EF991C31A63C0048AC4A /* Wireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = C809E9791BE6841C0058D948 /* Wireframe.swift */; }; C849EF9A1C31A7680048AC4A /* ActivityIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80397391BD3E17D009D8B26 /* ActivityIndicator.swift */; }; C849EF9C1C31A8750048AC4A /* String+URL.swift in Sources */ = {isa = PBXBuildFile; fileRef = C849EF9B1C31A8750048AC4A /* String+URL.swift */; }; @@ -85,6 +85,9 @@ C864BADD1C3332F10083833C /* TableViewWithEditingCommandsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C864BAD41C3332F10083833C /* TableViewWithEditingCommandsViewController.swift */; }; C864BADF1C3332F10083833C /* UIImageView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C864BAD51C3332F10083833C /* UIImageView+Extensions.swift */; }; C864BAE11C3332F10083833C /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = C864BAD61C3332F10083833C /* User.swift */; }; + C86781CC1DB824D500B2029A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86781CA1DB824D500B2029A /* AppDelegate.swift */; }; + C86781CE1DB824E500B2029A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C86781CB1DB824D500B2029A /* Main.storyboard */; }; + C86781D11DB8250400B2029A /* IntroductionExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86781D01DB8250400B2029A /* IntroductionExampleViewController.swift */; }; C86E2F3E1AE5A0CA00C31024 /* SearchResultViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86E2F321AE5A0CA00C31024 /* SearchResultViewModel.swift */; }; C86E2F451AE5A0CA00C31024 /* WikipediaAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86E2F3B1AE5A0CA00C31024 /* WikipediaAPI.swift */; }; C86E2F461AE5A0CA00C31024 /* WikipediaPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86E2F3C1AE5A0CA00C31024 /* WikipediaPage.swift */; }; @@ -131,7 +134,6 @@ C8A468F21B8A8C2600BF917B /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8A468ED1B8A8BCC00BF917B /* RxCocoa.framework */; }; C8A468F31B8A8C2600BF917B /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8A468EB1B8A8BC900BF917B /* RxSwift.framework */; }; C8BCD3DF1C1480E9005F1280 /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8BCD3DE1C1480E9005F1280 /* Operators.swift */; }; - C8BCD3E31C14820B005F1280 /* IntroductionExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8BCD3E21C14820B005F1280 /* IntroductionExampleViewController.swift */; }; C8BCD3E61C14A95E005F1280 /* NumbersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8BCD3E51C14A95E005F1280 /* NumbersViewController.swift */; }; C8BCD3EA1C14B02A005F1280 /* SimpleValidationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8BCD3E91C14B02A005F1280 /* SimpleValidationViewController.swift */; }; C8C46DA81B47F7110020D71E /* CollectionViewImageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8C46DA31B47F7110020D71E /* CollectionViewImageCell.swift */; }; @@ -142,11 +144,9 @@ C8CDF0C11D688DF700C18F99 /* UITableView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8CDF0C01D688DF700C18F99 /* UITableView+Extensions.swift */; }; C8D132151C42B54B00B59FFF /* UIImagePickerController+RxCreate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8D132141C42B54B00B59FFF /* UIImagePickerController+RxCreate.swift */; }; C8DF92CD1B0B2F84009BCF9A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DF92C81B0B2F84009BCF9A /* AppDelegate.swift */; }; - C8DF92DF1B0B328B009BCF9A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DF92DE1B0B328B009BCF9A /* AppDelegate.swift */; }; C8DF92E31B0B32DA009BCF9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = C8DF92E01B0B32DA009BCF9A /* LaunchScreen.xib */; }; C8DF92E41B0B32DA009BCF9A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C8DF92E11B0B32DA009BCF9A /* Main.storyboard */; }; C8DF92E51B0B32DA009BCF9A /* RootViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DF92E21B0B32DA009BCF9A /* RootViewController.swift */; }; - C8DF92E71B0B32F2009BCF9A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C8DF92E61B0B32F2009BCF9A /* Main.storyboard */; }; C8DF92EA1B0B38C0009BCF9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C8DF92E91B0B38C0009BCF9A /* Images.xcassets */; }; C8DF92EB1B0B38C0009BCF9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C8DF92E91B0B38C0009BCF9A /* Images.xcassets */; }; C8E9D2AF1BD3FD960079D0DB /* ActivityIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80397391BD3E17D009D8B26 /* ActivityIndicator.swift */; }; @@ -404,6 +404,9 @@ C864BAD41C3332F10083833C /* TableViewWithEditingCommandsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewWithEditingCommandsViewController.swift; sourceTree = ""; }; C864BAD51C3332F10083833C /* UIImageView+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImageView+Extensions.swift"; sourceTree = ""; }; C864BAD61C3332F10083833C /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = ""; }; + C86781CA1DB824D500B2029A /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + C86781CB1DB824D500B2029A /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; + C86781D01DB8250400B2029A /* IntroductionExampleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroductionExampleViewController.swift; sourceTree = ""; }; C86E2F321AE5A0CA00C31024 /* SearchResultViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = SearchResultViewModel.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; C86E2F3B1AE5A0CA00C31024 /* WikipediaAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WikipediaAPI.swift; sourceTree = ""; }; C86E2F3C1AE5A0CA00C31024 /* WikipediaPage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = WikipediaPage.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; @@ -435,7 +438,6 @@ C8A468EF1B8A8BD000BF917B /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RxBlocking.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C8B290BE1C959D2900E923D0 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; C8BCD3DE1C1480E9005F1280 /* Operators.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Operators.swift; sourceTree = ""; }; - C8BCD3E21C14820B005F1280 /* IntroductionExampleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroductionExampleViewController.swift; sourceTree = ""; }; C8BCD3E51C14A95E005F1280 /* NumbersViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NumbersViewController.swift; sourceTree = ""; }; C8BCD3E91C14B02A005F1280 /* SimpleValidationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimpleValidationViewController.swift; sourceTree = ""; }; C8C46DA31B47F7110020D71E /* CollectionViewImageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionViewImageCell.swift; sourceTree = ""; }; @@ -446,13 +448,11 @@ C8CDF0C01D688DF700C18F99 /* UITableView+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITableView+Extensions.swift"; sourceTree = ""; }; C8D132141C42B54B00B59FFF /* UIImagePickerController+RxCreate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImagePickerController+RxCreate.swift"; sourceTree = ""; }; C8DF92C81B0B2F84009BCF9A /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - C8DF92DE1B0B328B009BCF9A /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; C8DF92E01B0B32DA009BCF9A /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = ""; }; C8DF92E11B0B32DA009BCF9A /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; C8DF92E21B0B32DA009BCF9A /* RootViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RootViewController.swift; sourceTree = ""; }; - C8DF92E61B0B32F2009BCF9A /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; C8DF92E91B0B38C0009BCF9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - C8DF92F01B0B3E67009BCF9A /* Info-OSX.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-OSX.plist"; sourceTree = ""; }; + C8DF92F01B0B3E67009BCF9A /* Info-macOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-macOS.plist"; sourceTree = ""; }; C8DF92F21B0B3E71009BCF9A /* Info-iOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = ""; }; C8F8C4891C277F460047640B /* CalculatorState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CalculatorState.swift; sourceTree = ""; }; C8F8C49C1C277F4F0047640B /* CalculatorAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CalculatorAction.swift; sourceTree = ""; }; @@ -474,7 +474,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C849EF981C31A3340048AC4A /* RxTests.framework in Frameworks */, + C849EF981C31A3340048AC4A /* RxTest.framework in Frameworks */, C849EF971C31A3270048AC4A /* RxCocoa.framework in Frameworks */, C849EF961C31A3240048AC4A /* RxSwift.framework in Frameworks */, ); @@ -551,13 +551,13 @@ C81B3A131BC1C28400EF5A9F /* RxBlocking.framework */, C81B3A151BC1C28400EF5A9F /* RxBlocking.framework */, C81B3A171BC1C28400EF5A9F /* RxBlocking.framework */, - C8864C5A1C275A200073016D /* RxTests.framework */, - C8864C5C1C275A200073016D /* RxTests.framework */, - C8864C5E1C275A200073016D /* RxTests.framework */, - C8864C601C275A200073016D /* RxTests.framework */, + C8864C5A1C275A200073016D /* RxTest.framework */, + C8864C5C1C275A200073016D /* RxTest.framework */, + C8864C5E1C275A200073016D /* RxTest.framework */, + C8864C601C275A200073016D /* RxTest.framework */, 8479BC661C3BC98F00FB8B54 /* AllTests-iOS.xctest */, 8479BC681C3BC98F00FB8B54 /* AllTests-tvOS.xctest */, - 8479BC6A1C3BC98F00FB8B54 /* AllTests-OSX.xctest */, + 8479BC6A1C3BC98F00FB8B54 /* AllTests-macOS.xctest */, 8479BC6C1C3BC98F00FB8B54 /* PerformanceTests.app */, ); name = Products; @@ -610,6 +610,7 @@ isa = PBXGroup; children = ( C8DF92E91B0B38C0009BCF9A /* Images.xcassets */, + C86781C91DB824D500B2029A /* macOS */, C86E2F2E1AE5A0CA00C31024 /* Examples */, C83367101AD029AE00C668A7 /* Services */, 2864D5F11D995FCD004F8484 /* Application+Extensions.swift */, @@ -618,7 +619,6 @@ C890A65C1AEC084100AFF7E6 /* ViewController.swift */, C833670F1AD029AE00C668A7 /* Example.swift */, C849EF9B1C31A8750048AC4A /* String+URL.swift */, - C8DF92D11B0B2F8C009BCF9A /* OSX */, C8DF92C71B0B2F84009BCF9A /* iOS */, C83366E01AD0293800C668A7 /* Supporting Files */, ); @@ -629,7 +629,7 @@ isa = PBXGroup; children = ( C8DF92F21B0B3E71009BCF9A /* Info-iOS.plist */, - C8DF92F01B0B3E67009BCF9A /* Info-OSX.plist */, + C8DF92F01B0B3E67009BCF9A /* Info-macOS.plist */, ); name = "Supporting Files"; sourceTree = ""; @@ -748,6 +748,23 @@ path = TableViewWithEditingCommands; sourceTree = ""; }; + C86781C91DB824D500B2029A /* macOS */ = { + isa = PBXGroup; + children = ( + C86781CA1DB824D500B2029A /* AppDelegate.swift */, + C86781CB1DB824D500B2029A /* Main.storyboard */, + ); + path = macOS; + sourceTree = ""; + }; + C86781CF1DB8250400B2029A /* macOS simple example */ = { + isa = PBXGroup; + children = ( + C86781D01DB8250400B2029A /* IntroductionExampleViewController.swift */, + ); + path = "macOS simple example"; + sourceTree = ""; + }; C86E2F2E1AE5A0CA00C31024 /* Examples */ = { isa = PBXGroup; children = ( @@ -758,12 +775,12 @@ C86E2F4C1AE5A10900C31024 /* GitHubSignup */, C822B1E11C14E37B0088A01A /* SimpleTableViewExample */, C822B1E51C14E7120088A01A /* SimpleTableViewExampleSectioned */, + C86781CF1DB8250400B2029A /* macOS simple example */, C864BAD01C3332F10083833C /* TableViewWithEditingCommands */, C8984CCD1C36BC3E001E4272 /* TableViewPartialUpdates */, C86E2F301AE5A0CA00C31024 /* WikipediaImageSearch */, 075F130E1B4E9D10000D7861 /* APIWrappers */, 07A5C3D91B70B6B8001EFE5C /* Calculator */, - C8BCD3E11C14820B005F1280 /* OSX simple example */, C843A08B1C1CE39900CBA4BD /* GitHubSearchRepositories */, ); path = Examples; @@ -872,14 +889,6 @@ path = RxDataSources; sourceTree = ""; }; - C8BCD3E11C14820B005F1280 /* OSX simple example */ = { - isa = PBXGroup; - children = ( - C8BCD3E21C14820B005F1280 /* IntroductionExampleViewController.swift */, - ); - path = "OSX simple example"; - sourceTree = ""; - }; C8BCD3E41C14A950005F1280 /* Numbers */ = { isa = PBXGroup; children = ( @@ -908,15 +917,6 @@ path = iOS; sourceTree = ""; }; - C8DF92D11B0B2F8C009BCF9A /* OSX */ = { - isa = PBXGroup; - children = ( - C8DF92DE1B0B328B009BCF9A /* AppDelegate.swift */, - C8DF92E61B0B32F2009BCF9A /* Main.storyboard */, - ); - path = OSX; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -1066,10 +1066,10 @@ remoteRef = 8479BC671C3BC98F00FB8B54 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 8479BC6A1C3BC98F00FB8B54 /* AllTests-OSX.xctest */ = { + 8479BC6A1C3BC98F00FB8B54 /* AllTests-macOS.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = "AllTests-OSX.xctest"; + path = "AllTests-macOS.xctest"; remoteRef = 8479BC691C3BC98F00FB8B54 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1164,31 +1164,31 @@ remoteRef = C81B3A161BC1C28400EF5A9F /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - C8864C5A1C275A200073016D /* RxTests.framework */ = { + C8864C5A1C275A200073016D /* RxTest.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = RxTests.framework; + path = RxTest.framework; remoteRef = C8864C591C275A200073016D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - C8864C5C1C275A200073016D /* RxTests.framework */ = { + C8864C5C1C275A200073016D /* RxTest.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = RxTests.framework; + path = RxTest.framework; remoteRef = C8864C5B1C275A200073016D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - C8864C5E1C275A200073016D /* RxTests.framework */ = { + C8864C5E1C275A200073016D /* RxTest.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = RxTests.framework; + path = RxTest.framework; remoteRef = C8864C5D1C275A200073016D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - C8864C601C275A200073016D /* RxTests.framework */ = { + C8864C601C275A200073016D /* RxTest.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = RxTests.framework; + path = RxTest.framework; remoteRef = C8864C5F1C275A200073016D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1218,8 +1218,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - C8DF92E71B0B32F2009BCF9A /* Main.storyboard in Resources */, C8DF92EB1B0B38C0009BCF9A /* Images.xcassets in Resources */, + C86781CE1DB824E500B2029A /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1358,9 +1358,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C8BCD3E31C14820B005F1280 /* IntroductionExampleViewController.swift in Sources */, C809E97F1BE69B660058D948 /* Wireframe.swift in Sources */, - C8DF92DF1B0B328B009BCF9A /* AppDelegate.swift in Sources */, + C86781CC1DB824D500B2029A /* AppDelegate.swift in Sources */, C88BB8BB1B07E6C90064D411 /* SearchResultViewModel.swift in Sources */, C88BB8BC1B07E6C90064D411 /* HtmlParsing.swift in Sources */, C8E9D2AF1BD3FD960079D0DB /* ActivityIndicator.swift in Sources */, @@ -1368,6 +1367,7 @@ C88BB8BE1B07E6C90064D411 /* ImageService.swift in Sources */, B1604CC31BE5B8BD002E1279 /* ReachabilityService.swift in Sources */, 2864D5F31D995FCD004F8484 /* Application+Extensions.swift in Sources */, + C86781D11DB8250400B2029A /* IntroductionExampleViewController.swift in Sources */, C88BB8BF1B07E6C90064D411 /* WikipediaSearchResult.swift in Sources */, B18F3BBF1BD93DFF000AAC79 /* Reachability.swift in Sources */, C88BB8C31B07E6C90064D411 /* Example.swift in Sources */, @@ -1588,7 +1588,7 @@ isa = XCBuildConfiguration; buildSettings = { COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = "RxExample/Info-OSX.plist"; + INFOPLIST_FILE = "RxExample/Info-macOS.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @executable_path/../Frameworks"; OTHER_LDFLAGS = "-objc_loadall"; PRODUCT_BUNDLE_IDENTIFIER = "io.rx.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1600,7 +1600,7 @@ isa = XCBuildConfiguration; buildSettings = { COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = "RxExample/Info-OSX.plist"; + INFOPLIST_FILE = "RxExample/Info-macOS.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @executable_path/../Frameworks"; OTHER_LDFLAGS = "-objc_loadall"; PRODUCT_BUNDLE_IDENTIFIER = "io.rx.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1737,7 +1737,7 @@ isa = XCBuildConfiguration; buildSettings = { COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = "RxExample/Info-OSX.plist"; + INFOPLIST_FILE = "RxExample/Info-macOS.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @executable_path/../Frameworks"; OTHER_LDFLAGS = "-objc_loadall"; PRODUCT_BUNDLE_IDENTIFIER = "io.rx.$(PRODUCT_NAME:rfc1034identifier)"; diff --git a/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-OSX.xcscheme b/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-macOS.xcscheme similarity index 100% rename from RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-OSX.xcscheme rename to RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-macOS.xcscheme diff --git a/RxExample/RxExample/Application+Extensions.swift b/RxExample/RxExample/Application+Extensions.swift index 06858b9e1..e658c0ac5 100644 --- a/RxExample/RxExample/Application+Extensions.swift +++ b/RxExample/RxExample/Application+Extensions.swift @@ -9,7 +9,7 @@ #if os(iOS) import UIKit typealias OSApplication = UIApplication -#elseif os(OSX) +#elseif os(macOS) import Cocoa typealias OSApplication = NSApplication #endif diff --git a/RxExample/RxExample/Example.swift b/RxExample/RxExample/Example.swift index 12caada05..5e64146e5 100644 --- a/RxExample/RxExample/Example.swift +++ b/RxExample/RxExample/Example.swift @@ -11,7 +11,7 @@ import Foundation #if os(iOS) import UIKit typealias Image = UIImage -#elseif os(OSX) +#elseif os(macOS) import Cocoa import AppKit typealias Image = NSImage @@ -38,7 +38,7 @@ extension String { func showAlert(_ message: String) { #if os(iOS) UIAlertView(title: "RxExample", message: message, delegate: nil, cancelButtonTitle: "OK").show() - #elseif os(OSX) + #elseif os(macOS) let alert = NSAlert() alert.messageText = message alert.runModal() diff --git a/RxExample/RxExample/Examples/OSX simple example/IntroductionExampleViewController.swift b/RxExample/RxExample/Examples/macOS simple example/IntroductionExampleViewController.swift similarity index 100% rename from RxExample/RxExample/Examples/OSX simple example/IntroductionExampleViewController.swift rename to RxExample/RxExample/Examples/macOS simple example/IntroductionExampleViewController.swift diff --git a/RxExample/RxExample/Info-OSX.plist b/RxExample/RxExample/Info-macOS.plist similarity index 100% rename from RxExample/RxExample/Info-OSX.plist rename to RxExample/RxExample/Info-macOS.plist diff --git a/RxExample/RxExample/Services/DownloadableImage.swift b/RxExample/RxExample/Services/DownloadableImage.swift index 1951d1240..270806834 100644 --- a/RxExample/RxExample/Services/DownloadableImage.swift +++ b/RxExample/RxExample/Services/DownloadableImage.swift @@ -12,7 +12,7 @@ import RxSwift #endif #if os(iOS) import UIKit -#elseif os(OSX) +#elseif os(macOS) import Cocoa #endif diff --git a/RxExample/RxExample/Services/ImageService.swift b/RxExample/RxExample/Services/ImageService.swift index 62a747696..52760da44 100644 --- a/RxExample/RxExample/Services/ImageService.swift +++ b/RxExample/RxExample/Services/ImageService.swift @@ -14,7 +14,7 @@ import RxCocoa #if os(iOS) import UIKit -#elseif os(OSX) +#elseif os(macOS) import Cocoa #endif diff --git a/RxExample/RxExample/Services/Wireframe.swift b/RxExample/RxExample/Services/Wireframe.swift index 5ec63845d..d616b6885 100644 --- a/RxExample/RxExample/Services/Wireframe.swift +++ b/RxExample/RxExample/Services/Wireframe.swift @@ -13,7 +13,7 @@ import RxSwift #if os(iOS) import UIKit -#elseif os(OSX) +#elseif os(macOS) import Cocoa #endif @@ -34,7 +34,7 @@ class DefaultWireframe: Wireframe { func open(url: URL) { #if os(iOS) UIApplication.shared.openURL(url) - #elseif os(OSX) + #elseif os(macOS) NSWorkspace.shared().open(url) #endif } @@ -75,7 +75,7 @@ class DefaultWireframe: Wireframe { alertView.dismiss(animated:false, completion: nil) } } - #elseif os(OSX) + #elseif os(macOS) return Observable.error(NSError(domain: "Unimplemented", code: -1, userInfo: nil)) #endif } diff --git a/RxExample/RxExample/ViewController.swift b/RxExample/RxExample/ViewController.swift index b715f8574..0fcadaa86 100644 --- a/RxExample/RxExample/ViewController.swift +++ b/RxExample/RxExample/ViewController.swift @@ -14,7 +14,7 @@ import RxSwift #if os(iOS) import UIKit typealias OSViewController = UIViewController -#elseif os(OSX) +#elseif os(macOS) import Cocoa typealias OSViewController = NSViewController #endif diff --git a/RxExample/RxExample/OSX/AppDelegate.swift b/RxExample/RxExample/macOS/AppDelegate.swift similarity index 100% rename from RxExample/RxExample/OSX/AppDelegate.swift rename to RxExample/RxExample/macOS/AppDelegate.swift diff --git a/RxExample/RxExample/OSX/Main.storyboard b/RxExample/RxExample/macOS/Main.storyboard similarity index 100% rename from RxExample/RxExample/OSX/Main.storyboard rename to RxExample/RxExample/macOS/Main.storyboard diff --git a/RxSwift.podspec b/RxSwift.podspec index 64954bae5..bab8d04d3 100644 --- a/RxSwift.podspec +++ b/RxSwift.podspec @@ -7,7 +7,7 @@ This is a Swift port of [ReactiveX.io](https://github.com/ReactiveX) Like the original [Rx](https://github.com/Reactive-extensions/Rx.Net), its intention is to enable easy composition of asynchronous operations and event streams. -It tries to port as many concepts from the original Rx as possible, but some concepts were adapted for more pleasant and performant integration with iOS/OSX environment. +It tries to port as many concepts from the original Rx as possible, but some concepts were adapted for more pleasant and performant integration with iOS/macOS/Linux environment. Probably the best analogy for those who have never heard of Rx would be: diff --git a/Sources/AllTestz/main.swift b/Sources/AllTestz/main.swift index 4a6b712bf..a0b5bf507 100644 --- a/Sources/AllTestz/main.swift +++ b/Sources/AllTestz/main.swift @@ -3,7 +3,7 @@ import XCTest import RxSwift protocol RxTestCase { -#if os(OSX) +#if os(macOS) init() static var allTests: [(String, (Self) -> () -> ())] { get } #endif @@ -13,7 +13,7 @@ protocol RxTestCase { final class EventTests_ : EventTests, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -28,7 +28,7 @@ final class EventTests_ : EventTests, RxTestCase { } final class PublishSubjectTest_ : PublishSubjectTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -42,7 +42,7 @@ final class PublishSubjectTest_ : PublishSubjectTest, RxTestCase { } final class VirtualSchedulerTest_ : VirtualSchedulerTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -62,7 +62,7 @@ final class VirtualSchedulerTest_ : VirtualSchedulerTest, RxTestCase { } final class ObservableBlockingTest_ : ObservableBlockingTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -111,7 +111,7 @@ final class ObservableBlockingTest_ : ObservableBlockingTest, RxTestCase { } final class ObservableTimeTest_ : ObservableTimeTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -197,7 +197,7 @@ final class ObservableTimeTest_ : ObservableTimeTest, RxTestCase { } final class ObservableBindingTest_ : ObservableBindingTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -249,7 +249,7 @@ final class ObservableBindingTest_ : ObservableBindingTest, RxTestCase { } final class ObservableStandardSequenceOperatorsTest_ : ObservableStandardSequenceOperatorsTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -380,7 +380,7 @@ final class ObservableStandardSequenceOperatorsTest_ : ObservableStandardSequenc } final class ObservableSingleTest_ : ObservableSingleTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -441,7 +441,7 @@ final class ObservableSingleTest_ : ObservableSingleTest, RxTestCase { } final class ObservableAggregateTest_ : ObservableAggregateTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -471,7 +471,7 @@ final class ObservableAggregateTest_ : ObservableAggregateTest, RxTestCase { } final class SubjectConcurrencyTest_ : SubjectConcurrencyTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -485,7 +485,7 @@ final class SubjectConcurrencyTest_ : SubjectConcurrencyTest, RxTestCase { } final class VariableTest_ : VariableTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -499,7 +499,7 @@ final class VariableTest_ : VariableTest, RxTestCase { } final class ObservableConcurrencyTest_ : ObservableConcurrencyTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -522,7 +522,7 @@ final class ObservableConcurrencyTest_ : ObservableConcurrencyTest, RxTestCase { } final class ReactiveTests_ : ReactiveTests, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -534,7 +534,7 @@ final class ReactiveTests_ : ReactiveTests, RxTestCase { } final class ReplaySubjectTest_ : ReplaySubjectTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -548,7 +548,7 @@ final class ReplaySubjectTest_ : ReplaySubjectTest, RxTestCase { } final class ObservableSubscriptionTests_ : ObservableSubscriptionTests, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -563,7 +563,7 @@ final class ObservableSubscriptionTests_ : ObservableSubscriptionTests, RxTestCa } final class DisposableTest_ : DisposableTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -582,7 +582,7 @@ final class DisposableTest_ : DisposableTest, RxTestCase { } final class HistoricalSchedulerTest_ : HistoricalSchedulerTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -601,7 +601,7 @@ final class HistoricalSchedulerTest_ : HistoricalSchedulerTest, RxTestCase { } final class MainSchedulerTest_ : MainSchedulerTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -615,7 +615,7 @@ final class MainSchedulerTest_ : MainSchedulerTest, RxTestCase { } final class ObserverTests_ : ObserverTests, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -633,7 +633,7 @@ final class ObserverTests_ : ObserverTests, RxTestCase { } final class ConcurrentDispatchQueueSchedulerTests_ : ConcurrentDispatchQueueSchedulerTests, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -648,7 +648,7 @@ final class ConcurrentDispatchQueueSchedulerTests_ : ConcurrentDispatchQueueSche } final class QueueTest_ : QueueTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -660,7 +660,7 @@ final class QueueTest_ : QueueTest, RxTestCase { } final class ObservableMultipleTest_ : ObservableMultipleTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -904,7 +904,7 @@ final class ObservableMultipleTest_ : ObservableMultipleTest, RxTestCase { } final class AssumptionsTest_ : AssumptionsTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -919,7 +919,7 @@ final class AssumptionsTest_ : AssumptionsTest, RxTestCase { } final class BehaviorSubjectTest_ : BehaviorSubjectTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -937,7 +937,7 @@ final class BehaviorSubjectTest_ : BehaviorSubjectTest, RxTestCase { } final class ObservableCreationTests_ : ObservableCreationTests, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -975,7 +975,7 @@ final class ObservableCreationTests_ : ObservableCreationTests, RxTestCase { } final class ObservableConcurrentSchedulerConcurrencyTest_ : ObservableConcurrentSchedulerConcurrencyTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -993,7 +993,7 @@ final class ObservableConcurrentSchedulerConcurrencyTest_ : ObservableConcurrent } final class ObservableDebugTest_ : ObservableDebugTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -1006,7 +1006,7 @@ final class ObservableDebugTest_ : ObservableDebugTest, RxTestCase { } final class AnonymousObservableTests_ : AnonymousObservableTests, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -1020,7 +1020,7 @@ final class AnonymousObservableTests_ : AnonymousObservableTests, RxTestCase { } final class CurrentThreadSchedulerTest_ : CurrentThreadSchedulerTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -1035,7 +1035,7 @@ final class CurrentThreadSchedulerTest_ : CurrentThreadSchedulerTest, RxTestCase } final class BagTest_ : BagTest, RxTestCase { - #if os(OSX) + #if os(macOS) required override init() { super.init() } @@ -1050,7 +1050,7 @@ final class BagTest_ : BagTest, RxTestCase { ("testBag_complexityTestFromEnd", BagTest.testBag_complexityTestFromEnd), ] } } -#if os(OSX) || os(iOS) || os(tvOS) || os(watchOS) +#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) func testCase(_ tests: [(String, (T) -> () -> ())]) -> () -> () { return { diff --git a/Sources/RxCocoa/NSButton+Rx.swift b/Sources/RxCocoa/NSButton+Rx.swift index abbd873cc..c93127f71 120000 --- a/Sources/RxCocoa/NSButton+Rx.swift +++ b/Sources/RxCocoa/NSButton+Rx.swift @@ -1 +1 @@ -../../RxCocoa/OSX/NSButton+Rx.swift \ No newline at end of file +../../RxCocoa/macOS/NSButton+Rx.swift \ No newline at end of file diff --git a/Sources/RxCocoa/NSControl+Rx.swift b/Sources/RxCocoa/NSControl+Rx.swift index 263f73a8d..a7d9a3a41 120000 --- a/Sources/RxCocoa/NSControl+Rx.swift +++ b/Sources/RxCocoa/NSControl+Rx.swift @@ -1 +1 @@ -../../RxCocoa/OSX/NSControl+Rx.swift \ No newline at end of file +../../RxCocoa/macOS/NSControl+Rx.swift \ No newline at end of file diff --git a/Sources/RxCocoa/NSImageView+Rx.swift b/Sources/RxCocoa/NSImageView+Rx.swift index 6dec45d6c..b0aa9ccd5 120000 --- a/Sources/RxCocoa/NSImageView+Rx.swift +++ b/Sources/RxCocoa/NSImageView+Rx.swift @@ -1 +1 @@ -../../RxCocoa/OSX/NSImageView+Rx.swift \ No newline at end of file +../../RxCocoa/macOS/NSImageView+Rx.swift \ No newline at end of file diff --git a/Sources/RxCocoa/NSSlider+Rx.swift b/Sources/RxCocoa/NSSlider+Rx.swift index 8d7f6d49e..32ccaadc2 120000 --- a/Sources/RxCocoa/NSSlider+Rx.swift +++ b/Sources/RxCocoa/NSSlider+Rx.swift @@ -1 +1 @@ -../../RxCocoa/OSX/NSSlider+Rx.swift \ No newline at end of file +../../RxCocoa/macOS/NSSlider+Rx.swift \ No newline at end of file diff --git a/Sources/RxCocoa/NSTextField+Rx.swift b/Sources/RxCocoa/NSTextField+Rx.swift index d10cc81ff..2f8d8519b 120000 --- a/Sources/RxCocoa/NSTextField+Rx.swift +++ b/Sources/RxCocoa/NSTextField+Rx.swift @@ -1 +1 @@ -../../RxCocoa/OSX/NSTextField+Rx.swift \ No newline at end of file +../../RxCocoa/macOS/NSTextField+Rx.swift \ No newline at end of file diff --git a/Sources/RxCocoa/NSView+Rx.swift b/Sources/RxCocoa/NSView+Rx.swift index b62ad1951..2a4a12118 120000 --- a/Sources/RxCocoa/NSView+Rx.swift +++ b/Sources/RxCocoa/NSView+Rx.swift @@ -1 +1 @@ -../../RxCocoa/OSX/NSView+Rx.swift \ No newline at end of file +../../RxCocoa/macOS/NSView+Rx.swift \ No newline at end of file diff --git a/Tests/RxCocoaTests/DelegateProxyTest.swift b/Tests/RxCocoaTests/DelegateProxyTest.swift index 53ecc8ed7..674374e52 100644 --- a/Tests/RxCocoaTests/DelegateProxyTest.swift +++ b/Tests/RxCocoaTests/DelegateProxyTest.swift @@ -431,7 +431,7 @@ class MockThreeDSectionedViewProtocol : NSObject, ThreeDSectionedViewProtocol { } } -#if os(OSX) +#if os(macOS) extension MockTestDelegateProtocol : NSTextFieldDelegate { diff --git a/Tests/RxCocoaTests/KVOObservableTests.swift b/Tests/RxCocoaTests/KVOObservableTests.swift index 0c04b6ed0..e970dacec 100644 --- a/Tests/RxCocoaTests/KVOObservableTests.swift +++ b/Tests/RxCocoaTests/KVOObservableTests.swift @@ -13,7 +13,7 @@ import RxCocoa #if os(iOS) import UIKit -#elseif os(OSX) +#elseif os(macOS) import Cocoa #endif @@ -677,7 +677,7 @@ extension KVOObservableTests { XCTAssertTrue(rootDeallocated) } - #if os(OSX) + #if os(macOS) // just making sure it's all the same for NS extensions func testObserve_ObserveNSRect() { var root: HasStrongProperty! = HasStrongProperty() diff --git a/Tests/RxCocoaTests/NSLayoutConstraint+RxTests.swift b/Tests/RxCocoaTests/NSLayoutConstraint+RxTests.swift index b110e4f16..06cf340d4 100644 --- a/Tests/RxCocoaTests/NSLayoutConstraint+RxTests.swift +++ b/Tests/RxCocoaTests/NSLayoutConstraint+RxTests.swift @@ -10,7 +10,7 @@ import Foundation import RxSwift import RxCocoa import XCTest -#if os(OSX) +#if os(macOS) import Cocoa typealias View = NSView #else diff --git a/Tests/RxCocoaTests/RxTest-OSX-Bridging-Header.h b/Tests/RxCocoaTests/RxTest-macOS-Bridging-Header.h similarity index 81% rename from Tests/RxCocoaTests/RxTest-OSX-Bridging-Header.h rename to Tests/RxCocoaTests/RxTest-macOS-Bridging-Header.h index 3b589ed5b..9e779768c 100644 --- a/Tests/RxCocoaTests/RxTest-OSX-Bridging-Header.h +++ b/Tests/RxCocoaTests/RxTest-macOS-Bridging-Header.h @@ -1,5 +1,5 @@ // -// RxTest-OSX-Bridging-Header.h +// RxTest-macOS-Bridging-Header.h // Tests // // Created by Krunoslav Zaher on 11/25/15. diff --git a/Tests/RxTest.swift b/Tests/RxTest.swift index 3d1e8ee82..51eda4d06 100644 --- a/Tests/RxTest.swift +++ b/Tests/RxTest.swift @@ -13,16 +13,16 @@ import Foundation #if TRACE_RESOURCES #elseif RELEASE -#elseif os(OSX) || os(iOS) || os(tvOS) || os(watchOS) +#elseif os(macOS) || os(iOS) || os(tvOS) || os(watchOS) #elseif os(Linux) #else let failure = unhandled_case() #endif -// because otherwise OSX unit tests won't run +// because otherwise macOS unit tests won't run #if os(iOS) import UIKit -#elseif os(OSX) +#elseif os(macOS) import AppKit #endif diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh index f90b9d67d..9cdc1088b 100755 --- a/scripts/all-tests.sh +++ b/scripts/all-tests.sh @@ -193,8 +193,8 @@ if [ "${VALIDATE_UNIX}" -eq 1 ]; then # compile and run playgrounds . scripts/validate-playgrounds.sh - # make sure osx builds - for scheme in "RxExample-OSX" + # make sure macOS builds + for scheme in "RxExample-macOS" do for configuration in ${CONFIGURATIONS[@]} do @@ -202,10 +202,10 @@ if [ "${VALIDATE_UNIX}" -eq 1 ]; then done done - #make sure all OSX tests pass + #make sure all macOS tests pass for configuration in ${CONFIGURATIONS[@]} do - rx "RxSwift-OSX" ${configuration} "" test + rx "RxSwift-macOS" ${configuration} "" test done elif [[ "${UNIX_NAME}" == "${LINUX}" ]]; then cat Package.swift | sed "s/let buildTests = false/let buildTests = true/" > Package.tests.swift @@ -216,7 +216,7 @@ if [ "${VALIDATE_UNIX}" -eq 1 ]; then unsupported_os fi else - printf "${RED}Skipping OSX tests ...${RESET}\n" + printf "${RED}Skipping Unix (macOS, Linux) tests ...${RESET}\n" fi if [ "${VALIDATE_TVOS}" -eq 1 ]; then diff --git a/scripts/package-spm.swift b/scripts/package-spm.swift index a7a756b17..623e17522 100755 --- a/scripts/package-spm.swift +++ b/scripts/package-spm.swift @@ -178,7 +178,7 @@ func buildAllTestsTarget(_ testsPath: String) throws { mainContent.append("import RxSwift") mainContent.append("") mainContent.append("protocol RxTestCase {") - mainContent.append("#if os(OSX)") + mainContent.append("#if os(macOS)") mainContent.append(" init()") mainContent.append(" static var allTests: [(String, (Self) -> () -> ())] { get }") mainContent.append("#endif") @@ -191,7 +191,7 @@ func buildAllTestsTarget(_ testsPath: String) throws { mainContent.append("") mainContent.append("final class \(name)_ : \(name), RxTestCase {") - mainContent.append(" #if os(OSX)") + mainContent.append(" #if os(macOS)") mainContent.append(" required override init() {") mainContent.append(" super.init()") mainContent.append(" }") @@ -207,7 +207,7 @@ func buildAllTestsTarget(_ testsPath: String) throws { mainContent.append("}") } - mainContent.append("#if os(OSX) || os(iOS) || os(tvOS) || os(watchOS)") + mainContent.append("#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)") mainContent.append("") mainContent.append("func testCase(_ tests: [(String, (T) -> () -> ())]) -> () -> () {") mainContent.append(" return {") @@ -246,7 +246,7 @@ func buildAllTestsTarget(_ testsPath: String) throws { try packageRelativePath(["RxSwift"], targetDirName: "RxSwift") -//try packageRelativePath(["RxCocoa/Common", "RxCocoa/OSX", "RxCocoa/RxCocoa.h"], targetDirName: "RxCocoa") +//try packageRelativePath(["RxCocoa/Common", "RxCocoa/macOS", "RxCocoa/RxCocoa.h"], targetDirName: "RxCocoa") try packageRelativePath([ "RxCocoa/RxCocoa.swift", @@ -254,7 +254,7 @@ try packageRelativePath([ "RxCocoa/Common", "RxCocoa/Foundation", "RxCocoa/iOS", - "RxCocoa/OSX", + "RxCocoa/macOS", ], targetDirName: "RxCocoa") try packageRelativePath([ "RxCocoa/Runtime/include", diff --git a/scripts/validate-playgrounds.sh b/scripts/validate-playgrounds.sh index cae17c3e2..392184c6a 100755 --- a/scripts/validate-playgrounds.sh +++ b/scripts/validate-playgrounds.sh @@ -2,8 +2,8 @@ CONFIGURATIONS=(Release) -# make sure osx builds -for scheme in "RxSwift-OSX" +# make sure macOS builds +for scheme in "RxSwift-macOS" do for configuration in ${CONFIGURATIONS[@]} do