From 011dd5b46ce11e3275fe56b0e0abd76f99993d84 Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Thu, 2 May 2019 15:29:38 +0300 Subject: [PATCH 01/19] Swift 5 support Adding RxSwift 5.0.x support --- Cartfile | 2 +- Cartfile.resolved | 2 +- Changelog.md | 4 +++ NSObject+Rx.podspec | 6 ++--- NSObject+Rx.swift | 2 +- NSObject-Rx.xcodeproj/project.pbxproj | 26 ++++++++++++++++--- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++ .../xcschemes/NSObject_Rx.xcscheme | 2 +- 8 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 NSObject-Rx.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Cartfile b/Cartfile index 4056d09..6a8bfd6 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveX/RxSwift" ~> 4.3 +github "ReactiveX/RxSwift" ~> 5.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index b34f3f7..b751e3d 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "ReactiveX/RxSwift" "4.3.1" +github "ReactiveX/RxSwift" "5.0.1" diff --git a/Changelog.md b/Changelog.md index ca12b66..1f13050 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,10 @@ Current master - Nothing yet! +4.5.0 +----- +- Update to Swift 5.0 and Xcode 10.2 See [#59](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/65) - [@fassko](https://github.com/fassko) + 4.4.1 ----- - Specify Swift 4.2 in podspec and .swift-version See [#59](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/59) - [@fassko](https://github.com/fassko) diff --git a/NSObject+Rx.podspec b/NSObject+Rx.podspec index ec731c5..589033e 100644 --- a/NSObject+Rx.podspec +++ b/NSObject+Rx.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "NSObject+Rx" - s.version = "4.4.1" + s.version = "4.5.0" s.summary = "Handy RxSwift extensions on NSObject." s.description = <<-DESC Right now, we just have a `rx_disposeBag` property, but we're open to PRs! @@ -15,9 +15,9 @@ Pod::Spec.new do |s| s.watchos.deployment_target = '2.0' s.tvos.deployment_target = '9.0' - s.swift_version = '4.2' + s.swift_version = '5.0' s.source = { :git => "https://github.com/RxSwiftCommunity/NSObject-Rx.git", :tag => s.version } s.source_files = "*.swift" s.frameworks = "Foundation" - s.dependency 'RxSwift', '~> 4.3' + s.dependency 'RxSwift', '~> 5.0' end diff --git a/NSObject+Rx.swift b/NSObject+Rx.swift index c2d75c6..65386bb 100644 --- a/NSObject+Rx.swift +++ b/NSObject+Rx.swift @@ -16,7 +16,7 @@ extension Reactive where Base: AnyObject { public extension Reactive where Base: AnyObject { /// a unique DisposeBag that is related to the Reactive.Base instance only for Reference type - public var disposeBag: DisposeBag { + var disposeBag: DisposeBag { get { return synchronizedBag { if let disposeObject = objc_getAssociatedObject(base, &disposeBagContext) as? DisposeBag { diff --git a/NSObject-Rx.xcodeproj/project.pbxproj b/NSObject-Rx.xcodeproj/project.pbxproj index 80e6eef..aed7d1e 100644 --- a/NSObject-Rx.xcodeproj/project.pbxproj +++ b/NSObject-Rx.xcodeproj/project.pbxproj @@ -16,7 +16,7 @@ 188C6D911C47B2B20092101A /* NSObject_Rx.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NSObject_Rx.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 188C6DA21C47B4240092101A /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = SOURCE_ROOT; }; 1AE62DBF1F50C8230011BA4F /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = ""; }; - 5E6ACB5A1F58657A0050E957 /* NSObject+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSObject+Rx.swift"; sourceTree = SOURCE_ROOT; }; + 5E6ACB5A1F58657A0050E957 /* NSObject+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = "NSObject+Rx.swift"; sourceTree = SOURCE_ROOT; tabWidth = 4; }; AE629B2F1FA2E174008BA02F /* HasDisposeBag.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HasDisposeBag.swift; sourceTree = ""; }; FE5EDFCF1F6A2CBF000ABFAC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ @@ -99,7 +99,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0830; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = RxSwiftCommunity; TargetAttributes = { 188C6D901C47B2B20092101A = { @@ -110,7 +110,7 @@ }; buildConfigurationList = 18EE7A131C47B12F00C7256C /* Build configuration list for PBXProject "NSObject-Rx" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -212,18 +212,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -251,6 +260,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -258,18 +268,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -290,6 +309,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/NSObject-Rx.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/NSObject-Rx.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/NSObject-Rx.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/NSObject-Rx.xcodeproj/xcshareddata/xcschemes/NSObject_Rx.xcscheme b/NSObject-Rx.xcodeproj/xcshareddata/xcschemes/NSObject_Rx.xcscheme index 2f2194c..2bf9922 100644 --- a/NSObject-Rx.xcodeproj/xcshareddata/xcschemes/NSObject_Rx.xcscheme +++ b/NSObject-Rx.xcodeproj/xcshareddata/xcschemes/NSObject_Rx.xcscheme @@ -1,6 +1,6 @@ Date: Thu, 2 May 2019 15:31:30 +0300 Subject: [PATCH 02/19] Update gems --- Gemfile.lock | 118 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 91 insertions(+), 27 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ea8eff2..7cb237c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,39 +2,80 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - addressable (2.5.2) + activesupport (4.2.11.1) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) atomos (0.1.3) babosa (1.0.2) claide (1.0.2) + cocoapods (1.6.1) + activesupport (>= 4.0.2, < 5) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.6.1) + cocoapods-deintegrate (>= 1.0.2, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-stats (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (>= 2.2.0, < 3.0) + gh_inspector (~> 1.0) + molinillo (~> 0.6.6) + nap (~> 1.0) + ruby-macho (~> 1.4) + xcodeproj (>= 1.8.1, < 2.0) + cocoapods-core (1.6.1) + activesupport (>= 4.0.2, < 6) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + cocoapods-deintegrate (1.0.4) + cocoapods-downloader (1.2.2) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.0) + cocoapods-stats (1.1.0) + cocoapods-trunk (1.3.1) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.1.0) colored (1.2) colored2 (3.1.2) commander-fastlane (4.4.6) highline (~> 1.7.2) + concurrent-ruby (1.1.5) declarative (0.0.10) declarative-option (0.1.0) + digest-crc (0.4.1) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - dotenv (2.5.0) - emoji_regex (0.1.1) - excon (0.62.0) - faraday (0.15.3) + dotenv (2.7.2) + emoji_regex (1.0.1) + escape (0.0.4) + excon (0.64.0) + faraday (0.15.4) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) - faraday_middleware (0.12.2) + faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) - fastimage (2.1.4) - fastlane (2.105.2) + fastimage (2.1.5) + fastlane (2.121.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) - bundler (>= 1.12.0, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) colored commander-fastlane (>= 4.4.6, < 5.0.0) dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (~> 0.1) + emoji_regex (>= 0.1, < 2.0) excon (>= 0.45.0, < 1.0.0) faraday (~> 0.9) faraday-cookie_jar (~> 0.0.6) @@ -42,6 +83,7 @@ GEM fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-api-client (>= 0.21.2, < 0.24.0) + google-cloud-storage (>= 1.15.0, < 2.0.0) highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) mini_magick (~> 4.5.1) @@ -54,14 +96,16 @@ GEM security (= 0.1.3) simctl (~> 1.6.3) slack-notifier (>= 2.0.0, < 3.0.0) - terminal-notifier (>= 1.6.2, < 2.0.0) + terminal-notifier (>= 2.0.0, < 3.0.0) terminal-table (>= 1.4.5, < 2.0.0) tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) - xcodeproj (>= 1.6.0, < 2.0.0) + xcodeproj (>= 1.8.1, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) + fourflusher (2.2.0) + fuzzy_match (2.0.4) gh_inspector (1.1.3) google-api-client (0.23.9) addressable (~> 2.5, >= 2.5.1) @@ -71,10 +115,19 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) signet (~> 0.9) - googleauth (0.6.6) + google-cloud-core (1.3.0) + google-cloud-env (~> 1.0) + google-cloud-env (1.0.5) + faraday (~> 0.11) + google-cloud-storage (1.16.0) + digest-crc (~> 0.4) + google-api-client (~> 0.23) + google-cloud-core (~> 1.2) + googleauth (>= 0.6.2, < 0.10.0) + googleauth (0.6.7) faraday (~> 0.12) jwt (>= 1.4, < 3.0) - memoist (~> 0.12) + memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.7) @@ -82,20 +135,26 @@ GEM http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) - json (2.1.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (2.2.0) jwt (2.1.0) memoist (0.16.0) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) + mime-types-data (3.2019.0331) mini_magick (4.5.1) + minitest (5.11.3) + molinillo (0.6.6) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) nanaimo (0.2.6) + nap (1.1.0) naturally (2.2.0) - os (1.0.0) - plist (3.4.0) + netrc (0.11.0) + os (1.0.1) + plist (3.5.0) public_suffix (2.0.5) representable (3.0.4) declarative (< 0.1.0) @@ -103,9 +162,10 @@ GEM uber (< 0.2.0) retriable (3.1.2) rouge (2.0.7) + ruby-macho (1.4.0) rubyzip (1.2.2) security (0.1.3) - signet (0.10.0) + signet (0.11.0) addressable (~> 2.3) faraday (~> 0.9) jwt (>= 1.5, < 3.0) @@ -114,20 +174,23 @@ GEM CFPropertyList naturally slack-notifier (2.3.2) - terminal-notifier (1.8.0) + terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - tty-cursor (0.6.0) + thread_safe (0.3.6) + tty-cursor (0.6.1) tty-screen (0.6.5) - tty-spinner (0.8.0) - tty-cursor (>= 0.5.0) + tty-spinner (0.9.0) + tty-cursor (~> 0.6.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.5) - unicode-display_width (1.4.0) + unf_ext (0.0.7.6) + unicode-display_width (1.5.0) word_wrap (1.0.0) - xcodeproj (1.6.0) + xcodeproj (1.8.2) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -142,7 +205,8 @@ PLATFORMS ruby DEPENDENCIES + cocoapods fastlane BUNDLED WITH - 1.16.4 + 1.17.2 From 95727ea8f0befc93ce6e87fc8853a8b5cf86f97d Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Thu, 2 May 2019 15:31:54 +0300 Subject: [PATCH 03/19] Correct changelog url --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 1f13050..2abd248 100644 --- a/Changelog.md +++ b/Changelog.md @@ -8,7 +8,7 @@ Current master 4.5.0 ----- -- Update to Swift 5.0 and Xcode 10.2 See [#59](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/65) - [@fassko](https://github.com/fassko) +- Update to Swift 5.0 and Xcode 10.2 See [#59](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/67) - [@fassko](https://github.com/fassko) 4.4.1 ----- From 3c67968e1645da904e3c06bcc3021cb78ca5f660 Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Fri, 3 May 2019 10:17:55 +0300 Subject: [PATCH 04/19] * remove deprecated .swift-version file * change version in Changelog and podspec * use new Xcode for building --- .swift-version | 1 - Changelog.md | 2 +- NSObject+Rx.podspec | 2 +- circle.yml | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 .swift-version diff --git a/.swift-version b/.swift-version deleted file mode 100644 index bf77d54..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -4.2 diff --git a/Changelog.md b/Changelog.md index 2abd248..a913c5f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,7 +6,7 @@ Current master - Nothing yet! -4.5.0 +5.0.0 ----- - Update to Swift 5.0 and Xcode 10.2 See [#59](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/67) - [@fassko](https://github.com/fassko) diff --git a/NSObject+Rx.podspec b/NSObject+Rx.podspec index 589033e..0dd3794 100644 --- a/NSObject+Rx.podspec +++ b/NSObject+Rx.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "NSObject+Rx" - s.version = "4.5.0" + s.version = "5.0.0" s.summary = "Handy RxSwift extensions on NSObject." s.description = <<-DESC Right now, we just have a `rx_disposeBag` property, but we're open to PRs! diff --git a/circle.yml b/circle.yml index 12eded5..85208fa 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: xcode: - version: 10.0.0 + version: 10.2.0 environment: LANG: en_US.UTF-8 dependencies: From 9bb5c125ca8873625b7519257fc8f1edd7b07bd0 Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Fri, 3 May 2019 10:23:30 +0300 Subject: [PATCH 05/19] Update Gems --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7cb237c..06409b7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,7 +67,7 @@ GEM faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) fastimage (2.1.5) - fastlane (2.121.1) + fastlane (2.122.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -190,7 +190,7 @@ GEM unf_ext (0.0.7.6) unicode-display_width (1.5.0) word_wrap (1.0.0) - xcodeproj (1.8.2) + xcodeproj (1.9.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) From aa08d1f81df514074ce065f20049b7adb097b2fd Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Fri, 3 May 2019 12:54:09 +0300 Subject: [PATCH 06/19] Build in Circle CI 2 --- .circleci/config.yml | 51 + Demo/Demo.xcodeproj/project.pbxproj | 4 +- Demo/Podfile.lock | 20 +- .../Local Podspecs/NSObject+Rx.podspec.json | 7 +- Demo/Pods/Manifest.lock | 20 +- Demo/Pods/Nimble/README.md | 29 +- .../Nimble/Adapters/AdapterProtocols.swift | 1 + .../Nimble/Adapters/AssertionRecorder.swift | 33 +- .../Nimble/Adapters/NMBExpectation.swift | 6 +- .../Nimble/Adapters/NMBObjCMatcher.swift | 4 +- .../Nimble/Adapters/NimbleEnvironment.swift | 18 +- .../Nimble/Adapters/NimbleXCTestHandler.swift | 13 +- .../Pods/Nimble/Sources/Nimble/DSL+Wait.swift | 14 +- Demo/Pods/Nimble/Sources/Nimble/DSL.swift | 18 +- .../Sources/Nimble/ExpectationMessage.swift | 29 +- .../Nimble/Sources/Nimble/Expression.swift | 2 + .../Sources/Nimble/FailureMessage.swift | 1 + .../Sources/Nimble/Matchers/AllPass.swift | 3 +- .../Sources/Nimble/Matchers/Async.swift | 14 +- .../Sources/Nimble/Matchers/BeAKindOf.swift | 2 +- .../Nimble/Matchers/BeAnInstanceOf.swift | 4 +- .../Sources/Nimble/Matchers/BeCloseTo.swift | 9 +- .../Sources/Nimble/Matchers/BeEmpty.swift | 29 +- .../Nimble/Matchers/BeGreaterThan.swift | 8 +- .../Matchers/BeGreaterThanOrEqualTo.swift | 8 +- .../Nimble/Matchers/BeIdenticalTo.swift | 12 +- .../Sources/Nimble/Matchers/BeLessThan.swift | 8 +- .../Nimble/Matchers/BeLessThanOrEqual.swift | 8 +- .../Sources/Nimble/Matchers/BeLogical.swift | 47 +- .../Sources/Nimble/Matchers/BeNil.swift | 8 +- .../Sources/Nimble/Matchers/BeVoid.swift | 12 +- .../Sources/Nimble/Matchers/BeginWith.swift | 16 +- .../Sources/Nimble/Matchers/Contain.swift | 83 +- .../Matchers/ContainElementSatisfying.swift | 26 +- .../Nimble/Matchers/ElementsEqual.swift | 16 + .../Sources/Nimble/Matchers/EndWith.swift | 13 +- .../Sources/Nimble/Matchers/Equal.swift | 156 +- .../Sources/Nimble/Matchers/HaveCount.swift | 27 +- .../Sources/Nimble/Matchers/Match.swift | 2 +- .../Nimble/Matchers/MatcherProtocols.swift | 13 +- .../Nimble/Matchers/PostNotification.swift | 37 +- .../Sources/Nimble/Matchers/Predicate.swift | 5 +- .../Nimble/Matchers/RaisesException.swift | 12 +- .../Nimble/Matchers/SatisfyAllOf.swift | 10 +- .../Nimble/Matchers/SatisfyAnyOf.swift | 10 +- .../Nimble/Matchers/ThrowAssertion.swift | 7 +- .../Nimble/Sources/Nimble/Utils/Await.swift | 32 +- .../Sources/Nimble/Utils/Functional.swift | 6 +- .../Sources/Nimble/Utils/Stringers.swift | 5 +- Demo/Pods/Pods.xcodeproj/project.pbxproj | 3081 ++++++++--------- Demo/Pods/Quick/README.md | 4 +- Demo/Pods/Quick/Sources/Quick/Behavior.swift | 2 +- Demo/Pods/Quick/Sources/Quick/Callsite.swift | 29 +- .../Quick/Configuration/Configuration.swift | 4 +- Demo/Pods/Quick/Sources/Quick/DSL/DSL.swift | 20 +- .../Quick/Sources/Quick/DSL/World+DSL.swift | 30 +- .../Quick/Sources/Quick/ErrorUtility.swift | 2 +- Demo/Pods/Quick/Sources/Quick/Example.swift | 12 +- .../Quick/Sources/Quick/ExampleMetadata.swift | 12 +- Demo/Pods/Quick/Sources/Quick/Filter.swift | 12 +- .../Quick/NSBundle+CurrentTestBundle.swift | 4 +- .../Quick/QuickSelectedTestSuiteBuilder.swift | 2 +- .../Quick/Sources/Quick/QuickTestSuite.swift | 2 +- ...ift => String+C99ExtendedIdentifier.swift} | 11 +- Demo/Pods/Quick/Sources/Quick/World.swift | 16 +- .../Quick/Sources/QuickObjectiveC/QuickSpec.h | 2 +- Demo/Pods/RxSwift/Platform/AtomicInt.swift | 71 + .../RxSwift/Platform/DataStructures/Bag.swift | 20 +- .../DataStructures/InfiniteSequence.swift | 9 +- .../DataStructures/PriorityQueue.swift | 14 +- .../RxSwift/Platform/DeprecationWarner.swift | 43 - .../RxSwift/Platform/Platform.Darwin.swift | 34 +- .../RxSwift/Platform/Platform.Linux.swift | 77 +- Demo/Pods/RxSwift/README.md | 69 +- Demo/Pods/RxSwift/RxSwift/AnyObserver.swift | 13 +- .../RxSwift/Concurrency/AsyncLock.swift | 32 +- .../RxSwift/RxSwift/Concurrency/Lock.swift | 6 +- .../RxSwift/Concurrency/LockOwnerType.swift | 4 +- .../Concurrency/SynchronizedDisposeType.swift | 4 +- .../Concurrency/SynchronizedOnType.swift | 8 +- Demo/Pods/RxSwift/RxSwift/Date+Dispatch.swift | 65 + Demo/Pods/RxSwift/RxSwift/Deprecated.swift | 429 ++- .../Disposables/AnonymousDisposable.swift | 26 +- .../Disposables/BinaryDisposable.swift | 22 +- .../Disposables/BooleanDisposable.swift | 4 +- .../Disposables/CompositeDisposable.swift | 50 +- .../RxSwift/Disposables/DisposeBag.swift | 32 +- .../RxSwift/Disposables/DisposeBase.swift | 4 +- .../Disposables/RefCountDisposable.swift | 54 +- .../Disposables/ScheduledDisposable.swift | 14 +- .../Disposables/SerialDisposable.swift | 26 +- .../SingleAssignmentDisposable.swift | 34 +- .../Disposables/SubscriptionDisposable.swift | 6 +- Demo/Pods/RxSwift/RxSwift/Event.swift | 11 +- .../RxSwift/RxSwift/Extensions/Bag+Rx.swift | 2 +- .../RxSwift/Extensions/String+Rx.swift | 4 +- .../RxSwift/RxSwift/GroupedObservable.swift | 6 +- .../RxSwift/ImmediateSchedulerType.swift | 2 +- Demo/Pods/RxSwift/RxSwift/Observable.swift | 13 +- .../RxSwift/ObservableConvertibleType.swift | 9 +- .../RxSwift/ObservableType+Extensions.swift | 8 +- .../Pods/RxSwift/RxSwift/ObservableType.swift | 6 +- .../RxSwift/RxSwift/Observables/AddRef.swift | 27 +- .../RxSwift/RxSwift/Observables/Amb.swift | 60 +- .../RxSwift/RxSwift/Observables/AsMaybe.swift | 35 +- .../RxSwift/Observables/AsSingle.swift | 37 +- .../RxSwift/RxSwift/Observables/Buffer.swift | 71 +- .../RxSwift/RxSwift/Observables/Catch.swift | 122 +- .../CombineLatest+Collection.swift | 107 +- .../Observables/CombineLatest+arity.swift | 424 +-- .../RxSwift/Observables/CombineLatest.swift | 81 +- .../RxSwift/Observables/CompactMap.swift | 82 + .../RxSwift/RxSwift/Observables/Concat.swift | 54 +- .../RxSwift/RxSwift/Observables/Create.swift | 34 +- .../RxSwift/Observables/Debounce.swift | 65 +- .../RxSwift/RxSwift/Observables/Debug.swift | 38 +- .../RxSwift/Observables/DefaultIfEmpty.swift | 46 +- .../RxSwift/Observables/Deferred.swift | 39 +- .../RxSwift/RxSwift/Observables/Delay.swift | 107 +- .../Observables/DelaySubscription.swift | 36 +- .../RxSwift/Observables/Dematerialize.swift | 38 +- .../Observables/DistinctUntilChanged.swift | 60 +- .../Pods/RxSwift/RxSwift/Observables/Do.swift | 73 +- .../RxSwift/Observables/ElementAt.swift | 45 +- .../RxSwift/RxSwift/Observables/Empty.swift | 8 +- .../RxSwift/Observables/Enumerated.swift | 31 +- .../RxSwift/RxSwift/Observables/Error.swift | 10 +- .../RxSwift/RxSwift/Observables/Filter.swift | 54 +- .../RxSwift/RxSwift/Observables/First.swift | 29 +- .../RxSwift/Observables/Generate.swift | 40 +- .../RxSwift/RxSwift/Observables/GroupBy.swift | 81 +- .../RxSwift/RxSwift/Observables/Just.swift | 32 +- .../RxSwift/RxSwift/Observables/Map.swift | 60 +- .../RxSwift/Observables/Materialize.swift | 26 +- .../RxSwift/RxSwift/Observables/Merge.swift | 306 +- .../RxSwift/Observables/Multicast.swift | 241 +- .../RxSwift/RxSwift/Observables/Never.swift | 6 +- .../RxSwift/Observables/ObserveOn.swift | 120 +- .../RxSwift/Observables/Optional.swift | 40 +- .../RxSwift/Observables/Producer.swift | 56 +- .../RxSwift/RxSwift/Observables/Range.swift | 36 +- .../RxSwift/RxSwift/Observables/Reduce.swift | 52 +- .../RxSwift/RxSwift/Observables/Repeat.swift | 20 +- .../RxSwift/Observables/RetryWhen.swift | 116 +- .../RxSwift/RxSwift/Observables/Sample.swift | 79 +- .../RxSwift/RxSwift/Observables/Scan.swift | 51 +- .../RxSwift/Observables/Sequence.swift | 30 +- .../Observables/ShareReplayScope.swift | 140 +- .../RxSwift/Observables/SingleAsync.swift | 59 +- .../RxSwift/RxSwift/Observables/Sink.swift | 63 +- .../RxSwift/RxSwift/Observables/Skip.swift | 53 +- .../RxSwift/Observables/SkipUntil.swift | 78 +- .../RxSwift/Observables/SkipWhile.swift | 40 +- .../RxSwift/Observables/StartWith.swift | 12 +- .../RxSwift/Observables/SubscribeOn.swift | 16 +- .../RxSwift/RxSwift/Observables/Switch.swift | 151 +- .../RxSwift/Observables/SwitchIfEmpty.swift | 72 +- .../RxSwift/RxSwift/Observables/Take.swift | 99 +- .../RxSwift/Observables/TakeLast.swift | 48 +- .../RxSwift/Observables/TakeUntil.swift | 172 +- .../RxSwift/Observables/TakeWhile.swift | 46 +- .../RxSwift/Observables/Throttle.swift | 88 +- .../RxSwift/RxSwift/Observables/Timeout.swift | 53 +- .../RxSwift/RxSwift/Observables/Timer.swift | 67 +- .../RxSwift/RxSwift/Observables/ToArray.swift | 30 +- .../RxSwift/RxSwift/Observables/Using.swift | 34 +- .../RxSwift/RxSwift/Observables/Window.swift | 90 +- .../RxSwift/Observables/WithLatestFrom.swift | 86 +- .../RxSwift/Observables/Zip+Collection.swift | 86 +- .../RxSwift/Observables/Zip+arity.swift | 452 ++- .../RxSwift/RxSwift/Observables/Zip.swift | 89 +- Demo/Pods/RxSwift/RxSwift/ObserverType.swift | 17 +- .../RxSwift/Observers/AnonymousObserver.swift | 12 +- .../RxSwift/Observers/ObserverBase.swift | 20 +- .../RxSwift/Observers/TailRecursiveSink.swift | 72 +- Demo/Pods/RxSwift/RxSwift/Reactive.swift | 9 +- Demo/Pods/RxSwift/RxSwift/Rx.swift | 33 +- Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift | 30 +- Demo/Pods/RxSwift/RxSwift/SchedulerType.swift | 6 +- .../ConcurrentDispatchQueueScheduler.swift | 6 +- .../Schedulers/ConcurrentMainScheduler.swift | 18 +- .../Schedulers/CurrentThreadScheduler.swift | 10 +- .../HistoricalSchedulerTimeConverter.swift | 8 +- .../Internal/DispatchQueueConfiguration.swift | 33 +- .../Internal/InvocableScheduledItem.swift | 6 +- .../Schedulers/Internal/ScheduledItem.swift | 10 +- .../RxSwift/Schedulers/MainScheduler.swift | 28 +- .../Schedulers/RecursiveScheduler.swift | 46 +- .../SchedulerServices+Emulation.swift | 24 +- .../SerialDispatchQueueScheduler.swift | 6 +- .../Schedulers/VirtualTimeConverterType.swift | 6 +- .../Schedulers/VirtualTimeScheduler.swift | 86 +- .../RxSwift/Subjects/AsyncSubject.swift | 56 +- .../RxSwift/Subjects/BehaviorSubject.swift | 78 +- .../RxSwift/Subjects/PublishSubject.swift | 70 +- .../RxSwift/Subjects/ReplaySubject.swift | 110 +- .../RxSwift/Subjects/SubjectType.swift | 7 +- .../RxSwift/SwiftSupport/SwiftSupport.swift | 25 +- .../RxSwift/Traits/Completable+AndThen.swift | 44 +- .../RxSwift/RxSwift/Traits/Completable.swift | 83 +- Demo/Pods/RxSwift/RxSwift/Traits/Maybe.swift | 83 +- .../ObservableType+PrimitiveSequence.swift | 22 +- .../Traits/PrimitiveSequence+Zip+arity.swift | 168 +- .../RxSwift/Traits/PrimitiveSequence.swift | 59 +- Demo/Pods/RxSwift/RxSwift/Traits/Single.swift | 127 +- .../NSObject+Rx/NSObject+Rx-Info.plist | 2 +- .../NSObject+Rx/NSObject+Rx.xcconfig | 4 +- .../Nimble/Nimble-Info.plist | 2 +- .../Nimble/Nimble.xcconfig | 2 +- .../Pods-DemoTests-frameworks.sh | 28 +- .../Pods-DemoTests.debug.xcconfig | 8 +- .../Pods-DemoTests.release.xcconfig | 8 +- .../Quick/Quick-Info.plist | 2 +- .../Target Support Files/Quick/Quick.xcconfig | 4 +- .../RxSwift/RxSwift-Info.plist | 2 +- .../RxSwift/RxSwift.xcconfig | 2 +- 216 files changed, 6377 insertions(+), 5828 deletions(-) create mode 100644 .circleci/config.yml create mode 100644 Demo/Pods/Nimble/Sources/Nimble/Matchers/ElementsEqual.swift rename Demo/Pods/Quick/Sources/Quick/{NSString+C99ExtendedIdentifier.swift => String+C99ExtendedIdentifier.swift} (77%) create mode 100644 Demo/Pods/RxSwift/Platform/AtomicInt.swift delete mode 100644 Demo/Pods/RxSwift/Platform/DeprecationWarner.swift create mode 100644 Demo/Pods/RxSwift/RxSwift/Date+Dispatch.swift create mode 100644 Demo/Pods/RxSwift/RxSwift/Observables/CompactMap.swift diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..9eb2b41 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,51 @@ +version: 2 +jobs: + build-and-test: + macos: + xcode: "10.2.0" + + steps: + - checkout + - restore_cache: + keys: + - v2-dep-{{ .Branch }}- + - v2-dep-master- + - v2-dep- + + - run: + name: Update ruby and cocoapods + command: | + sudo gem install cocoapods + sudo gem cleanup + curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf + + - run: + name: Test + command: | + cd Demo + pod repo update + xcodebuild -workspace 'Demo.xcworkspace' -scheme 'Demo' -configuration 'Debug' -sdk iphonesimulator -destination 'name=iPhone Xs' build test | xcpretty -c + + - run: + name: Pod lib lint + command: pod lib lint --allow-warnings + + - save_cache: + key: v2-dep-{{ .Branch }}-{{ epoch }} + paths: + - Carthage +workflows: + version: 2 + nightly: + triggers: + - schedule: + cron: "0 0 * * *" + filters: + branches: + only: + - master + jobs: + - build-and-test + build-and-test: + jobs: + - build-and-test diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj index 4e57d46..3df524f 100644 --- a/Demo/Demo.xcodeproj/project.pbxproj +++ b/Demo/Demo.xcodeproj/project.pbxproj @@ -273,7 +273,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-DemoTests/Pods-DemoTests-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-DemoTests/Pods-DemoTests-frameworks.sh", "${BUILT_PRODUCTS_DIR}/NSObject+Rx/NSObject_Rx.framework", "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework", "${BUILT_PRODUCTS_DIR}/Quick/Quick.framework", @@ -288,7 +288,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-DemoTests/Pods-DemoTests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DemoTests/Pods-DemoTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock index 3d2bac8..de7978c 100644 --- a/Demo/Podfile.lock +++ b/Demo/Podfile.lock @@ -1,9 +1,9 @@ PODS: - - Nimble (7.3.1) - - "NSObject+Rx (4.4.0)": - - RxSwift (~> 4.3) - - Quick (1.3.1) - - RxSwift (4.3.1) + - Nimble (8.0.1) + - "NSObject+Rx (5.0.0)": + - RxSwift (~> 5.0) + - Quick (2.1.0) + - RxSwift (5.0.0) DEPENDENCIES: - Nimble @@ -22,11 +22,11 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae - "NSObject+Rx": e9d2b56cd4bf13a42f4ee326b638c49c84bf4707 - Quick: d17304d58d0d169dd0bd1c6e5c28e3318de32a1a - RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4 + Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0 + "NSObject+Rx": 8ecb1e4714f3d35ac91485d2a769b7ab4b62e697 + Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d + RxSwift: 8b0671caa829a763bbce7271095859121cbd895f PODFILE CHECKSUM: 4f420ecd33a82075e360098bbed0ccaadfeb1728 -COCOAPODS: 1.5.3 +COCOAPODS: 1.6.1 diff --git a/Demo/Pods/Local Podspecs/NSObject+Rx.podspec.json b/Demo/Pods/Local Podspecs/NSObject+Rx.podspec.json index 9a04215..6d81685 100644 --- a/Demo/Pods/Local Podspecs/NSObject+Rx.podspec.json +++ b/Demo/Pods/Local Podspecs/NSObject+Rx.podspec.json @@ -1,6 +1,6 @@ { "name": "NSObject+Rx", - "version": "4.4.0", + "version": "5.0.0", "summary": "Handy RxSwift extensions on NSObject.", "description": "Right now, we just have a `rx_disposeBag` property, but we're open to PRs!", "homepage": "https://github.com/RxSwiftCommunity/NSObject-Rx", @@ -18,15 +18,16 @@ "watchos": "2.0", "tvos": "9.0" }, + "swift_version": "5.0", "source": { "git": "https://github.com/RxSwiftCommunity/NSObject-Rx.git", - "tag": "4.4.0" + "tag": "5.0.0" }, "source_files": "*.swift", "frameworks": "Foundation", "dependencies": { "RxSwift": [ - "~> 4.3" + "~> 5.0" ] } } diff --git a/Demo/Pods/Manifest.lock b/Demo/Pods/Manifest.lock index 3d2bac8..de7978c 100644 --- a/Demo/Pods/Manifest.lock +++ b/Demo/Pods/Manifest.lock @@ -1,9 +1,9 @@ PODS: - - Nimble (7.3.1) - - "NSObject+Rx (4.4.0)": - - RxSwift (~> 4.3) - - Quick (1.3.1) - - RxSwift (4.3.1) + - Nimble (8.0.1) + - "NSObject+Rx (5.0.0)": + - RxSwift (~> 5.0) + - Quick (2.1.0) + - RxSwift (5.0.0) DEPENDENCIES: - Nimble @@ -22,11 +22,11 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae - "NSObject+Rx": e9d2b56cd4bf13a42f4ee326b638c49c84bf4707 - Quick: d17304d58d0d169dd0bd1c6e5c28e3318de32a1a - RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4 + Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0 + "NSObject+Rx": 8ecb1e4714f3d35ac91485d2a769b7ab4b62e697 + Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d + RxSwift: 8b0671caa829a763bbce7271095859121cbd895f PODFILE CHECKSUM: 4f420ecd33a82075e360098bbed0ccaadfeb1728 -COCOAPODS: 1.5.3 +COCOAPODS: 1.6.1 diff --git a/Demo/Pods/Nimble/README.md b/Demo/Pods/Nimble/README.md index 19c562f..dde7fc4 100644 --- a/Demo/Pods/Nimble/README.md +++ b/Demo/Pods/Nimble/README.md @@ -4,6 +4,7 @@ [![CocoaPods](https://img.shields.io/cocoapods/v/Nimble.svg)](https://cocoapods.org/pods/Nimble) [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Platforms](https://img.shields.io/cocoapods/p/Nimble.svg)](https://cocoapods.org/pods/Nimble) +[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com) Use Nimble to express the expected outcomes of Swift or Objective-C expressions. Inspired by @@ -306,8 +307,7 @@ In Nimble, it's easy to make expectations on values that are updated asynchronously. Just use `toEventually` or `toEventuallyNot`: ```swift -// Swift 3.0 and later - +// Swift DispatchQueue.main.async { ocean.add("dolphins") ocean.add("whales") @@ -316,17 +316,6 @@ expect(ocean).toEventually(contain("dolphins", "whales")) ``` -```swift -// Swift 2.3 and earlier - -dispatch_async(dispatch_get_main_queue()) { - ocean.add("dolphins") - ocean.add("whales") -} -expect(ocean).toEventually(contain("dolphins", "whales")) -``` - - ```objc // Objective-C @@ -857,11 +846,7 @@ Notes: ## Swift Error Handling -If you're using Swift 2.0 or newer, you can use the `throwError` matcher to check if an error is thrown. - -Note: -The following code sample references the `Swift.Error` protocol. -This is `Swift.ErrorProtocol` in versions of Swift prior to version 3.0. +You can use the `throwError` matcher to check if an error is thrown. ```swift // Swift @@ -1277,7 +1262,7 @@ public func equal(expectedValue: T?) -> Predicate { // Predicate { actual in ... } // // But shown with types here for clarity. - return Predicate { (actual: Expression) throws -> PredicateResult in + return Predicate { (actualExpression: Expression) throws -> PredicateResult in let msg = ExpectationMessage.expectedActualValueTo("equal <\(expectedValue)>") if let actualValue = try actualExpression.evaluate() { return PredicateResult( @@ -1673,11 +1658,11 @@ backported. The deprecating plan is a 3 major versions removal. Which is as follows: 1. Introduce new `Predicate` API, deprecation warning for old matcher APIs. - (Nimble `v7.x.x`) + (Nimble `v7.x.x` and `v8.x.x`) 2. Introduce warnings on migration-path features (`.predicate`, `Predicate`-constructors with similar arguments to old API). (Nimble - `v8.x.x`) - 3. Remove old API. (Nimble `v9.x.x`) + `v9.x.x`) + 3. Remove old API. (Nimble `v10.x.x`) # Installing Nimble diff --git a/Demo/Pods/Nimble/Sources/Nimble/Adapters/AdapterProtocols.swift b/Demo/Pods/Nimble/Sources/Nimble/Adapters/AdapterProtocols.swift index 2e58fdf..abaf532 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Adapters/AdapterProtocols.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Adapters/AdapterProtocols.swift @@ -13,5 +13,6 @@ public protocol AssertionHandler { /// /// @see AssertionHandler public var NimbleAssertionHandler: AssertionHandler = { () -> AssertionHandler in + // swiftlint:disable:previous identifier_name return isXCTestAvailable() ? NimbleXCTestHandler() : NimbleXCTestUnavailableHandler() }() diff --git a/Demo/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift b/Demo/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift index cc39636..0f5df59 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift @@ -37,21 +37,48 @@ public class AssertionRecorder: AssertionHandler { } } +extension NMBExceptionCapture { + internal func tryBlockThrows(_ unsafeBlock: () throws -> Void) throws { + var catchedError: Error? + tryBlock { + do { + try unsafeBlock() + } catch { + catchedError = error + } + } + if let error = catchedError { + throw error + } + } +} + /// Allows you to temporarily replace the current Nimble assertion handler with /// the one provided for the scope of the closure. /// /// Once the closure finishes, then the original Nimble assertion handler is restored. /// /// @see AssertionHandler -public func withAssertionHandler(_ tempAssertionHandler: AssertionHandler, closure: () throws -> Void) { +public func withAssertionHandler(_ tempAssertionHandler: AssertionHandler, + file: FileString = #file, + line: UInt = #line, + closure: () throws -> Void) { let environment = NimbleEnvironment.activeInstance let oldRecorder = environment.assertionHandler let capturer = NMBExceptionCapture(handler: nil, finally: ({ environment.assertionHandler = oldRecorder })) environment.assertionHandler = tempAssertionHandler - capturer.tryBlock { - try! closure() + + do { + try capturer.tryBlockThrows { + try closure() + } + } catch { + let failureMessage = FailureMessage() + failureMessage.stringValue = "unexpected error thrown: <\(error)>" + let location = SourceLocation(file: file, line: line) + tempAssertionHandler.assert(false, message: failureMessage, location: location) } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift b/Demo/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift index add7d3f..b3eb09a 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift @@ -1,6 +1,6 @@ import Foundation -#if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE +#if canImport(Darwin) && !SWIFT_PACKAGE private func from(objcPredicate: NMBPredicate) -> Predicate { return Predicate { actualExpression in @@ -15,6 +15,7 @@ internal struct ObjCMatcherWrapper: Matcher { func matches(_ actualExpression: Expression, failureMessage: FailureMessage) -> Bool { return matcher.matches( + // swiftlint:disable:next force_try ({ try! actualExpression.evaluate() }), failureMessage: failureMessage, location: actualExpression.location) @@ -22,6 +23,7 @@ internal struct ObjCMatcherWrapper: Matcher { func doesNotMatch(_ actualExpression: Expression, failureMessage: FailureMessage) -> Bool { return matcher.doesNotMatch( + // swiftlint:disable:next force_try ({ try! actualExpression.evaluate() }), failureMessage: failureMessage, location: actualExpression.location) @@ -30,11 +32,13 @@ internal struct ObjCMatcherWrapper: Matcher { // Equivalent to Expectation, but for Nimble's Objective-C interface public class NMBExpectation: NSObject { + // swiftlint:disable identifier_name internal let _actualBlock: () -> NSObject? internal var _negative: Bool internal let _file: FileString internal let _line: UInt internal var _timeout: TimeInterval = 1.0 + // swiftlint:enable identifier_name @objc public init(actualBlock: @escaping () -> NSObject?, negative: Bool, file: FileString, line: UInt) { self._actualBlock = actualBlock diff --git a/Demo/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift b/Demo/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift index a114dff..a91efe3 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift @@ -1,6 +1,6 @@ import Foundation -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) // swiftlint:disable line_length public typealias MatcherBlock = (_ actualExpression: Expression, _ failureMessage: FailureMessage) throws -> Bool @@ -8,8 +8,10 @@ public typealias FullMatcherBlock = (_ actualExpression: Expression, _ // swiftlint:enable line_length public class NMBObjCMatcher: NSObject, NMBMatcher { + // swiftlint:disable identifier_name let _match: MatcherBlock let _doesNotMatch: MatcherBlock + // swiftlint:enable identifier_name let canMatchNil: Bool public init(canMatchNil: Bool, matcher: @escaping MatcherBlock, notMatcher: @escaping MatcherBlock) { diff --git a/Demo/Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift b/Demo/Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift index e1b5432..1b2e8c0 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift @@ -3,7 +3,7 @@ import Foundation /// "Global" state of Nimble is stored here. Only DSL functions should access / be aware of this /// class' existence -internal class NimbleEnvironment { +internal class NimbleEnvironment: NSObject { static var activeInstance: NimbleEnvironment { get { let env = Thread.current.threadDictionary["NimbleEnvironment"] @@ -20,6 +20,7 @@ internal class NimbleEnvironment { } } + // swiftlint:disable:next todo // TODO: eventually migrate the global to this environment value var assertionHandler: AssertionHandler { get { return NimbleAssertionHandler } @@ -29,17 +30,14 @@ internal class NimbleEnvironment { var suppressTVOSAssertionWarning: Bool = false var awaiter: Awaiter - init() { - let timeoutQueue: DispatchQueue - if #available(OSX 10.10, *) { - timeoutQueue = DispatchQueue.global(qos: .userInitiated) - } else { - timeoutQueue = DispatchQueue.global(priority: .high) - } - + override init() { + let timeoutQueue = DispatchQueue.global(qos: .userInitiated) awaiter = Awaiter( waitLock: AssertionWaitLock(), asyncQueue: .main, - timeoutQueue: timeoutQueue) + timeoutQueue: timeoutQueue + ) + + super.init() } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift b/Demo/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift index 14bb045..719bf44 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift @@ -64,7 +64,7 @@ class NimbleXCTestUnavailableHandler: AssertionHandler { #endif func isXCTestAvailable() -> Bool { -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) // XCTest is weakly linked and so may not be present return NSClassFromString("XCTestCase") != nil #else @@ -77,15 +77,14 @@ public func recordFailure(_ message: String, location: SourceLocation) { XCTFail("\(message)", file: location.file, line: location.line) #else if let testCase = CurrentTestCaseTracker.sharedInstance.currentTestCase { - #if swift(>=4) let line = Int(location.line) - #else - let line = location.line - #endif testCase.recordFailure(withDescription: message, inFile: location.file, atLine: line, expected: true) } else { - let msg = "Attempted to report a test failure to XCTest while no test case was running. " + - "The failure was:\n\"\(message)\"\nIt occurred at: \(location.file):\(location.line)" + let msg = """ + Attempted to report a test failure to XCTest while no test case was running. The failure was: + \"\(message)\" + It occurred at: \(location.file):\(location.line) + """ NSException(name: .internalInconsistencyException, reason: msg, userInfo: nil).raise() } #endif diff --git a/Demo/Pods/Nimble/Sources/Nimble/DSL+Wait.swift b/Demo/Pods/Nimble/Sources/Nimble/DSL+Wait.swift index e874136..c049417 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/DSL+Wait.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/DSL+Wait.swift @@ -14,7 +14,7 @@ internal class NMBWait: NSObject { // About these kind of lines, `@objc` attributes are only required for Objective-C // support, so that should be conditional on Darwin platforms and normal Xcode builds // (non-SwiftPM builds). -#if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE +#if canImport(Darwin) && !SWIFT_PACKAGE @objc internal class func until( timeout: TimeInterval, @@ -87,13 +87,19 @@ internal class NMBWait: NSObject { } } -#if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE +#if canImport(Darwin) && !SWIFT_PACKAGE @objc(untilFile:line:action:) - internal class func until(_ file: FileString = #file, line: UInt = #line, action: @escaping (() -> Void) -> Void) { + internal class func until( + _ file: FileString = #file, + line: UInt = #line, + action: @escaping (@escaping () -> Void) -> Void) { until(timeout: 1, file: file, line: line, action: action) } #else - internal class func until(_ file: FileString = #file, line: UInt = #line, action: @escaping (() -> Void) -> Void) { + internal class func until( + _ file: FileString = #file, + line: UInt = #line, + action: @escaping (@escaping () -> Void) -> Void) { until(timeout: 1, file: file, line: line, action: action) } #endif diff --git a/Demo/Pods/Nimble/Sources/Nimble/DSL.swift b/Demo/Pods/Nimble/Sources/Nimble/DSL.swift index e49bb0c..d6dc9cc 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/DSL.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/DSL.swift @@ -43,12 +43,13 @@ internal func nimblePrecondition( line: UInt = #line) { let result = expr() if !result { -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) - let e = NSException( +#if canImport(Darwin) + let exception = NSException( name: NSExceptionName(name()), reason: message(), - userInfo: nil) - e.raise() + userInfo: nil + ) + exception.raise() #else preconditionFailure("\(name()) - \(message())", file: file, line: line) #endif @@ -56,9 +57,12 @@ internal func nimblePrecondition( } internal func internalError(_ msg: String, file: FileString = #file, line: UInt = #line) -> Never { + // swiftlint:disable line_length fatalError( - "Nimble Bug Found: \(msg) at \(file):\(line).\n" + - "Please file a bug to Nimble: https://github.com/Quick/Nimble/issues with the " + - "code snippet that caused this error." + """ + Nimble Bug Found: \(msg) at \(file):\(line). + Please file a bug to Nimble: https://github.com/Quick/Nimble/issues with the code snippet that caused this error. + """ ) + // swiftlint:enable line_length } diff --git a/Demo/Pods/Nimble/Sources/Nimble/ExpectationMessage.swift b/Demo/Pods/Nimble/Sources/Nimble/ExpectationMessage.swift index 7aae341..b0cbcc3 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/ExpectationMessage.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/ExpectationMessage.swift @@ -75,6 +75,7 @@ public indirect enum ExpectationMessage { } internal func visitLeafs(_ f: (ExpectationMessage) -> ExpectationMessage) -> ExpectationMessage { + // swiftlint:disable:previous identifier_name switch self { case .fail, .expectedTo, .expectedActualValueTo, .expectedCustomValueTo: return f(self) @@ -90,6 +91,7 @@ public indirect enum ExpectationMessage { /// Replaces a primary expectation with one returned by f. Preserves all composite expectations /// that were built upon it (aka - all appended(message:) and appended(details:). public func replacedExpectation(_ f: @escaping (ExpectationMessage) -> ExpectationMessage) -> ExpectationMessage { + // swiftlint:disable:previous identifier_name func walk(_ msg: ExpectationMessage) -> ExpectationMessage { switch msg { case .fail, .expectedTo, .expectedActualValueTo, .expectedCustomValueTo: @@ -124,6 +126,7 @@ public indirect enum ExpectationMessage { return visitLeafs(walk) } + // swiftlint:disable:next todo // TODO: test & verify correct behavior internal func prepended(message: String) -> ExpectationMessage { return .prepends(message, self) @@ -183,32 +186,32 @@ public indirect enum ExpectationMessage { extension FailureMessage { internal func toExpectationMessage() -> ExpectationMessage { - let defaultMsg = FailureMessage() - if expected != defaultMsg.expected || _stringValueOverride != nil { + let defaultMessage = FailureMessage() + if expected != defaultMessage.expected || _stringValueOverride != nil { return .fail(stringValue) } - var msg: ExpectationMessage = .fail(userDescription ?? "") + var message: ExpectationMessage = .fail(userDescription ?? "") if actualValue != "" && actualValue != nil { - msg = .expectedCustomValueTo(postfixMessage, actualValue ?? "") - } else if postfixMessage != defaultMsg.postfixMessage { + message = .expectedCustomValueTo(postfixMessage, actualValue ?? "") + } else if postfixMessage != defaultMessage.postfixMessage { if actualValue == nil { - msg = .expectedTo(postfixMessage) + message = .expectedTo(postfixMessage) } else { - msg = .expectedActualValueTo(postfixMessage) + message = .expectedActualValueTo(postfixMessage) } } - if postfixActual != defaultMsg.postfixActual { - msg = .appends(msg, postfixActual) + if postfixActual != defaultMessage.postfixActual { + message = .appends(message, postfixActual) } - if let m = extendedMessage { - msg = .details(msg, m) + if let extended = extendedMessage { + message = .details(message, extended) } - return msg + return message } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) public class NMBExpectationMessage: NSObject { private let msg: ExpectationMessage diff --git a/Demo/Pods/Nimble/Sources/Nimble/Expression.swift b/Demo/Pods/Nimble/Sources/Nimble/Expression.swift index 5a233fd..b6b2ee3 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Expression.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Expression.swift @@ -24,8 +24,10 @@ internal func memoizedClosure(_ closure: @escaping () throws -> T) -> (Bool) /// This provides a common consumable API for matchers to utilize to allow /// Nimble to change internals to how the captured closure is managed. public struct Expression { + // swiftlint:disable identifier_name internal let _expression: (Bool) throws -> T? internal let _withoutCaching: Bool + // swiftlint:enable identifier_name public let location: SourceLocation public let isClosure: Bool diff --git a/Demo/Pods/Nimble/Sources/Nimble/FailureMessage.swift b/Demo/Pods/Nimble/Sources/Nimble/FailureMessage.swift index 2bc57eb..503b540 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/FailureMessage.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/FailureMessage.swift @@ -28,6 +28,7 @@ public class FailureMessage: NSObject { } } + // swiftlint:disable:next identifier_name internal var _stringValueOverride: String? internal var hasOverriddenStringValue: Bool { return _stringValueOverride != nil diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/AllPass.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/AllPass.swift index cc6c24f..dbbccb9 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/AllPass.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/AllPass.swift @@ -63,7 +63,7 @@ private func createPredicate(_ elementMatcher: Predicate) } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { @objc public class func allPassMatcher(_ matcher: NMBMatcher) -> NMBPredicate { return NMBPredicate { actualExpression in @@ -103,6 +103,7 @@ extension NMBObjCMatcher { } else { let failureMessage = FailureMessage() let result = matcher.matches( + // swiftlint:disable:next force_try ({ try! expr.evaluate() }), failureMessage: failureMessage, location: expr.location diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/Async.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/Async.swift index 63e863e..5022fe2 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/Async.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/Async.swift @@ -23,14 +23,18 @@ private func async(style: ExpectationStyle, predicate: Predicate, timeout: } switch result { case .completed: return lastPredicateResult! - case .timedOut: return PredicateResult(status: .fail, message: lastPredicateResult!.message) + case .timedOut: + let message = lastPredicateResult?.message ?? .fail("timed out before returning a value") + return PredicateResult(status: .fail, message: message) case let .errorThrown(error): return PredicateResult(status: .fail, message: .fail("unexpected error thrown: <\(error)>")) case let .raisedException(exception): return PredicateResult(status: .fail, message: .fail("unexpected exception raised: \(exception)")) case .blockedRunLoop: // swiftlint:disable:next line_length - return PredicateResult(status: .fail, message: lastPredicateResult!.message.appended(message: " (timed out, but main thread was unresponsive).")) + let message = lastPredicateResult?.message.appended(message: " (timed out, but main run loop was unresponsive).") ?? + .fail("main run loop was unresponsive") + return PredicateResult(status: .fail, message: message) case .incomplete: internalError("Reached .incomplete state for \(fnName)(...).") } @@ -38,8 +42,10 @@ private func async(style: ExpectationStyle, predicate: Predicate, timeout: } private let toEventuallyRequiresClosureError = FailureMessage( - // swiftlint:disable:next line_length - stringValue: "expect(...).toEventually(...) requires an explicit closure (eg - expect { ... }.toEventually(...) )\nSwift 1.2 @autoclosure behavior has changed in an incompatible way for Nimble to function" + stringValue: """ + expect(...).toEventually(...) requires an explicit closure (eg - expect { ... }.toEventually(...) ) + Swift 1.2 @autoclosure behavior has changed in an incompatible way for Nimble to function + """ ) extension Expectation { diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeAKindOf.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeAKindOf.swift index 5d0f5a1..3a68b09 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeAKindOf.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeAKindOf.swift @@ -29,7 +29,7 @@ public func beAKindOf(_ expectedType: T.Type) -> Predicate { } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) /// A Nimble matcher that succeeds when the actual value is an instance of the given class. /// @see beAnInstanceOf if you want to match against the exact class diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeAnInstanceOf.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeAnInstanceOf.swift index bc1b02c..3cef3a7 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeAnInstanceOf.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeAnInstanceOf.swift @@ -33,7 +33,7 @@ public func beAnInstanceOf(_ expectedClass: AnyClass) -> Predicate { } else { actualString = "" } - #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) + #if canImport(Darwin) let matches = instance != nil && instance!.isMember(of: expectedClass) #else let matches = instance != nil && type(of: instance!) == expectedClass @@ -45,7 +45,7 @@ public func beAnInstanceOf(_ expectedClass: AnyClass) -> Predicate { } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { @objc public class func beAnInstanceOfMatcher(_ expected: AnyClass) -> NMBMatcher { return NMBPredicate { actualExpression in diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeCloseTo.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeCloseTo.swift index b1e6f4c..d6fd1ee 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeCloseTo.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeCloseTo.swift @@ -1,5 +1,6 @@ import Foundation +// swiftlint:disable:next identifier_name public let DefaultDelta = 0.0001 internal func isCloseTo(_ actualValue: NMBDoubleConvertible?, @@ -34,10 +35,12 @@ public func beCloseTo(_ expectedValue: NMBDoubleConvertible, within delta: Doubl } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) public class NMBObjCBeCloseToMatcher: NSObject, NMBMatcher { + // swiftlint:disable identifier_name var _expected: NSNumber var _delta: CDouble + // swiftlint:enable identifier_name init(expected: NSNumber, within: CDouble) { _expected = expected _delta = within @@ -110,14 +113,17 @@ public func beCloseTo(_ expectedValues: [Double], within delta: Double = Default infix operator ≈ : ComparisonPrecedence +// swiftlint:disable:next identifier_name public func ≈(lhs: Expectation<[Double]>, rhs: [Double]) { lhs.to(beCloseTo(rhs)) } +// swiftlint:disable:next identifier_name public func ≈(lhs: Expectation, rhs: NMBDoubleConvertible) { lhs.to(beCloseTo(rhs)) } +// swiftlint:disable:next identifier_name public func ≈(lhs: Expectation, rhs: (expected: NMBDoubleConvertible, delta: Double)) { lhs.to(beCloseTo(rhs.expected, within: rhs.delta)) } @@ -133,6 +139,7 @@ precedencegroup PlusMinusOperatorPrecedence { } infix operator ± : PlusMinusOperatorPrecedence +// swiftlint:disable:next identifier_name public func ±(lhs: NMBDoubleConvertible, rhs: Double) -> (expected: NMBDoubleConvertible, delta: Double) { return (expected: lhs, delta: rhs) } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeEmpty.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeEmpty.swift index 8d73dcc..860287f 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeEmpty.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeEmpty.swift @@ -4,15 +4,36 @@ import Foundation /// means the are no items in that collection. For strings, it is an empty string. public func beEmpty() -> Predicate { return Predicate.simple("be empty") { actualExpression in - let actualSeq = try actualExpression.evaluate() - if actualSeq == nil { + guard let actual = try actualExpression.evaluate() else { return .fail } - var generator = actualSeq!.makeIterator() + var generator = actual.makeIterator() return PredicateStatus(bool: generator.next() == nil) } } +/// A Nimble matcher that succeeds when a value is "empty". For collections, this +/// means the are no items in that collection. For strings, it is an empty string. +public func beEmpty() -> Predicate { + return Predicate.simple("be empty") { actualExpression in + guard let actual = try actualExpression.evaluate() else { + return .fail + } + return PredicateStatus(bool: actual.isEmpty) + } +} + +/// A Nimble matcher that succeeds when a value is "empty". For collections, this +/// means the are no items in that collection. For strings, it is an empty string. +public func beEmpty() -> Predicate { + return Predicate.simple("be empty") { actualExpression in + guard let actual = try actualExpression.evaluate() else { + return .fail + } + return PredicateStatus(bool: actual.isEmpty) + } +} + /// A Nimble matcher that succeeds when a value is "empty". For collections, this /// means the are no items in that collection. For strings, it is an empty string. public func beEmpty() -> Predicate { @@ -61,7 +82,7 @@ public func beEmpty() -> Predicate { } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { @objc public class func beEmptyMatcher() -> NMBPredicate { return NMBPredicate { actualExpression in diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThan.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThan.swift index b86f25d..4a4cdd2 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThan.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThan.swift @@ -30,12 +30,12 @@ public func > (lhs: Expectation, rhs: NMBComparable?) { lhs.to(beGreaterThan(rhs)) } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { - @objc public class func beGreaterThanMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in + @objc public class func beGreaterThanMatcher(_ expected: NMBComparable?) -> NMBMatcher { + return NMBPredicate { actualExpression in let expr = actualExpression.cast { $0 as? NMBComparable } - return try beGreaterThan(expected).matches(expr, failureMessage: failureMessage) + return try beGreaterThan(expected).satisfies(expr).toObjectiveC() } } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift index 2a3ca4a..39d9e63 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift @@ -32,12 +32,12 @@ public func >=(lhs: Expectation, rhs: T) { lhs.to(beGreaterThanOrEqualTo(rhs)) } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { - @objc public class func beGreaterThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in + @objc public class func beGreaterThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBMatcher { + return NMBPredicate { actualExpression in let expr = actualExpression.cast { $0 as? NMBComparable } - return try beGreaterThanOrEqualTo(expected).matches(expr, failureMessage: failureMessage) + return try beGreaterThanOrEqualTo(expected).satisfies(expr).toObjectiveC() } } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeIdenticalTo.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeIdenticalTo.swift index 94758c2..49e503e 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeIdenticalTo.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeIdenticalTo.swift @@ -4,14 +4,14 @@ import Foundation /// as the expected instance. public func beIdenticalTo(_ expected: Any?) -> Predicate { return Predicate.define { actualExpression in - #if os(Linux) + #if os(Linux) && !swift(>=4.1.50) let actual = try actualExpression.evaluate() as? AnyObject #else let actual = try actualExpression.evaluate() as AnyObject? #endif let bool: Bool - #if os(Linux) + #if os(Linux) && !swift(>=4.1.50) bool = actual === (expected as? AnyObject) && actual !== nil #else bool = actual === (expected as AnyObject?) && actual !== nil @@ -41,12 +41,12 @@ public func be(_ expected: Any?) -> Predicate { return beIdenticalTo(expected) } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { - @objc public class func beIdenticalToMatcher(_ expected: NSObject?) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in + @objc public class func beIdenticalToMatcher(_ expected: NSObject?) -> NMBMatcher { + return NMBPredicate { actualExpression in let aExpr = actualExpression.cast { $0 as Any? } - return try beIdenticalTo(expected).matches(aExpr, failureMessage: failureMessage) + return try beIdenticalTo(expected).satisfies(aExpr).toObjectiveC() } } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeLessThan.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeLessThan.swift index e1fbf1e..ef0a7d4 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeLessThan.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeLessThan.swift @@ -29,12 +29,12 @@ public func < (lhs: Expectation, rhs: NMBComparable?) { lhs.to(beLessThan(rhs)) } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { - @objc public class func beLessThanMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in + @objc public class func beLessThanMatcher(_ expected: NMBComparable?) -> NMBMatcher { + return NMBPredicate { actualExpression in let expr = actualExpression.cast { $0 as? NMBComparable } - return try beLessThan(expected).matches(expr, failureMessage: failureMessage) + return try beLessThan(expected).satisfies(expr).toObjectiveC() } } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift index c37cb16..30ce043 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift @@ -29,12 +29,12 @@ public func <=(lhs: Expectation, rhs: T) { lhs.to(beLessThanOrEqualTo(rhs)) } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { - @objc public class func beLessThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in + @objc public class func beLessThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBMatcher { + return NMBPredicate { actualExpression in let expr = actualExpression.cast { $0 as? NMBComparable } - return try beLessThanOrEqualTo(expected).matches(expr, failureMessage: failureMessage) + return try beLessThanOrEqualTo(expected).satisfies(expr).toObjectiveC() } } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeLogical.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeLogical.swift index 035500e..788234b 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeLogical.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeLogical.swift @@ -100,14 +100,6 @@ public func beTruthy() -> Predicate< return Predicate.simpleNilable("be truthy") { actualExpression in let actualValue = try actualExpression.evaluate() if let actualValue = actualValue { - // FIXME: This is a workaround to SR-2290. - // See: - // - https://bugs.swift.org/browse/SR-2290 - // - https://github.com/norio-nomura/Nimble/pull/5#issuecomment-237835873 - if let number = actualValue as? NSNumber { - return PredicateStatus(bool: number.boolValue == true) - } - return PredicateStatus(bool: actualValue == (true as T)) } return PredicateStatus(bool: actualValue != nil) @@ -120,47 +112,42 @@ public func beFalsy() -> Predicate NMBObjCMatcher { - return NMBObjCMatcher { actualExpression, failureMessage in + @objc public class func beTruthyMatcher() -> NMBMatcher { + return NMBPredicate { actualExpression in let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false } - return try beTruthy().matches(expr, failureMessage: failureMessage) + return try beTruthy().satisfies(expr).toObjectiveC() } } - @objc public class func beFalsyMatcher() -> NMBObjCMatcher { - return NMBObjCMatcher { actualExpression, failureMessage in + @objc public class func beFalsyMatcher() -> NMBMatcher { + return NMBPredicate { actualExpression in let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false } - return try beFalsy().matches(expr, failureMessage: failureMessage) + return try beFalsy().satisfies(expr).toObjectiveC() } } - @objc public class func beTrueMatcher() -> NMBObjCMatcher { - return NMBObjCMatcher { actualExpression, failureMessage in + @objc public class func beTrueMatcher() -> NMBMatcher { + return NMBPredicate { actualExpression in let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false } - return try beTrue().matches(expr, failureMessage: failureMessage) + return try beTrue().satisfies(expr).toObjectiveC() } } - @objc public class func beFalseMatcher() -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in - let expr = actualExpression.cast { ($0 as? NSNumber)?.boolValue ?? false } - return try beFalse().matches(expr, failureMessage: failureMessage) + @objc public class func beFalseMatcher() -> NMBMatcher { + return NMBPredicate { actualExpression in + let expr = actualExpression.cast { value -> Bool? in + guard let value = value else { return nil } + return (value as? NSNumber)?.boolValue ?? false + } + return try beFalse().satisfies(expr).toObjectiveC() } } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeNil.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeNil.swift index 387420b..0f21d41 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeNil.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeNil.swift @@ -8,11 +8,11 @@ public func beNil() -> Predicate { } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { - @objc public class func beNilMatcher() -> NMBObjCMatcher { - return NMBObjCMatcher { actualExpression, failureMessage in - return try beNil().matches(actualExpression, failureMessage: failureMessage) + @objc public class func beNilMatcher() -> NMBMatcher { + return NMBPredicate { actualExpression in + return try beNil().satisfies(actualExpression).toObjectiveC() } } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeVoid.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeVoid.swift index a9dbc28..9a7eafd 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeVoid.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeVoid.swift @@ -8,10 +8,12 @@ public func beVoid() -> Predicate<()> { } } -public func == (lhs: Expectation<()>, rhs: ()) { - lhs.to(beVoid()) -} +extension Expectation where T == () { + public static func == (lhs: Expectation<()>, rhs: ()) { + lhs.to(beVoid()) + } -public func != (lhs: Expectation<()>, rhs: ()) { - lhs.toNot(beVoid()) + public static func != (lhs: Expectation<()>, rhs: ()) { + lhs.toNot(beVoid()) + } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeginWith.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeginWith.swift index a013f9f..3183eb9 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeginWith.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/BeginWith.swift @@ -35,24 +35,24 @@ public func beginWith(_ startingElement: Any) -> Predicate public func beginWith(_ startingSubstring: String) -> Predicate { return Predicate.simple("begin with <\(startingSubstring)>") { actualExpression in if let actual = try actualExpression.evaluate() { - let range = actual.range(of: startingSubstring) - return PredicateStatus(bool: range != nil && range!.lowerBound == actual.startIndex) + return PredicateStatus(bool: actual.hasPrefix(startingSubstring)) } return .fail } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { - @objc public class func beginWithMatcher(_ expected: Any) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in + @objc public class func beginWithMatcher(_ expected: Any) -> NMBMatcher { + return NMBPredicate { actualExpression in let actual = try actualExpression.evaluate() - if (actual as? String) != nil { + if actual is String { let expr = actualExpression.cast { $0 as? String } - return try beginWith(expected as! String).matches(expr, failureMessage: failureMessage) + // swiftlint:disable:next force_cast + return try beginWith(expected as! String).satisfies(expr).toObjectiveC() } else { let expr = actualExpression.cast { $0 as? NMBOrderedCollection } - return try beginWith(expected).matches(expr, failureMessage: failureMessage) + return try beginWith(expected).satisfies(expr).toObjectiveC() } } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/Contain.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/Contain.swift index 2c84c5c..6974a4d 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/Contain.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/Contain.swift @@ -1,16 +1,17 @@ import Foundation -/// A Nimble matcher that succeeds when the actual sequence contains the expected value. +/// A Nimble matcher that succeeds when the actual sequence contains the expected values. public func contain(_ items: T...) -> Predicate - where S.Iterator.Element == T { + where S.Element == T { return contain(items) } +/// A Nimble matcher that succeeds when the actual sequence contains the expected values. public func contain(_ items: [T]) -> Predicate - where S.Iterator.Element == T { + where S.Element == T { return Predicate.simple("contain <\(arrayAsString(items))>") { actualExpression in if let actual = try actualExpression.evaluate() { - let matches = items.all { + let matches = items.allSatisfy { return actual.contains($0) } return PredicateStatus(bool: matches) @@ -19,6 +20,46 @@ public func contain(_ items: [T]) -> Predicate } } +/// A Nimble matcher that succeeds when the actual set contains the expected values. +public func contain(_ items: T...) -> Predicate + where S.Element == T { + return contain(items) +} + +/// A Nimble matcher that succeeds when the actual set contains the expected values. +public func contain(_ items: [T]) -> Predicate + where S.Element == T { + return Predicate.simple("contain <\(arrayAsString(items))>") { actualExpression in + if let actual = try actualExpression.evaluate() { + let matches = items.allSatisfy { + return actual.contains($0) + } + return PredicateStatus(bool: matches) + } + return .fail + } +} + +/// A Nimble matcher that succeeds when the actual set contains the expected values. +public func contain(_ items: T...) -> Predicate + where S.Element == T { + return contain(items) +} + +/// A Nimble matcher that succeeds when the actual set contains the expected values. +public func contain(_ items: [T]) -> Predicate + where S.Element == T { + return Predicate.simple("contain <\(arrayAsString(items))>") { actualExpression in + if let actual = try actualExpression.evaluate() { + let matches = items.allSatisfy { + return actual.contains($0) + } + return PredicateStatus(bool: matches) + } + return .fail + } +} + /// A Nimble matcher that succeeds when the actual string contains the expected substring. public func contain(_ substrings: String...) -> Predicate { return contain(substrings) @@ -27,7 +68,7 @@ public func contain(_ substrings: String...) -> Predicate { public func contain(_ substrings: [String]) -> Predicate { return Predicate.simple("contain <\(arrayAsString(substrings))>") { actualExpression in if let actual = try actualExpression.evaluate() { - let matches = substrings.all { + let matches = substrings.allSatisfy { let range = actual.range(of: $0) return range != nil && !range!.isEmpty } @@ -45,7 +86,7 @@ public func contain(_ substrings: NSString...) -> Predicate { public func contain(_ substrings: [NSString]) -> Predicate { return Predicate.simple("contain <\(arrayAsString(substrings))>") { actualExpression in if let actual = try actualExpression.evaluate() { - let matches = substrings.all { actual.range(of: $0.description).length != 0 } + let matches = substrings.allSatisfy { actual.range(of: $0.description).length != 0 } return PredicateStatus(bool: matches) } return .fail @@ -60,17 +101,17 @@ public func contain(_ items: Any?...) -> Predicate { public func contain(_ items: [Any?]) -> Predicate { return Predicate.simple("contain <\(arrayAsString(items))>") { actualExpression in guard let actual = try actualExpression.evaluate() else { return .fail } - let matches = items.all { item in + let matches = items.allSatisfy { item in return item.map { actual.contains($0) } ?? false } return PredicateStatus(bool: matches) } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { - @objc public class func containMatcher(_ expected: [NSObject]) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in + @objc public class func containMatcher(_ expected: [NSObject]) -> NMBMatcher { + return NMBPredicate { actualExpression in let location = actualExpression.location let actualValue = try actualExpression.evaluate() if let value = actualValue as? NMBContainer { @@ -78,17 +119,25 @@ extension NMBObjCMatcher { // A straightforward cast on the array causes this to crash, so we have to cast the individual items let expectedOptionals: [Any?] = expected.map({ $0 as Any? }) - return try contain(expectedOptionals).matches(expr, failureMessage: failureMessage) + return try contain(expectedOptionals).satisfies(expr).toObjectiveC() } else if let value = actualValue as? NSString { let expr = Expression(expression: ({ value as String }), location: location) - return try contain(expected as! [String]).matches(expr, failureMessage: failureMessage) - } else if actualValue != nil { - // swiftlint:disable:next line_length - failureMessage.postfixMessage = "contain <\(arrayAsString(expected))> (only works for NSArrays, NSSets, NSHashTables, and NSStrings)" + // swiftlint:disable:next force_cast + return try contain(expected as! [String]).satisfies(expr).toObjectiveC() + } + + let message: ExpectationMessage + if actualValue != nil { + message = ExpectationMessage.expectedActualValueTo( + // swiftlint:disable:next line_length + "contain <\(arrayAsString(expected))> (only works for NSArrays, NSSets, NSHashTables, and NSStrings)" + ) } else { - failureMessage.postfixMessage = "contain <\(arrayAsString(expected))>" + message = ExpectationMessage + .expectedActualValueTo("contain <\(arrayAsString(expected))>") + .appendedBeNilHint() } - return false + return NMBPredicateResult(status: .fail, message: message.toObjectiveC()) } } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/ContainElementSatisfying.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/ContainElementSatisfying.swift index 8a23a6c..331f3bc 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/ContainElementSatisfying.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/ContainElementSatisfying.swift @@ -24,20 +24,22 @@ public func containElementSatisfying(_ predicate: @escaping ((T) } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { - @objc public class func containElementSatisfyingMatcher(_ predicate: @escaping ((NSObject) -> Bool)) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in + @objc public class func containElementSatisfyingMatcher(_ predicate: @escaping ((NSObject) -> Bool)) -> NMBMatcher { + return NMBPredicate { actualExpression in let value = try actualExpression.evaluate() guard let enumeration = value as? NSFastEnumeration else { - // swiftlint:disable:next line_length - failureMessage.postfixMessage = "containElementSatisfying must be provided an NSFastEnumeration object" - failureMessage.actualValue = nil - failureMessage.expected = "" - failureMessage.to = "" - return false + let message = ExpectationMessage.fail( + "containElementSatisfying must be provided an NSFastEnumeration object" + ) + return NMBPredicateResult(status: .fail, message: message.toObjectiveC()) } + let message = ExpectationMessage + .expectedTo("find object in collection that satisfies predicate") + .toObjectiveC() + var iterator = NSFastEnumerationIterator(enumeration) while let item = iterator.next() { guard let object = item as? NSObject else { @@ -45,13 +47,11 @@ public func containElementSatisfying(_ predicate: @escaping ((T) } if predicate(object) { - return true + return NMBPredicateResult(status: .matches, message: message) } } - failureMessage.actualValue = nil - failureMessage.postfixMessage = "find object in collection that satisfies predicate" - return false + return NMBPredicateResult(status: .doesNotMatch, message: message) } } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/ElementsEqual.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/ElementsEqual.swift new file mode 100644 index 0000000..1704e94 --- /dev/null +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/ElementsEqual.swift @@ -0,0 +1,16 @@ +/// A Nimble matcher that succeeds when the actual sequence contain the same elements in the same order to the exepected sequence. +public func elementsEqual(_ expectedValue: S?) -> Predicate where S.Element: Equatable { + // A matcher abstraction for https://developer.apple.com/documentation/swift/sequence/2949668-elementsequal + return Predicate.define("elementsEqual <\(stringify(expectedValue))>") { (actualExpression, msg) in + let actualValue = try actualExpression.evaluate() + switch (expectedValue, actualValue) { + case (nil, _?): + return PredicateResult(status: .fail, message: msg.appendedBeNilHint()) + case (nil, nil), (_, nil): + return PredicateResult(status: .fail, message: msg) + case (let expected?, let actual?): + let matches = expected.elementsEqual(actual) + return PredicateResult(bool: matches, message: msg) + } + } +} diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/EndWith.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/EndWith.swift index 80a06ca..13bdb31 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/EndWith.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/EndWith.swift @@ -50,17 +50,18 @@ public func endWith(_ endingSubstring: String) -> Predicate { } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { - @objc public class func endWithMatcher(_ expected: Any) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in + @objc public class func endWithMatcher(_ expected: Any) -> NMBMatcher { + return NMBPredicate { actualExpression in let actual = try actualExpression.evaluate() - if (actual as? String) != nil { + if actual is String { let expr = actualExpression.cast { $0 as? String } - return try endWith(expected as! String).matches(expr, failureMessage: failureMessage) + // swiftlint:disable:next force_cast + return try endWith(expected as! String).satisfies(expr).toObjectiveC() } else { let expr = actualExpression.cast { $0 as? NMBOrderedCollection } - return try endWith(expected).matches(expr, failureMessage: failureMessage) + return try endWith(expected).satisfies(expr).toObjectiveC() } } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/Equal.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/Equal.swift index 5f26f49..b08d5f6 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/Equal.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/Equal.swift @@ -7,103 +7,30 @@ import Foundation public func equal(_ expectedValue: T?) -> Predicate { return Predicate.define("equal <\(stringify(expectedValue))>") { actualExpression, msg in let actualValue = try actualExpression.evaluate() - let matches = actualValue == expectedValue && expectedValue != nil - if expectedValue == nil || actualValue == nil { - if expectedValue == nil && actualValue != nil { - return PredicateResult( - status: .fail, - message: msg.appendedBeNilHint() - ) - } + switch (expectedValue, actualValue) { + case (nil, _?): + return PredicateResult(status: .fail, message: msg.appendedBeNilHint()) + case (nil, nil), (_, nil): return PredicateResult(status: .fail, message: msg) + case (let expected?, let actual?): + let matches = expected == actual + return PredicateResult(bool: matches, message: msg) } - return PredicateResult(status: PredicateStatus(bool: matches), message: msg) - } -} - -/// A Nimble matcher that succeeds when the actual value is equal to the expected value. -/// Values can support equal by supporting the Equatable protocol. -/// -/// @see beCloseTo if you want to match imprecise types (eg - floats, doubles). -public func equal(_ expectedValue: [T: C]?) -> Predicate<[T: C]> { - return Predicate.define("equal <\(stringify(expectedValue))>") { actualExpression, msg in - let actualValue = try actualExpression.evaluate() - if expectedValue == nil || actualValue == nil { - if expectedValue == nil && actualValue != nil { - return PredicateResult( - status: .fail, - message: msg.appendedBeNilHint() - ) - } - return PredicateResult(status: .fail, message: msg) - } - return PredicateResult( - status: PredicateStatus(bool: expectedValue! == actualValue!), - message: msg - ) - } -} - -/// A Nimble matcher that succeeds when the actual collection is equal to the expected collection. -/// Items must implement the Equatable protocol. -public func equal(_ expectedValue: [T]?) -> Predicate<[T]> { - return Predicate.define("equal <\(stringify(expectedValue))>") { actualExpression, msg in - let actualValue = try actualExpression.evaluate() - if expectedValue == nil || actualValue == nil { - if expectedValue == nil && actualValue != nil { - return PredicateResult( - status: .fail, - message: msg.appendedBeNilHint() - ) - } - return PredicateResult( - status: .fail, - message: msg - ) - } - return PredicateResult( - bool: expectedValue! == actualValue!, - message: msg - ) } } /// A Nimble matcher allowing comparison of collection with optional type public func equal(_ expectedValue: [T?]) -> Predicate<[T?]> { return Predicate.define("equal <\(stringify(expectedValue))>") { actualExpression, msg in - if let actualValue = try actualExpression.evaluate() { - let doesNotMatch = PredicateResult( - status: .doesNotMatch, - message: msg - ) - - if expectedValue.count != actualValue.count { - return doesNotMatch - } - - for (index, item) in actualValue.enumerated() { - let otherItem = expectedValue[index] - if item == nil && otherItem == nil { - continue - } else if item == nil && otherItem != nil { - return doesNotMatch - } else if item != nil && otherItem == nil { - return doesNotMatch - } else if item! != otherItem! { - return doesNotMatch - } - } - - return PredicateResult( - status: .matches, - message: msg - ) - } else { + guard let actualValue = try actualExpression.evaluate() else { return PredicateResult( status: .fail, message: msg.appendedBeNilHint() ) } + + let matches = expectedValue == actualValue + return PredicateResult(bool: matches, message: msg) } } @@ -128,44 +55,45 @@ private func equal(_ expectedValue: Set?, stringify: @escaping (Set?) - var errorMessage: ExpectationMessage = .expectedActualValueTo("equal <\(stringify(expectedValue))>") - if let expectedValue = expectedValue { - if let actualValue = try actualExpression.evaluate() { - errorMessage = .expectedCustomValueTo( - "equal <\(stringify(expectedValue))>", - "<\(stringify(actualValue))>" - ) - - if expectedValue == actualValue { - return PredicateResult( - status: .matches, - message: errorMessage - ) - } - - let missing = expectedValue.subtracting(actualValue) - if missing.count > 0 { - errorMessage = errorMessage.appended(message: ", missing <\(stringify(missing))>") - } - - let extra = actualValue.subtracting(expectedValue) - if extra.count > 0 { - errorMessage = errorMessage.appended(message: ", extra <\(stringify(extra))>") - } - return PredicateResult( - status: .doesNotMatch, - message: errorMessage - ) - } + guard let expectedValue = expectedValue else { return PredicateResult( status: .fail, message: errorMessage.appendedBeNilHint() ) - } else { + } + + guard let actualValue = try actualExpression.evaluate() else { return PredicateResult( status: .fail, message: errorMessage.appendedBeNilHint() ) } + + errorMessage = .expectedCustomValueTo( + "equal <\(stringify(expectedValue))>", + "<\(stringify(actualValue))>" + ) + + if expectedValue == actualValue { + return PredicateResult( + status: .matches, + message: errorMessage + ) + } + + let missing = expectedValue.subtracting(actualValue) + if missing.count > 0 { + errorMessage = errorMessage.appended(message: ", missing <\(stringify(missing))>") + } + + let extra = actualValue.subtracting(expectedValue) + if extra.count > 0 { + errorMessage = errorMessage.appended(message: ", extra <\(stringify(extra))>") + } + return PredicateResult( + status: .doesNotMatch, + message: errorMessage + ) } } @@ -209,7 +137,7 @@ public func !=(lhs: Expectation<[T: C]>, rhs: [T: C]?) { lhs.toNot(equal(rhs)) } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { @objc public class func equalMatcher(_ expected: NSObject) -> NMBMatcher { return NMBPredicate { actualExpression in diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/HaveCount.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/HaveCount.swift index 3529da8..984e2d4 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/HaveCount.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/HaveCount.swift @@ -7,7 +7,7 @@ import Foundation /// A Nimble matcher that succeeds when the actual Collection's count equals /// the expected value -public func haveCount(_ expectedValue: T.IndexDistance) -> Predicate { +public func haveCount(_ expectedValue: Int) -> Predicate { return Predicate.define { actualExpression in if let actualValue = try actualExpression.evaluate() { let message = ExpectationMessage @@ -45,20 +45,29 @@ public func haveCount(_ expectedValue: Int) -> Predicate { } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { - @objc public class func haveCountMatcher(_ expected: NSNumber) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in + @objc public class func haveCountMatcher(_ expected: NSNumber) -> NMBMatcher { + return NMBPredicate { actualExpression in let location = actualExpression.location let actualValue = try actualExpression.evaluate() if let value = actualValue as? NMBCollection { let expr = Expression(expression: ({ value as NMBCollection}), location: location) - return try haveCount(expected.intValue).matches(expr, failureMessage: failureMessage) - } else if let actualValue = actualValue { - failureMessage.postfixMessage = "get type of NSArray, NSSet, NSDictionary, or NSHashTable" - failureMessage.actualValue = "\(String(describing: type(of: actualValue)))" + return try haveCount(expected.intValue).satisfies(expr).toObjectiveC() } - return false + + let message: ExpectationMessage + if let actualValue = actualValue { + message = ExpectationMessage.expectedCustomValueTo( + "get type of NSArray, NSSet, NSDictionary, or NSHashTable", + "\(String(describing: type(of: actualValue)))" + ) + } else { + message = ExpectationMessage + .expectedActualValueTo("have a collection with count \(stringify(expected.intValue))") + .appendedBeNilHint() + } + return NMBPredicateResult(status: .fail, message: message.toObjectiveC()) } } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/Match.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/Match.swift index f738daf..dbcff09 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/Match.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/Match.swift @@ -15,7 +15,7 @@ public func match(_ expectedValue: String?) -> Predicate { } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { @objc public class func matchMatcher(_ expected: NSString) -> NMBMatcher { diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift index 6f8f103..38bb297 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift @@ -1,6 +1,6 @@ import Foundation // `CGFloat` is in Foundation (swift-corelibs-foundation) on Linux. -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) import CoreGraphics #endif @@ -28,7 +28,7 @@ extension Matcher { } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) /// Objective-C interface to the Swift variant of Matcher. @objc public protocol NMBMatcher { func matches(_ actualBlock: @escaping () -> NSObject?, failureMessage: FailureMessage, location: SourceLocation) -> Bool @@ -41,7 +41,8 @@ public protocol NMBContainer { func contains(_ anObject: Any) -> Bool } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) +// swiftlint:disable:next todo // FIXME: NSHashTable can not conform to NMBContainer since swift-DEVELOPMENT-SNAPSHOT-2016-04-25-a //extension NSHashTable : NMBContainer {} // Corelibs Foundation does not include this class yet #endif @@ -54,7 +55,7 @@ public protocol NMBCollection { var count: Int { get } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NSHashTable: NMBCollection {} // Corelibs Foundation does not include these classes yet extension NSMapTable: NMBCollection {} #endif @@ -131,7 +132,7 @@ extension NSDate: TestOutputStringConvertible { /// beGreaterThan(), beGreaterThanOrEqualTo(), and equal() matchers. /// /// Types that conform to Swift's Comparable protocol will work implicitly too -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) @objc public protocol NMBComparable { func NMB_compare(_ otherObject: NMBComparable!) -> ComparisonResult } @@ -144,11 +145,13 @@ public protocol NMBComparable { extension NSNumber: NMBComparable { public func NMB_compare(_ otherObject: NMBComparable!) -> ComparisonResult { + // swiftlint:disable:next force_cast return compare(otherObject as! NSNumber) } } extension NSString: NMBComparable { public func NMB_compare(_ otherObject: NMBComparable!) -> ComparisonResult { + // swiftlint:disable:next force_cast return compare(otherObject as! String) } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift index 16af011..7d3e44c 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift @@ -1,36 +1,9 @@ import Foundation -// A workaround to SR-6419. -extension NotificationCenter { -#if !(os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) - #if swift(>=4.0) - #if swift(>=4.0.2) - #else - func addObserver(forName name: Notification.Name?, object obj: Any?, queue: OperationQueue?, using block: @escaping (Notification) -> Void) -> NSObjectProtocol { - return addObserver(forName: name, object: obj, queue: queue, usingBlock: block) - } - #endif - #elseif swift(>=3.2) - #if swift(>=3.2.2) - #else - // swiftlint:disable:next line_length - func addObserver(forName name: Notification.Name?, object obj: Any?, queue: OperationQueue?, using block: @escaping (Notification) -> Void) -> NSObjectProtocol { - return addObserver(forName: name, object: obj, queue: queue, usingBlock: block) - } - #endif - #else - // swiftlint:disable:next line_length - func addObserver(forName name: Notification.Name?, object obj: Any?, queue: OperationQueue?, using block: @escaping (Notification) -> Void) -> NSObjectProtocol { - return addObserver(forName: name, object: obj, queue: queue, usingBlock: block) - } - #endif -#endif -} - internal class NotificationCollector { private(set) var observedNotifications: [Notification] private let notificationCenter: NotificationCenter - #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) + #if canImport(Darwin) private var token: AnyObject? #else private var token: NSObjectProtocol? @@ -43,14 +16,14 @@ internal class NotificationCollector { func startObserving() { // swiftlint:disable:next line_length - self.token = self.notificationCenter.addObserver(forName: nil, object: nil, queue: nil, using: { [weak self] n in + self.token = self.notificationCenter.addObserver(forName: nil, object: nil, queue: nil) { [weak self] notification in // linux-swift gets confused by .append(n) - self?.observedNotifications.append(n) - }) + self?.observedNotifications.append(notification) + } } deinit { - #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) + #if canImport(Darwin) if let token = self.token { self.notificationCenter.removeObserver(token) } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/Predicate.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/Predicate.swift index 19fd322..2604411 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/Predicate.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/Predicate.swift @@ -218,6 +218,7 @@ extension Predicate: Matcher { extension Predicate { // Someday, make this public? Needs documentation internal func after(f: @escaping (Expression, PredicateResult) throws -> PredicateResult) -> Predicate { + // swiftlint:disable:previous identifier_name return Predicate { actual -> PredicateResult in let result = try self.satisfies(actual) return try f(actual, result) @@ -241,7 +242,7 @@ extension Predicate { } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) public typealias PredicateBlock = (_ actualExpression: Expression) throws -> NMBPredicateResult public class NMBPredicate: NSObject { @@ -311,7 +312,7 @@ final public class NMBPredicateStatus: NSObject { public static let doesNotMatch: NMBPredicateStatus = NMBPredicateStatus(status: 1) public static let fail: NMBPredicateStatus = NMBPredicateStatus(status: 2) - public override var hashValue: Int { return self.status.hashValue } + public override var hash: Int { return self.status.hashValue } public override func isEqual(_ object: Any?) -> Bool { guard let otherPredicate = object as? NMBPredicateStatus else { diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/RaisesException.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/RaisesException.swift index 459d2cd..f44c810 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/RaisesException.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/RaisesException.swift @@ -1,7 +1,7 @@ import Foundation // This matcher requires the Objective-C, and being built by Xcode rather than the Swift Package Manager -#if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE +#if canImport(Darwin) && !SWIFT_PACKAGE /// A Nimble matcher that succeeds when the actual expression raises an /// exception with the specified name, reason, and/or userInfo. @@ -23,8 +23,12 @@ public func raiseException( exception = e }), finally: nil) - capture.tryBlock { - _ = try! actualExpression.evaluate() + do { + try capture.tryBlockThrows { + _ = try actualExpression.evaluate() + } + } catch { + return PredicateResult(status: .fail, message: .fail("unexpected error thrown: <\(error)>")) } let failureMessage = FailureMessage() @@ -118,10 +122,12 @@ internal func exceptionMatchesNonNilFieldsOrClosure( } public class NMBObjCRaiseExceptionMatcher: NSObject, NMBMatcher { + // swiftlint:disable identifier_name internal var _name: String? internal var _reason: String? internal var _userInfo: NSDictionary? internal var _block: ((NSException) -> Void)? + // swiftlint:enable identifier_name internal init(name: String?, reason: String?, userInfo: NSDictionary?, block: ((NSException) -> Void)?) { _name = name diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAllOf.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAllOf.swift index 2b9eb21..da3ea9a 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAllOf.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAllOf.swift @@ -39,7 +39,7 @@ public func && (left: Predicate, right: Predicate) -> Predicate { return satisfyAllOf(left, right) } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { @objc public class func satisfyAllOfMatcher(_ matchers: [NMBMatcher]) -> NMBPredicate { return NMBPredicate { actualExpression in @@ -60,8 +60,12 @@ extension NMBObjCMatcher { return predicate.satisfies({ try expression.evaluate() }, location: actualExpression.location).toSwift() } else { let failureMessage = FailureMessage() - // swiftlint:disable:next line_length - let success = matcher.matches({ try! expression.evaluate() }, failureMessage: failureMessage, location: actualExpression.location) + let success = matcher.matches( + // swiftlint:disable:next force_try + { try! expression.evaluate() }, + failureMessage: failureMessage, + location: actualExpression.location + ) return PredicateResult(bool: success, message: failureMessage.toExpectationMessage()) } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAnyOf.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAnyOf.swift index 57b15fd..6724956 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAnyOf.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/SatisfyAnyOf.swift @@ -47,7 +47,7 @@ public func || (left: MatcherFunc, right: MatcherFunc) -> Predicate return satisfyAnyOf(left, right) } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) extension NMBObjCMatcher { @objc public class func satisfyAnyOfMatcher(_ matchers: [NMBMatcher]) -> NMBPredicate { return NMBPredicate { actualExpression in @@ -68,8 +68,12 @@ extension NMBObjCMatcher { return predicate.satisfies({ try expression.evaluate() }, location: actualExpression.location).toSwift() } else { let failureMessage = FailureMessage() - // swiftlint:disable:next line_length - let success = matcher.matches({ try! expression.evaluate() }, failureMessage: failureMessage, location: actualExpression.location) + let success = matcher.matches( + // swiftlint:disable:next force_try + { try! expression.evaluate() }, + failureMessage: failureMessage, + location: actualExpression.location + ) return PredicateResult(bool: success, message: failureMessage.toExpectationMessage()) } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Matchers/ThrowAssertion.swift b/Demo/Pods/Nimble/Sources/Nimble/Matchers/ThrowAssertion.swift index 035c744..53d9191 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Matchers/ThrowAssertion.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Matchers/ThrowAssertion.swift @@ -2,7 +2,7 @@ import Foundation public func throwAssertion() -> Predicate { return Predicate { actualExpression in - #if arch(x86_64) && (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE + #if arch(x86_64) && canImport(Darwin) && !SWIFT_PACKAGE let message = ExpectationMessage.expectedTo("throw an assertion") var actualError: Error? @@ -44,9 +44,8 @@ public func throwAssertion() -> Predicate { " conditional statement") #else fatalError("The throwAssertion Nimble matcher can only run on x86_64 platforms with " + - "Objective-C (e.g. Mac, iPhone 5s or later simulators). You can silence this error " + - "by placing the test case inside an #if arch(x86_64) or (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) conditional statement") - // swiftlint:disable:previous line_length + "Objective-C (e.g. macOS, iPhone 5s or later simulators). You can silence this error " + + "by placing the test case inside an #if arch(x86_64) or canImport(Darwin) conditional statement") #endif } } diff --git a/Demo/Pods/Nimble/Sources/Nimble/Utils/Await.swift b/Demo/Pods/Nimble/Sources/Nimble/Utils/Await.swift index cb672ad..276f618 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Utils/Await.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Utils/Await.swift @@ -2,7 +2,7 @@ import CoreFoundation import Dispatch import Foundation -#if !(os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) +#if canImport(CDispatch) import CDispatch #endif @@ -32,7 +32,7 @@ internal class AssertionWaitLock: WaitLock { func acquireWaitingLock(_ fnName: String, file: FileString, line: UInt) { let info = WaitingInfo(name: fnName, file: file, lineNumber: line) - #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) + #if canImport(Darwin) let isMainThread = Thread.isMainThread #else let isMainThread = _CFIsMainThread() @@ -45,10 +45,15 @@ internal class AssertionWaitLock: WaitLock { nimblePrecondition( currentWaiter == nil, "InvalidNimbleAPIUsage", - "Nested async expectations are not allowed to avoid creating flaky tests.\n\n" + - "The call to\n\t\(info)\n" + - "triggered this exception because\n\t\(currentWaiter!)\n" + - "is currently managing the main run loop." + """ + Nested async expectations are not allowed to avoid creating flaky tests. + + The call to + \t\(info) + triggered this exception because + \t\(currentWaiter!) + is currently managing the main run loop. + """ ) currentWaiter = info } @@ -180,25 +185,18 @@ internal class AwaitPromiseBuilder { // checked. // // In addition, stopping the run loop is used to halt code executed on the main run loop. - #if swift(>=4.0) trigger.timeoutSource.schedule( deadline: DispatchTime.now() + timeoutInterval, repeating: .never, leeway: timeoutLeeway ) - #else - trigger.timeoutSource.scheduleOneshot( - deadline: DispatchTime.now() + timeoutInterval, - leeway: timeoutLeeway - ) - #endif trigger.timeoutSource.setEventHandler { guard self.promise.asyncResult.isIncomplete() else { return } let timedOutSem = DispatchSemaphore(value: 0) let semTimedOutOrBlocked = DispatchSemaphore(value: 0) semTimedOutOrBlocked.signal() let runLoop = CFRunLoopGetMain() - #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) + #if canImport(Darwin) let runLoopMode = CFRunLoopMode.defaultMode.rawValue #else let runLoopMode = kCFRunLoopDefaultMode @@ -263,7 +261,7 @@ internal class AwaitPromiseBuilder { self.trigger.timeoutSource.resume() while self.promise.asyncResult.isIncomplete() { // Stopping the run loop does not work unless we run only 1 mode - #if swift(>=4.2) + #if (swift(>=4.2) && canImport(Darwin)) || compiler(>=5.0) _ = RunLoop.current.run(mode: .default, before: .distantFuture) #else _ = RunLoop.current.run(mode: .defaultRunLoopMode, before: .distantFuture) @@ -333,11 +331,7 @@ internal class Awaiter { let asyncSource = createTimerSource(asyncQueue) let trigger = AwaitTrigger(timeoutSource: timeoutSource, actionSource: asyncSource) { let interval = DispatchTimeInterval.nanoseconds(Int(pollInterval * TimeInterval(NSEC_PER_SEC))) - #if swift(>=4.0) asyncSource.schedule(deadline: .now(), repeating: interval, leeway: pollLeeway) - #else - asyncSource.scheduleRepeating(deadline: .now(), interval: interval, leeway: pollLeeway) - #endif asyncSource.setEventHandler { do { if let result = try closure() { diff --git a/Demo/Pods/Nimble/Sources/Nimble/Utils/Functional.swift b/Demo/Pods/Nimble/Sources/Nimble/Utils/Functional.swift index 6c5126a..c87af76 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Utils/Functional.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Utils/Functional.swift @@ -1,12 +1,14 @@ import Foundation +#if !swift(>=4.2) extension Sequence { - internal func all(_ fn: (Iterator.Element) -> Bool) -> Bool { + internal func allSatisfy(_ predicate: (Element) throws -> Bool) rethrows -> Bool { for item in self { - if !fn(item) { + if try !predicate(item) { return false } } return true } } +#endif diff --git a/Demo/Pods/Nimble/Sources/Nimble/Utils/Stringers.swift b/Demo/Pods/Nimble/Sources/Nimble/Utils/Stringers.swift index 7c4d273..4ab18d2 100644 --- a/Demo/Pods/Nimble/Sources/Nimble/Utils/Stringers.swift +++ b/Demo/Pods/Nimble/Sources/Nimble/Utils/Stringers.swift @@ -2,7 +2,7 @@ import Foundation internal func identityAsString(_ value: Any?) -> String { let anyObject: AnyObject? -#if os(Linux) +#if os(Linux) && !swift(>=4.1.50) anyObject = value as? AnyObject #else anyObject = value as AnyObject? @@ -122,6 +122,7 @@ extension String: TestOutputStringConvertible { extension Data: TestOutputStringConvertible { public var testDescription: String { #if os(Linux) + // swiftlint:disable:next todo // FIXME: Swift on Linux triggers a segfault when calling NSData's hash() (last checked on 03-11-16) return "Data" #else @@ -158,7 +159,7 @@ public func stringify(_ value: T?) -> String { return String(describing: value) } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) @objc public class NMBStringer: NSObject { @objc public class func stringify(_ obj: Any?) -> String { return Nimble.stringify(obj) diff --git a/Demo/Pods/Pods.xcodeproj/project.pbxproj b/Demo/Pods/Pods.xcodeproj/project.pbxproj index 2fd82ee..687b76a 100644 --- a/Demo/Pods/Pods.xcodeproj/project.pbxproj +++ b/Demo/Pods/Pods.xcodeproj/project.pbxproj @@ -7,1387 +7,1390 @@ objects = { /* Begin PBXBuildFile section */ - 01089B3FDEFB0CDD0B67D38ED86963BB /* AsMaybe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D8A88E7CC4DB576335240864037BBF5 /* AsMaybe.swift */; }; - 014C8C742FEFDB7E7542BF2436F955CA /* ObserveOn.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC444D5DB3186C2696883C395754E536 /* ObserveOn.swift */; }; - 020D79365071F89CF47E8F65D60DF685 /* NSObject+Rx-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = BFDD89119F9756A31AAE0C61C6C392F5 /* NSObject+Rx-dummy.m */; }; - 02DD07956B014D81FC3B7E17BC237ACC /* RxSwift-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 95B816FDFB9914FDB5932A277BF49BE8 /* RxSwift-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 04C3D6EA8DB704A044E57A603F8051AD /* OperationQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C91694859FC7B8E83B4294F7DEE91417 /* OperationQueueScheduler.swift */; }; - 0584D0378A7BC566D680CA4745759AAE /* TailRecursiveSink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893DFA6FA782016C4ADC97E04614AA64 /* TailRecursiveSink.swift */; }; - 06A8D4A5474C39C04655948F8CD31A2F /* Zip.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8E5FDC2B2154419FF94FF3678B00B02 /* Zip.swift */; }; - 06D49CD0E284F13EC4446F702800D17B /* Create.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77BF4BFBEE7621F16B88B263CA2C38CD /* Create.swift */; }; - 06F38DD26D80484050C9ED86478406F2 /* BeLessThanOrEqual.swift in Sources */ = {isa = PBXBuildFile; fileRef = B18710F2DC29EACD57A91E061B8FEC5A /* BeLessThanOrEqual.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 076322ECD83CCD5978E82A6C27850C42 /* QuickSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8D444BAF7554FCBEECBC80AD3B8A5F /* QuickSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 08210EC63215AC1453760A6267015D98 /* Dematerialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12E109B04A41B36246DD8B544AF9B7EC /* Dematerialize.swift */; }; - 089F2B2C34FD6211087F479001EEB544 /* Using.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A80966CC4EC9818649F9C9E2CFC0741 /* Using.swift */; }; - 0C345DBBF5EF9ED046CB579FDD401A57 /* NimbleEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7074E9CA670A4C3E1FE286964C801BB3 /* NimbleEnvironment.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 0D26DF5C78770563BB602E49C68DD75A /* InfiniteSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F9A5783A2A7CE35D48E4AAE5C202487 /* InfiniteSequence.swift */; }; - 0D74DB80E4766C505062F32B6C5A70AD /* BeAnInstanceOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9BE8C1E97DC1056F68928312334310C /* BeAnInstanceOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 103425C9315079FFDF4868042FE2CF79 /* ExampleHooks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15BB44DFD228A90F805B9FEEBA7A4E80 /* ExampleHooks.swift */; }; - 112CAE9947132F20975ED24B680C0E0A /* ReplaySubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6122E3E38B44456ED3B5B47B73EB2DC /* ReplaySubject.swift */; }; - 114852CA7443A6F59DC7F10854BFFE5E /* VirtualTimeConverterType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A65F0423427F1590B3974881584BA82 /* VirtualTimeConverterType.swift */; }; - 17B386AD2B53702744C4169B5201217C /* Closures.swift in Sources */ = {isa = PBXBuildFile; fileRef = B531259A56F7748DE2B778579A87338F /* Closures.swift */; }; - 18FAD9641B101E8EEBEB00EE431E3440 /* CombineLatest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 797BA25F337844CAD75AED0CB57A95CD /* CombineLatest.swift */; }; - 19291565899B5113A5355002CF9C8F2F /* Equal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F354095154E0131D2DBC40757AF3EA6 /* Equal.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 1AC5D2CE6FA79327468F53B53D0A9418 /* AllPass.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA8DFA962931C0D5C66AA5C3A08F61F /* AllPass.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 1E2AE2B6202B65E712FE05FB2699BD2C /* ExpectationMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95E460802B8FFF3BF02E54C2EA0BE9D9 /* ExpectationMessage.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 1F2F8FB86E40FAB4663086CE83B7654D /* BooleanDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4198195DE6196A273806238279B8F604 /* BooleanDisposable.swift */; }; - 2008CD2E1A5CB2AC1E02C9BD37AF8C22 /* Do.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6303AD957AF6EB732CD23753FEFD3A0 /* Do.swift */; }; - 205B3DFADA2BF30BFF78E1EC996EE385 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FFC65524FB644895BDCBBA0657F2FA07 /* XCTest.framework */; }; - 218D5177D58A35446EF01C47A2ECC7CC /* BehaviorSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C716D15548A214C7698156BFC17719D /* BehaviorSubject.swift */; }; - 223CA7D4EDF23874D61C762F6CF51C56 /* NMBExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305E4331419736FD5897A2AE8C89EE97 /* NMBExpectation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 22948773F0660B81265C2C17A0761F0D /* PostNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2011689AB7C05B7EFCB3487499B8D277 /* PostNotification.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 2443408236BFC805C0E5EC554DA4787C /* Completable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C9205A34A84D74C21CDC8A2C00CE7C8 /* Completable.swift */; }; - 24AC6513961FF6DC60E0FB284E8914B6 /* FailureMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A46CC4790475C2D3E8C62106E9E87BF /* FailureMessage.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 24E286D69C7DC48C2914448A0A7B29DC /* WithLatestFrom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C13AB47B67BD647DDFA8EB325A17A5 /* WithLatestFrom.swift */; }; - 25670E01BF12BAC45AB20A404F24EB91 /* Pods-DemoTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 947511070799896770CAF73BCB20B722 /* Pods-DemoTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 2574D09B363D42ACA6BA589B675FFA26 /* CwlCatchException.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACBE3CDD05A5487CDC82EAB5F2171E23 /* CwlCatchException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 28B4541F690EC0D5DEB304142D6A5CFE /* Single.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0C55A49EBBDEA751964AB79B51D5144 /* Single.swift */; }; - 2A53CE49E35851735AC464248730EF5A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4629AD8C523D2FDA5C72258FAA2846DC /* Foundation.framework */; }; - 2A8ADC8C1A772582E3F54ABAE5DFA18B /* SubscribeOn.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5AE0479796206409FCAA0309BF6CDF /* SubscribeOn.swift */; }; - 2ACB6F721F83AA421857ACACBECD7BA1 /* SkipWhile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B28044CA00CB23EC2407CC4122C4D28 /* SkipWhile.swift */; }; - 2C06E9D96634BC6B95FAF6BF7CED54A1 /* SynchronizedOnType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F99207603EB59E03D49A87AD6985D75 /* SynchronizedOnType.swift */; }; - 2CC91D1EF04393AE48463B5C9D8CAF96 /* DisposeBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE15C6D1844F1E64D2B1AFD049A9D79A /* DisposeBase.swift */; }; - 2D09E756E4941FA3825047E1E2517091 /* QCKDSL.h in Headers */ = {isa = PBXBuildFile; fileRef = FFA5A3E4C4EA8083112AB03B934B3322 /* QCKDSL.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 2EF89DB591335BFB29606E0706E66D9F /* NMBExceptionCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = F6A24D057CFAB8AC0F42B410E04BC8DA /* NMBExceptionCapture.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 2F8837FDE943E4810DA303DB0C4D5483 /* QuickConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 5291FFF3A591A584E3FD0C0D57FB22B0 /* QuickConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 2FDEB16F1990368152338AF2DE6D0C32 /* AnonymousObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A82807BF1FD7E2A42F11A48277F0D4B /* AnonymousObserver.swift */; }; - 30151F3559071F4DFAC85F54E8A1A37A /* SkipUntil.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1701A6D3E2D2886092827A97CB2B50E /* SkipUntil.swift */; }; - 33044D36B602FD581BE14DEBE3A4F489 /* Behavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92A189AEA8097CFFFDB0E5804C3C1C71 /* Behavior.swift */; }; - 3312F77A6C289F2CEFBF0C1D98431671 /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88011BB9DEE5C83495C831B3F209E75A /* Async.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 3351B401498926F2535052FC5EAF64A7 /* String+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1BB4BBDD3FA1FE0AB0D5CD935421FE9 /* String+Rx.swift */; }; - 34FF932D6DEFC87B16BB8B2CE3AA5A01 /* AnonymousDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9966B286269124E595FC35634650F842 /* AnonymousDisposable.swift */; }; - 350C051E271508531C90540A2496684C /* CwlCatchBadInstruction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F83D1F29400CB3E6AC588928E3AE393 /* CwlCatchBadInstruction.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 35382B1E443979F689AB1B64A9DF839B /* Generate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDC007682565B2949752002198645C43 /* Generate.swift */; }; - 37C3C6235A5DDB8E37629314CF0E8489 /* ThrowAssertion.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB58ADA89038564E8D37D27A81D9EEB3 /* ThrowAssertion.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 39022340BA4C753EE74695EE2C7C455D /* Amb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 160AC927638F4BB5403FCDA183972881 /* Amb.swift */; }; - 3A9EFBA686520511F5F4E7A57643EF3B /* Just.swift in Sources */ = {isa = PBXBuildFile; fileRef = 114E68352CD984771851423579F40A2A /* Just.swift */; }; - 3BED04BCEE6536D8937220381EE790AA /* ConcurrentDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3337AADFE03A8F4AD76EAA5747827B5 /* ConcurrentDispatchQueueScheduler.swift */; }; - 3C0D99EED837A3AD705A664503EF48DE /* NMBStringify.m in Sources */ = {isa = PBXBuildFile; fileRef = AB94114691FA364F6528B887F9CCB745 /* NMBStringify.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 3D600AC02826CE784CB7E9F88E9AC5DD /* QCKDSL.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B422D4026116E98349BC299E86A115F /* QCKDSL.m */; }; - 3D7E3805A91D58036235B9A70333A9AE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4629AD8C523D2FDA5C72258FAA2846DC /* Foundation.framework */; }; - 3DA38E69E7910F5F001F05BD09D957D1 /* Empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 074852CF0825C588D1A3D4BAFFF336F8 /* Empty.swift */; }; - 3E5BF54F40548F50A634D911A92F8D18 /* Quick.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1EC9968F9F25CDF86C277FB0995035 /* Quick.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3F076E5E0ACCE80863235591773EA2CD /* QuickSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 46A0731852D50F1DB5BAFB19F88EAB8C /* QuickSpec.m */; }; - 3F5316B5ADE2B573B9ECEB45B5D061C0 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C210218A9F8486C724AF000E9BC9C37A /* Configuration.swift */; }; - 3FC7EEF76396FF30EF783749C26F8C05 /* Disposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 427E782658A674CCF0CB37E38704950A /* Disposable.swift */; }; - 42927A4F037AAE24843B79E44FE19AC9 /* ObserverBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8157656B0734D038A9E7480F90A400FB /* ObserverBase.swift */; }; - 429367E7C28030B3509C31B053D17CB0 /* ErrorUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93E44F300CBA04F70194186384480022 /* ErrorUtility.swift */; }; - 42A9F49A3D23555A2EC71F3E84E435FB /* DSL+Wait.swift in Sources */ = {isa = PBXBuildFile; fileRef = 240F5BB7F84055523169BA056A193790 /* DSL+Wait.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 4349DBA2D11F7116FCA85B892C0966C5 /* VirtualTimeScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F1000398A937193871996A3F20A1462 /* VirtualTimeScheduler.swift */; }; - 4463FF547D5F565394B614D1A73D8877 /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAEF29A6102B5568BD9AAFF638630D8D /* Range.swift */; }; - 44F6B7EB2EAF73218A16F56D45C877A4 /* MatcherFunc.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF9F9A43FECF77D55637FBA87BE8F84C /* MatcherFunc.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 44FA2F66B24E147991026B20AEFD2158 /* Bag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 354D24E958A393E94828843EB7BA53E7 /* Bag.swift */; }; - 45B3DA8C3A339E583A2BEDF6161D0592 /* Cancelable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48CA898E26C422AA68784F179A306788 /* Cancelable.swift */; }; - 46238EE10297B2070114146C08FED333 /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AC713BD372892587446BB06FED1F3EB /* Error.swift */; }; - 47542DCAC61738574E2F2BCACA6611F1 /* DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB78C52CD56B4FA18B083FA7296FCB0C /* DSL.swift */; }; - 4949A35DFD7AF5D991FA12BA16D37A6F /* CompositeDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 164F3AB078C274155C74354ABDB631F7 /* CompositeDisposable.swift */; }; - 4BC738EA304E6FA57294B9AAFEC56F70 /* Functional.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FB7B448FE8D14A1A1033C5B2D60297A /* Functional.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 4C093ABFA796CEC3AC89C1B9DC36841D /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C31E6FEB9D56741DB672C8382B2518A /* Errors.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 4FD0B668599BDAF28C3B48264646A05D /* Pods-Demo-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 61FCD9F5AFAA918AE18E0F1754E59089 /* Pods-Demo-dummy.m */; }; - 51294689F8DD7158A89F4083A2207F60 /* PriorityQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2319471065A9D1CD76F47F65B85C2B9A /* PriorityQueue.swift */; }; - 540670A34C103B3D2EFC67692D64D94C /* TakeUntil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E69C9350D2F7C715612EAA27FE74850 /* TakeUntil.swift */; }; - 54CCCCF6DE0F0196785ED239FB290146 /* RxMutableBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63155FFB4E0398159B73FA1AB4B35DBE /* RxMutableBox.swift */; }; - 54EFB7A3E7737C4CFF3C0E30C525B81E /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 939094E692477DC2564BA8E062FD8322 /* Timer.swift */; }; - 562B8E7BBB3176E837BEBD6D24DA7EF4 /* NMBObjCMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D0BB645A4FAFCB5F640230E7F25570B /* NMBObjCMatcher.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 5747F17B237F1ACB862F3F2911E5CBB1 /* BeVoid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E6878F54DB7E975AF72BCA44F5186D3 /* BeVoid.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 574F89786271FD7BAD216D075EA1E898 /* Nimble.h in Headers */ = {isa = PBXBuildFile; fileRef = 53C19900EDD8583ACC910B537E5D5C4B /* Nimble.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 5780AAD342CE3C8CCDC47ADFF96973B1 /* Buffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 844DD75ACFEDFA15534455AAED0E3653 /* Buffer.swift */; }; - 5895EA4D5666103B2CD4243690487D07 /* RaisesException.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E603428CD7A07A4FC0C6F7958B3CAC /* RaisesException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 58B249717B134855DA1DF182DF0AEDB9 /* BeGreaterThanOrEqualTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39850425D82DB5D7CEB583E418B77552 /* BeGreaterThanOrEqualTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 596E6C82A98EE40174F48463FA1BE093 /* StartWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87E3408C3DA17809FD2D1AF79092FB61 /* StartWith.swift */; }; - 5B392CA36C975AC73B4ACD3FA812176D /* RecursiveScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 143DC6F29498D8013E6BEC40FBA5E02C /* RecursiveScheduler.swift */; }; - 5B8933F55D812751FD5DC9C962D4B880 /* SchedulerServices+Emulation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B72A9772A6F1DAC3C6BE21ABCD1EB7A1 /* SchedulerServices+Emulation.swift */; }; - 5BA1006DAFD72ACF9F31DC95096FD054 /* mach_excServer.h in Headers */ = {isa = PBXBuildFile; fileRef = D4D814CA1F7D55C5CE8D8A62F578BDCB /* mach_excServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 5BFF937266E4511B7365D3B5F552EE4C /* Reactive.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA4A119E40151F454272BA8D2E6DDE07 /* Reactive.swift */; }; - 5E689A3A729873D290AD5C963C4D5389 /* Concat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FDA83E1F8E3CEA2D465E20D3214B773 /* Concat.swift */; }; - 5E901977E117A5D74CD1701BB665B3A0 /* Multicast.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1C08FDD640F8069F0780569F49E173C /* Multicast.swift */; }; - 60F93E168485BCB9AA3A157FE2CB7C41 /* ExampleGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBF3EE16F855C8DBB30D15A2D3D1AFDA /* ExampleGroup.swift */; }; - 618C13D4020EBA363997EFB60A56AC20 /* DSL.h in Headers */ = {isa = PBXBuildFile; fileRef = C7DD7EC55777F14EF1925F57BDF9C1E1 /* DSL.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 62795B841FA47336A4A09F0B0776FDA5 /* Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4DC9433907411D9872E64D72EC0EB8C /* Rx.swift */; }; - 62A3D36B892ED9C9A3210134C97FE3F9 /* NimbleXCTestHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = B178C80B40AAE6BB62339FF0344BE272 /* NimbleXCTestHandler.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 631DE69A990BC90C4B864A9056F810A8 /* ObservableConvertibleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEECCD6C2C998EE81C97DF26F90C00A3 /* ObservableConvertibleType.swift */; }; - 65345217D4A1DE88312F171F0251DB96 /* HooksPhase.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0635D052A48DC2468609F1AC2E6F7D /* HooksPhase.swift */; }; - 65FF97EE04691FA9881DAA432DEAC165 /* ExampleMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C813EBE18B28E147E2D2A4E1315ED6B /* ExampleMetadata.swift */; }; - 6677FB54CA94A573E7055E91A774BAA7 /* PrimitiveSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A6E3F42A38B96DC41F4AD405047BAE /* PrimitiveSequence.swift */; }; - 66B1964BB363964D6D5997D1A036AA4C /* Pods-DemoTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B986DA8565410A1FBB275EBDC22173F /* Pods-DemoTests-dummy.m */; }; - 66D3DA2225488356273B3D0AB83DA268 /* CwlMachBadInstructionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = DF5265DC9B29D8CA8FF54085E2B7DF5D /* CwlMachBadInstructionHandler.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 6789FBB44FD34F04961C57D946F303C8 /* SingleAsync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BCCD69666E088C50F6C38EA6CD1AB4B /* SingleAsync.swift */; }; - 682734406B4017836DFA3477E9580A75 /* Completable+AndThen.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28E1A1F23E60EF795CDF40CC4BACEA8 /* Completable+AndThen.swift */; }; - 694209670715D02154935BBC68357DDC /* RefCountDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E4E005EEF95B0D83D99B6692A1350BC /* RefCountDisposable.swift */; }; - 6985430721C89135D5B4CBE13357EC31 /* DSL.m in Sources */ = {isa = PBXBuildFile; fileRef = 7667193A493030E75DFD96FE7487BAA1 /* DSL.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 69DCD40C8C5C22615B29432BF0ADB8F1 /* Sequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 359EF32513E15E5F9736472E34E8BA2F /* Sequence.swift */; }; - 6A81D8BA95FB1AE2D08BAF2CD8722D1F /* Repeat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 953602682825A527034579F7C76FE490 /* Repeat.swift */; }; - 6ABBC348BEF5F20DBE251EB1DA4139D8 /* Zip+Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370E28D8AB2F773D22F0F14A4380D8D1 /* Zip+Collection.swift */; }; - 6B124A4D8EB28A918E0C87F2E75D94F8 /* MatcherProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = E32EF20994BA990A01264A673D581032 /* MatcherProtocols.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 6B2DF45B9BFABD4BF3DDC503F073FB71 /* BeAKindOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA5CA08861E3FE5683C967ACE8CB4B6E /* BeAKindOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 6C7793E96DD52017C4265E4AC7B7DFDC /* CombineLatest+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0355709C623A5CE75C62DADE7ED13864 /* CombineLatest+arity.swift */; }; - 6ED60AC96F8472044C00C8D7D628A0C6 /* AsSingle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C6E9FFEAEA19E766DE091CA2CED49B /* AsSingle.swift */; }; - 6FC73E611DB28D56E414368C62293B35 /* SingleAssignmentDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7891998A72CC5885870EAA5C1DB6090D /* SingleAssignmentDisposable.swift */; }; - 6FE504E9ED5B37C05CFC2A530019AE5D /* BeGreaterThan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C16136FA33975C0E5E721B340B54FEC /* BeGreaterThan.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 71620E4C41A339C58454366C0C745343 /* Platform.Linux.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14254979BB7DBDECF8A42729EB0DAD3A /* Platform.Linux.swift */; }; - 71E9ACE34A2AC6107D9D3FD879E54003 /* ShareReplayScope.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE060340E5949C3EA68028FFE2F6FAFD /* ShareReplayScope.swift */; }; - 7296E0A03EC8B756490B091FC364D56C /* AsyncLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9C10D0D490E840FD368480CA5687CB9 /* AsyncLock.swift */; }; - 72F5C956E3EEC102D8C074CECC6BC3FA /* Deferred.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E964D3332805902ED02A58CEAD6763 /* Deferred.swift */; }; - 7371D9E42417DC2735CC0B33FCAA5B53 /* ConnectableObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4713F6654D54AB72593C74FC5B61E96 /* ConnectableObservableType.swift */; }; - 74605907C211553B00F09768BEF12834 /* EndWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E119EFB1EAF08A062C6AE19BAF7AC39 /* EndWith.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 746D0DBAF8EB27CA816CFD021DE2A7A1 /* SatisfyAnyOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = C248DC53B42DE75A0CBD7043CB1F3BCC /* SatisfyAnyOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 7485AAEB633B78268D656D019B77E023 /* SatisfyAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 469C30CEF7D2A4D3C4CCF20CEE62E015 /* SatisfyAllOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 783623D1EBFE01DAB87B7B68F150C4C4 /* CombineLatest+Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08B5B59E45712A057FDA37338206B27D /* CombineLatest+Collection.swift */; }; - 7876A8DBFDC1DB9B1AE2DEDE6A3215B1 /* HistoricalSchedulerTimeConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA2B4351FE4514079E5C27A7CC047C5 /* HistoricalSchedulerTimeConverter.swift */; }; - 792874E54F86CE42C62738D2A617471B /* GroupBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1EEE78514F442CE33602A647235C73E /* GroupBy.swift */; }; - 7961143C7234A4CCE19F18B3E46A3675 /* RetryWhen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54C8B8F19EE0A378AFB47AEF4F46106B /* RetryWhen.swift */; }; - 79A97F6BE246CF2D3CAF89AD701B92DA /* PrimitiveSequence+Zip+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A9320BEA924A5F642EFD71C5422EF8 /* PrimitiveSequence+Zip+arity.swift */; }; - 79FA255F43C9E42470C9720C0604444F /* Nimble-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 77EF7A3BA578E9A34C4A4608778AAD11 /* Nimble-dummy.m */; }; - 7AA9A7388AF44BB4EB2111CEDB29A666 /* MatchError.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6CF95E05725AA13265818026FD6246B /* MatchError.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 7ABB709BD6428FCC8793EA57479CB750 /* DistinctUntilChanged.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24D1A75476250C2A48E7F5448FAF09A9 /* DistinctUntilChanged.swift */; }; - 7BF648A27F63C337E891EFD80CEFEDCF /* Sample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B445A2DE8B41E87F9063B9231FBBF8E /* Sample.swift */; }; - 7E4106FB6CD590CF28FB62BEF94CFC9B /* RxSwift-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F3C35BAE591AFECEB05635881E769C9 /* RxSwift-dummy.m */; }; - 7F1BE590E76E43F561D8F8CF354F72F6 /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC800C898D2D37EE433653C10CD924F4 /* Filter.swift */; }; - 8050C10B78F2D1DD98A2F3E250A24AD0 /* CwlDarwinDefinitions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B071A84DD47E9A2223335FED77ADF2C7 /* CwlDarwinDefinitions.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 81FEEC4A4AAE20EB19B8D499CC21F0F0 /* TakeWhile.swift in Sources */ = {isa = PBXBuildFile; fileRef = D14B39EDDF06E204809CFC94AFFDEB86 /* TakeWhile.swift */; }; - 836BD1324E5478A3AB7542A3CE75F283 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 363D20503FA622D74B2953ADE9EF5BC9 /* Errors.swift */; }; - 845A3084299A4B5366BC11E793F47FC8 /* SubjectType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8101628CF72189785B691AC6B4E0289 /* SubjectType.swift */; }; - 85107C3BD627EA89CC1EAB25859EF85D /* AssertionRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 714F613A3647ADF3B1A3BC1CAD3DDA28 /* AssertionRecorder.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 8580697F001A38CF65562CBE91B3C3D0 /* ObservableType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470B86DFF7ED33C296F43DACA490CE9C /* ObservableType+Extensions.swift */; }; - 86DC85C7CF36987627A4A36D82C310C5 /* DeprecationWarner.swift in Sources */ = {isa = PBXBuildFile; fileRef = B21EC49FB786C1D81036492BE569EC3D /* DeprecationWarner.swift */; }; - 8A07E63BB7C668B40163BA52C80E6532 /* HasDisposeBag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10B10CE857DE60321E2473DA326FB12B /* HasDisposeBag.swift */; }; - 8BB7F5B7E3E77CF25E64E1EAD1A26E68 /* ContainElementSatisfying.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3842DB32E06DE501958B97A857F58B82 /* ContainElementSatisfying.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 8D4752D7E2883F2567EF632CC4E226C4 /* Maybe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6671BAA13CD18FEE8106C9712F03FA43 /* Maybe.swift */; }; - 8DB82AD773179E60305CE27BCD1A089E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4629AD8C523D2FDA5C72258FAA2846DC /* Foundation.framework */; }; - 8E83E547D107FFC8B596829313AAF38F /* BeNil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95EF400AF65F8B21865F81A17A3CB4BB /* BeNil.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 8F5F62256B3D0CA7C0F3C12873E5A6AE /* ToArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F7E207A4F51F9EB4921B778F527FD38 /* ToArray.swift */; }; - 9096D686AB39D3475A4227F0765C3DC4 /* Nimble-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 2802F374F28EDC38A097F63405F76D6E /* Nimble-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 91BBDC01F5559CD8ECBF2591ACAB7E04 /* InvocableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C22E5D2E05F8DF2210DCECD0FA648DA /* InvocableType.swift */; }; - 93438224836AC1AFFD43A69A04501382 /* NSBundle+CurrentTestBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCD9AA26C47D968373890A1FB6485742 /* NSBundle+CurrentTestBundle.swift */; }; - 935558F919649CDE3784CBD344D3C008 /* Predicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810E828B743FB8120679616F1A71760C /* Predicate.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 94641EE53103489464DC9A221DB495A2 /* Disposables.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFEE7880FB8439DCD66B8C502896611 /* Disposables.swift */; }; - 95971795C6F61C01410B264C4BBF3A6E /* World.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D3AA38902E6E9E06B7493AB312E5236 /* World.swift */; }; - 960B9B027E55F6C0481B63E25CF50EE6 /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54E70EA13F7FA77DD8FA0B1F55597CE3 /* Event.swift */; }; - 97A60F28FA1FF94422D2560002CEE407 /* NMBStringify.h in Headers */ = {isa = PBXBuildFile; fileRef = DA98F69D71655FD9BD126636D8287A07 /* NMBStringify.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 97EE56F66DCD3C983D0585D8F45FDB6A /* BeIdenticalTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = A741EC25A9FAB83CC4422BE397426328 /* BeIdenticalTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 9832EC5987372E75A4C3F1E13CD3F372 /* ConcurrentMainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42F5A272707A1F50C050DE72AB2003B1 /* ConcurrentMainScheduler.swift */; }; - 9837B2C2E8067FC961F5ADF7F2A70764 /* Reduce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70768FAAD304AE8702BB00F59F1D0DC3 /* Reduce.swift */; }; - 983B50800F73172C0CFDBE2C9AA34CCD /* Debounce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16A0AAA6F245B75A656A4B2518C7335B /* Debounce.swift */; }; - 98D381D62E332A089ACB3A59FCCE4ACF /* Callsite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B0CA0F1FC4FC57170B89F6C07D3B2DE /* Callsite.swift */; }; - 993640128A087C5D96F453A18DCD9138 /* AsyncSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE7E9035154A3B24B6F7BF064B34D961 /* AsyncSubject.swift */; }; - 9A0EB2F0A468E4576E776AE1E9221E7A /* CwlBadInstructionException.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB5FAD837BE2AAE61455BFD7B32DA9F7 /* CwlBadInstructionException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 9C22921616DC80691662977DDEA6B2C4 /* BeEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6586E98D2401323473BC5C42F6FEC090 /* BeEmpty.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - 9C736F7C9C052DFFF87DCBA83FF50599 /* XCTestSuite+QuickTestSuiteBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 2352A949CDB3DB99563DEEFB6A3C4B0C /* XCTestSuite+QuickTestSuiteBuilder.m */; }; - 9CA1B83C396A9E9AB68F7C5137B493FD /* URL+FileName.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA9BB2D4A6C2F84F3A205B1635BBA99 /* URL+FileName.swift */; }; - 9CAA6C0F3A9D7BED04A08EECF400A0CE /* TakeLast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FEAFE56F3ED5F6E99CF9B24253F2421 /* TakeLast.swift */; }; - 9D4E546FF329D4109FC3C282928B02E8 /* Quick-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FA2AE3513A9716B710893D98246801C /* Quick-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A274C62D7E69DB37DDBF4634D893E4BC /* Lock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8EEACE83E0A6A980E3B00BB915449B7E /* Lock.swift */; }; - A286AD495C5D4520ADF2ECE7786EF950 /* Expectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5E5FF9976441B8C4B99ADBA2B921D91 /* Expectation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - A3209494C8B29F390AC14D95519460A8 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4629AD8C523D2FDA5C72258FAA2846DC /* Foundation.framework */; }; - A3769A79129A62719850CA2BD7F8B4BC /* Platform.Darwin.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1A7DA6A081CAE89BEE14C9BC4655DAA /* Platform.Darwin.swift */; }; - A490FAE0B78B47AF739B0DAFC1DC5AD6 /* DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49742A5C11C901751E6A9D8BB806B59C /* DSL.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - A54297FF959864299C019286DDCE4E90 /* BinaryDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47825406D7C5A6DEA89B0AF2C056C79F /* BinaryDisposable.swift */; }; - A6D8B1FECC9C49BC75F4FFEDD6DD86AA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4629AD8C523D2FDA5C72258FAA2846DC /* Foundation.framework */; }; - A773C0EEDBE9F7DF4D6F7F13D60C8509 /* Window.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84693A87C5C5D2F05C08327D2A4B001D /* Window.swift */; }; - A7EA3539CBE2EBB42D92C3132763E251 /* World+DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98A0F18D7BA4CD704304888CCF78EB82 /* World+DSL.swift */; }; - A9ED0D16B96A912902689EC0B359D695 /* SynchronizedDisposeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7EE7E5BED1F5444680691BAC2DC2217 /* SynchronizedDisposeType.swift */; }; - ACBC3FF2772BDB948D79DE4ACE4D7722 /* HistoricalScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2CEAB6772D554FD8158AA584BB52908 /* HistoricalScheduler.swift */; }; - ACBDFCBB834F0381E3CC9B223F9FF40E /* AnyObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 329F6D3325A0CFDCA45B42B53996B676 /* AnyObserver.swift */; }; - AD3AB11277BC8A2880794BFA14AA3327 /* SwiftSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F92503F46B55D4F4A3BFD15E7179C81 /* SwiftSupport.swift */; }; - ADBCE6E49E093AD2C1E6366DABBBC03F /* DisposeBag.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3283B87E27D08583CBA1ECF30756E5F /* DisposeBag.swift */; }; - B0F913BBEE0EFA8232619A91191BF412 /* LockOwnerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F0D73D9BD0515FA3306EFC358189E8 /* LockOwnerType.swift */; }; - B16E0468AF7B79011E9E5008D74DF99D /* Throttle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22B1203DA40864EE94B6C1E277231E5E /* Throttle.swift */; }; - B287D5E766B234A090DCBC039E87B2D6 /* Map.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAB8BAF401ECC4A253D755B27763BC4B /* Map.swift */; }; - B2F5395D43472600D7BA7E26E3772069 /* BeLessThan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3692E1BE689C456EFFCA8713705DB0E0 /* BeLessThan.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - B30FCDD03BFE82B7E9776FD9CE3A1C51 /* Contain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AF226AA1C6369E28470BFDF0B8B1811 /* Contain.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - B34A6018FDF04D597D6E7529674C70B8 /* Catch.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD9A6F50B048B75D8EA7E457FAB2953F /* Catch.swift */; }; - B3895E766FFE0B7DF58F4D0BE246221B /* XCTestObservationCenter+Register.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B4F410F57910B0F6B0F18AFD2F8AF74 /* XCTestObservationCenter+Register.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - B3C3D7DAB6567A273DA50FD2068AFF77 /* NMBExceptionCapture.h in Headers */ = {isa = PBXBuildFile; fileRef = 826512B771104143AEAB0F494EEAF955 /* NMBExceptionCapture.h */; settings = {ATTRIBUTES = (Public, ); }; }; - B5541AEE9C3EF1FC587FD966C696255A /* Switch.swift in Sources */ = {isa = PBXBuildFile; fileRef = E72D33CF85D0E14163C30C93662CCF51 /* Switch.swift */; }; - B5C4D238942464AAF42FEDDBB3512EF7 /* NSObject+Rx-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F448C4244A86825882FEC5453730CA1F /* NSObject+Rx-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - B6F0D7C04121F97B1D4933C0168278EF /* AssertionDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBFAA7F4BF7C3113856D36AD34A1DE76 /* AssertionDispatcher.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - B7ED1B41F56087971B656A2E38322310 /* Stringers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CDED84A81BE984BDBC5FC295D439898 /* Stringers.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - B8A8CC77A2A845C44237B66CF0C8F022 /* ScheduledItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 240BA3650D70E820ABF9412BCA527E91 /* ScheduledItem.swift */; }; - BB02C07DFD814F2B8FD5797635B156A3 /* Delay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 682299A86071B7158145932CB0D1BBF5 /* Delay.swift */; }; - BB7BDB047E44BF96B6967525A2EF0301 /* ImmediateSchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77E0E76A1C543895177E899C435E069A /* ImmediateSchedulerType.swift */; }; - BDDE7F52290E745F8E0ADF2F1B88B660 /* MainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5552815B1D6B85B22773B342182410F /* MainScheduler.swift */; }; - BEB8082717D949400F2DE3458E75CBE3 /* CwlMachBadInstructionHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = D4713B10B2644CE1F98886857CDB397E /* CwlMachBadInstructionHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C062E295E908096B138F19EAC25F86F6 /* PublishSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAED59CA25B110A7B74B373CA11A5DD7 /* PublishSubject.swift */; }; - C17F7ABA56D9CF3BCCCC099B28E2180F /* SwitchIfEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E03BA62093D7BC8C7CF21D07B63CE87 /* SwitchIfEmpty.swift */; }; - C25C2936C31569B3F4247170224114E3 /* Queue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03A68F151BE54A2F04AB50E53B935D79 /* Queue.swift */; }; - C25FC7A56AC20E4C745248B505FB8864 /* AddRef.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D7B9B6643C71DDDBC3A8B7C0B60A880 /* AddRef.swift */; }; - C2DB15EDDCB2D09A7BA3DADEE3E48A3E /* Zip+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EF5A94E2EF4108B8AAF8ED75F7A1872 /* Zip+arity.swift */; }; - C3DB1DB7DDD26BB48EDA8EA92289F398 /* Observable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B256F24A6D99A8F066F044EB158EADA /* Observable.swift */; }; - C4F42D1DA4FF9D2A4A74B2EACBB42EEE /* NopDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9F5B8284085D8FECC48F4A0F89485D8 /* NopDisposable.swift */; }; - C5305DE0B553BCA7361C3997ACD70FFB /* mach_excServer.c in Sources */ = {isa = PBXBuildFile; fileRef = 9EAF6483E08D795DEA5172EE1BC70F1B /* mach_excServer.c */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - C606BCAC386078403182F3AB0EA32A95 /* NSString+C99ExtendedIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5271EE6500A485B24AB3878D7B2CA7B /* NSString+C99ExtendedIdentifier.swift */; }; - C70836640F9BCAD036DC24CD53EAD941 /* Scan.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA662D89BF735BEDA1820FF2B1259DD /* Scan.swift */; }; - C798F9D3D2C528634CE1AF5B9D1A86EC /* CurrentThreadScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF20B48B6E7109EE06F817D2F4FD91B /* CurrentThreadScheduler.swift */; }; - CB2070AAD7F9B9E283AD2A50624DC8E5 /* Materialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693FA9B96E88629D39696CE901394BC4 /* Materialize.swift */; }; - CB3FE477A28D5F42659E775DDADFA162 /* SubscriptionDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 969E229627CEB3E2BB5AC2D0A021B227 /* SubscriptionDisposable.swift */; }; - CC6C123ABABD01D69876BB64F3F78884 /* QuickSpecBase.h in Headers */ = {isa = PBXBuildFile; fileRef = D8D94B3AF1FAE7195873672682DD65CE /* QuickSpecBase.h */; settings = {ATTRIBUTES = (Project, ); }; }; - CDE5591E5DC14A3BD4C44557996D0912 /* DispatchQueueConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8618BABC2E115BF6DDD424871D134F62 /* DispatchQueueConfiguration.swift */; }; - CDE8D74CECACB82D52879CA3EFA439A9 /* ObservableType+PrimitiveSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6413E762A5EBA3739D651907C4AFE4AE /* ObservableType+PrimitiveSequence.swift */; }; - CE1287DA39DB4208F5511CE47FE8298D /* AdapterProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0276210F7791A98E44CF60C73E6BA118 /* AdapterProtocols.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - CF1ED281DEC16E6F808DE809FD9A4688 /* RecursiveLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1933D8E0310F94603B8FD9851FD5FE1B /* RecursiveLock.swift */; }; - CF344AE64DC644F7F9643462510552F0 /* SchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25E927D100A94EBC1CFB1D2C75F540CC /* SchedulerType.swift */; }; - D20332D3554078C7F69A22AD794F38DF /* Take.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CEB04C02E607AA3AD97B6F71EBAFF25 /* Take.swift */; }; - D20D415DB1DC034E1434D3265645F21D /* ObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42A6C4D50D4793EB419FC568B796501 /* ObservableType.swift */; }; - D288903D8382C3A45230B8E8F1ABD4A3 /* DefaultIfEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9ABE8F53EEDF350CE9E98036A1388B9 /* DefaultIfEmpty.swift */; }; - D2E59573AB346DE7A8E9492084578ED4 /* ScheduledItemType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C53E3F10D7DBBB1C92DB551BE4E55FA3 /* ScheduledItemType.swift */; }; - D469257F041DDCAF64BEED7BC8A03095 /* ScheduledDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 133B81FBCBE2867E65695417011A8A0F /* ScheduledDisposable.swift */; }; - D5E2476AE4B2324B73B769C1B866D709 /* QuickConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 892AE6FA0CC8D00329D80A079A2CC781 /* QuickConfiguration.m */; }; - D66898CEEBBB911BAD9BD1FD9179A7B5 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC74AA969E8AB63D1EB8807A90B9E291 /* RxSwift.framework */; }; - D710D0C1F200BB05972529EEED15D4AE /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16AA2AC65F9FD2C9F028886DA5DF992D /* Filter.swift */; }; - D7F54D1594E9B050170EAD9762901A41 /* Merge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 591AB3255214FAC8B04C1178BF4AB315 /* Merge.swift */; }; - D89AD296DD7AAF395C236A8708FCE1AA /* SynchronizedUnsubscribeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE18D3D48A514F0873D97857ADFD5467 /* SynchronizedUnsubscribeType.swift */; }; - DA257CBBCAB6C22BA5476F983AC78BB5 /* BeCloseTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F0DE87C78ADC36B83F5F95C1D79FE6 /* BeCloseTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - DA4FBA76599ECAB9A1993F119A41359D /* SourceLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8375E055ABF700CDD22E540C278690CA /* SourceLocation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - DAF21E37BBBFD5D408F514E867A5936C /* ToSucceed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B62414F5CC774D8C0A71BFBCFED3C28 /* ToSucceed.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - DD2EB3198539280E2F07F0E360AFF324 /* BeLogical.swift in Sources */ = {isa = PBXBuildFile; fileRef = B91C3C38EDF4C0FA75689C670E9FF69C /* BeLogical.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - DDB89D0F2F9422FEFF8D3ABB4B1FC7F9 /* Match.swift in Sources */ = {isa = PBXBuildFile; fileRef = F404DBBC429942E6C3B29B82B9B33127 /* Match.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - DEEDD0D7C0369178EC867A59373F6380 /* Await.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D15E09F59E707CE8DCFA06DA95E1955 /* Await.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - DEF90E9699C9CFF31E275EDF10E67F5A /* Timeout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9E8191074B83A31E03235A74753E1C /* Timeout.swift */; }; - DF7CF1941236840A89D99B233E4DC086 /* BeginWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAFAF82614BD68A87F254861741C0F09 /* BeginWith.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - E0AE698E1A4F0D9064C04882327C92F3 /* Example.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F9D0F9A639D77A50EFB45E3EEF3284E /* Example.swift */; }; - E1ED227B3AD36380A637CA2B5980E7CC /* QuickSpecBase.m in Sources */ = {isa = PBXBuildFile; fileRef = E9589240691151AB6A2D4C860573AD53 /* QuickSpecBase.m */; }; - E2A16679D4DDEBA514BE2B37ED821EBC /* Enumerated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F14ADA04EC375F9355811F7FB479F30 /* Enumerated.swift */; }; - E2B9A7FCED63F1F8FE196ADAB3F10E8B /* Pods-Demo-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = ED4652D686FFA05E4CFD837F5DD948A0 /* Pods-Demo-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E3520A44C282726253DDE4DAC512CCA0 /* Quick-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 80D7E59A7AB5A6E0A9F70553026A1432 /* Quick-dummy.m */; }; - E454528E8D39931207848DACBB617A4C /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = C19BC99B3171B4D39B517C1C8F619EE0 /* Expression.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - E4D4B352127EE8DB616595CF15FA7704 /* Never.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8E5D7A9D671C721C1E12793E2003311 /* Never.swift */; }; - E4E54DCF87B0DDFE063F6E4DC162BDE6 /* ElementAt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69C14CC6F1FDF38F363AFC56BA6F3308 /* ElementAt.swift */; }; - E85EAC40F42C10F327BE0BCF39C2DF3B /* ThrowError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57B68089FB51524F2540E998F84D39F6 /* ThrowError.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - E9051C0B4E7A242E6E97A5B5AA0404A4 /* SerialDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50AF8513B9AB383E48A62162FCE5CDCD /* SerialDispatchQueueScheduler.swift */; }; - E984CB87ABF0DD970BD4B856DEA35E1A /* CwlPreconditionTesting.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A331E455E604A8FD062D062BC8C2CDE /* CwlPreconditionTesting.h */; settings = {ATTRIBUTES = (Public, ); }; }; - EAE3244F76D911D79ED30B4A7259DFB6 /* DelaySubscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA979333254652BCD92B81BE2A52273 /* DelaySubscription.swift */; }; - EB7C68E6DCCC3500FE08F9B2F0C85F08 /* NSObject+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DA0C14A9787B97E9C5E661EA66B8618 /* NSObject+Rx.swift */; }; - EE99E3B1DCB0348F44C7499B2BA809A9 /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2189B77DF040C86FCFF5D369FB3174E /* Deprecated.swift */; }; - F01E5B65B40B6E3082994D09EC7A55BE /* GroupedObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1146875A7BF6594AA772516883D1AC4D /* GroupedObservable.swift */; }; - F088EE1AE386EEF27AC934DE13F455BB /* CwlCatchException.h in Headers */ = {isa = PBXBuildFile; fileRef = AA72A7AC13BEBC006DC6A08BE7158B77 /* CwlCatchException.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F099097291330AC895E75E72028EBC0B /* QuickTestSuite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0217A0A42340465992FEC11F73C50759 /* QuickTestSuite.swift */; }; - F09B92DBEA01E4AC34B1936261B29D7C /* Skip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88384211B224E7DC58855FA587A676A7 /* Skip.swift */; }; - F19DEFB017CE9B3CFB0C0A0AE9249CC4 /* QuickSelectedTestSuiteBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047E23E180142B6FADC17E1E69757B2C /* QuickSelectedTestSuiteBuilder.swift */; }; - F32B9D0318D13B740E6D88E16709FEA3 /* HaveCount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 315147E49635C8F348F328E18989C976 /* HaveCount.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - F3BD9C72BAF02A3B4B8731C95C076B69 /* Producer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36A538752EB17DCE0DB682EF8DE237B8 /* Producer.swift */; }; - F3D08045C8E29935EA0B91BCE94B951F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4629AD8C523D2FDA5C72258FAA2846DC /* Foundation.framework */; }; - F44B8D914434D1395E2873C45587B500 /* DispatchQueue+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5605D21C0A02C9A590028A83CFF730DC /* DispatchQueue+Extensions.swift */; }; - F4EE282D8435D54A662C6DDD30A3D2CD /* CwlCatchException.m in Sources */ = {isa = PBXBuildFile; fileRef = 0691A529241CC719252270B5515C79F2 /* CwlCatchException.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; - F4F64B5A42509E4397D3D51E13B0C4C9 /* Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77CD36657390EB761A89CC16CFCF007D /* Debug.swift */; }; - F552462D6CD28A8074CF8746ED010AF6 /* First.swift in Sources */ = {isa = PBXBuildFile; fileRef = A83B3BD4D27B914EF152352BB94DF1A0 /* First.swift */; }; - F647E5A7CA3CDAB1EB28BB0E119FF954 /* SuiteHooks.swift in Sources */ = {isa = PBXBuildFile; fileRef = B70E02E24CED64298A1B42C70BA76CA8 /* SuiteHooks.swift */; }; - F683E04324F4494A9FA86E8D9AB15F0A /* Sink.swift in Sources */ = {isa = PBXBuildFile; fileRef = E730DFEBE1FC3034DE9A7F4481D1B76A /* Sink.swift */; }; - F7D7D1D92A2A67BF2977AE46A48ABBF7 /* InvocableScheduledItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = E38701C3B0A94C31245884CA79DE9371 /* InvocableScheduledItem.swift */; }; - FA47FEE3404BEA929C6B6081015CAA22 /* Optional.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9874781A641D9A2DC14AF764B2E138F /* Optional.swift */; }; - FB208F9C94AE4284B4695DCED66AF03F /* Bag+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CF7F13A70415793AAB045D2F65EC7FF /* Bag+Rx.swift */; }; - FD164FECF087F6F23A090797CA3E9949 /* SerialDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C481F203A3D82E046D561B227D7708B /* SerialDisposable.swift */; }; - FDBCBA60FA2DCFBCE0D09A484859687E /* ObserverType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66807E6510B06C0EB6C8084D8262B245 /* ObserverType.swift */; }; + 00DFF8BC77E1EABBE00639D3C86668C4 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CF52CE2305F254C916316AE08AA41DF /* RxSwift.framework */; }; + 01D3D0B2FE5A3D3CAEF52570612375C8 /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17C68372DD42CDEB42628569784CB9BC /* Filter.swift */; }; + 02FF4329F0BA1BC3F6041C32EE62D9C1 /* Multicast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E45BBF074C6E712C7BB2C76EE123F46 /* Multicast.swift */; }; + 03705FCE353B9A436320B5798C9F7A50 /* ContainElementSatisfying.swift in Sources */ = {isa = PBXBuildFile; fileRef = D754E73EF6F72DD1CCFE3BD8C7BEE95E /* ContainElementSatisfying.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 0438A36029E714EF1A08B5969F52D1A3 /* Dematerialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47487CDBB7BDB0F5BECACCF955C405FB /* Dematerialize.swift */; }; + 05D6872E1E4C28423550C859B6E03820 /* CwlMachBadInstructionHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 73DC08049B4577692ADDBF4061427281 /* CwlMachBadInstructionHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 07341C1184E09D43173AA6C6823E1D36 /* VirtualTimeScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2458AECC105ACEDE6FA7C9B340B0ED60 /* VirtualTimeScheduler.swift */; }; + 075311A9B30D68479A7D7404A99B2FB1 /* NMBExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34EED2A3C153C9A70C1F548325F9AAFD /* NMBExpectation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 07B1934FD97C7EA7F08A620890DBB3E5 /* InfiniteSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CF728F762A35AF084F570B67CB633D0 /* InfiniteSequence.swift */; }; + 07E769518F498C23EE106C903A8CADF3 /* QuickSpecBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 20D6B60706BFA445FEED480BCDA5AB30 /* QuickSpecBase.m */; }; + 07F525BCE6ED0DB7EAC4A6E95043A3B5 /* Throttle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40BE5F65E38F83289611D559F00895E4 /* Throttle.swift */; }; + 084C081527EE23904A5F2242789A197A /* SerialDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = EF1010758638D4FDCFAFAB1CB79294B9 /* SerialDispatchQueueScheduler.swift */; }; + 085E5D1B0B5419D791BEC14829EA5A5C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9203674664692F426565EC45CDDBF5BA /* Foundation.framework */; }; + 08D64D7CE863D44D3FB427F7C2C92D9D /* Producer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1698BF9491D9AF9E0D072611202F8282 /* Producer.swift */; }; + 092FA20F0D433948FE67EEDE3458B54F /* AsyncSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BC23C9C171C7D46F6BD59C01D2BA05F /* AsyncSubject.swift */; }; + 0999B997CDAC772A41A7F70CEF4A1D49 /* BeginWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9FA38E89746E40040711688C9C638E3 /* BeginWith.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 0A121E2F07E4C48E7BAB14213F9767C1 /* CurrentThreadScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA174D3A29E55C151709E402E425E17B /* CurrentThreadScheduler.swift */; }; + 0B515B50273DE9B9512865F3F81F3655 /* Map.swift in Sources */ = {isa = PBXBuildFile; fileRef = 864EA88B57A9A74D855D1AB88504CF2E /* Map.swift */; }; + 0C38F0B2690DDB2B5E81FDDF3FF54C4B /* SynchronizedOnType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6669606A1A55F80E390F616917F55CB2 /* SynchronizedOnType.swift */; }; + 0DB667ADE5584B0A23324D631EFCD93B /* SubscriptionDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD305D94C58742A63AD40CD3AE898D7A /* SubscriptionDisposable.swift */; }; + 0F31FA39DE65E4B1F239F8D4DC999A8A /* SourceLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0F313ADAF338946CF8EC0C60FFA068B /* SourceLocation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 108599C3E1008BED2A23B6624CDE4DB1 /* RecursiveLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87A494DDB25746D60618F74AB302B56D /* RecursiveLock.swift */; }; + 10BF98CE1607BC08BE99E8C951B550D5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9203674664692F426565EC45CDDBF5BA /* Foundation.framework */; }; + 11C77BABE18E94E835C0767A050F4777 /* SkipWhile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A066E0D7A1C7046AF10250E1EF1402 /* SkipWhile.swift */; }; + 1303EBE21C27E82EDFFD46A69C8799EA /* QCKDSL.h in Headers */ = {isa = PBXBuildFile; fileRef = A56AE6A582FB021ABD8CF3968D2CEEC6 /* QCKDSL.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 13FBB20EA4647EA46F0CB2E7254A5F50 /* NMBObjCMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893B3C81DDD0AEDB5318550AAE7825C5 /* NMBObjCMatcher.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 144775D2B46212EAF82D9F31AB34E5DB /* PrimitiveSequence+Zip+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC6C325BAE01EB3857F38A5602424012 /* PrimitiveSequence+Zip+arity.swift */; }; + 144D51351559785B569309A2A8760C79 /* StartWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B4B214F9D223A5B568DC72942D886D4 /* StartWith.swift */; }; + 152A5412073D29FC86307CA29DF0E3C6 /* AnonymousObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = A34EF631ADBFC0FB9E01FE45DEBC48A1 /* AnonymousObserver.swift */; }; + 15421ECBE1802FDF325E28355BEEFA6C /* MainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3CACD10549C86B60E4B541F63D459E7 /* MainScheduler.swift */; }; + 1B2CD81981F4205D652523F2718F3B5C /* NSObject+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E669816937CF59045E459D9ED49359A /* NSObject+Rx.swift */; }; + 1BAA60FABBC4047372D87D9B739C4463 /* CwlCatchBadInstruction.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20E787F4CFC5733D13721FB1DA12B58 /* CwlCatchBadInstruction.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 1BAEDA109B23A9F1F66A906865309037 /* SatisfyAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4435E8036A0AE62B70C00A1FD13C0E10 /* SatisfyAllOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 1E3721725546B8B58815CFB0D07D6005 /* Pods-DemoTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = A7F9C0A828FF93A4C5286724F02EFD3A /* Pods-DemoTests-dummy.m */; }; + 1F03FBF435D83E6BD68FF7368EF9F538 /* ScheduledItemType.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9A7430ADE207FADA08FBFF7C79A698 /* ScheduledItemType.swift */; }; + 1FA0DEC9E883929115DD91352F570F3B /* Nimble.h in Headers */ = {isa = PBXBuildFile; fileRef = C365B873AC920896A7A7A74B01921478 /* Nimble.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1FAA12958A27E5AA0C36DDE0F1B4BF6D /* Completable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 007173EC56EB5DDF3E309BA654A205AB /* Completable.swift */; }; + 207B72EF029C1A871E3B066CEBF115D5 /* QuickSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 2492390A030EEDAB0016F4F5126DEFAF /* QuickSpec.m */; }; + 21E645D02DDA948AB2A6C373DEA32FFA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9203674664692F426565EC45CDDBF5BA /* Foundation.framework */; }; + 23C5E2521B0474FD12A13ACCE9A95A55 /* SchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFFC2994E0C251CEEB4E6EBF474A9807 /* SchedulerType.swift */; }; + 24AD9C69B1A899FA7DB0CA4D346319C5 /* CwlCatchException.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23B6F183FB63627B5D229DD879BAF6E4 /* CwlCatchException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 2528E862042FE23A29EBE9932F91C5C0 /* Concat.swift in Sources */ = {isa = PBXBuildFile; fileRef = E25E9ACD6C7A8625BDB9BCC68738D856 /* Concat.swift */; }; + 26B1C556D262EF5E79F770EC9576E182 /* ScheduledItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4306B653917652B04CEC39EAD0F9243 /* ScheduledItem.swift */; }; + 26D3C02DFDC6BD7149116CB8ECBE91C2 /* ToArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDD6181A1F716E62FAA1CAA57CC13BD1 /* ToArray.swift */; }; + 2774D2F1FB09F89175C53EE58288553C /* Deferred.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7F3573E6BF1E0D30B2A08DF0543FDEF /* Deferred.swift */; }; + 286743CF5D5D808E9414617FA7C79D6C /* Behavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27C708952D512115F713119550860048 /* Behavior.swift */; }; + 28D61886B4D68DF9BE7D097ED22A262B /* CombineLatest+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 418059AEB1C7BAD0D9D08A77D342FE6A /* CombineLatest+arity.swift */; }; + 2A712AC70477FB3C55883C27664A4ED2 /* ObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F8FED30A7EF068219D9F750C05938A5 /* ObservableType.swift */; }; + 2FEBB7168BFD93CC7A938E18C8476AC7 /* Maybe.swift in Sources */ = {isa = PBXBuildFile; fileRef = C417F0901D9B4C26E1B7B6E01C4DFB03 /* Maybe.swift */; }; + 307FF1920F6895BD3771B49C40E61D5F /* ImmediateSchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD8045CEEEE80C1C40E362B764CBAF93 /* ImmediateSchedulerType.swift */; }; + 30966E26266F62432C8E914340871113 /* NMBExceptionCapture.h in Headers */ = {isa = PBXBuildFile; fileRef = 35E36D81A814B979B83FA5907B56A7FB /* NMBExceptionCapture.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3101D8F2678E107351E1179C14FC7BF5 /* BeAnInstanceOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC35933B0CDB9B68B7E57E274FE9D47 /* BeAnInstanceOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 31DCC4FEA92A71A9FE8D881B73FC7426 /* CwlDarwinDefinitions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 083FAB3C284C8E05A1CB7C7853D722D9 /* CwlDarwinDefinitions.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 323C94462A9847E89F793321103FDFA4 /* SingleAsync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 160D768CDCFE9392110517E4A0D93764 /* SingleAsync.swift */; }; + 328CBB53BF5236042DF4CB4B751EA062 /* Contain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BA070A8D8EB82400E6C4CEECC8BF706 /* Contain.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 33CB3E3B60DC895E8A7AA5F68C928C4F /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 491F072013433A7A58D8B65F358D026F /* Errors.swift */; }; + 33EA3FCF9F6FEEF8F43442D8066C9BD4 /* Enumerated.swift in Sources */ = {isa = PBXBuildFile; fileRef = A524A8BE73EA070015863E3A303069F5 /* Enumerated.swift */; }; + 348070A05CC41B15230199FBEDF43E51 /* SkipUntil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 553741506265A8B822CD579E97DD89A5 /* SkipUntil.swift */; }; + 34CF627F0AC1430B44258758CD9D549C /* QCKDSL.m in Sources */ = {isa = PBXBuildFile; fileRef = 340F762CA16D9DA5F8B769F02F1CC6C0 /* QCKDSL.m */; }; + 35087B8F6AC4F000C85B8D672760AFAA /* CwlMachBadInstructionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = E5CCE15BBC2E9FDF93E97CFCCF26388B /* CwlMachBadInstructionHandler.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 352B13E49D3F52756B78A23DF201209C /* Optional.swift in Sources */ = {isa = PBXBuildFile; fileRef = 095DBDFCD66DFCE4478A57B9BC654B4D /* Optional.swift */; }; + 3537F7CBFBE04113D495FF50BC3D6672 /* DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4451839469875A94743BBE0EC81F799E /* DSL.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 373C57D757D6DFAC77450763C6BFA620 /* FailureMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A688FE1F18259F93E9B9ED5664A4009 /* FailureMessage.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 37BFF15B683F5B19389434D157237B06 /* VirtualTimeConverterType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 799A44334C97C4C289A07B544B38F135 /* VirtualTimeConverterType.swift */; }; + 37C0A3D8328AE580621384421F00F455 /* PublishSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = A50A171CA6E7F8A60D00C8B48AA063F8 /* PublishSubject.swift */; }; + 3813E280C0C2616938095B89B187B42D /* ElementAt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991F5D74BFCC68EA980CEC8242E55916 /* ElementAt.swift */; }; + 38FEA25D16ACC1E6F5C696CD95B41A69 /* CwlPreconditionTesting.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F7DE55A32562758730BDBF5AEF1FFB6 /* CwlPreconditionTesting.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 392B6696BC59BDCD988D7C5DF3E3E1C5 /* NMBStringify.m in Sources */ = {isa = PBXBuildFile; fileRef = 44D90AC3EEC70EF9313990274F3B9B54 /* NMBStringify.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 39A40262339C79DCDCF9432DF16E3E4E /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9645E5620CD00D3A1732900485D00BE0 /* Timer.swift */; }; + 3BCEB530F8511ADDFC8200F10A44000A /* Take.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AA9AE04B6D2414D8BE2E58C784DF027 /* Take.swift */; }; + 3BF57A6E34107240EE60D291DF52CFF4 /* Catch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64ED03ED0B4C5DD981DA39D53E7B7983 /* Catch.swift */; }; + 3DF180681EFD688A1A5D5A2544F602FE /* Disposables.swift in Sources */ = {isa = PBXBuildFile; fileRef = D36F786CF140C1D310179D6AC68A2BB1 /* Disposables.swift */; }; + 404BC35387478E3C89A2B798F954DC29 /* String+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29683BBE08614F57258947E9C050A0C8 /* String+Rx.swift */; }; + 40CC20434FD530CF3BA09F87FFB2DE95 /* Create.swift in Sources */ = {isa = PBXBuildFile; fileRef = F093AA58D0ECFDCB5D45209E2AE7975E /* Create.swift */; }; + 4218C8CDDDCAF09FDD425C8BD9A8D487 /* AsMaybe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B971CF6E1166AD169CB187B7513ED8 /* AsMaybe.swift */; }; + 4279ABC29B2508E407EBDDA5ACC8385E /* TailRecursiveSink.swift in Sources */ = {isa = PBXBuildFile; fileRef = F133CB22026F00A974203CB61CCED061 /* TailRecursiveSink.swift */; }; + 4330B50A5B4ABCF088AF8406A597529E /* XCTestSuite+QuickTestSuiteBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = EAD015DD8E9C07A420E036603D509788 /* XCTestSuite+QuickTestSuiteBuilder.m */; }; + 439B7DBAF82C63E4FE81F76C1DC926A3 /* AddRef.swift in Sources */ = {isa = PBXBuildFile; fileRef = 739640B6CB464D96E93F9A7F2185648E /* AddRef.swift */; }; + 43BFCAC14F9577A11F53390BB37EA453 /* PriorityQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4655DE872F116F68D71BA26D294282E2 /* PriorityQueue.swift */; }; + 43E95567704203A2DE95E07947BDF70E /* Equal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6076937CB3B94CF8BCC4268678E2DA7B /* Equal.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 470A9D5B4F0ED6B06D9A0152D5ED3479 /* Example.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22278AF12F067909FA575ACD18B69E53 /* Example.swift */; }; + 4A518B07303F24DA77B98BD14C1F8B9D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9203674664692F426565EC45CDDBF5BA /* Foundation.framework */; }; + 4AA777DB1D55F1FC940F409C8329BC8B /* Generate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93D3D880DC6CA05FCDEDD0FAB4CF33C8 /* Generate.swift */; }; + 4ACC7AA26D1EFC94BE2E840F146C896D /* CompositeDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F019D06E4B3C576EBA0B9B2FCCFEAECF /* CompositeDisposable.swift */; }; + 4E70FE29FB2BAD7E5427532B5D2FCF26 /* XCTestObservationCenter+Register.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F2341B63B600E3B9C6CFA288BB3BB86 /* XCTestObservationCenter+Register.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 4E78B55C734693377EA13349E7630675 /* SchedulerServices+Emulation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F09BBFF80F6478F3CC6EA98EFE72152 /* SchedulerServices+Emulation.swift */; }; + 4F4F2EF6766041064E30DD44A593197E /* ConcurrentDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03D979FD09AE7BD39BC9F957699CB515 /* ConcurrentDispatchQueueScheduler.swift */; }; + 501F8993912E8A0D8E396B8102BF4AFF /* Quick-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 40E134A10DD4AD633309F267288BEABA /* Quick-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 540A6C2E70CBA45C304C24C47DCD5090 /* Sink.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2AA8A7B89B2F388897200471D987A3 /* Sink.swift */; }; + 580965622A993EA9485A713D5D71CA89 /* DispatchQueueConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42EEEA2EBAE54BB4C13D8F15D4D298DB /* DispatchQueueConfiguration.swift */; }; + 5997315B6EFC3804EC64035839DBD127 /* Bag+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378744A6F971741B9EE4360680756EE3 /* Bag+Rx.swift */; }; + 5B1BC6D53F7D9462CF33EA419CF98DCD /* OperationQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A291ED223703BC09683E17ABC820E17 /* OperationQueueScheduler.swift */; }; + 5B403645B70F195A2FC00A8DCCB82727 /* String+C99ExtendedIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = B18115DA18C19A68FF96C5585CA275F7 /* String+C99ExtendedIdentifier.swift */; }; + 5C0E939DCE5E7007D9A60D417BD1AAFD /* Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0749291D522211F84D19F63DCBC23B /* Rx.swift */; }; + 5CA3BB0A88B8A8743548B3C4B42C2DB4 /* Window.swift in Sources */ = {isa = PBXBuildFile; fileRef = C500E0BD5E10E791A8112375E55E4F14 /* Window.swift */; }; + 5F154C985B9DE1085A993CF9AB332BF2 /* AssertionRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FCD390E1B79DD3BA4C14C38AE0A41DB /* AssertionRecorder.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 60395BFA77F80D165CC5C90FD63CEC1C /* ObservableConvertibleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99DE5BF6E4A651E58DA13A9BFC20B5C9 /* ObservableConvertibleType.swift */; }; + 617D022B89E86BB1ADA234E6DD976ECE /* SwiftSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09E2678C71840FD764A782CEE7FBF70A /* SwiftSupport.swift */; }; + 61D20AE2CD6246A7B3C78F97DA8A8A60 /* Pods-Demo-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A445804FFB07BE08F37DABA6FBD5E7C /* Pods-Demo-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 627AA18DE0143FDB09DF788EA022E3A0 /* RxSwift-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 419DEDD652E5BD17A6264BABB02A555D /* RxSwift-dummy.m */; }; + 6365C6E1F6AF291B7A2DA5B1BA1227B0 /* First.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D29F4A7DE18D4FC192E77CE44742703 /* First.swift */; }; + 636DE207312ECEC9E011B9632F78F2CD /* Empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC522DB704164394EB7C4A55BEE80E4F /* Empty.swift */; }; + 646252390176E7F531A393469CE36BCB /* Using.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB1AEB6D73EB42568D027020774BA46 /* Using.swift */; }; + 647711A9145D2B67F5C14AD9920300DC /* Do.swift in Sources */ = {isa = PBXBuildFile; fileRef = B89E636CEECC331FE886443352E1C3ED /* Do.swift */; }; + 6686B242826487CD0923111B5F0C03C3 /* Switch.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4D0E70501E592A560A7F99D642F8DF2 /* Switch.swift */; }; + 682EE071D16796978937BEB8D5971DA7 /* SubjectType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 929B5F6DFEE1875321B18BB0F4A91E93 /* SubjectType.swift */; }; + 68804FE195D2B3233E3DC13575EC9393 /* ConnectableObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99E1510063771124B571F6CC51E900DE /* ConnectableObservableType.swift */; }; + 6B2655179ABC6C2F38995340A6F961E0 /* HasDisposeBag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80572ECE5B752DA94194B3642DF15D04 /* HasDisposeBag.swift */; }; + 6B4197D2E87B5B445A7AAF18DBA22509 /* SatisfyAnyOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7525E1C10E9A6F11D2D8D014C14CD8 /* SatisfyAnyOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 6D539350FE4E42FD2973B5008258FFD2 /* DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB62B53C4C45333651904E570B6B4FD /* DSL.swift */; }; + 6DBD103E103A5B3DCAD3E234C8F9DB99 /* Zip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73AE77B0CB085577A2060F18AC4EB0E8 /* Zip.swift */; }; + 6ED749CAF781EDB557E30C69637DBC5F /* MatchError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A53DEBB3ABE82DE21ADCE55D40D7F95 /* MatchError.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 6F0645651F1A0955C54E573360440234 /* DispatchQueue+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E384495CDCA6E6862479A378FD2BB9E0 /* DispatchQueue+Extensions.swift */; }; + 6F4630769E58C59D1653EAA8B8A5C2AD /* Scan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2064AAE1E9DA13FDB1162AF2EC06FBB5 /* Scan.swift */; }; + 6FC59CBB360B3EF8E45D151D945BCA54 /* mach_excServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 91EBCC5EA02EA118E1B15B3C4FC673C4 /* mach_excServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 70BB444AD4DC21ABDF48407F4F3114D4 /* Buffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1E2C09923DEA065AF83CF897AC210C8 /* Buffer.swift */; }; + 714F22BDA11631DF383D674E6B0F5F89 /* AtomicInt.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE7F957D96604AF5FFF02EDDA6996967 /* AtomicInt.swift */; }; + 714F3B880FD0FC5DAC40A13779623F95 /* Skip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DFD2E90EE0F63DA2DC67AD336E739C /* Skip.swift */; }; + 71C41A5F1784FE55FBA6287B438AEF49 /* Never.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E309A17917F99EE3EDDA7C6FC4631E /* Never.swift */; }; + 73522A93D62BDC1988911165DDD3C9C2 /* AsyncLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9BDF0E7D5C9359579BA1055A66E603B /* AsyncLock.swift */; }; + 73A3005F9A9007AB0E5B36B8ADD4B71D /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B48F5FB717AC6F300389C0FFBD2B9698 /* XCTest.framework */; }; + 7403EBDEC592DF5F4AA19EEFED35AC5A /* BeIdenticalTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F8528339456DF076461FC577F0A20EA /* BeIdenticalTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 74C4A30A55AC7DB057CE14BCA15299C4 /* NMBStringify.h in Headers */ = {isa = PBXBuildFile; fileRef = 345F9CFB17730EA512B4D93130DB9950 /* NMBStringify.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 74ED9CD132927F6B4743101436B7BB49 /* SwitchIfEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4036CE58C0921C4E1D2C23949D06804A /* SwitchIfEmpty.swift */; }; + 75D9A7BE78853E43A19D64005569CFA9 /* Date+Dispatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 122591A6C078E284A3AA63B0234E1AC7 /* Date+Dispatch.swift */; }; + 7602C3F30968CAD38EAF6BF139C35297 /* World+DSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A1A01565E72028CC41B0C12ABFBEDA6 /* World+DSL.swift */; }; + 784DC54B4603FF9B368122FCD7D1D897 /* ElementsEqual.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95EF087247CBEAB5BB1F5769AADADC29 /* ElementsEqual.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 7AA21A2A7686580BEF335C12D3D7AB81 /* Await.swift in Sources */ = {isa = PBXBuildFile; fileRef = 971B42C48B80C86CECDF6A1C01124315 /* Await.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 7C54BE4E7B14BC495EBBB336AD33BB3F /* Delay.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAAC0F6C09C79336F353332C4A3C7C70 /* Delay.swift */; }; + 7DCF2F0DA5F3AE0D756EDDD15F8ADA06 /* Reactive.swift in Sources */ = {isa = PBXBuildFile; fileRef = A185553AF8D5EE097A2A593475615A86 /* Reactive.swift */; }; + 7E8FA671634C3AD01E98E39F3C2846C9 /* ConcurrentMainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF4DAE78EF1BB1EAFFEFCF807CB41F0 /* ConcurrentMainScheduler.swift */; }; + 7FA411A969F1D1A7AD517C3E7B739AA6 /* DSL+Wait.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44226ED63CE2351598FD3761606AE007 /* DSL+Wait.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 821231B2CFF05E5FBF9A45E596AB5D9E /* AsSingle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23C54A2448A56E39C1E753B4B2632DDD /* AsSingle.swift */; }; + 8223126FF3B20923489B62FC80DD2240 /* PrimitiveSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = CFDBA3A608FFDB187DA673044C0D539A /* PrimitiveSequence.swift */; }; + 822408F7968E0050742BE64E216D472A /* WithLatestFrom.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDC6DB082462C04F43B7E12106F7F8D9 /* WithLatestFrom.swift */; }; + 82607C525BEE07050E18F0BFCF0AEA52 /* DSL.m in Sources */ = {isa = PBXBuildFile; fileRef = 172AEB1F149833D984184CE96288B146 /* DSL.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 83E49C3B8280FEEAE4F2A81F64A549B4 /* Match.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34EB90060782B713111526B30C226EF6 /* Match.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 8413172B4FBB9E364EC42674F13A9FE3 /* BeLogical.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DB8A6BC46F58342A40BE570A48C758D /* BeLogical.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 84CB7AE5E9C32642F502CAC37DDB6986 /* BinaryDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D99A258CCE9551CC1D7213678DDCBAB0 /* BinaryDisposable.swift */; }; + 86D91D7B3B6F632E07E96F86CDBC24DC /* Quick-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F0149FBB2BEDDF7D59A71B44B5BE9469 /* Quick-dummy.m */; }; + 86E4F4DBFB87FD52170B4CBE3AD000D7 /* Observable.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC9407E1BE6EEBEE51569EB6CED48FD8 /* Observable.swift */; }; + 870471424FE3C6BA3E33C949BEF04D50 /* ToSucceed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61FE06DC15E9AAA2F46D5F928E1ED9D4 /* ToSucceed.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 8784230CBBBC7267F29611E0E1DC961E /* BeAKindOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = E161EEED24F14309AFBE4DD9689E4124 /* BeAKindOf.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 888B88EF8BDEBCB1702F8BB33BCBC3B2 /* CwlCatchException.m in Sources */ = {isa = PBXBuildFile; fileRef = C6572705BFB9EFFD839B70B0D2E16933 /* CwlCatchException.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 88AB85B9E734E5DFA009CA50C70C9B98 /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76895B730377EE1ADAB60122ACF3E450 /* Filter.swift */; }; + 899AFF0012B24A1AF38A4DE92F573B55 /* BehaviorSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 662C228F137DE9248B3761A2208A61F9 /* BehaviorSubject.swift */; }; + 89A206D51752309E13BD5C427C35A090 /* BeLessThan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C1AD32944E19CC51BFD861D3E396779 /* BeLessThan.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 89D30C28183DF9BFC6C940211DA889D7 /* BeLessThanOrEqual.swift in Sources */ = {isa = PBXBuildFile; fileRef = E528AC40D3234F5B32D6BEB118D60DFE /* BeLessThanOrEqual.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 8BC9880E7C921681D7AB3D5C42B94BD7 /* NSBundle+CurrentTestBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86CB05CF1CDB882B295FF2558772B744 /* NSBundle+CurrentTestBundle.swift */; }; + 8DA5C18630C2EA960E9B47D4C958D07C /* SynchronizedDisposeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42F29017D99035B21B9C6378D0C20553 /* SynchronizedDisposeType.swift */; }; + 90DEE54A48A7E76CF37778D1C04F5F71 /* Repeat.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0CDE9AE8CC17F4EF7306505AFB081D8 /* Repeat.swift */; }; + 920F0B5A40AE626A151C8396AA4F34FE /* HooksPhase.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA05B093FF4C3C2C1BEB9D082D1089FC /* HooksPhase.swift */; }; + 92156314105ABEAD97AFAE08E79E6671 /* AnonymousDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48B17F38282DCCD060FA38EE3B6EF44C /* AnonymousDisposable.swift */; }; + 92806CD65D9123E9D02FB549E350A44A /* ErrorUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4EFFAD6B5A918722C8C62CE8BB5CDF4 /* ErrorUtility.swift */; }; + 9299E0D83B13837D4FB943B19818CF3B /* Disposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA39CFD4DCD38EDFA77A991FB2ACF008 /* Disposable.swift */; }; + 93D24452DA6FD399E392A8F0AD89864F /* Sample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 179D0EEE4255E84E7E62884FA3E63463 /* Sample.swift */; }; + 9479B13C44947B10A62390AF1AF0EF4B /* Debounce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69CDAC0156DA9DB5BF282C9DB82A82E0 /* Debounce.swift */; }; + 94C84E6DFA71C70DF521E9D995C1505F /* BeVoid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96FC8E6849EECC37066F443FD2E5CA33 /* BeVoid.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 952F1233D7E19DC25932627428EB6930 /* ObserverBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B1369E7D7133C572D2BCF73A2E60E0 /* ObserverBase.swift */; }; + 9561EAAB5294ACF53D9DC7E7A2E6E46F /* ObservableType+PrimitiveSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49E951D4FA0C5D1F4608FAE716EB6423 /* ObservableType+PrimitiveSequence.swift */; }; + 962B5DB233BCDC2975CA9C13AD07FD2F /* DelaySubscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCC52929F7301BB1D01CD3A10C78FB4A /* DelaySubscription.swift */; }; + 966FBB84C847F2BCAED02AA147A2CFAB /* MatcherFunc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08FD69D13E326AB5A59478A26464FE5D /* MatcherFunc.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 96E60773237EFF4FB35C82AE89B91B27 /* ReplaySubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = BED4A6A7963FC39EEC0EDE427573AEA3 /* ReplaySubject.swift */; }; + 9735795628BA3695F1375A797D363C5D /* CombineLatest+Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9780F7DEF6EAF35A39289889ECC01073 /* CombineLatest+Collection.swift */; }; + 9880E06BEA94E7230CC528F627ADEB81 /* RxMutableBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26FB5D8D479C5D23529758EC2CAA9968 /* RxMutableBox.swift */; }; + 98C05E1E07FF53BDFC55EF5F883906BF /* TakeWhile.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60973C44D517664106EA2EAFECB1426 /* TakeWhile.swift */; }; + 9C3F7FC69ADC5BFCE26D5BCB0B9234C6 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C3334FC797BB9C4584DDE37CEDAD0AB /* Errors.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 9DB1E08337AC3FF955539F4E0D1074D2 /* PostNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3D7C1A8E5B6E92D5C5E204A72A1827 /* PostNotification.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + 9DB412FBFF6191D49BD020E0AA9E5356 /* SynchronizedUnsubscribeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3470946FA7BF51F483D9AFD149C96012 /* SynchronizedUnsubscribeType.swift */; }; + 9E41BE4A42783378AE4AD3A93ABB7B8F /* NSObject+Rx-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 5371702C71D5AB22A49E8DC1098CE566 /* NSObject+Rx-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9E9BCCD3F742CDF6C0B7ED41322F47FB /* Lock.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC63D273B2E772CC1E4794932A104E9C /* Lock.swift */; }; + 9EEF9E84E580920E11E06170D25F65C3 /* DSL.h in Headers */ = {isa = PBXBuildFile; fileRef = 765FDD2F217C19565C263E9ED16403BB /* DSL.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A3943215251A0AF61AA2B686AECEC648 /* LockOwnerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B6FFF4739881F7A932F90A810A695B4 /* LockOwnerType.swift */; }; + A4B6197170839BA97DE105AA9D1FAD7D /* NimbleEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B361A811319AC8B1C604D47C3D3221D /* NimbleEnvironment.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + A51570857887E8E40B39F91C35358E2D /* Predicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10C27CB44E825B852933F04A0448DDF5 /* Predicate.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + A59E1184445DE1EC82EE24EBEE2404FF /* Pods-DemoTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 38E7CF3EB74343DE4C7F0A783416A3C2 /* Pods-DemoTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A70777FC88C21D2B635D8C6B0937408E /* TakeLast.swift in Sources */ = {isa = PBXBuildFile; fileRef = E94E15B8094B8996E63FAEFBD6C99720 /* TakeLast.swift */; }; + A737EA82F22134AF6A26D9257FB4A76B /* Quick.h in Headers */ = {isa = PBXBuildFile; fileRef = 78030D0464F3ED40785E91AEE4F7B13B /* Quick.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A74BB407D18EF6E795D961FB63AB6679 /* DefaultIfEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AD76329FD166FBE92988A21CCBAB7AB /* DefaultIfEmpty.swift */; }; + A74CEEC58BDEB1F9A37685FCA3376746 /* BeGreaterThanOrEqualTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D0C13A90BEBB0C6CFFB0F3511874170 /* BeGreaterThanOrEqualTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + A93007F83A3A608E0EC7FB332F97D8E1 /* Platform.Darwin.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1CED0DD23F664841111999586B08666 /* Platform.Darwin.swift */; }; + A9E520BAE196DF245610CBC9156EFE6D /* Just.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D444CC91C409BA22228D122152F5F8D /* Just.swift */; }; + A9F93A9C40771906414564A30333FDB9 /* AdapterProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 953A6880A842C07CA6C5183DA77986A1 /* AdapterProtocols.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + AC26B8C4461E89CC285F1D3273A659BC /* ThrowAssertion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0965493271A2B072B7F25DEC8F3960EC /* ThrowAssertion.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + ACADD12312F8C1F6FE4874503A4A804A /* SingleAssignmentDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C51164C3E4A2BEB0BF46FF69E22390B /* SingleAssignmentDisposable.swift */; }; + AD37336CCB9B4534847D2587C408AA4A /* RefCountDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BF3F614CC5C37ECA2A7BD0474CE0061 /* RefCountDisposable.swift */; }; + AED1FFA35B2B1950B83BE97CD641A9C4 /* Queue.swift in Sources */ = {isa = PBXBuildFile; fileRef = C862873B1A4C2B34881F93A7C66C8B41 /* Queue.swift */; }; + AEFDBE936035B9EE50FEECB910186160 /* GroupedObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CC739507DFF73A8441FC1425E443FA2 /* GroupedObservable.swift */; }; + B15F2E64DA6AF598BEB54396872002A9 /* Reduce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70AA7E86250B1D076683EFF1FF394D0A /* Reduce.swift */; }; + B597480D3D2C471B0C86260B9755486D /* RxSwift-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = D7F6BAD109E4B77AC3D38280441B5277 /* RxSwift-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B5D1ED494A876522ED12E476B08C0469 /* QuickConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = C5BD61BC458D529EC17262DE3F100F23 /* QuickConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B764E73F1E0453C6C3BB5F747D23AAA1 /* QuickTestSuite.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5D1998DBCCE80042B0FD7C534021B42 /* QuickTestSuite.swift */; }; + B836AB3DB63144FE21C715D2944AEA07 /* NMBExceptionCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 420FA3C42F688A80EAADC3F6B1C6351E /* NMBExceptionCapture.m */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + B9369949A929B490F868A189D23E9F24 /* RetryWhen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28C8DE8590BE8EB0BC6766626E449868 /* RetryWhen.swift */; }; + BA63F9061BDC9F2D0035403AC6435068 /* ExampleMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = C95406072BED9A8CF9FCFA764E92282A /* ExampleMetadata.swift */; }; + BBC78F9AF751CEFB46C7EE6601FACBA3 /* RecursiveScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 169046F6F353D9FE68E8F82E5E825D53 /* RecursiveScheduler.swift */; }; + BC87FE8A6FA3788EBCC12308C5353695 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9203674664692F426565EC45CDDBF5BA /* Foundation.framework */; }; + BDD51FEAEA517ABA9C530B9BB0FB30A1 /* AnyObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 586F48AC25492C756894B35EF4E01116 /* AnyObserver.swift */; }; + BF41738CE0366D7C0BF64459B4079B34 /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D5B6457B7CB65CC7A5B4D9DEA1BF613 /* Deprecated.swift */; }; + BF5CE1D4C759C879037BFB67D1964D7A /* Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = F49D11949FEDEEA45CC2B54B748F02D3 /* Debug.swift */; }; + C0367D0510CE9E409A33E9B356422017 /* Nimble-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 9EB1694C39E6DE003004873B619DCDE4 /* Nimble-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C18DEDB4A3286A59EDA63418657D9118 /* Zip+Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56178108E601F5E0C6B619348D02A043 /* Zip+Collection.swift */; }; + C24BDE802BC880E383B2B866B0857EF0 /* URL+FileName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE692EC061E31389090FF1898F0B956 /* URL+FileName.swift */; }; + C2FD48442C9797B247D085636C65C913 /* CompactMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 770CF6054E4D291AB95498A6D4471FBD /* CompactMap.swift */; }; + C3AF3B799B34CA45617AFBAC5C723BAE /* Bag.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1B39910B76025550C09316E51CABD53 /* Bag.swift */; }; + C56CE025F6E708D6F5F11DB4EA23728C /* MatcherProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC571702237AF10BD4BF9BDA2C7B95C7 /* MatcherProtocols.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + C5808A46FC4C07F235753E2AE4A7511A /* mach_excServer.c in Sources */ = {isa = PBXBuildFile; fileRef = C8545D704733DF6E81F91A0129D3AF9F /* mach_excServer.c */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + C791FEFA54FDA12CE87E8C4096E0EC20 /* SubscribeOn.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F998F9C73474BC516D1C522E9587D6C /* SubscribeOn.swift */; }; + C7B9D1E45DDA944F4C7E372D3A20999C /* Stringers.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96D40B2EA457A03805CD8EA316348BF /* Stringers.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + C94795A1C0DB7BD502EC483AD3572842 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15E5914EF2A1F09493BAF40F329B7C9F /* Configuration.swift */; }; + CA51827D3AF68767D306B39D61EEDDF4 /* QuickSpecBase.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A6E4406CE90AAEAE552B2E2AE682FD /* QuickSpecBase.h */; settings = {ATTRIBUTES = (Project, ); }; }; + CDB48F0247C3ADE596E73CE4946F9FC8 /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = A23A58D5CAE1671D168F8D2A2ADD6DEB /* Range.swift */; }; + CE80F47CF0E8E61CCE2B054FE69A912B /* Callsite.swift in Sources */ = {isa = PBXBuildFile; fileRef = F926472FBE78C0875B5E34AB5BDE2374 /* Callsite.swift */; }; + CF38013F48221FC7C288D1C7F6EB8120 /* QuickConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A34FEA5B12FEAFE57D2706ED347939B /* QuickConfiguration.m */; }; + CFA5F472172FEE47D0E3FCC43633BA5C /* Completable+AndThen.swift in Sources */ = {isa = PBXBuildFile; fileRef = B99DF630A2BB08BDA5E3C4B19D6EBBBD /* Completable+AndThen.swift */; }; + D0117BC10CB96CA7F32536A69C085C49 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F77C855B4953D558FDD99186D1754A8 /* Expression.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + D0D4FEC992CCC7EC3AF2D38631E26E52 /* HistoricalScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3A2E620FE47D3CC7DCBCB4F2CD213B0 /* HistoricalScheduler.swift */; }; + D1A4A1DD617C96759F7B2AB2A6AEB0E1 /* NimbleXCTestHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45EDAB83D40AEF7D4A49E69D910C479E /* NimbleXCTestHandler.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + D1FD91581D2DC0A42C9134862F569C83 /* RaisesException.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8681D84A6DEF565F816AEAED2D00110C /* RaisesException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + D3A571F180E2A2D8A1248890490C9E36 /* BeEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195F882A3718E80481ADE7A265930C76 /* BeEmpty.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + D3B003C04E10F1B56DE2CD94426EAB76 /* Merge.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED737DB056A7D47F54CC4A64A4C698E0 /* Merge.swift */; }; + D4809A8D74D3C810C92FE7FEC596E7E5 /* ExampleGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3949BE60143D652443DDC3A6ADDED88 /* ExampleGroup.swift */; }; + D4FF0990DB524278EB20490C5311E19B /* AllPass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C8D4932E40C1397A9C94701357D6193 /* AllPass.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + D5AAAC079F816850BCCF8FB559171617 /* TakeUntil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48E4058CD6925712AC02CAFA9AFC78D3 /* TakeUntil.swift */; }; + D71C8A2B465E5A1D610A52A7657A53E2 /* BooleanDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73C12FA20125292B2792A8F3473357D5 /* BooleanDisposable.swift */; }; + D8227DDE3DD50DDDAA7075D62FF4301E /* DisposeBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9947EE212430E0F76F04ABEAF0A65FAC /* DisposeBase.swift */; }; + D845D55E7CD75BA58F753A5AA454E422 /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4E95BD09FCA7388EAE580AAA82C92C9 /* Async.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + D92A39045A9F582961DF39A8BB13865A /* World.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54500F67CA02884681B5614FE3681225 /* World.swift */; }; + D955DC16333D3A49BDBCB9C629D83130 /* CombineLatest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18AA6BE89F22B7C82515AD7CC46A77F5 /* CombineLatest.swift */; }; + D9CDC561FE34C512AA565ED9C9BD335F /* Pods-Demo-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E14599B8E960E81610BDD82AABE7DC8 /* Pods-Demo-dummy.m */; }; + D9FEB1F14A7C841D4BE3109A0F193843 /* CwlBadInstructionException.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7A2D3D585F92FDA97D07ABCF4D6D58D /* CwlBadInstructionException.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + DA28D44BB7C7CE1CC8F91BEE1E89C610 /* BeNil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8230E5BB66AB17F65D15BF9B23EE3186 /* BeNil.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + DA59CB94170244911D780C1C3746CB23 /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76E7C33532BF1CFBB387322A40FD7E5F /* Error.swift */; }; + DC59B35B1F1BEB28DF96E7451797693D /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AA469B510A2D075730A6C6BC5016AD /* Event.swift */; }; + DE28E11308041B80BE7ED204B05E1713 /* Amb.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0735A682CD60FE6282D8AAFDE148CEA /* Amb.swift */; }; + DE41036F5CDFE75D351DEAC46ECD9FA9 /* Nimble-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = DD6299DF68B27F3BA2F904C06D884591 /* Nimble-dummy.m */; }; + DE54DDE5C5B6283DE5ADBBDAA91ED589 /* EndWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435B0B09412A7DF9097CF9F8640D2B70 /* EndWith.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + DE773E19794E4BB587F8A78191971389 /* ExampleHooks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FC3DB461B28F2357DB3221F6A36BACB /* ExampleHooks.swift */; }; + DF50C201EB25B9BDDD6363698ADE639C /* HaveCount.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0AE5742B155BF9E385D886F0B3B0380 /* HaveCount.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + E1C5AE23F3288A2E8A13489165FD3FF2 /* CwlCatchException.h in Headers */ = {isa = PBXBuildFile; fileRef = 463DC9FEBCC3FECB56439E057DCAF875 /* CwlCatchException.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E3D18A848ABDF2641023484EFA3F61BD /* ObserverType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2FE150B74BBAE937000858263EAE139 /* ObserverType.swift */; }; + E40A6E85823CE585BF269D1DF4EF5E04 /* ThrowError.swift in Sources */ = {isa = PBXBuildFile; fileRef = A026B36C0AAADE7B1C5BF97ABEA1EA1F /* ThrowError.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + E421CC9222B4DCD92124CA45FBA6A247 /* BeGreaterThan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BC2302E78E5715DF91416B09369D056 /* BeGreaterThan.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + E5CCA983C0C06E3C8A9EA38DAE916E85 /* Zip+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0CA816D313D08FA9BA746BDE71AA3BE /* Zip+arity.swift */; }; + E6407B2CEA12036DE8C4C6B0708747D7 /* GroupBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CCCD6A748D7D3DBD7ADCEB7306E4366 /* GroupBy.swift */; }; + E74C63A506330D4E6E1DC8F3894BDC22 /* Expectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9111564BF366D0F190DD21BE04CEB3F0 /* Expectation.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + E7A4FA9182CDC050300568FFA8713D9D /* NSObject+Rx-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = C18CD2F7824016ABD4FE096813C8BAA6 /* NSObject+Rx-dummy.m */; }; + E80F2F25B622EBC3F1CACD1AFD851A11 /* ExpectationMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E5757B71F28F87433D5F3F2326DD383 /* ExpectationMessage.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + E838204059BEC029C142146899A07C28 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9203674664692F426565EC45CDDBF5BA /* Foundation.framework */; }; + EA07C7E8EAC448DA3BF41EFE4D9D60C3 /* SerialDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DE05031B38702C48126EDF418E9D10A /* SerialDisposable.swift */; }; + EACEBAA1D40EA9618B95A5B90079ACF3 /* Closures.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2DD534995FC6FCBDC0EA5817B05B7E1 /* Closures.swift */; }; + EADC5E8DA8858F2D1C7DFE9EF5290C5C /* Sequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E0ACB811D4E17BC094CD48454E5FC6 /* Sequence.swift */; }; + EB062EA45D4A3859C6CEA85DAC1ED237 /* AssertionDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF38DA772A3242727ED2610D020467E8 /* AssertionDispatcher.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + EB9AABCDC67100A5E42812A2EEA571C7 /* NopDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D95722B7B1802FD8435155E622168012 /* NopDisposable.swift */; }; + EC55D8E1E24780E4E5C95AAE69C32AC4 /* Cancelable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 279E8909B681F6B0B61A0D2DF338D983 /* Cancelable.swift */; }; + ECFA3013D7A5860B059916C371738C29 /* ObserveOn.swift in Sources */ = {isa = PBXBuildFile; fileRef = F324E6EF493E4ED6308EE33BDF63ECBD /* ObserveOn.swift */; }; + EEF05428DB90B5324320E9F10FA1E936 /* Materialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 610F14E64877C284D3F10C8CE41EF89E /* Materialize.swift */; }; + EF6DB9F024C96A590708CF7F1BCB7F7E /* Platform.Linux.swift in Sources */ = {isa = PBXBuildFile; fileRef = EF0EC64F9FBC94A3DD565035EB1BC6FE /* Platform.Linux.swift */; }; + F0544B8B8299481FA44F48C804A45B8C /* HistoricalSchedulerTimeConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBA40696EFDEEEFEBC6BF379E8AA9571 /* HistoricalSchedulerTimeConverter.swift */; }; + F15BD8EC9ECB8CD62AEE60ED93458FDE /* InvocableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 477C25B6F5561DE9F10676AC439D09FB /* InvocableType.swift */; }; + F1759331988D9DFF47C9D7C66D08DFE4 /* InvocableScheduledItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC1AD732807DA62C8E1A30577D2ABE6C /* InvocableScheduledItem.swift */; }; + F3E03BAB16610B05E06C49EE3E5590AA /* QuickSelectedTestSuiteBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81B348D58BBB252BA537B9BC53E5E8B9 /* QuickSelectedTestSuiteBuilder.swift */; }; + F5090F52CF4E6B768D0FB5F676B61AE9 /* Functional.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC738E332792A056A082C75643681536 /* Functional.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + F596D6BBE5BAD012376F7CB73D44CE6B /* BeCloseTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0DEC1A9ADFD54566E0B0A077EA09CD7 /* BeCloseTo.swift */; settings = {COMPILER_FLAGS = "-DPRODUCT_NAME=Nimble/Nimble"; }; }; + F67E50D2228DB562A2E22F7A40A7877F /* Single.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38393E0581EDE5BE524ECA0118F8D96E /* Single.swift */; }; + F8B40ED7183B27B2795C8B59E7007B9D /* ScheduledDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06DD76EEACF1D44371266EA4EF7030E3 /* ScheduledDisposable.swift */; }; + FACF48E30E4F34EA0A0067BFB33910A2 /* ShareReplayScope.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7051E4B2C830EFAE623F564DC174C8A /* ShareReplayScope.swift */; }; + FBC98F20993AF83BC59BD2A677C8587D /* SuiteHooks.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6B140DAEE98DB6D6E5FCE31C6D0AAF6 /* SuiteHooks.swift */; }; + FC809EA2196F623AFF31497859E25001 /* DistinctUntilChanged.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9B4F2F089C5DFA1BA32B3BF56152CBF /* DistinctUntilChanged.swift */; }; + FE65523623494850282EDCB0735FF1BF /* ObservableType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E43ED4E8723CB03438FFD8D52ECF620 /* ObservableType+Extensions.swift */; }; + FF07FD541D8D557EFF423EE7462CBFC1 /* DisposeBag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C86B1D9DF0ED8AAED4F908B60C66454 /* DisposeBag.swift */; }; + FF425524D4E2775F0EA804C381956402 /* Timeout.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB75FAE4E6C545CB3CE7E5055296AD99 /* Timeout.swift */; }; + FFED0B227D5F580EFD0B905C48988B83 /* QuickSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A1B74E1DB9779AA8F3DE87108D26C8A /* QuickSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 1945352C42EA3A9BB808659DF7EF5C93 /* PBXContainerItemProxy */ = { + 382882674E75C28CC9411D8C724B9153 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; + containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; - remoteGlobalIDString = 5E269AA9A7FBCB9BFD8EA487B43AE7F9; + remoteGlobalIDString = F554EA343D656E7FB0C1ACC045EB2666; remoteInfo = Nimble; }; - 84FAAE3376CA8F3F598F8202CA76A6B5 /* PBXContainerItemProxy */ = { + 75F09C244A3F7AAD83FBE92EFFCC784E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; + containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; - remoteGlobalIDString = AB6A097ED9ED31C93AA4B971CFDBBC33; + remoteGlobalIDString = 2EC00BC1B651DF6BA1208D1D610630D0; remoteInfo = RxSwift; }; - 9C4E6AA93842E1B669F2567D9577B796 /* PBXContainerItemProxy */ = { + 8E28BEC4B4F29017BC1673563816FB1D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; + containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; - remoteGlobalIDString = C86D25EC2265DA7A383D953ED7711121; - remoteInfo = Quick; + remoteGlobalIDString = DCDAFB3810BA0828CB04917C3C9BB0D3; + remoteInfo = "NSObject+Rx"; }; - AD4AC3E78E4C00FE6FA84A78B2B48EF9 /* PBXContainerItemProxy */ = { + A15F253DE59A02BB37EF3BAD03923955 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; + containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; - remoteGlobalIDString = 6DB514A28E386B633179B9615872C399; - remoteInfo = "NSObject+Rx"; + remoteGlobalIDString = 2EC00BC1B651DF6BA1208D1D610630D0; + remoteInfo = RxSwift; }; - D0865859F488184744C9D0FB7CC8B06A /* PBXContainerItemProxy */ = { + AEC25B41396A99CE0DF06548A480D5C7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; + containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; - remoteGlobalIDString = AB6A097ED9ED31C93AA4B971CFDBBC33; - remoteInfo = RxSwift; + remoteGlobalIDString = CC37898399F3CE1D13D5F03D344200F6; + remoteInfo = Quick; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 00C13AB47B67BD647DDFA8EB325A17A5 /* WithLatestFrom.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = WithLatestFrom.swift; path = RxSwift/Observables/WithLatestFrom.swift; sourceTree = ""; }; - 01F89D13AB5B86376E75FEE6A9DBA004 /* Quick.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Quick.framework; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 0217A0A42340465992FEC11F73C50759 /* QuickTestSuite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickTestSuite.swift; path = Sources/Quick/QuickTestSuite.swift; sourceTree = ""; }; - 0276210F7791A98E44CF60C73E6BA118 /* AdapterProtocols.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AdapterProtocols.swift; path = Sources/Nimble/Adapters/AdapterProtocols.swift; sourceTree = ""; }; - 0355709C623A5CE75C62DADE7ED13864 /* CombineLatest+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "CombineLatest+arity.swift"; path = "RxSwift/Observables/CombineLatest+arity.swift"; sourceTree = ""; }; - 03A68F151BE54A2F04AB50E53B935D79 /* Queue.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Queue.swift; path = Platform/DataStructures/Queue.swift; sourceTree = ""; }; - 047E23E180142B6FADC17E1E69757B2C /* QuickSelectedTestSuiteBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickSelectedTestSuiteBuilder.swift; path = Sources/Quick/QuickSelectedTestSuiteBuilder.swift; sourceTree = ""; }; - 0691A529241CC719252270B5515C79F2 /* CwlCatchException.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CwlCatchException.m; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m; sourceTree = ""; }; - 06E620464506C8F032D83509BF8CA155 /* Readme.md */ = {isa = PBXFileReference; includeInIndex = 1; path = Readme.md; sourceTree = ""; }; - 074852CF0825C588D1A3D4BAFFF336F8 /* Empty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Empty.swift; path = RxSwift/Observables/Empty.swift; sourceTree = ""; }; - 08B5B59E45712A057FDA37338206B27D /* CombineLatest+Collection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "CombineLatest+Collection.swift"; path = "RxSwift/Observables/CombineLatest+Collection.swift"; sourceTree = ""; }; - 0B4F410F57910B0F6B0F18AFD2F8AF74 /* XCTestObservationCenter+Register.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "XCTestObservationCenter+Register.m"; path = "Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m"; sourceTree = ""; }; - 0E6878F54DB7E975AF72BCA44F5186D3 /* BeVoid.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeVoid.swift; path = Sources/Nimble/Matchers/BeVoid.swift; sourceTree = ""; }; - 0EF5A94E2EF4108B8AAF8ED75F7A1872 /* Zip+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Zip+arity.swift"; path = "RxSwift/Observables/Zip+arity.swift"; sourceTree = ""; }; - 0F83D1F29400CB3E6AC588928E3AE393 /* CwlCatchBadInstruction.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlCatchBadInstruction.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift; sourceTree = ""; }; - 0FB7B448FE8D14A1A1033C5B2D60297A /* Functional.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Functional.swift; path = Sources/Nimble/Utils/Functional.swift; sourceTree = ""; }; - 10B10CE857DE60321E2473DA326FB12B /* HasDisposeBag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HasDisposeBag.swift; sourceTree = ""; }; - 1146875A7BF6594AA772516883D1AC4D /* GroupedObservable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = GroupedObservable.swift; path = RxSwift/GroupedObservable.swift; sourceTree = ""; }; - 114E68352CD984771851423579F40A2A /* Just.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Just.swift; path = RxSwift/Observables/Just.swift; sourceTree = ""; }; - 12E109B04A41B36246DD8B544AF9B7EC /* Dematerialize.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Dematerialize.swift; path = RxSwift/Observables/Dematerialize.swift; sourceTree = ""; }; - 133B81FBCBE2867E65695417011A8A0F /* ScheduledDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledDisposable.swift; path = RxSwift/Disposables/ScheduledDisposable.swift; sourceTree = ""; }; - 137F93901D86DD727245232DB84C0501 /* Pods-DemoTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-DemoTests-acknowledgements.markdown"; sourceTree = ""; }; - 14254979BB7DBDECF8A42729EB0DAD3A /* Platform.Linux.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Platform.Linux.swift; path = Platform/Platform.Linux.swift; sourceTree = ""; }; - 143DC6F29498D8013E6BEC40FBA5E02C /* RecursiveScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RecursiveScheduler.swift; path = RxSwift/Schedulers/RecursiveScheduler.swift; sourceTree = ""; }; - 15BB44DFD228A90F805B9FEEBA7A4E80 /* ExampleHooks.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleHooks.swift; path = Sources/Quick/Hooks/ExampleHooks.swift; sourceTree = ""; }; - 160AC927638F4BB5403FCDA183972881 /* Amb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Amb.swift; path = RxSwift/Observables/Amb.swift; sourceTree = ""; }; - 164F3AB078C274155C74354ABDB631F7 /* CompositeDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CompositeDisposable.swift; path = RxSwift/Disposables/CompositeDisposable.swift; sourceTree = ""; }; - 16A0AAA6F245B75A656A4B2518C7335B /* Debounce.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Debounce.swift; path = RxSwift/Observables/Debounce.swift; sourceTree = ""; }; - 16AA2AC65F9FD2C9F028886DA5DF992D /* Filter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Filter.swift; path = Sources/Quick/Filter.swift; sourceTree = ""; }; - 1933D8E0310F94603B8FD9851FD5FE1B /* RecursiveLock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RecursiveLock.swift; path = Platform/RecursiveLock.swift; sourceTree = ""; }; - 1A4E7DF30B61AC226D85BBEF42D356F3 /* Nimble.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Nimble.modulemap; sourceTree = ""; }; - 1B422D4026116E98349BC299E86A115F /* QCKDSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QCKDSL.m; path = Sources/QuickObjectiveC/DSL/QCKDSL.m; sourceTree = ""; }; - 1C813EBE18B28E147E2D2A4E1315ED6B /* ExampleMetadata.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleMetadata.swift; path = Sources/Quick/ExampleMetadata.swift; sourceTree = ""; }; - 1E03BA62093D7BC8C7CF21D07B63CE87 /* SwitchIfEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SwitchIfEmpty.swift; path = RxSwift/Observables/SwitchIfEmpty.swift; sourceTree = ""; }; - 1E119EFB1EAF08A062C6AE19BAF7AC39 /* EndWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = EndWith.swift; path = Sources/Nimble/Matchers/EndWith.swift; sourceTree = ""; }; - 1F9A5783A2A7CE35D48E4AAE5C202487 /* InfiniteSequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InfiniteSequence.swift; path = Platform/DataStructures/InfiniteSequence.swift; sourceTree = ""; }; - 2011689AB7C05B7EFCB3487499B8D277 /* PostNotification.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PostNotification.swift; path = Sources/Nimble/Matchers/PostNotification.swift; sourceTree = ""; }; - 22B1203DA40864EE94B6C1E277231E5E /* Throttle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Throttle.swift; path = RxSwift/Observables/Throttle.swift; sourceTree = ""; }; - 2319471065A9D1CD76F47F65B85C2B9A /* PriorityQueue.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PriorityQueue.swift; path = Platform/DataStructures/PriorityQueue.swift; sourceTree = ""; }; - 2352A949CDB3DB99563DEEFB6A3C4B0C /* XCTestSuite+QuickTestSuiteBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "XCTestSuite+QuickTestSuiteBuilder.m"; path = "Sources/QuickObjectiveC/XCTestSuite+QuickTestSuiteBuilder.m"; sourceTree = ""; }; - 240BA3650D70E820ABF9412BCA527E91 /* ScheduledItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledItem.swift; path = RxSwift/Schedulers/Internal/ScheduledItem.swift; sourceTree = ""; }; - 240F5BB7F84055523169BA056A193790 /* DSL+Wait.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DSL+Wait.swift"; path = "Sources/Nimble/DSL+Wait.swift"; sourceTree = ""; }; - 24D1A75476250C2A48E7F5448FAF09A9 /* DistinctUntilChanged.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DistinctUntilChanged.swift; path = RxSwift/Observables/DistinctUntilChanged.swift; sourceTree = ""; }; - 25E927D100A94EBC1CFB1D2C75F540CC /* SchedulerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SchedulerType.swift; path = RxSwift/SchedulerType.swift; sourceTree = ""; }; - 2795306084CC6CBA4B48D733AB0F8249 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 2802F374F28EDC38A097F63405F76D6E /* Nimble-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nimble-umbrella.h"; sourceTree = ""; }; - 29A6E3F42A38B96DC41F4AD405047BAE /* PrimitiveSequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PrimitiveSequence.swift; path = RxSwift/Traits/PrimitiveSequence.swift; sourceTree = ""; }; - 2A82807BF1FD7E2A42F11A48277F0D4B /* AnonymousObserver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnonymousObserver.swift; path = RxSwift/Observers/AnonymousObserver.swift; sourceTree = ""; }; - 2D752ECA4EA765B6DC3853D1F8DE902C /* RxSwift.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = RxSwift.xcconfig; sourceTree = ""; }; - 2F14ADA04EC375F9355811F7FB479F30 /* Enumerated.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Enumerated.swift; path = RxSwift/Observables/Enumerated.swift; sourceTree = ""; }; - 2F92503F46B55D4F4A3BFD15E7179C81 /* SwiftSupport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SwiftSupport.swift; path = RxSwift/SwiftSupport/SwiftSupport.swift; sourceTree = ""; }; - 305E4331419736FD5897A2AE8C89EE97 /* NMBExpectation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NMBExpectation.swift; path = Sources/Nimble/Adapters/NMBExpectation.swift; sourceTree = ""; }; - 315147E49635C8F348F328E18989C976 /* HaveCount.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HaveCount.swift; path = Sources/Nimble/Matchers/HaveCount.swift; sourceTree = ""; }; - 329F6D3325A0CFDCA45B42B53996B676 /* AnyObserver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnyObserver.swift; path = RxSwift/AnyObserver.swift; sourceTree = ""; }; - 34F0D73D9BD0515FA3306EFC358189E8 /* LockOwnerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LockOwnerType.swift; path = RxSwift/Concurrency/LockOwnerType.swift; sourceTree = ""; }; - 354D24E958A393E94828843EB7BA53E7 /* Bag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Bag.swift; path = Platform/DataStructures/Bag.swift; sourceTree = ""; }; - 359EF32513E15E5F9736472E34E8BA2F /* Sequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sequence.swift; path = RxSwift/Observables/Sequence.swift; sourceTree = ""; }; - 363D20503FA622D74B2953ADE9EF5BC9 /* Errors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Errors.swift; path = RxSwift/Errors.swift; sourceTree = ""; }; - 3692E1BE689C456EFFCA8713705DB0E0 /* BeLessThan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLessThan.swift; path = Sources/Nimble/Matchers/BeLessThan.swift; sourceTree = ""; }; - 36A538752EB17DCE0DB682EF8DE237B8 /* Producer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Producer.swift; path = RxSwift/Observables/Producer.swift; sourceTree = ""; }; - 370E28D8AB2F773D22F0F14A4380D8D1 /* Zip+Collection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Zip+Collection.swift"; path = "RxSwift/Observables/Zip+Collection.swift"; sourceTree = ""; }; - 3842DB32E06DE501958B97A857F58B82 /* ContainElementSatisfying.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ContainElementSatisfying.swift; path = Sources/Nimble/Matchers/ContainElementSatisfying.swift; sourceTree = ""; }; - 39850425D82DB5D7CEB583E418B77552 /* BeGreaterThanOrEqualTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeGreaterThanOrEqualTo.swift; path = Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift; sourceTree = ""; }; - 399B006E2977C12A104E16C77804FD8D /* Pods-DemoTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-DemoTests-frameworks.sh"; sourceTree = ""; }; - 399E5C6EE42A10DDD4470126DBF1B820 /* Quick.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Quick.modulemap; sourceTree = ""; }; - 3A80966CC4EC9818649F9C9E2CFC0741 /* Using.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Using.swift; path = RxSwift/Observables/Using.swift; sourceTree = ""; }; - 3AFEE7880FB8439DCD66B8C502896611 /* Disposables.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Disposables.swift; path = RxSwift/Disposables/Disposables.swift; sourceTree = ""; }; - 3C716D15548A214C7698156BFC17719D /* BehaviorSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BehaviorSubject.swift; path = RxSwift/Subjects/BehaviorSubject.swift; sourceTree = ""; }; - 3D8A88E7CC4DB576335240864037BBF5 /* AsMaybe.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsMaybe.swift; path = RxSwift/Observables/AsMaybe.swift; sourceTree = ""; }; - 3E4E005EEF95B0D83D99B6692A1350BC /* RefCountDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RefCountDisposable.swift; path = RxSwift/Disposables/RefCountDisposable.swift; sourceTree = ""; }; - 4198195DE6196A273806238279B8F604 /* BooleanDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BooleanDisposable.swift; path = RxSwift/Disposables/BooleanDisposable.swift; sourceTree = ""; }; - 427E782658A674CCF0CB37E38704950A /* Disposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Disposable.swift; path = RxSwift/Disposable.swift; sourceTree = ""; }; - 42CC3F1254541F29401A9CEAF5840368 /* RxSwift-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RxSwift-prefix.pch"; sourceTree = ""; }; - 42F5A272707A1F50C050DE72AB2003B1 /* ConcurrentMainScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConcurrentMainScheduler.swift; path = RxSwift/Schedulers/ConcurrentMainScheduler.swift; sourceTree = ""; }; - 43B0514188824A8DF9BE4525F4C0AAF7 /* Pods-Demo-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Demo-frameworks.sh"; sourceTree = ""; }; - 445E569FB550D10E1D62648BF25BB32D /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 4629AD8C523D2FDA5C72258FAA2846DC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - 469C30CEF7D2A4D3C4CCF20CEE62E015 /* SatisfyAllOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SatisfyAllOf.swift; path = Sources/Nimble/Matchers/SatisfyAllOf.swift; sourceTree = ""; }; - 46A0731852D50F1DB5BAFB19F88EAB8C /* QuickSpec.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickSpec.m; path = Sources/QuickObjectiveC/QuickSpec.m; sourceTree = ""; }; - 470B86DFF7ED33C296F43DACA490CE9C /* ObservableType+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "ObservableType+Extensions.swift"; path = "RxSwift/ObservableType+Extensions.swift"; sourceTree = ""; }; - 47825406D7C5A6DEA89B0AF2C056C79F /* BinaryDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BinaryDisposable.swift; path = RxSwift/Disposables/BinaryDisposable.swift; sourceTree = ""; }; - 48CA898E26C422AA68784F179A306788 /* Cancelable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Cancelable.swift; path = RxSwift/Cancelable.swift; sourceTree = ""; }; - 4906E7F6E307512D338DAAB9808A5980 /* Pods-Demo.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-Demo.modulemap"; sourceTree = ""; }; - 49742A5C11C901751E6A9D8BB806B59C /* DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DSL.swift; path = Sources/Nimble/DSL.swift; sourceTree = ""; }; - 4B256F24A6D99A8F066F044EB158EADA /* Observable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Observable.swift; path = RxSwift/Observable.swift; sourceTree = ""; }; - 4B5AE0479796206409FCAA0309BF6CDF /* SubscribeOn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubscribeOn.swift; path = RxSwift/Observables/SubscribeOn.swift; sourceTree = ""; }; - 4B9E8191074B83A31E03235A74753E1C /* Timeout.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timeout.swift; path = RxSwift/Observables/Timeout.swift; sourceTree = ""; }; - 4C31E6FEB9D56741DB672C8382B2518A /* Errors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Errors.swift; path = Sources/Nimble/Utils/Errors.swift; sourceTree = ""; }; - 4CA2B4351FE4514079E5C27A7CC047C5 /* HistoricalSchedulerTimeConverter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HistoricalSchedulerTimeConverter.swift; path = RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift; sourceTree = ""; }; - 4CB22A9BED60505A355D13240451A9E0 /* Pods-DemoTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-DemoTests-resources.sh"; sourceTree = ""; }; - 50420501293EDA6AA5A34DACAEFBB2EA /* NSObject+Rx.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = "NSObject+Rx.podspec"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 50AF8513B9AB383E48A62162FCE5CDCD /* SerialDispatchQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SerialDispatchQueueScheduler.swift; path = RxSwift/Schedulers/SerialDispatchQueueScheduler.swift; sourceTree = ""; }; - 5167FF8A5B2F212486CFD19AD479585A /* NSObject+Rx.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "NSObject+Rx.xcconfig"; sourceTree = ""; }; - 5291FFF3A591A584E3FD0C0D57FB22B0 /* QuickConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickConfiguration.h; path = Sources/QuickObjectiveC/Configuration/QuickConfiguration.h; sourceTree = ""; }; - 53C19900EDD8583ACC910B537E5D5C4B /* Nimble.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Nimble.h; path = Sources/Nimble/Nimble.h; sourceTree = ""; }; - 54C8B8F19EE0A378AFB47AEF4F46106B /* RetryWhen.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RetryWhen.swift; path = RxSwift/Observables/RetryWhen.swift; sourceTree = ""; }; - 54E70EA13F7FA77DD8FA0B1F55597CE3 /* Event.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Event.swift; path = RxSwift/Event.swift; sourceTree = ""; }; - 55E603428CD7A07A4FC0C6F7958B3CAC /* RaisesException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RaisesException.swift; path = Sources/Nimble/Matchers/RaisesException.swift; sourceTree = ""; }; - 5605D21C0A02C9A590028A83CFF730DC /* DispatchQueue+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Extensions.swift"; path = "Platform/DispatchQueue+Extensions.swift"; sourceTree = ""; }; - 57B68089FB51524F2540E998F84D39F6 /* ThrowError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ThrowError.swift; path = Sources/Nimble/Matchers/ThrowError.swift; sourceTree = ""; }; - 591AB3255214FAC8B04C1178BF4AB315 /* Merge.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Merge.swift; path = RxSwift/Observables/Merge.swift; sourceTree = ""; }; - 5A65F0423427F1590B3974881584BA82 /* VirtualTimeConverterType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = VirtualTimeConverterType.swift; path = RxSwift/Schedulers/VirtualTimeConverterType.swift; sourceTree = ""; }; - 5C22E5D2E05F8DF2210DCECD0FA648DA /* InvocableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InvocableType.swift; path = RxSwift/Schedulers/Internal/InvocableType.swift; sourceTree = ""; }; - 5D0BB645A4FAFCB5F640230E7F25570B /* NMBObjCMatcher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NMBObjCMatcher.swift; path = Sources/Nimble/Adapters/NMBObjCMatcher.swift; sourceTree = ""; }; - 5D15E09F59E707CE8DCFA06DA95E1955 /* Await.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Await.swift; path = Sources/Nimble/Utils/Await.swift; sourceTree = ""; }; - 5F1000398A937193871996A3F20A1462 /* VirtualTimeScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = VirtualTimeScheduler.swift; path = RxSwift/Schedulers/VirtualTimeScheduler.swift; sourceTree = ""; }; - 5F99207603EB59E03D49A87AD6985D75 /* SynchronizedOnType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedOnType.swift; path = RxSwift/Concurrency/SynchronizedOnType.swift; sourceTree = ""; }; - 5FEAFE56F3ED5F6E99CF9B24253F2421 /* TakeLast.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeLast.swift; path = RxSwift/Observables/TakeLast.swift; sourceTree = ""; }; - 61FCD9F5AFAA918AE18E0F1754E59089 /* Pods-Demo-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Demo-dummy.m"; sourceTree = ""; }; - 62E964D3332805902ED02A58CEAD6763 /* Deferred.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Deferred.swift; path = RxSwift/Observables/Deferred.swift; sourceTree = ""; }; - 63155FFB4E0398159B73FA1AB4B35DBE /* RxMutableBox.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RxMutableBox.swift; path = RxSwift/RxMutableBox.swift; sourceTree = ""; }; - 6413E762A5EBA3739D651907C4AFE4AE /* ObservableType+PrimitiveSequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "ObservableType+PrimitiveSequence.swift"; path = "RxSwift/Traits/ObservableType+PrimitiveSequence.swift"; sourceTree = ""; }; - 6586E98D2401323473BC5C42F6FEC090 /* BeEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeEmpty.swift; path = Sources/Nimble/Matchers/BeEmpty.swift; sourceTree = ""; }; - 6671BAA13CD18FEE8106C9712F03FA43 /* Maybe.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Maybe.swift; path = RxSwift/Traits/Maybe.swift; sourceTree = ""; }; - 66807E6510B06C0EB6C8084D8262B245 /* ObserverType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserverType.swift; path = RxSwift/ObserverType.swift; sourceTree = ""; }; - 682299A86071B7158145932CB0D1BBF5 /* Delay.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Delay.swift; path = RxSwift/Observables/Delay.swift; sourceTree = ""; }; - 693FA9B96E88629D39696CE901394BC4 /* Materialize.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Materialize.swift; path = RxSwift/Observables/Materialize.swift; sourceTree = ""; }; - 69C14CC6F1FDF38F363AFC56BA6F3308 /* ElementAt.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ElementAt.swift; path = RxSwift/Observables/ElementAt.swift; sourceTree = ""; }; - 6AF226AA1C6369E28470BFDF0B8B1811 /* Contain.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Contain.swift; path = Sources/Nimble/Matchers/Contain.swift; sourceTree = ""; }; - 6B62414F5CC774D8C0A71BFBCFED3C28 /* ToSucceed.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ToSucceed.swift; path = Sources/Nimble/Matchers/ToSucceed.swift; sourceTree = ""; }; - 6B986DA8565410A1FBB275EBDC22173F /* Pods-DemoTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-DemoTests-dummy.m"; sourceTree = ""; }; - 6CA979333254652BCD92B81BE2A52273 /* DelaySubscription.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DelaySubscription.swift; path = RxSwift/Observables/DelaySubscription.swift; sourceTree = ""; }; - 6CDED84A81BE984BDBC5FC295D439898 /* Stringers.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Stringers.swift; path = Sources/Nimble/Utils/Stringers.swift; sourceTree = ""; }; - 6CEB04C02E607AA3AD97B6F71EBAFF25 /* Take.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Take.swift; path = RxSwift/Observables/Take.swift; sourceTree = ""; }; - 6D963093B3E8D12443FDB45479F08481 /* Nimble-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nimble-prefix.pch"; sourceTree = ""; }; - 6F354095154E0131D2DBC40757AF3EA6 /* Equal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Equal.swift; path = Sources/Nimble/Matchers/Equal.swift; sourceTree = ""; }; - 6F7E207A4F51F9EB4921B778F527FD38 /* ToArray.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ToArray.swift; path = RxSwift/Observables/ToArray.swift; sourceTree = ""; }; - 6FA2AE3513A9716B710893D98246801C /* Quick-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Quick-umbrella.h"; sourceTree = ""; }; - 6FDA83E1F8E3CEA2D465E20D3214B773 /* Concat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Concat.swift; path = RxSwift/Observables/Concat.swift; sourceTree = ""; }; - 7074E9CA670A4C3E1FE286964C801BB3 /* NimbleEnvironment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NimbleEnvironment.swift; path = Sources/Nimble/Adapters/NimbleEnvironment.swift; sourceTree = ""; }; - 70768FAAD304AE8702BB00F59F1D0DC3 /* Reduce.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Reduce.swift; path = RxSwift/Observables/Reduce.swift; sourceTree = ""; }; - 714F613A3647ADF3B1A3BC1CAD3DDA28 /* AssertionRecorder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AssertionRecorder.swift; path = Sources/Nimble/Adapters/AssertionRecorder.swift; sourceTree = ""; }; - 7476D59404D46DDD01ACC0AF798AA489 /* Pods_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Demo.framework; path = "Pods-Demo.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 7667193A493030E75DFD96FE7487BAA1 /* DSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DSL.m; path = Sources/NimbleObjectiveC/DSL.m; sourceTree = ""; }; - 77BF4BFBEE7621F16B88B263CA2C38CD /* Create.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Create.swift; path = RxSwift/Observables/Create.swift; sourceTree = ""; }; - 77CD36657390EB761A89CC16CFCF007D /* Debug.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Debug.swift; path = RxSwift/Observables/Debug.swift; sourceTree = ""; }; - 77E0E76A1C543895177E899C435E069A /* ImmediateSchedulerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ImmediateSchedulerType.swift; path = RxSwift/ImmediateSchedulerType.swift; sourceTree = ""; }; - 77EF7A3BA578E9A34C4A4608778AAD11 /* Nimble-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Nimble-dummy.m"; sourceTree = ""; }; - 7891998A72CC5885870EAA5C1DB6090D /* SingleAssignmentDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SingleAssignmentDisposable.swift; path = RxSwift/Disposables/SingleAssignmentDisposable.swift; sourceTree = ""; }; - 797BA25F337844CAD75AED0CB57A95CD /* CombineLatest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CombineLatest.swift; path = RxSwift/Observables/CombineLatest.swift; sourceTree = ""; }; - 7A331E455E604A8FD062D062BC8C2CDE /* CwlPreconditionTesting.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlPreconditionTesting.h; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/Mach/CwlPreconditionTesting.h; sourceTree = ""; }; - 7A46CC4790475C2D3E8C62106E9E87BF /* FailureMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = FailureMessage.swift; path = Sources/Nimble/FailureMessage.swift; sourceTree = ""; }; - 7BAABE3D70B15D706F0E0BC9A5AA411C /* Nimble.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Nimble.xcconfig; sourceTree = ""; }; - 7C16136FA33975C0E5E721B340B54FEC /* BeGreaterThan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeGreaterThan.swift; path = Sources/Nimble/Matchers/BeGreaterThan.swift; sourceTree = ""; }; - 7C9205A34A84D74C21CDC8A2C00CE7C8 /* Completable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Completable.swift; path = RxSwift/Traits/Completable.swift; sourceTree = ""; }; - 7DA0C14A9787B97E9C5E661EA66B8618 /* NSObject+Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "NSObject+Rx.swift"; sourceTree = ""; }; - 7F9D0F9A639D77A50EFB45E3EEF3284E /* Example.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Example.swift; path = Sources/Quick/Example.swift; sourceTree = ""; }; - 80D7E59A7AB5A6E0A9F70553026A1432 /* Quick-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Quick-dummy.m"; sourceTree = ""; }; - 810E828B743FB8120679616F1A71760C /* Predicate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Predicate.swift; path = Sources/Nimble/Matchers/Predicate.swift; sourceTree = ""; }; - 8157656B0734D038A9E7480F90A400FB /* ObserverBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserverBase.swift; path = RxSwift/Observers/ObserverBase.swift; sourceTree = ""; }; - 826512B771104143AEAB0F494EEAF955 /* NMBExceptionCapture.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NMBExceptionCapture.h; path = Sources/NimbleObjectiveC/NMBExceptionCapture.h; sourceTree = ""; }; - 8375E055ABF700CDD22E540C278690CA /* SourceLocation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SourceLocation.swift; path = Sources/Nimble/Utils/SourceLocation.swift; sourceTree = ""; }; - 844DD75ACFEDFA15534455AAED0E3653 /* Buffer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Buffer.swift; path = RxSwift/Observables/Buffer.swift; sourceTree = ""; }; - 84693A87C5C5D2F05C08327D2A4B001D /* Window.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Window.swift; path = RxSwift/Observables/Window.swift; sourceTree = ""; }; - 84F0DE87C78ADC36B83F5F95C1D79FE6 /* BeCloseTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeCloseTo.swift; path = Sources/Nimble/Matchers/BeCloseTo.swift; sourceTree = ""; }; - 8618BABC2E115BF6DDD424871D134F62 /* DispatchQueueConfiguration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DispatchQueueConfiguration.swift; path = RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift; sourceTree = ""; }; - 87642C0C62C2F733872ED6F8967428A5 /* NSObject+Rx.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "NSObject+Rx.modulemap"; sourceTree = ""; }; - 8770613CD8D6FFEBC01B5906D0AE2C99 /* Pods-Demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Demo.release.xcconfig"; sourceTree = ""; }; - 87E3408C3DA17809FD2D1AF79092FB61 /* StartWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = StartWith.swift; path = RxSwift/Observables/StartWith.swift; sourceTree = ""; }; - 88011BB9DEE5C83495C831B3F209E75A /* Async.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Async.swift; path = Sources/Nimble/Matchers/Async.swift; sourceTree = ""; }; - 88384211B224E7DC58855FA587A676A7 /* Skip.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Skip.swift; path = RxSwift/Observables/Skip.swift; sourceTree = ""; }; - 892AE6FA0CC8D00329D80A079A2CC781 /* QuickConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickConfiguration.m; path = Sources/QuickObjectiveC/Configuration/QuickConfiguration.m; sourceTree = ""; }; - 893DFA6FA782016C4ADC97E04614AA64 /* TailRecursiveSink.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TailRecursiveSink.swift; path = RxSwift/Observers/TailRecursiveSink.swift; sourceTree = ""; }; - 899F7D96738B594A432CEED858F6FF94 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8AC713BD372892587446BB06FED1F3EB /* Error.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Error.swift; path = RxSwift/Observables/Error.swift; sourceTree = ""; }; - 8B0CA0F1FC4FC57170B89F6C07D3B2DE /* Callsite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Callsite.swift; path = Sources/Quick/Callsite.swift; sourceTree = ""; }; - 8B445A2DE8B41E87F9063B9231FBBF8E /* Sample.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sample.swift; path = RxSwift/Observables/Sample.swift; sourceTree = ""; }; - 8BCCD69666E088C50F6C38EA6CD1AB4B /* SingleAsync.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SingleAsync.swift; path = RxSwift/Observables/SingleAsync.swift; sourceTree = ""; }; - 8D3AA38902E6E9E06B7493AB312E5236 /* World.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = World.swift; path = Sources/Quick/World.swift; sourceTree = ""; }; - 8E69C9350D2F7C715612EAA27FE74850 /* TakeUntil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeUntil.swift; path = RxSwift/Observables/TakeUntil.swift; sourceTree = ""; }; - 8EEACE83E0A6A980E3B00BB915449B7E /* Lock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Lock.swift; path = RxSwift/Concurrency/Lock.swift; sourceTree = ""; }; - 8F3C35BAE591AFECEB05635881E769C9 /* RxSwift-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "RxSwift-dummy.m"; sourceTree = ""; }; - 9035AB3B1B87BE64DA7F6D62D4004A32 /* Pods-Demo-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Demo-acknowledgements.markdown"; sourceTree = ""; }; - 91E4AEE60C203947FD25B20886A6938C /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 92A189AEA8097CFFFDB0E5804C3C1C71 /* Behavior.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Behavior.swift; path = Sources/Quick/Behavior.swift; sourceTree = ""; }; - 939094E692477DC2564BA8E062FD8322 /* Timer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timer.swift; path = RxSwift/Observables/Timer.swift; sourceTree = ""; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 93E44F300CBA04F70194186384480022 /* ErrorUtility.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ErrorUtility.swift; path = Sources/Quick/ErrorUtility.swift; sourceTree = ""; }; - 947511070799896770CAF73BCB20B722 /* Pods-DemoTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-DemoTests-umbrella.h"; sourceTree = ""; }; - 953602682825A527034579F7C76FE490 /* Repeat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Repeat.swift; path = RxSwift/Observables/Repeat.swift; sourceTree = ""; }; - 95B816FDFB9914FDB5932A277BF49BE8 /* RxSwift-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RxSwift-umbrella.h"; sourceTree = ""; }; - 95E460802B8FFF3BF02E54C2EA0BE9D9 /* ExpectationMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpectationMessage.swift; path = Sources/Nimble/ExpectationMessage.swift; sourceTree = ""; }; - 95EF400AF65F8B21865F81A17A3CB4BB /* BeNil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeNil.swift; path = Sources/Nimble/Matchers/BeNil.swift; sourceTree = ""; }; - 969E229627CEB3E2BB5AC2D0A021B227 /* SubscriptionDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubscriptionDisposable.swift; path = RxSwift/Disposables/SubscriptionDisposable.swift; sourceTree = ""; }; - 98A0F18D7BA4CD704304888CCF78EB82 /* World+DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "World+DSL.swift"; path = "Sources/Quick/DSL/World+DSL.swift"; sourceTree = ""; }; - 9966B286269124E595FC35634650F842 /* AnonymousDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnonymousDisposable.swift; path = RxSwift/Disposables/AnonymousDisposable.swift; sourceTree = ""; }; - 9B28044CA00CB23EC2407CC4122C4D28 /* SkipWhile.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SkipWhile.swift; path = RxSwift/Observables/SkipWhile.swift; sourceTree = ""; }; - 9C481F203A3D82E046D561B227D7708B /* SerialDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SerialDisposable.swift; path = RxSwift/Disposables/SerialDisposable.swift; sourceTree = ""; }; - 9C86746B7782939999EF488A707ED793 /* Pods-DemoTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-DemoTests.debug.xcconfig"; sourceTree = ""; }; - 9CF7F13A70415793AAB045D2F65EC7FF /* Bag+Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Bag+Rx.swift"; path = "RxSwift/Extensions/Bag+Rx.swift"; sourceTree = ""; }; - 9D7B9B6643C71DDDBC3A8B7C0B60A880 /* AddRef.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AddRef.swift; path = RxSwift/Observables/AddRef.swift; sourceTree = ""; }; - 9EAF6483E08D795DEA5172EE1BC70F1B /* mach_excServer.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mach_excServer.c; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.c; sourceTree = ""; }; - A1A7DA6A081CAE89BEE14C9BC4655DAA /* Platform.Darwin.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Platform.Darwin.swift; path = Platform/Platform.Darwin.swift; sourceTree = ""; }; - A2189B77DF040C86FCFF5D369FB3174E /* Deprecated.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Deprecated.swift; path = RxSwift/Deprecated.swift; sourceTree = ""; }; - A3337AADFE03A8F4AD76EAA5747827B5 /* ConcurrentDispatchQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConcurrentDispatchQueueScheduler.swift; path = RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift; sourceTree = ""; }; - A54350F518A110AD397EF8CFF0150CAD /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A6303AD957AF6EB732CD23753FEFD3A0 /* Do.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Do.swift; path = RxSwift/Observables/Do.swift; sourceTree = ""; }; - A6CB3D9F45EE9BAEB738CFCA213A7D9A /* Pods-Demo-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Demo-resources.sh"; sourceTree = ""; }; - A741EC25A9FAB83CC4422BE397426328 /* BeIdenticalTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeIdenticalTo.swift; path = Sources/Nimble/Matchers/BeIdenticalTo.swift; sourceTree = ""; }; - A7EE7E5BED1F5444680691BAC2DC2217 /* SynchronizedDisposeType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedDisposeType.swift; path = RxSwift/Concurrency/SynchronizedDisposeType.swift; sourceTree = ""; }; - A83B3BD4D27B914EF152352BB94DF1A0 /* First.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = First.swift; path = RxSwift/Observables/First.swift; sourceTree = ""; }; - A8E5FDC2B2154419FF94FF3678B00B02 /* Zip.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Zip.swift; path = RxSwift/Observables/Zip.swift; sourceTree = ""; }; - A90D775A3043D21572B4AF438A91629D /* Pods-DemoTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-DemoTests-acknowledgements.plist"; sourceTree = ""; }; - A95A9A98F76112807DB84996E09D0E14 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = ""; }; - A9D57B9A5440D76082DF3AD2C1289F7B /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A9F5B8284085D8FECC48F4A0F89485D8 /* NopDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NopDisposable.swift; path = RxSwift/Disposables/NopDisposable.swift; sourceTree = ""; }; - AA4A119E40151F454272BA8D2E6DDE07 /* Reactive.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Reactive.swift; path = RxSwift/Reactive.swift; sourceTree = ""; }; - AA72A7AC13BEBC006DC6A08BE7158B77 /* CwlCatchException.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlCatchException.h; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h; sourceTree = ""; }; - AAA662D89BF735BEDA1820FF2B1259DD /* Scan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Scan.swift; path = RxSwift/Observables/Scan.swift; sourceTree = ""; }; - AAA9BB2D4A6C2F84F3A205B1635BBA99 /* URL+FileName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "URL+FileName.swift"; path = "Sources/Quick/URL+FileName.swift"; sourceTree = ""; }; - AB12C0F86FEBA9F3834D32312A15B28A /* NSObject_Rx.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = NSObject_Rx.framework; path = "NSObject+Rx.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - AB94114691FA364F6528B887F9CCB745 /* NMBStringify.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NMBStringify.m; path = Sources/NimbleObjectiveC/NMBStringify.m; sourceTree = ""; }; - AC444D5DB3186C2696883C395754E536 /* ObserveOn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserveOn.swift; path = RxSwift/Observables/ObserveOn.swift; sourceTree = ""; }; - ACBE3CDD05A5487CDC82EAB5F2171E23 /* CwlCatchException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlCatchException.swift; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift; sourceTree = ""; }; - AEECCD6C2C998EE81C97DF26F90C00A3 /* ObservableConvertibleType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObservableConvertibleType.swift; path = RxSwift/ObservableConvertibleType.swift; sourceTree = ""; }; - AFA8DFA962931C0D5C66AA5C3A08F61F /* AllPass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AllPass.swift; path = Sources/Nimble/Matchers/AllPass.swift; sourceTree = ""; }; - B071A84DD47E9A2223335FED77ADF2C7 /* CwlDarwinDefinitions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlDarwinDefinitions.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift; sourceTree = ""; }; - B178C80B40AAE6BB62339FF0344BE272 /* NimbleXCTestHandler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NimbleXCTestHandler.swift; path = Sources/Nimble/Adapters/NimbleXCTestHandler.swift; sourceTree = ""; }; - B18710F2DC29EACD57A91E061B8FEC5A /* BeLessThanOrEqual.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLessThanOrEqual.swift; path = Sources/Nimble/Matchers/BeLessThanOrEqual.swift; sourceTree = ""; }; - B21EC49FB786C1D81036492BE569EC3D /* DeprecationWarner.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DeprecationWarner.swift; path = Platform/DeprecationWarner.swift; sourceTree = ""; }; - B3B1FE08B862EAB796DF4CF965FDAF54 /* Pods-Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Demo.debug.xcconfig"; sourceTree = ""; }; - B40B43EEE8457F3CC4D6A4F0FA11471A /* RxSwift.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = RxSwift.modulemap; sourceTree = ""; }; - B531259A56F7748DE2B778579A87338F /* Closures.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Closures.swift; path = Sources/Quick/Hooks/Closures.swift; sourceTree = ""; }; - B5C6E9FFEAEA19E766DE091CA2CED49B /* AsSingle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsSingle.swift; path = RxSwift/Observables/AsSingle.swift; sourceTree = ""; }; - B6CF95E05725AA13265818026FD6246B /* MatchError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatchError.swift; path = Sources/Nimble/Matchers/MatchError.swift; sourceTree = ""; }; - B70E02E24CED64298A1B42C70BA76CA8 /* SuiteHooks.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SuiteHooks.swift; path = Sources/Quick/Hooks/SuiteHooks.swift; sourceTree = ""; }; - B72A9772A6F1DAC3C6BE21ABCD1EB7A1 /* SchedulerServices+Emulation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "SchedulerServices+Emulation.swift"; path = "RxSwift/Schedulers/SchedulerServices+Emulation.swift"; sourceTree = ""; }; - B8101628CF72189785B691AC6B4E0289 /* SubjectType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubjectType.swift; path = RxSwift/Subjects/SubjectType.swift; sourceTree = ""; }; - B91C3C38EDF4C0FA75689C670E9FF69C /* BeLogical.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLogical.swift; path = Sources/Nimble/Matchers/BeLogical.swift; sourceTree = ""; }; - B9874781A641D9A2DC14AF764B2E138F /* Optional.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Optional.swift; path = RxSwift/Observables/Optional.swift; sourceTree = ""; }; - B9BE8C1E97DC1056F68928312334310C /* BeAnInstanceOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeAnInstanceOf.swift; path = Sources/Nimble/Matchers/BeAnInstanceOf.swift; sourceTree = ""; }; - B9C10D0D490E840FD368480CA5687CB9 /* AsyncLock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsyncLock.swift; path = RxSwift/Concurrency/AsyncLock.swift; sourceTree = ""; }; - BB78C52CD56B4FA18B083FA7296FCB0C /* DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DSL.swift; path = Sources/Quick/DSL/DSL.swift; sourceTree = ""; }; - BE15C6D1844F1E64D2B1AFD049A9D79A /* DisposeBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DisposeBase.swift; path = RxSwift/Disposables/DisposeBase.swift; sourceTree = ""; }; - BE7E9035154A3B24B6F7BF064B34D961 /* AsyncSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsyncSubject.swift; path = RxSwift/Subjects/AsyncSubject.swift; sourceTree = ""; }; - BFDD89119F9756A31AAE0C61C6C392F5 /* NSObject+Rx-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSObject+Rx-dummy.m"; sourceTree = ""; }; - C0C55A49EBBDEA751964AB79B51D5144 /* Single.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Single.swift; path = RxSwift/Traits/Single.swift; sourceTree = ""; }; - C1701A6D3E2D2886092827A97CB2B50E /* SkipUntil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SkipUntil.swift; path = RxSwift/Observables/SkipUntil.swift; sourceTree = ""; }; - C19BC99B3171B4D39B517C1C8F619EE0 /* Expression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Expression.swift; path = Sources/Nimble/Expression.swift; sourceTree = ""; }; - C210218A9F8486C724AF000E9BC9C37A /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = Sources/Quick/Configuration/Configuration.swift; sourceTree = ""; }; - C248DC53B42DE75A0CBD7043CB1F3BCC /* SatisfyAnyOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SatisfyAnyOf.swift; path = Sources/Nimble/Matchers/SatisfyAnyOf.swift; sourceTree = ""; }; - C3283B87E27D08583CBA1ECF30756E5F /* DisposeBag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DisposeBag.swift; path = RxSwift/Disposables/DisposeBag.swift; sourceTree = ""; }; - C493BBD5CFCB280EB8EF00B929156F28 /* Pods_DemoTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_DemoTests.framework; path = "Pods-DemoTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - C53E3F10D7DBBB1C92DB551BE4E55FA3 /* ScheduledItemType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledItemType.swift; path = RxSwift/Schedulers/Internal/ScheduledItemType.swift; sourceTree = ""; }; - C54E50CCCF5E687EC58D23139DBE4815 /* NSObject+Rx-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSObject+Rx-prefix.pch"; sourceTree = ""; }; - C7DD7EC55777F14EF1925F57BDF9C1E1 /* DSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DSL.h; path = Sources/NimbleObjectiveC/DSL.h; sourceTree = ""; }; - C91694859FC7B8E83B4294F7DEE91417 /* OperationQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = OperationQueueScheduler.swift; path = RxSwift/Schedulers/OperationQueueScheduler.swift; sourceTree = ""; }; - CA5CA08861E3FE5683C967ACE8CB4B6E /* BeAKindOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeAKindOf.swift; path = Sources/Nimble/Matchers/BeAKindOf.swift; sourceTree = ""; }; - CA7749509FFC4CF987FE94C109993700 /* Pods-DemoTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-DemoTests.modulemap"; sourceTree = ""; }; - CC74AA969E8AB63D1EB8807A90B9E291 /* RxSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - CDC007682565B2949752002198645C43 /* Generate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Generate.swift; path = RxSwift/Observables/Generate.swift; sourceTree = ""; }; - CE0635D052A48DC2468609F1AC2E6F7D /* HooksPhase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HooksPhase.swift; path = Sources/Quick/Hooks/HooksPhase.swift; sourceTree = ""; }; - CEE8FAC3960020923D811F92029719E4 /* Pods-DemoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-DemoTests.release.xcconfig"; sourceTree = ""; }; - CF9F9A43FECF77D55637FBA87BE8F84C /* MatcherFunc.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatcherFunc.swift; path = Sources/Nimble/Matchers/MatcherFunc.swift; sourceTree = ""; }; - D14B39EDDF06E204809CFC94AFFDEB86 /* TakeWhile.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeWhile.swift; path = RxSwift/Observables/TakeWhile.swift; sourceTree = ""; }; - D1BB4BBDD3FA1FE0AB0D5CD935421FE9 /* String+Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "String+Rx.swift"; path = "RxSwift/Extensions/String+Rx.swift"; sourceTree = ""; }; - D1C08FDD640F8069F0780569F49E173C /* Multicast.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Multicast.swift; path = RxSwift/Observables/Multicast.swift; sourceTree = ""; }; - D1EEE78514F442CE33602A647235C73E /* GroupBy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = GroupBy.swift; path = RxSwift/Observables/GroupBy.swift; sourceTree = ""; }; - D28E1A1F23E60EF795CDF40CC4BACEA8 /* Completable+AndThen.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Completable+AndThen.swift"; path = "RxSwift/Traits/Completable+AndThen.swift"; sourceTree = ""; }; - D4713B10B2644CE1F98886857CDB397E /* CwlMachBadInstructionHandler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlMachBadInstructionHandler.h; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/include/CwlMachBadInstructionHandler.h; sourceTree = ""; }; - D4713F6654D54AB72593C74FC5B61E96 /* ConnectableObservableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConnectableObservableType.swift; path = RxSwift/ConnectableObservableType.swift; sourceTree = ""; }; - D4D814CA1F7D55C5CE8D8A62F578BDCB /* mach_excServer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = mach_excServer.h; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.h; sourceTree = ""; }; - D5271EE6500A485B24AB3878D7B2CA7B /* NSString+C99ExtendedIdentifier.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSString+C99ExtendedIdentifier.swift"; path = "Sources/Quick/NSString+C99ExtendedIdentifier.swift"; sourceTree = ""; }; - D5552815B1D6B85B22773B342182410F /* MainScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MainScheduler.swift; path = RxSwift/Schedulers/MainScheduler.swift; sourceTree = ""; }; - D8D94B3AF1FAE7195873672682DD65CE /* QuickSpecBase.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickSpecBase.h; path = Sources/QuickSpecBase/include/QuickSpecBase.h; sourceTree = ""; }; - D9ABE8F53EEDF350CE9E98036A1388B9 /* DefaultIfEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DefaultIfEmpty.swift; path = RxSwift/Observables/DefaultIfEmpty.swift; sourceTree = ""; }; - DA8D444BAF7554FCBEECBC80AD3B8A5F /* QuickSpec.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickSpec.h; path = Sources/QuickObjectiveC/QuickSpec.h; sourceTree = ""; }; - DA98F69D71655FD9BD126636D8287A07 /* NMBStringify.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NMBStringify.h; path = Sources/NimbleObjectiveC/NMBStringify.h; sourceTree = ""; }; - DAB8BAF401ECC4A253D755B27763BC4B /* Map.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Map.swift; path = RxSwift/Observables/Map.swift; sourceTree = ""; }; - DC1EC9968F9F25CDF86C277FB0995035 /* Quick.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Quick.h; path = Sources/QuickObjectiveC/Quick.h; sourceTree = ""; }; - DC800C898D2D37EE433653C10CD924F4 /* Filter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Filter.swift; path = RxSwift/Observables/Filter.swift; sourceTree = ""; }; - DD9A6F50B048B75D8EA7E457FAB2953F /* Catch.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Catch.swift; path = RxSwift/Observables/Catch.swift; sourceTree = ""; }; - DF5265DC9B29D8CA8FF54085E2B7DF5D /* CwlMachBadInstructionHandler.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CwlMachBadInstructionHandler.m; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.m; sourceTree = ""; }; - E0BCA2F92CA4AF4599FC7E2A65DD2420 /* RxSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = RxSwift.framework; path = RxSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - E2CEAB6772D554FD8158AA584BB52908 /* HistoricalScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HistoricalScheduler.swift; path = RxSwift/Schedulers/HistoricalScheduler.swift; sourceTree = ""; }; - E32EF20994BA990A01264A673D581032 /* MatcherProtocols.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatcherProtocols.swift; path = Sources/Nimble/Matchers/MatcherProtocols.swift; sourceTree = ""; }; - E38701C3B0A94C31245884CA79DE9371 /* InvocableScheduledItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InvocableScheduledItem.swift; path = RxSwift/Schedulers/Internal/InvocableScheduledItem.swift; sourceTree = ""; }; - E4A14CA2097D3428011144D158327644 /* Quick-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Quick-prefix.pch"; sourceTree = ""; }; - E591EB13105E3738351C6AB010D7A223 /* Pods-Demo-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Demo-acknowledgements.plist"; sourceTree = ""; }; - E6122E3E38B44456ED3B5B47B73EB2DC /* ReplaySubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ReplaySubject.swift; path = RxSwift/Subjects/ReplaySubject.swift; sourceTree = ""; }; - E72D33CF85D0E14163C30C93662CCF51 /* Switch.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Switch.swift; path = RxSwift/Observables/Switch.swift; sourceTree = ""; }; - E730DFEBE1FC3034DE9A7F4481D1B76A /* Sink.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sink.swift; path = RxSwift/Observables/Sink.swift; sourceTree = ""; }; - E8E5D7A9D671C721C1E12793E2003311 /* Never.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Never.swift; path = RxSwift/Observables/Never.swift; sourceTree = ""; }; - E9589240691151AB6A2D4C860573AD53 /* QuickSpecBase.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickSpecBase.m; path = Sources/QuickSpecBase/QuickSpecBase.m; sourceTree = ""; }; - EAED59CA25B110A7B74B373CA11A5DD7 /* PublishSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PublishSubject.swift; path = RxSwift/Subjects/PublishSubject.swift; sourceTree = ""; }; - EAEF29A6102B5568BD9AAFF638630D8D /* Range.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Range.swift; path = RxSwift/Observables/Range.swift; sourceTree = ""; }; - EAFAF82614BD68A87F254861741C0F09 /* BeginWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeginWith.swift; path = Sources/Nimble/Matchers/BeginWith.swift; sourceTree = ""; }; - EB58ADA89038564E8D37D27A81D9EEB3 /* ThrowAssertion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ThrowAssertion.swift; path = Sources/Nimble/Matchers/ThrowAssertion.swift; sourceTree = ""; }; - EB5FAD837BE2AAE61455BFD7B32DA9F7 /* CwlBadInstructionException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlBadInstructionException.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift; sourceTree = ""; }; - EBFAA7F4BF7C3113856D36AD34A1DE76 /* AssertionDispatcher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AssertionDispatcher.swift; path = Sources/Nimble/Adapters/AssertionDispatcher.swift; sourceTree = ""; }; - ED4652D686FFA05E4CFD837F5DD948A0 /* Pods-Demo-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Demo-umbrella.h"; sourceTree = ""; }; - F404DBBC429942E6C3B29B82B9B33127 /* Match.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Match.swift; path = Sources/Nimble/Matchers/Match.swift; sourceTree = ""; }; - F42A6C4D50D4793EB419FC568B796501 /* ObservableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObservableType.swift; path = RxSwift/ObservableType.swift; sourceTree = ""; }; - F448C4244A86825882FEC5453730CA1F /* NSObject+Rx-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSObject+Rx-umbrella.h"; sourceTree = ""; }; - F4DC9433907411D9872E64D72EC0EB8C /* Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Rx.swift; path = RxSwift/Rx.swift; sourceTree = ""; }; - F5E5FF9976441B8C4B99ADBA2B921D91 /* Expectation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Expectation.swift; path = Sources/Nimble/Expectation.swift; sourceTree = ""; }; - F6A24D057CFAB8AC0F42B410E04BC8DA /* NMBExceptionCapture.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NMBExceptionCapture.m; path = Sources/NimbleObjectiveC/NMBExceptionCapture.m; sourceTree = ""; }; - F7A9320BEA924A5F642EFD71C5422EF8 /* PrimitiveSequence+Zip+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "PrimitiveSequence+Zip+arity.swift"; path = "RxSwift/Traits/PrimitiveSequence+Zip+arity.swift"; sourceTree = ""; }; - F98E837E3836FD16E13D4A18CEED912B /* Quick.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Quick.xcconfig; sourceTree = ""; }; - F996C636C4BFB2FF8976D728BB62B899 /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Nimble.framework; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - FBF3EE16F855C8DBB30D15A2D3D1AFDA /* ExampleGroup.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleGroup.swift; path = Sources/Quick/ExampleGroup.swift; sourceTree = ""; }; - FCD9AA26C47D968373890A1FB6485742 /* NSBundle+CurrentTestBundle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSBundle+CurrentTestBundle.swift"; path = "Sources/Quick/NSBundle+CurrentTestBundle.swift"; sourceTree = ""; }; - FDF20B48B6E7109EE06F817D2F4FD91B /* CurrentThreadScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CurrentThreadScheduler.swift; path = RxSwift/Schedulers/CurrentThreadScheduler.swift; sourceTree = ""; }; - FE060340E5949C3EA68028FFE2F6FAFD /* ShareReplayScope.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ShareReplayScope.swift; path = RxSwift/Observables/ShareReplayScope.swift; sourceTree = ""; }; - FE18D3D48A514F0873D97857ADFD5467 /* SynchronizedUnsubscribeType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedUnsubscribeType.swift; path = RxSwift/Concurrency/SynchronizedUnsubscribeType.swift; sourceTree = ""; }; - FFA5A3E4C4EA8083112AB03B934B3322 /* QCKDSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QCKDSL.h; path = Sources/QuickObjectiveC/DSL/QCKDSL.h; sourceTree = ""; }; - FFC65524FB644895BDCBBA0657F2FA07 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; + 007173EC56EB5DDF3E309BA654A205AB /* Completable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Completable.swift; path = RxSwift/Traits/Completable.swift; sourceTree = ""; }; + 01B587407E8068DE98971366D428A0FA /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Nimble.framework; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 03D979FD09AE7BD39BC9F957699CB515 /* ConcurrentDispatchQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConcurrentDispatchQueueScheduler.swift; path = RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift; sourceTree = ""; }; + 04B1369E7D7133C572D2BCF73A2E60E0 /* ObserverBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserverBase.swift; path = RxSwift/Observers/ObserverBase.swift; sourceTree = ""; }; + 06DD76EEACF1D44371266EA4EF7030E3 /* ScheduledDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledDisposable.swift; path = RxSwift/Disposables/ScheduledDisposable.swift; sourceTree = ""; }; + 07A066E0D7A1C7046AF10250E1EF1402 /* SkipWhile.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SkipWhile.swift; path = RxSwift/Observables/SkipWhile.swift; sourceTree = ""; }; + 083FAB3C284C8E05A1CB7C7853D722D9 /* CwlDarwinDefinitions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlDarwinDefinitions.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift; sourceTree = ""; }; + 08FD69D13E326AB5A59478A26464FE5D /* MatcherFunc.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatcherFunc.swift; path = Sources/Nimble/Matchers/MatcherFunc.swift; sourceTree = ""; }; + 095DBDFCD66DFCE4478A57B9BC654B4D /* Optional.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Optional.swift; path = RxSwift/Observables/Optional.swift; sourceTree = ""; }; + 0965493271A2B072B7F25DEC8F3960EC /* ThrowAssertion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ThrowAssertion.swift; path = Sources/Nimble/Matchers/ThrowAssertion.swift; sourceTree = ""; }; + 09E2678C71840FD764A782CEE7FBF70A /* SwiftSupport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SwiftSupport.swift; path = RxSwift/SwiftSupport/SwiftSupport.swift; sourceTree = ""; }; + 0A1A01565E72028CC41B0C12ABFBEDA6 /* World+DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "World+DSL.swift"; path = "Sources/Quick/DSL/World+DSL.swift"; sourceTree = ""; }; + 0A1B74E1DB9779AA8F3DE87108D26C8A /* QuickSpec.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickSpec.h; path = Sources/QuickObjectiveC/QuickSpec.h; sourceTree = ""; }; + 0BA070A8D8EB82400E6C4CEECC8BF706 /* Contain.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Contain.swift; path = Sources/Nimble/Matchers/Contain.swift; sourceTree = ""; }; + 0C7525E1C10E9A6F11D2D8D014C14CD8 /* SatisfyAnyOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SatisfyAnyOf.swift; path = Sources/Nimble/Matchers/SatisfyAnyOf.swift; sourceTree = ""; }; + 0CB1AEB6D73EB42568D027020774BA46 /* Using.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Using.swift; path = RxSwift/Observables/Using.swift; sourceTree = ""; }; + 0DE05031B38702C48126EDF418E9D10A /* SerialDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SerialDisposable.swift; path = RxSwift/Disposables/SerialDisposable.swift; sourceTree = ""; }; + 0EB62B53C4C45333651904E570B6B4FD /* DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DSL.swift; path = Sources/Quick/DSL/DSL.swift; sourceTree = ""; }; + 0F998F9C73474BC516D1C522E9587D6C /* SubscribeOn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubscribeOn.swift; path = RxSwift/Observables/SubscribeOn.swift; sourceTree = ""; }; + 0FB3EFBA229C8E3BC633A6EE8DA748DB /* Pods-DemoTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-DemoTests.debug.xcconfig"; sourceTree = ""; }; + 10C27CB44E825B852933F04A0448DDF5 /* Predicate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Predicate.swift; path = Sources/Nimble/Matchers/Predicate.swift; sourceTree = ""; }; + 122591A6C078E284A3AA63B0234E1AC7 /* Date+Dispatch.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Date+Dispatch.swift"; path = "RxSwift/Date+Dispatch.swift"; sourceTree = ""; }; + 1282B1B0ED6B31216E1EFA67179598ED /* Pods-DemoTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-DemoTests-frameworks.sh"; sourceTree = ""; }; + 15E5914EF2A1F09493BAF40F329B7C9F /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = Sources/Quick/Configuration/Configuration.swift; sourceTree = ""; }; + 160D768CDCFE9392110517E4A0D93764 /* SingleAsync.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SingleAsync.swift; path = RxSwift/Observables/SingleAsync.swift; sourceTree = ""; }; + 169046F6F353D9FE68E8F82E5E825D53 /* RecursiveScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RecursiveScheduler.swift; path = RxSwift/Schedulers/RecursiveScheduler.swift; sourceTree = ""; }; + 1698BF9491D9AF9E0D072611202F8282 /* Producer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Producer.swift; path = RxSwift/Observables/Producer.swift; sourceTree = ""; }; + 172AEB1F149833D984184CE96288B146 /* DSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DSL.m; path = Sources/NimbleObjectiveC/DSL.m; sourceTree = ""; }; + 179D0EEE4255E84E7E62884FA3E63463 /* Sample.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sample.swift; path = RxSwift/Observables/Sample.swift; sourceTree = ""; }; + 17C68372DD42CDEB42628569784CB9BC /* Filter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Filter.swift; path = Sources/Quick/Filter.swift; sourceTree = ""; }; + 18AA6BE89F22B7C82515AD7CC46A77F5 /* CombineLatest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CombineLatest.swift; path = RxSwift/Observables/CombineLatest.swift; sourceTree = ""; }; + 195F882A3718E80481ADE7A265930C76 /* BeEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeEmpty.swift; path = Sources/Nimble/Matchers/BeEmpty.swift; sourceTree = ""; }; + 1A445804FFB07BE08F37DABA6FBD5E7C /* Pods-Demo-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Demo-umbrella.h"; sourceTree = ""; }; + 1B361A811319AC8B1C604D47C3D3221D /* NimbleEnvironment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NimbleEnvironment.swift; path = Sources/Nimble/Adapters/NimbleEnvironment.swift; sourceTree = ""; }; + 1CE558E6171D431907FFBC0E230BA1E1 /* Pods-Demo.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-Demo.modulemap"; sourceTree = ""; }; + 1CF52CE2305F254C916316AE08AA41DF /* RxSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1F7DE55A32562758730BDBF5AEF1FFB6 /* CwlPreconditionTesting.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlPreconditionTesting.h; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/Mach/CwlPreconditionTesting.h; sourceTree = ""; }; + 1F8FED30A7EF068219D9F750C05938A5 /* ObservableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObservableType.swift; path = RxSwift/ObservableType.swift; sourceTree = ""; }; + 2037A14401A1B4BF81E786F530D287C1 /* Pods-DemoTests-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-DemoTests-Info.plist"; sourceTree = ""; }; + 2064AAE1E9DA13FDB1162AF2EC06FBB5 /* Scan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Scan.swift; path = RxSwift/Observables/Scan.swift; sourceTree = ""; }; + 20D6B60706BFA445FEED480BCDA5AB30 /* QuickSpecBase.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickSpecBase.m; path = Sources/QuickSpecBase/QuickSpecBase.m; sourceTree = ""; }; + 22278AF12F067909FA575ACD18B69E53 /* Example.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Example.swift; path = Sources/Quick/Example.swift; sourceTree = ""; }; + 23B6F183FB63627B5D229DD879BAF6E4 /* CwlCatchException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlCatchException.swift; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift; sourceTree = ""; }; + 23C54A2448A56E39C1E753B4B2632DDD /* AsSingle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsSingle.swift; path = RxSwift/Observables/AsSingle.swift; sourceTree = ""; }; + 2458AECC105ACEDE6FA7C9B340B0ED60 /* VirtualTimeScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = VirtualTimeScheduler.swift; path = RxSwift/Schedulers/VirtualTimeScheduler.swift; sourceTree = ""; }; + 2492390A030EEDAB0016F4F5126DEFAF /* QuickSpec.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickSpec.m; path = Sources/QuickObjectiveC/QuickSpec.m; sourceTree = ""; }; + 25706706F8C3EDE14C88BED0DF4AB34F /* RxSwift.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = RxSwift.xcconfig; sourceTree = ""; }; + 26FB5D8D479C5D23529758EC2CAA9968 /* RxMutableBox.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RxMutableBox.swift; path = RxSwift/RxMutableBox.swift; sourceTree = ""; }; + 279E8909B681F6B0B61A0D2DF338D983 /* Cancelable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Cancelable.swift; path = RxSwift/Cancelable.swift; sourceTree = ""; }; + 27C708952D512115F713119550860048 /* Behavior.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Behavior.swift; path = Sources/Quick/Behavior.swift; sourceTree = ""; }; + 28C8DE8590BE8EB0BC6766626E449868 /* RetryWhen.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RetryWhen.swift; path = RxSwift/Observables/RetryWhen.swift; sourceTree = ""; }; + 29683BBE08614F57258947E9C050A0C8 /* String+Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "String+Rx.swift"; path = "RxSwift/Extensions/String+Rx.swift"; sourceTree = ""; }; + 29B5670BC4705C072326DAA05F608700 /* Nimble-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nimble-prefix.pch"; sourceTree = ""; }; + 2B4B214F9D223A5B568DC72942D886D4 /* StartWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = StartWith.swift; path = RxSwift/Observables/StartWith.swift; sourceTree = ""; }; + 2CE692EC061E31389090FF1898F0B956 /* URL+FileName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "URL+FileName.swift"; path = "Sources/Quick/URL+FileName.swift"; sourceTree = ""; }; + 2D5B6457B7CB65CC7A5B4D9DEA1BF613 /* Deprecated.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Deprecated.swift; path = RxSwift/Deprecated.swift; sourceTree = ""; }; + 2E14599B8E960E81610BDD82AABE7DC8 /* Pods-Demo-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Demo-dummy.m"; sourceTree = ""; }; + 2FC3DB461B28F2357DB3221F6A36BACB /* ExampleHooks.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleHooks.swift; path = Sources/Quick/Hooks/ExampleHooks.swift; sourceTree = ""; }; + 2FCD390E1B79DD3BA4C14C38AE0A41DB /* AssertionRecorder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AssertionRecorder.swift; path = Sources/Nimble/Adapters/AssertionRecorder.swift; sourceTree = ""; }; + 330C2F743555602F00A672BFCB32DF69 /* Pods-Demo-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Demo-Info.plist"; sourceTree = ""; }; + 340F762CA16D9DA5F8B769F02F1CC6C0 /* QCKDSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QCKDSL.m; path = Sources/QuickObjectiveC/DSL/QCKDSL.m; sourceTree = ""; }; + 345F9CFB17730EA512B4D93130DB9950 /* NMBStringify.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NMBStringify.h; path = Sources/NimbleObjectiveC/NMBStringify.h; sourceTree = ""; }; + 3470946FA7BF51F483D9AFD149C96012 /* SynchronizedUnsubscribeType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedUnsubscribeType.swift; path = RxSwift/Concurrency/SynchronizedUnsubscribeType.swift; sourceTree = ""; }; + 34EB90060782B713111526B30C226EF6 /* Match.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Match.swift; path = Sources/Nimble/Matchers/Match.swift; sourceTree = ""; }; + 34EED2A3C153C9A70C1F548325F9AAFD /* NMBExpectation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NMBExpectation.swift; path = Sources/Nimble/Adapters/NMBExpectation.swift; sourceTree = ""; }; + 35E36D81A814B979B83FA5907B56A7FB /* NMBExceptionCapture.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NMBExceptionCapture.h; path = Sources/NimbleObjectiveC/NMBExceptionCapture.h; sourceTree = ""; }; + 378744A6F971741B9EE4360680756EE3 /* Bag+Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Bag+Rx.swift"; path = "RxSwift/Extensions/Bag+Rx.swift"; sourceTree = ""; }; + 37E0ACB811D4E17BC094CD48454E5FC6 /* Sequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sequence.swift; path = RxSwift/Observables/Sequence.swift; sourceTree = ""; }; + 38393E0581EDE5BE524ECA0118F8D96E /* Single.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Single.swift; path = RxSwift/Traits/Single.swift; sourceTree = ""; }; + 38E7CF3EB74343DE4C7F0A783416A3C2 /* Pods-DemoTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-DemoTests-umbrella.h"; sourceTree = ""; }; + 39C2FBBD4335AF46D3FB91038FD4A912 /* Pods-DemoTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-DemoTests-acknowledgements.markdown"; sourceTree = ""; }; + 3A688FE1F18259F93E9B9ED5664A4009 /* FailureMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = FailureMessage.swift; path = Sources/Nimble/FailureMessage.swift; sourceTree = ""; }; + 3AF2F451666410366F2DEB794AA75CBA /* Pods-Demo-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Demo-acknowledgements.plist"; sourceTree = ""; }; + 3B6FFF4739881F7A932F90A810A695B4 /* LockOwnerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LockOwnerType.swift; path = RxSwift/Concurrency/LockOwnerType.swift; sourceTree = ""; }; + 3CC739507DFF73A8441FC1425E443FA2 /* GroupedObservable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = GroupedObservable.swift; path = RxSwift/GroupedObservable.swift; sourceTree = ""; }; + 3D0C13A90BEBB0C6CFFB0F3511874170 /* BeGreaterThanOrEqualTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeGreaterThanOrEqualTo.swift; path = Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift; sourceTree = ""; }; + 3E43ED4E8723CB03438FFD8D52ECF620 /* ObservableType+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "ObservableType+Extensions.swift"; path = "RxSwift/ObservableType+Extensions.swift"; sourceTree = ""; }; + 3FD4ADEC48199E79E1F9D299F12BC92C /* Nimble.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Nimble.xcconfig; sourceTree = ""; }; + 4036CE58C0921C4E1D2C23949D06804A /* SwitchIfEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SwitchIfEmpty.swift; path = RxSwift/Observables/SwitchIfEmpty.swift; sourceTree = ""; }; + 40BE5F65E38F83289611D559F00895E4 /* Throttle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Throttle.swift; path = RxSwift/Observables/Throttle.swift; sourceTree = ""; }; + 40E134A10DD4AD633309F267288BEABA /* Quick-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Quick-umbrella.h"; sourceTree = ""; }; + 418059AEB1C7BAD0D9D08A77D342FE6A /* CombineLatest+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "CombineLatest+arity.swift"; path = "RxSwift/Observables/CombineLatest+arity.swift"; sourceTree = ""; }; + 419DEDD652E5BD17A6264BABB02A555D /* RxSwift-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "RxSwift-dummy.m"; sourceTree = ""; }; + 420FA3C42F688A80EAADC3F6B1C6351E /* NMBExceptionCapture.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NMBExceptionCapture.m; path = Sources/NimbleObjectiveC/NMBExceptionCapture.m; sourceTree = ""; }; + 42EEEA2EBAE54BB4C13D8F15D4D298DB /* DispatchQueueConfiguration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DispatchQueueConfiguration.swift; path = RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift; sourceTree = ""; }; + 42F29017D99035B21B9C6378D0C20553 /* SynchronizedDisposeType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedDisposeType.swift; path = RxSwift/Concurrency/SynchronizedDisposeType.swift; sourceTree = ""; }; + 435B0B09412A7DF9097CF9F8640D2B70 /* EndWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = EndWith.swift; path = Sources/Nimble/Matchers/EndWith.swift; sourceTree = ""; }; + 44226ED63CE2351598FD3761606AE007 /* DSL+Wait.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DSL+Wait.swift"; path = "Sources/Nimble/DSL+Wait.swift"; sourceTree = ""; }; + 4435E8036A0AE62B70C00A1FD13C0E10 /* SatisfyAllOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SatisfyAllOf.swift; path = Sources/Nimble/Matchers/SatisfyAllOf.swift; sourceTree = ""; }; + 4451839469875A94743BBE0EC81F799E /* DSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DSL.swift; path = Sources/Nimble/DSL.swift; sourceTree = ""; }; + 44D90AC3EEC70EF9313990274F3B9B54 /* NMBStringify.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NMBStringify.m; path = Sources/NimbleObjectiveC/NMBStringify.m; sourceTree = ""; }; + 45EDAB83D40AEF7D4A49E69D910C479E /* NimbleXCTestHandler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NimbleXCTestHandler.swift; path = Sources/Nimble/Adapters/NimbleXCTestHandler.swift; sourceTree = ""; }; + 463DC9FEBCC3FECB56439E057DCAF875 /* CwlCatchException.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlCatchException.h; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h; sourceTree = ""; }; + 4655DE872F116F68D71BA26D294282E2 /* PriorityQueue.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PriorityQueue.swift; path = Platform/DataStructures/PriorityQueue.swift; sourceTree = ""; }; + 47487CDBB7BDB0F5BECACCF955C405FB /* Dematerialize.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Dematerialize.swift; path = RxSwift/Observables/Dematerialize.swift; sourceTree = ""; }; + 477C25B6F5561DE9F10676AC439D09FB /* InvocableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InvocableType.swift; path = RxSwift/Schedulers/Internal/InvocableType.swift; sourceTree = ""; }; + 48B17F38282DCCD060FA38EE3B6EF44C /* AnonymousDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnonymousDisposable.swift; path = RxSwift/Disposables/AnonymousDisposable.swift; sourceTree = ""; }; + 48E4058CD6925712AC02CAFA9AFC78D3 /* TakeUntil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeUntil.swift; path = RxSwift/Observables/TakeUntil.swift; sourceTree = ""; }; + 491F072013433A7A58D8B65F358D026F /* Errors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Errors.swift; path = RxSwift/Errors.swift; sourceTree = ""; }; + 49E951D4FA0C5D1F4608FAE716EB6423 /* ObservableType+PrimitiveSequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "ObservableType+PrimitiveSequence.swift"; path = "RxSwift/Traits/ObservableType+PrimitiveSequence.swift"; sourceTree = ""; }; + 4B0749291D522211F84D19F63DCBC23B /* Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Rx.swift; path = RxSwift/Rx.swift; sourceTree = ""; }; + 4E45BBF074C6E712C7BB2C76EE123F46 /* Multicast.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Multicast.swift; path = RxSwift/Observables/Multicast.swift; sourceTree = ""; }; + 4F09BBFF80F6478F3CC6EA98EFE72152 /* SchedulerServices+Emulation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "SchedulerServices+Emulation.swift"; path = "RxSwift/Schedulers/SchedulerServices+Emulation.swift"; sourceTree = ""; }; + 50A130B45DC117C0E84097C8E9CAC997 /* Readme.md */ = {isa = PBXFileReference; includeInIndex = 1; path = Readme.md; sourceTree = ""; }; + 50B971CF6E1166AD169CB187B7513ED8 /* AsMaybe.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsMaybe.swift; path = RxSwift/Observables/AsMaybe.swift; sourceTree = ""; }; + 527413A2EB579A7CB3F08E371A559141 /* RxSwift-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "RxSwift-Info.plist"; sourceTree = ""; }; + 5371702C71D5AB22A49E8DC1098CE566 /* NSObject+Rx-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSObject+Rx-umbrella.h"; sourceTree = ""; }; + 54500F67CA02884681B5614FE3681225 /* World.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = World.swift; path = Sources/Quick/World.swift; sourceTree = ""; }; + 553741506265A8B822CD579E97DD89A5 /* SkipUntil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SkipUntil.swift; path = RxSwift/Observables/SkipUntil.swift; sourceTree = ""; }; + 56178108E601F5E0C6B619348D02A043 /* Zip+Collection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Zip+Collection.swift"; path = "RxSwift/Observables/Zip+Collection.swift"; sourceTree = ""; }; + 5853A1F9E428570888855D70D2F62266 /* Pods-Demo-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Demo-acknowledgements.markdown"; sourceTree = ""; }; + 586F48AC25492C756894B35EF4E01116 /* AnyObserver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnyObserver.swift; path = RxSwift/AnyObserver.swift; sourceTree = ""; }; + 59FD319EE04B8C01BB6A46E534466872 /* Pods-DemoTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-DemoTests-acknowledgements.plist"; sourceTree = ""; }; + 5AD76329FD166FBE92988A21CCBAB7AB /* DefaultIfEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DefaultIfEmpty.swift; path = RxSwift/Observables/DefaultIfEmpty.swift; sourceTree = ""; }; + 5C51164C3E4A2BEB0BF46FF69E22390B /* SingleAssignmentDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SingleAssignmentDisposable.swift; path = RxSwift/Disposables/SingleAssignmentDisposable.swift; sourceTree = ""; }; + 5D29F4A7DE18D4FC192E77CE44742703 /* First.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = First.swift; path = RxSwift/Observables/First.swift; sourceTree = ""; }; + 5EDFCCE9101470BB7E6D840B1A5E0913 /* Quick-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Quick-prefix.pch"; sourceTree = ""; }; + 6076937CB3B94CF8BCC4268678E2DA7B /* Equal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Equal.swift; path = Sources/Nimble/Matchers/Equal.swift; sourceTree = ""; }; + 610F14E64877C284D3F10C8CE41EF89E /* Materialize.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Materialize.swift; path = RxSwift/Observables/Materialize.swift; sourceTree = ""; }; + 61FE06DC15E9AAA2F46D5F928E1ED9D4 /* ToSucceed.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ToSucceed.swift; path = Sources/Nimble/Matchers/ToSucceed.swift; sourceTree = ""; }; + 64ED03ED0B4C5DD981DA39D53E7B7983 /* Catch.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Catch.swift; path = RxSwift/Observables/Catch.swift; sourceTree = ""; }; + 662C228F137DE9248B3761A2208A61F9 /* BehaviorSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BehaviorSubject.swift; path = RxSwift/Subjects/BehaviorSubject.swift; sourceTree = ""; }; + 6669606A1A55F80E390F616917F55CB2 /* SynchronizedOnType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedOnType.swift; path = RxSwift/Concurrency/SynchronizedOnType.swift; sourceTree = ""; }; + 6798E3801E9E92C404A5A73C9BC8D9E1 /* Pods-Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Demo.debug.xcconfig"; sourceTree = ""; }; + 69CDAC0156DA9DB5BF282C9DB82A82E0 /* Debounce.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Debounce.swift; path = RxSwift/Observables/Debounce.swift; sourceTree = ""; }; + 6AA9AE04B6D2414D8BE2E58C784DF027 /* Take.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Take.swift; path = RxSwift/Observables/Take.swift; sourceTree = ""; }; + 6BC23C9C171C7D46F6BD59C01D2BA05F /* AsyncSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsyncSubject.swift; path = RxSwift/Subjects/AsyncSubject.swift; sourceTree = ""; }; + 6C8D4932E40C1397A9C94701357D6193 /* AllPass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AllPass.swift; path = Sources/Nimble/Matchers/AllPass.swift; sourceTree = ""; }; + 6CC4D50DEEAF80E5F4E7BD524FA2FBE1 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = ""; }; + 6CCCD6A748D7D3DBD7ADCEB7306E4366 /* GroupBy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = GroupBy.swift; path = RxSwift/Observables/GroupBy.swift; sourceTree = ""; }; + 6F2341B63B600E3B9C6CFA288BB3BB86 /* XCTestObservationCenter+Register.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "XCTestObservationCenter+Register.m"; path = "Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m"; sourceTree = ""; }; + 6F8528339456DF076461FC577F0A20EA /* BeIdenticalTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeIdenticalTo.swift; path = Sources/Nimble/Matchers/BeIdenticalTo.swift; sourceTree = ""; }; + 703E9D7D28980AA24200E4E3AFAD81D5 /* RxSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = RxSwift.framework; path = RxSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 70AA7E86250B1D076683EFF1FF394D0A /* Reduce.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Reduce.swift; path = RxSwift/Observables/Reduce.swift; sourceTree = ""; }; + 739640B6CB464D96E93F9A7F2185648E /* AddRef.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AddRef.swift; path = RxSwift/Observables/AddRef.swift; sourceTree = ""; }; + 73AE77B0CB085577A2060F18AC4EB0E8 /* Zip.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Zip.swift; path = RxSwift/Observables/Zip.swift; sourceTree = ""; }; + 73C12FA20125292B2792A8F3473357D5 /* BooleanDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BooleanDisposable.swift; path = RxSwift/Disposables/BooleanDisposable.swift; sourceTree = ""; }; + 73DC08049B4577692ADDBF4061427281 /* CwlMachBadInstructionHandler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlMachBadInstructionHandler.h; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/include/CwlMachBadInstructionHandler.h; sourceTree = ""; }; + 765FDD2F217C19565C263E9ED16403BB /* DSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DSL.h; path = Sources/NimbleObjectiveC/DSL.h; sourceTree = ""; }; + 76895B730377EE1ADAB60122ACF3E450 /* Filter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Filter.swift; path = RxSwift/Observables/Filter.swift; sourceTree = ""; }; + 76E7C33532BF1CFBB387322A40FD7E5F /* Error.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Error.swift; path = RxSwift/Observables/Error.swift; sourceTree = ""; }; + 770CF6054E4D291AB95498A6D4471FBD /* CompactMap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CompactMap.swift; path = RxSwift/Observables/CompactMap.swift; sourceTree = ""; }; + 78030D0464F3ED40785E91AEE4F7B13B /* Quick.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Quick.h; path = Sources/QuickObjectiveC/Quick.h; sourceTree = ""; }; + 799A44334C97C4C289A07B544B38F135 /* VirtualTimeConverterType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = VirtualTimeConverterType.swift; path = RxSwift/Schedulers/VirtualTimeConverterType.swift; sourceTree = ""; }; + 79DFD2E90EE0F63DA2DC67AD336E739C /* Skip.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Skip.swift; path = RxSwift/Observables/Skip.swift; sourceTree = ""; }; + 7A34FEA5B12FEAFE57D2706ED347939B /* QuickConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QuickConfiguration.m; path = Sources/QuickObjectiveC/Configuration/QuickConfiguration.m; sourceTree = ""; }; + 7CF728F762A35AF084F570B67CB633D0 /* InfiniteSequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InfiniteSequence.swift; path = Platform/DataStructures/InfiniteSequence.swift; sourceTree = ""; }; + 7E669816937CF59045E459D9ED49359A /* NSObject+Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "NSObject+Rx.swift"; sourceTree = ""; }; + 7F00072FC535659EF6F6711EE3E4F92B /* RxSwift-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RxSwift-prefix.pch"; sourceTree = ""; }; + 7F77C855B4953D558FDD99186D1754A8 /* Expression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Expression.swift; path = Sources/Nimble/Expression.swift; sourceTree = ""; }; + 801A90D4FBC3C50CA5C669EF264EEB4A /* NSObject_Rx.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = NSObject_Rx.framework; path = "NSObject+Rx.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 80572ECE5B752DA94194B3642DF15D04 /* HasDisposeBag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HasDisposeBag.swift; sourceTree = ""; }; + 81B348D58BBB252BA537B9BC53E5E8B9 /* QuickSelectedTestSuiteBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickSelectedTestSuiteBuilder.swift; path = Sources/Quick/QuickSelectedTestSuiteBuilder.swift; sourceTree = ""; }; + 8230E5BB66AB17F65D15BF9B23EE3186 /* BeNil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeNil.swift; path = Sources/Nimble/Matchers/BeNil.swift; sourceTree = ""; }; + 864EA88B57A9A74D855D1AB88504CF2E /* Map.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Map.swift; path = RxSwift/Observables/Map.swift; sourceTree = ""; }; + 8681D84A6DEF565F816AEAED2D00110C /* RaisesException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RaisesException.swift; path = Sources/Nimble/Matchers/RaisesException.swift; sourceTree = ""; }; + 86CB05CF1CDB882B295FF2558772B744 /* NSBundle+CurrentTestBundle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSBundle+CurrentTestBundle.swift"; path = "Sources/Quick/NSBundle+CurrentTestBundle.swift"; sourceTree = ""; }; + 87A494DDB25746D60618F74AB302B56D /* RecursiveLock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RecursiveLock.swift; path = Platform/RecursiveLock.swift; sourceTree = ""; }; + 88C92136A05C9E40786905B32D20F90F /* NSObject+Rx.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "NSObject+Rx.modulemap"; sourceTree = ""; }; + 891BF6C52A161F6ED8C016969CE97BA2 /* Quick.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Quick.modulemap; sourceTree = ""; }; + 893B3C81DDD0AEDB5318550AAE7825C5 /* NMBObjCMatcher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NMBObjCMatcher.swift; path = Sources/Nimble/Adapters/NMBObjCMatcher.swift; sourceTree = ""; }; + 8A291ED223703BC09683E17ABC820E17 /* OperationQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = OperationQueueScheduler.swift; path = RxSwift/Schedulers/OperationQueueScheduler.swift; sourceTree = ""; }; + 8BF3F614CC5C37ECA2A7BD0474CE0061 /* RefCountDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RefCountDisposable.swift; path = RxSwift/Disposables/RefCountDisposable.swift; sourceTree = ""; }; + 8C1AD32944E19CC51BFD861D3E396779 /* BeLessThan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLessThan.swift; path = Sources/Nimble/Matchers/BeLessThan.swift; sourceTree = ""; }; + 8C3334FC797BB9C4584DDE37CEDAD0AB /* Errors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Errors.swift; path = Sources/Nimble/Utils/Errors.swift; sourceTree = ""; }; + 8C86B1D9DF0ED8AAED4F908B60C66454 /* DisposeBag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DisposeBag.swift; path = RxSwift/Disposables/DisposeBag.swift; sourceTree = ""; }; + 8D8CAE5BC71CB290315BB8CCE54F0149 /* Pods_DemoTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_DemoTests.framework; path = "Pods-DemoTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9111564BF366D0F190DD21BE04CEB3F0 /* Expectation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Expectation.swift; path = Sources/Nimble/Expectation.swift; sourceTree = ""; }; + 91EBCC5EA02EA118E1B15B3C4FC673C4 /* mach_excServer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = mach_excServer.h; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.h; sourceTree = ""; }; + 9203674664692F426565EC45CDDBF5BA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + 929B5F6DFEE1875321B18BB0F4A91E93 /* SubjectType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubjectType.swift; path = RxSwift/Subjects/SubjectType.swift; sourceTree = ""; }; + 93D3D880DC6CA05FCDEDD0FAB4CF33C8 /* Generate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Generate.swift; path = RxSwift/Observables/Generate.swift; sourceTree = ""; }; + 953A6880A842C07CA6C5183DA77986A1 /* AdapterProtocols.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AdapterProtocols.swift; path = Sources/Nimble/Adapters/AdapterProtocols.swift; sourceTree = ""; }; + 95EF087247CBEAB5BB1F5769AADADC29 /* ElementsEqual.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ElementsEqual.swift; path = Sources/Nimble/Matchers/ElementsEqual.swift; sourceTree = ""; }; + 9645E5620CD00D3A1732900485D00BE0 /* Timer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timer.swift; path = RxSwift/Observables/Timer.swift; sourceTree = ""; }; + 96FC8E6849EECC37066F443FD2E5CA33 /* BeVoid.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeVoid.swift; path = Sources/Nimble/Matchers/BeVoid.swift; sourceTree = ""; }; + 971B42C48B80C86CECDF6A1C01124315 /* Await.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Await.swift; path = Sources/Nimble/Utils/Await.swift; sourceTree = ""; }; + 9780F7DEF6EAF35A39289889ECC01073 /* CombineLatest+Collection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "CombineLatest+Collection.swift"; path = "RxSwift/Observables/CombineLatest+Collection.swift"; sourceTree = ""; }; + 991F5D74BFCC68EA980CEC8242E55916 /* ElementAt.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ElementAt.swift; path = RxSwift/Observables/ElementAt.swift; sourceTree = ""; }; + 9947EE212430E0F76F04ABEAF0A65FAC /* DisposeBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DisposeBase.swift; path = RxSwift/Disposables/DisposeBase.swift; sourceTree = ""; }; + 99B58D683D333643680081A992D5405E /* Quick.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Quick.framework; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 99DE5BF6E4A651E58DA13A9BFC20B5C9 /* ObservableConvertibleType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObservableConvertibleType.swift; path = RxSwift/ObservableConvertibleType.swift; sourceTree = ""; }; + 99E1510063771124B571F6CC51E900DE /* ConnectableObservableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConnectableObservableType.swift; path = RxSwift/ConnectableObservableType.swift; sourceTree = ""; }; + 9A53DEBB3ABE82DE21ADCE55D40D7F95 /* MatchError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatchError.swift; path = Sources/Nimble/Matchers/MatchError.swift; sourceTree = ""; }; + 9BB202E5E8D772663A53F4A8AF528512 /* Quick-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Quick-Info.plist"; sourceTree = ""; }; + 9BC2302E78E5715DF91416B09369D056 /* BeGreaterThan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeGreaterThan.swift; path = Sources/Nimble/Matchers/BeGreaterThan.swift; sourceTree = ""; }; + 9D444CC91C409BA22228D122152F5F8D /* Just.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Just.swift; path = RxSwift/Observables/Just.swift; sourceTree = ""; }; + 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 9DB8A6BC46F58342A40BE570A48C758D /* BeLogical.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLogical.swift; path = Sources/Nimble/Matchers/BeLogical.swift; sourceTree = ""; }; + 9E5757B71F28F87433D5F3F2326DD383 /* ExpectationMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpectationMessage.swift; path = Sources/Nimble/ExpectationMessage.swift; sourceTree = ""; }; + 9EB1694C39E6DE003004873B619DCDE4 /* Nimble-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nimble-umbrella.h"; sourceTree = ""; }; + A026B36C0AAADE7B1C5BF97ABEA1EA1F /* ThrowError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ThrowError.swift; path = Sources/Nimble/Matchers/ThrowError.swift; sourceTree = ""; }; + A0AE5742B155BF9E385D886F0B3B0380 /* HaveCount.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HaveCount.swift; path = Sources/Nimble/Matchers/HaveCount.swift; sourceTree = ""; }; + A0CA816D313D08FA9BA746BDE71AA3BE /* Zip+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Zip+arity.swift"; path = "RxSwift/Observables/Zip+arity.swift"; sourceTree = ""; }; + A0F313ADAF338946CF8EC0C60FFA068B /* SourceLocation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SourceLocation.swift; path = Sources/Nimble/Utils/SourceLocation.swift; sourceTree = ""; }; + A116D1B52080E4C877AE8FF8525C1E66 /* Nimble.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Nimble.modulemap; sourceTree = ""; }; + A185553AF8D5EE097A2A593475615A86 /* Reactive.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Reactive.swift; path = RxSwift/Reactive.swift; sourceTree = ""; }; + A1E2C09923DEA065AF83CF897AC210C8 /* Buffer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Buffer.swift; path = RxSwift/Observables/Buffer.swift; sourceTree = ""; }; + A23A58D5CAE1671D168F8D2A2ADD6DEB /* Range.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Range.swift; path = RxSwift/Observables/Range.swift; sourceTree = ""; }; + A2DD534995FC6FCBDC0EA5817B05B7E1 /* Closures.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Closures.swift; path = Sources/Quick/Hooks/Closures.swift; sourceTree = ""; }; + A34EF631ADBFC0FB9E01FE45DEBC48A1 /* AnonymousObserver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnonymousObserver.swift; path = RxSwift/Observers/AnonymousObserver.swift; sourceTree = ""; }; + A3CACD10549C86B60E4B541F63D459E7 /* MainScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MainScheduler.swift; path = RxSwift/Schedulers/MainScheduler.swift; sourceTree = ""; }; + A4EFFAD6B5A918722C8C62CE8BB5CDF4 /* ErrorUtility.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ErrorUtility.swift; path = Sources/Quick/ErrorUtility.swift; sourceTree = ""; }; + A50A171CA6E7F8A60D00C8B48AA063F8 /* PublishSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PublishSubject.swift; path = RxSwift/Subjects/PublishSubject.swift; sourceTree = ""; }; + A524A8BE73EA070015863E3A303069F5 /* Enumerated.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Enumerated.swift; path = RxSwift/Observables/Enumerated.swift; sourceTree = ""; }; + A56AE6A582FB021ABD8CF3968D2CEEC6 /* QCKDSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QCKDSL.h; path = Sources/QuickObjectiveC/DSL/QCKDSL.h; sourceTree = ""; }; + A6920670AC8745CF019BDE92265FBD9B /* Pods_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Demo.framework; path = "Pods-Demo.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + A7A2D3D585F92FDA97D07ABCF4D6D58D /* CwlBadInstructionException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlBadInstructionException.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift; sourceTree = ""; }; + A7F9C0A828FF93A4C5286724F02EFD3A /* Pods-DemoTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-DemoTests-dummy.m"; sourceTree = ""; }; + A8A6E4406CE90AAEAE552B2E2AE682FD /* QuickSpecBase.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickSpecBase.h; path = Sources/QuickSpecBase/include/QuickSpecBase.h; sourceTree = ""; }; + A96D40B2EA457A03805CD8EA316348BF /* Stringers.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Stringers.swift; path = Sources/Nimble/Utils/Stringers.swift; sourceTree = ""; }; + A9BDF0E7D5C9359579BA1055A66E603B /* AsyncLock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsyncLock.swift; path = RxSwift/Concurrency/AsyncLock.swift; sourceTree = ""; }; + AAAC0F6C09C79336F353332C4A3C7C70 /* Delay.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Delay.swift; path = RxSwift/Observables/Delay.swift; sourceTree = ""; }; + B0DEC1A9ADFD54566E0B0A077EA09CD7 /* BeCloseTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeCloseTo.swift; path = Sources/Nimble/Matchers/BeCloseTo.swift; sourceTree = ""; }; + B18115DA18C19A68FF96C5585CA275F7 /* String+C99ExtendedIdentifier.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "String+C99ExtendedIdentifier.swift"; path = "Sources/Quick/String+C99ExtendedIdentifier.swift"; sourceTree = ""; }; + B3A2E620FE47D3CC7DCBCB4F2CD213B0 /* HistoricalScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HistoricalScheduler.swift; path = RxSwift/Schedulers/HistoricalScheduler.swift; sourceTree = ""; }; + B48F5FB717AC6F300389C0FFBD2B9698 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; + B4D0E70501E592A560A7F99D642F8DF2 /* Switch.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Switch.swift; path = RxSwift/Observables/Switch.swift; sourceTree = ""; }; + B60973C44D517664106EA2EAFECB1426 /* TakeWhile.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeWhile.swift; path = RxSwift/Observables/TakeWhile.swift; sourceTree = ""; }; + B89E636CEECC331FE886443352E1C3ED /* Do.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Do.swift; path = RxSwift/Observables/Do.swift; sourceTree = ""; }; + B99DF630A2BB08BDA5E3C4B19D6EBBBD /* Completable+AndThen.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Completable+AndThen.swift"; path = "RxSwift/Traits/Completable+AndThen.swift"; sourceTree = ""; }; + BA05B093FF4C3C2C1BEB9D082D1089FC /* HooksPhase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HooksPhase.swift; path = Sources/Quick/Hooks/HooksPhase.swift; sourceTree = ""; }; + BA9A7430ADE207FADA08FBFF7C79A698 /* ScheduledItemType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledItemType.swift; path = RxSwift/Schedulers/Internal/ScheduledItemType.swift; sourceTree = ""; }; + BC571702237AF10BD4BF9BDA2C7B95C7 /* MatcherProtocols.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MatcherProtocols.swift; path = Sources/Nimble/Matchers/MatcherProtocols.swift; sourceTree = ""; }; + BD8045CEEEE80C1C40E362B764CBAF93 /* ImmediateSchedulerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ImmediateSchedulerType.swift; path = RxSwift/ImmediateSchedulerType.swift; sourceTree = ""; }; + BED4A6A7963FC39EEC0EDE427573AEA3 /* ReplaySubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ReplaySubject.swift; path = RxSwift/Subjects/ReplaySubject.swift; sourceTree = ""; }; + BFF4DAE78EF1BB1EAFFEFCF807CB41F0 /* ConcurrentMainScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConcurrentMainScheduler.swift; path = RxSwift/Schedulers/ConcurrentMainScheduler.swift; sourceTree = ""; }; + C0CDE9AE8CC17F4EF7306505AFB081D8 /* Repeat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Repeat.swift; path = RxSwift/Observables/Repeat.swift; sourceTree = ""; }; + C18CD2F7824016ABD4FE096813C8BAA6 /* NSObject+Rx-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSObject+Rx-dummy.m"; sourceTree = ""; }; + C1CED0DD23F664841111999586B08666 /* Platform.Darwin.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Platform.Darwin.swift; path = Platform/Platform.Darwin.swift; sourceTree = ""; }; + C365B873AC920896A7A7A74B01921478 /* Nimble.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Nimble.h; path = Sources/Nimble/Nimble.h; sourceTree = ""; }; + C417F0901D9B4C26E1B7B6E01C4DFB03 /* Maybe.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Maybe.swift; path = RxSwift/Traits/Maybe.swift; sourceTree = ""; }; + C4306B653917652B04CEC39EAD0F9243 /* ScheduledItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledItem.swift; path = RxSwift/Schedulers/Internal/ScheduledItem.swift; sourceTree = ""; }; + C4AA469B510A2D075730A6C6BC5016AD /* Event.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Event.swift; path = RxSwift/Event.swift; sourceTree = ""; }; + C500E0BD5E10E791A8112375E55E4F14 /* Window.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Window.swift; path = RxSwift/Observables/Window.swift; sourceTree = ""; }; + C5BD61BC458D529EC17262DE3F100F23 /* QuickConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickConfiguration.h; path = Sources/QuickObjectiveC/Configuration/QuickConfiguration.h; sourceTree = ""; }; + C6572705BFB9EFFD839B70B0D2E16933 /* CwlCatchException.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CwlCatchException.m; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m; sourceTree = ""; }; + C6F16D155F41C66237C1E97FE8EA6828 /* NSObject+Rx.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "NSObject+Rx.xcconfig"; sourceTree = ""; }; + C7F3573E6BF1E0D30B2A08DF0543FDEF /* Deferred.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Deferred.swift; path = RxSwift/Observables/Deferred.swift; sourceTree = ""; }; + C8545D704733DF6E81F91A0129D3AF9F /* mach_excServer.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mach_excServer.c; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.c; sourceTree = ""; }; + C862873B1A4C2B34881F93A7C66C8B41 /* Queue.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Queue.swift; path = Platform/DataStructures/Queue.swift; sourceTree = ""; }; + C95406072BED9A8CF9FCFA764E92282A /* ExampleMetadata.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleMetadata.swift; path = Sources/Quick/ExampleMetadata.swift; sourceTree = ""; }; + CA39CFD4DCD38EDFA77A991FB2ACF008 /* Disposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Disposable.swift; path = RxSwift/Disposable.swift; sourceTree = ""; }; + CC738E332792A056A082C75643681536 /* Functional.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Functional.swift; path = Sources/Nimble/Utils/Functional.swift; sourceTree = ""; }; + CD305D94C58742A63AD40CD3AE898D7A /* SubscriptionDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubscriptionDisposable.swift; path = RxSwift/Disposables/SubscriptionDisposable.swift; sourceTree = ""; }; + CE3D7C1A8E5B6E92D5C5E204A72A1827 /* PostNotification.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PostNotification.swift; path = Sources/Nimble/Matchers/PostNotification.swift; sourceTree = ""; }; + CFDBA3A608FFDB187DA673044C0D539A /* PrimitiveSequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PrimitiveSequence.swift; path = RxSwift/Traits/PrimitiveSequence.swift; sourceTree = ""; }; + D1B39910B76025550C09316E51CABD53 /* Bag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Bag.swift; path = Platform/DataStructures/Bag.swift; sourceTree = ""; }; + D20E787F4CFC5733D13721FB1DA12B58 /* CwlCatchBadInstruction.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlCatchBadInstruction.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift; sourceTree = ""; }; + D36F786CF140C1D310179D6AC68A2BB1 /* Disposables.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Disposables.swift; path = RxSwift/Disposables/Disposables.swift; sourceTree = ""; }; + D5CBDE79352C4185F6C726CBAB8DE17F /* Quick.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Quick.xcconfig; sourceTree = ""; }; + D5D1998DBCCE80042B0FD7C534021B42 /* QuickTestSuite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickTestSuite.swift; path = Sources/Quick/QuickTestSuite.swift; sourceTree = ""; }; + D754E73EF6F72DD1CCFE3BD8C7BEE95E /* ContainElementSatisfying.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ContainElementSatisfying.swift; path = Sources/Nimble/Matchers/ContainElementSatisfying.swift; sourceTree = ""; }; + D7F6BAD109E4B77AC3D38280441B5277 /* RxSwift-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RxSwift-umbrella.h"; sourceTree = ""; }; + D95722B7B1802FD8435155E622168012 /* NopDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NopDisposable.swift; path = RxSwift/Disposables/NopDisposable.swift; sourceTree = ""; }; + D99A258CCE9551CC1D7213678DDCBAB0 /* BinaryDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BinaryDisposable.swift; path = RxSwift/Disposables/BinaryDisposable.swift; sourceTree = ""; }; + DA174D3A29E55C151709E402E425E17B /* CurrentThreadScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CurrentThreadScheduler.swift; path = RxSwift/Schedulers/CurrentThreadScheduler.swift; sourceTree = ""; }; + DA2AA8A7B89B2F388897200471D987A3 /* Sink.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sink.swift; path = RxSwift/Observables/Sink.swift; sourceTree = ""; }; + DC1AD732807DA62C8E1A30577D2ABE6C /* InvocableScheduledItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InvocableScheduledItem.swift; path = RxSwift/Schedulers/Internal/InvocableScheduledItem.swift; sourceTree = ""; }; + DC63D273B2E772CC1E4794932A104E9C /* Lock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Lock.swift; path = RxSwift/Concurrency/Lock.swift; sourceTree = ""; }; + DC9407E1BE6EEBEE51569EB6CED48FD8 /* Observable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Observable.swift; path = RxSwift/Observable.swift; sourceTree = ""; }; + DD6299DF68B27F3BA2F904C06D884591 /* Nimble-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Nimble-dummy.m"; sourceTree = ""; }; + DF38DA772A3242727ED2610D020467E8 /* AssertionDispatcher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AssertionDispatcher.swift; path = Sources/Nimble/Adapters/AssertionDispatcher.swift; sourceTree = ""; }; + E0735A682CD60FE6282D8AAFDE148CEA /* Amb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Amb.swift; path = RxSwift/Observables/Amb.swift; sourceTree = ""; }; + E161EEED24F14309AFBE4DD9689E4124 /* BeAKindOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeAKindOf.swift; path = Sources/Nimble/Matchers/BeAKindOf.swift; sourceTree = ""; }; + E25E9ACD6C7A8625BDB9BCC68738D856 /* Concat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Concat.swift; path = RxSwift/Observables/Concat.swift; sourceTree = ""; }; + E2604B6B85493BB7D113A76F39B36F98 /* RxSwift.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = RxSwift.modulemap; sourceTree = ""; }; + E29DE8A204E52E82115DB7B194A3771A /* Pods-DemoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-DemoTests.release.xcconfig"; sourceTree = ""; }; + E2A86986464892D969668BEEFB36C9BE /* NSObject+Rx.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = "NSObject+Rx.podspec"; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + E384495CDCA6E6862479A378FD2BB9E0 /* DispatchQueue+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Extensions.swift"; path = "Platform/DispatchQueue+Extensions.swift"; sourceTree = ""; }; + E528AC40D3234F5B32D6BEB118D60DFE /* BeLessThanOrEqual.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeLessThanOrEqual.swift; path = Sources/Nimble/Matchers/BeLessThanOrEqual.swift; sourceTree = ""; }; + E554E11903685C6F5C1CF9CDD1571F04 /* NSObject+Rx-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "NSObject+Rx-Info.plist"; sourceTree = ""; }; + E5CCE15BBC2E9FDF93E97CFCCF26388B /* CwlMachBadInstructionHandler.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CwlMachBadInstructionHandler.m; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.m; sourceTree = ""; }; + E7051E4B2C830EFAE623F564DC174C8A /* ShareReplayScope.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ShareReplayScope.swift; path = RxSwift/Observables/ShareReplayScope.swift; sourceTree = ""; }; + E94E15B8094B8996E63FAEFBD6C99720 /* TakeLast.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeLast.swift; path = RxSwift/Observables/TakeLast.swift; sourceTree = ""; }; + E9B4F2F089C5DFA1BA32B3BF56152CBF /* DistinctUntilChanged.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DistinctUntilChanged.swift; path = RxSwift/Observables/DistinctUntilChanged.swift; sourceTree = ""; }; + E9E309A17917F99EE3EDDA7C6FC4631E /* Never.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Never.swift; path = RxSwift/Observables/Never.swift; sourceTree = ""; }; + EAD015DD8E9C07A420E036603D509788 /* XCTestSuite+QuickTestSuiteBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "XCTestSuite+QuickTestSuiteBuilder.m"; path = "Sources/QuickObjectiveC/XCTestSuite+QuickTestSuiteBuilder.m"; sourceTree = ""; }; + EBA40696EFDEEEFEBC6BF379E8AA9571 /* HistoricalSchedulerTimeConverter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HistoricalSchedulerTimeConverter.swift; path = RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift; sourceTree = ""; }; + EC522DB704164394EB7C4A55BEE80E4F /* Empty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Empty.swift; path = RxSwift/Observables/Empty.swift; sourceTree = ""; }; + ED737DB056A7D47F54CC4A64A4C698E0 /* Merge.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Merge.swift; path = RxSwift/Observables/Merge.swift; sourceTree = ""; }; + EDD6181A1F716E62FAA1CAA57CC13BD1 /* ToArray.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ToArray.swift; path = RxSwift/Observables/ToArray.swift; sourceTree = ""; }; + EE7F957D96604AF5FFF02EDDA6996967 /* AtomicInt.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AtomicInt.swift; path = Platform/AtomicInt.swift; sourceTree = ""; }; + EEC35933B0CDB9B68B7E57E274FE9D47 /* BeAnInstanceOf.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeAnInstanceOf.swift; path = Sources/Nimble/Matchers/BeAnInstanceOf.swift; sourceTree = ""; }; + EF0EC64F9FBC94A3DD565035EB1BC6FE /* Platform.Linux.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Platform.Linux.swift; path = Platform/Platform.Linux.swift; sourceTree = ""; }; + EF1010758638D4FDCFAFAB1CB79294B9 /* SerialDispatchQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SerialDispatchQueueScheduler.swift; path = RxSwift/Schedulers/SerialDispatchQueueScheduler.swift; sourceTree = ""; }; + F0149FBB2BEDDF7D59A71B44B5BE9469 /* Quick-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Quick-dummy.m"; sourceTree = ""; }; + F019D06E4B3C576EBA0B9B2FCCFEAECF /* CompositeDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CompositeDisposable.swift; path = RxSwift/Disposables/CompositeDisposable.swift; sourceTree = ""; }; + F093AA58D0ECFDCB5D45209E2AE7975E /* Create.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Create.swift; path = RxSwift/Observables/Create.swift; sourceTree = ""; }; + F133CB22026F00A974203CB61CCED061 /* TailRecursiveSink.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TailRecursiveSink.swift; path = RxSwift/Observers/TailRecursiveSink.swift; sourceTree = ""; }; + F15FE4E192F4951399F34196FBCD8799 /* Pods-DemoTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-DemoTests.modulemap"; sourceTree = ""; }; + F2FE150B74BBAE937000858263EAE139 /* ObserverType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserverType.swift; path = RxSwift/ObserverType.swift; sourceTree = ""; }; + F324E6EF493E4ED6308EE33BDF63ECBD /* ObserveOn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserveOn.swift; path = RxSwift/Observables/ObserveOn.swift; sourceTree = ""; }; + F3949BE60143D652443DDC3A6ADDED88 /* ExampleGroup.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleGroup.swift; path = Sources/Quick/ExampleGroup.swift; sourceTree = ""; }; + F3986CA8C77ABE9248513C630836043A /* Pods-Demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Demo.release.xcconfig"; sourceTree = ""; }; + F402413C0C531BA2B16496516C6C70A8 /* Nimble-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Nimble-Info.plist"; sourceTree = ""; }; + F49D11949FEDEEA45CC2B54B748F02D3 /* Debug.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Debug.swift; path = RxSwift/Observables/Debug.swift; sourceTree = ""; }; + F4E95BD09FCA7388EAE580AAA82C92C9 /* Async.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Async.swift; path = Sources/Nimble/Matchers/Async.swift; sourceTree = ""; }; + F6B140DAEE98DB6D6E5FCE31C6D0AAF6 /* SuiteHooks.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SuiteHooks.swift; path = Sources/Quick/Hooks/SuiteHooks.swift; sourceTree = ""; }; + F926472FBE78C0875B5E34AB5BDE2374 /* Callsite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Callsite.swift; path = Sources/Quick/Callsite.swift; sourceTree = ""; }; + F9FA38E89746E40040711688C9C638E3 /* BeginWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeginWith.swift; path = Sources/Nimble/Matchers/BeginWith.swift; sourceTree = ""; }; + FB75FAE4E6C545CB3CE7E5055296AD99 /* Timeout.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timeout.swift; path = RxSwift/Observables/Timeout.swift; sourceTree = ""; }; + FC6C325BAE01EB3857F38A5602424012 /* PrimitiveSequence+Zip+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "PrimitiveSequence+Zip+arity.swift"; path = "RxSwift/Traits/PrimitiveSequence+Zip+arity.swift"; sourceTree = ""; }; + FCC52929F7301BB1D01CD3A10C78FB4A /* DelaySubscription.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DelaySubscription.swift; path = RxSwift/Observables/DelaySubscription.swift; sourceTree = ""; }; + FD3B56B47E95664DDDD1B7AE73F89FE1 /* NSObject+Rx-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "NSObject+Rx-prefix.pch"; sourceTree = ""; }; + FDC6DB082462C04F43B7E12106F7F8D9 /* WithLatestFrom.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = WithLatestFrom.swift; path = RxSwift/Observables/WithLatestFrom.swift; sourceTree = ""; }; + FFFC2994E0C251CEEB4E6EBF474A9807 /* SchedulerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SchedulerType.swift; path = RxSwift/SchedulerType.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 02575E8E5526E395222B8E6986F55C36 /* Frameworks */ = { + 1782CC589832E1A65308BFBED178F0C1 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F3D08045C8E29935EA0B91BCE94B951F /* Foundation.framework in Frameworks */, + BC87FE8A6FA3788EBCC12308C5353695 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 22249B7EC004189037EC4DC74DA5AC70 /* Frameworks */ = { + 3928EB848CAFE6B2A89FADAFD3998ABA /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A6D8B1FECC9C49BC75F4FFEDD6DD86AA /* Foundation.framework in Frameworks */, - 205B3DFADA2BF30BFF78E1EC996EE385 /* XCTest.framework in Frameworks */, + 085E5D1B0B5419D791BEC14829EA5A5C /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 53AE72D620A2271AD1024079E2C920E3 /* Frameworks */ = { + CAC69611971DF6747042F733134319AB /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3D7E3805A91D58036235B9A70333A9AE /* Foundation.framework in Frameworks */, + E838204059BEC029C142146899A07C28 /* Foundation.framework in Frameworks */, + 00DFF8BC77E1EABBE00639D3C86668C4 /* RxSwift.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 7F682A9E296D139B5A1E649989FB51D0 /* Frameworks */ = { + D3E84765C87A533730FE9D01CF07174F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A3209494C8B29F390AC14D95519460A8 /* Foundation.framework in Frameworks */, + 4A518B07303F24DA77B98BD14C1F8B9D /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - A1DF0937E05CA7B08FF16B515B2D0108 /* Frameworks */ = { + E0FF1E83143A05DF24BC4BFE5FDB7A9D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8DB82AD773179E60305CE27BCD1A089E /* Foundation.framework in Frameworks */, - D66898CEEBBB911BAD9BD1FD9179A7B5 /* RxSwift.framework in Frameworks */, + 10BF98CE1607BC08BE99E8C951B550D5 /* Foundation.framework in Frameworks */, + 73A3005F9A9007AB0E5B36B8ADD4B71D /* XCTest.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - DF3AF52FC03889BB23520BD9B51A5DCC /* Frameworks */ = { + F9F8CFCD3C9798C561B7623608D3C821 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2A53CE49E35851735AC464248730EF5A /* Foundation.framework in Frameworks */, + 21E645D02DDA948AB2A6C373DEA32FFA /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0F33FF97839F84AA56FCBC831C93EC68 /* RxSwift */ = { + 136DC34A2F304BA734391B4A5978B76E /* Pods */ = { isa = PBXGroup; children = ( - 9D7B9B6643C71DDDBC3A8B7C0B60A880 /* AddRef.swift */, - 160AC927638F4BB5403FCDA183972881 /* Amb.swift */, - 9966B286269124E595FC35634650F842 /* AnonymousDisposable.swift */, - 2A82807BF1FD7E2A42F11A48277F0D4B /* AnonymousObserver.swift */, - 329F6D3325A0CFDCA45B42B53996B676 /* AnyObserver.swift */, - 3D8A88E7CC4DB576335240864037BBF5 /* AsMaybe.swift */, - B5C6E9FFEAEA19E766DE091CA2CED49B /* AsSingle.swift */, - B9C10D0D490E840FD368480CA5687CB9 /* AsyncLock.swift */, - BE7E9035154A3B24B6F7BF064B34D961 /* AsyncSubject.swift */, - 354D24E958A393E94828843EB7BA53E7 /* Bag.swift */, - 9CF7F13A70415793AAB045D2F65EC7FF /* Bag+Rx.swift */, - 3C716D15548A214C7698156BFC17719D /* BehaviorSubject.swift */, - 47825406D7C5A6DEA89B0AF2C056C79F /* BinaryDisposable.swift */, - 4198195DE6196A273806238279B8F604 /* BooleanDisposable.swift */, - 844DD75ACFEDFA15534455AAED0E3653 /* Buffer.swift */, - 48CA898E26C422AA68784F179A306788 /* Cancelable.swift */, - DD9A6F50B048B75D8EA7E457FAB2953F /* Catch.swift */, - 797BA25F337844CAD75AED0CB57A95CD /* CombineLatest.swift */, - 0355709C623A5CE75C62DADE7ED13864 /* CombineLatest+arity.swift */, - 08B5B59E45712A057FDA37338206B27D /* CombineLatest+Collection.swift */, - 7C9205A34A84D74C21CDC8A2C00CE7C8 /* Completable.swift */, - D28E1A1F23E60EF795CDF40CC4BACEA8 /* Completable+AndThen.swift */, - 164F3AB078C274155C74354ABDB631F7 /* CompositeDisposable.swift */, - 6FDA83E1F8E3CEA2D465E20D3214B773 /* Concat.swift */, - A3337AADFE03A8F4AD76EAA5747827B5 /* ConcurrentDispatchQueueScheduler.swift */, - 42F5A272707A1F50C050DE72AB2003B1 /* ConcurrentMainScheduler.swift */, - D4713F6654D54AB72593C74FC5B61E96 /* ConnectableObservableType.swift */, - 77BF4BFBEE7621F16B88B263CA2C38CD /* Create.swift */, - FDF20B48B6E7109EE06F817D2F4FD91B /* CurrentThreadScheduler.swift */, - 16A0AAA6F245B75A656A4B2518C7335B /* Debounce.swift */, - 77CD36657390EB761A89CC16CFCF007D /* Debug.swift */, - D9ABE8F53EEDF350CE9E98036A1388B9 /* DefaultIfEmpty.swift */, - 62E964D3332805902ED02A58CEAD6763 /* Deferred.swift */, - 682299A86071B7158145932CB0D1BBF5 /* Delay.swift */, - 6CA979333254652BCD92B81BE2A52273 /* DelaySubscription.swift */, - 12E109B04A41B36246DD8B544AF9B7EC /* Dematerialize.swift */, - A2189B77DF040C86FCFF5D369FB3174E /* Deprecated.swift */, - B21EC49FB786C1D81036492BE569EC3D /* DeprecationWarner.swift */, - 5605D21C0A02C9A590028A83CFF730DC /* DispatchQueue+Extensions.swift */, - 8618BABC2E115BF6DDD424871D134F62 /* DispatchQueueConfiguration.swift */, - 427E782658A674CCF0CB37E38704950A /* Disposable.swift */, - 3AFEE7880FB8439DCD66B8C502896611 /* Disposables.swift */, - C3283B87E27D08583CBA1ECF30756E5F /* DisposeBag.swift */, - BE15C6D1844F1E64D2B1AFD049A9D79A /* DisposeBase.swift */, - 24D1A75476250C2A48E7F5448FAF09A9 /* DistinctUntilChanged.swift */, - A6303AD957AF6EB732CD23753FEFD3A0 /* Do.swift */, - 69C14CC6F1FDF38F363AFC56BA6F3308 /* ElementAt.swift */, - 074852CF0825C588D1A3D4BAFFF336F8 /* Empty.swift */, - 2F14ADA04EC375F9355811F7FB479F30 /* Enumerated.swift */, - 8AC713BD372892587446BB06FED1F3EB /* Error.swift */, - 363D20503FA622D74B2953ADE9EF5BC9 /* Errors.swift */, - 54E70EA13F7FA77DD8FA0B1F55597CE3 /* Event.swift */, - DC800C898D2D37EE433653C10CD924F4 /* Filter.swift */, - A83B3BD4D27B914EF152352BB94DF1A0 /* First.swift */, - CDC007682565B2949752002198645C43 /* Generate.swift */, - D1EEE78514F442CE33602A647235C73E /* GroupBy.swift */, - 1146875A7BF6594AA772516883D1AC4D /* GroupedObservable.swift */, - E2CEAB6772D554FD8158AA584BB52908 /* HistoricalScheduler.swift */, - 4CA2B4351FE4514079E5C27A7CC047C5 /* HistoricalSchedulerTimeConverter.swift */, - 77E0E76A1C543895177E899C435E069A /* ImmediateSchedulerType.swift */, - 1F9A5783A2A7CE35D48E4AAE5C202487 /* InfiniteSequence.swift */, - E38701C3B0A94C31245884CA79DE9371 /* InvocableScheduledItem.swift */, - 5C22E5D2E05F8DF2210DCECD0FA648DA /* InvocableType.swift */, - 114E68352CD984771851423579F40A2A /* Just.swift */, - 8EEACE83E0A6A980E3B00BB915449B7E /* Lock.swift */, - 34F0D73D9BD0515FA3306EFC358189E8 /* LockOwnerType.swift */, - D5552815B1D6B85B22773B342182410F /* MainScheduler.swift */, - DAB8BAF401ECC4A253D755B27763BC4B /* Map.swift */, - 693FA9B96E88629D39696CE901394BC4 /* Materialize.swift */, - 6671BAA13CD18FEE8106C9712F03FA43 /* Maybe.swift */, - 591AB3255214FAC8B04C1178BF4AB315 /* Merge.swift */, - D1C08FDD640F8069F0780569F49E173C /* Multicast.swift */, - E8E5D7A9D671C721C1E12793E2003311 /* Never.swift */, - A9F5B8284085D8FECC48F4A0F89485D8 /* NopDisposable.swift */, - 4B256F24A6D99A8F066F044EB158EADA /* Observable.swift */, - AEECCD6C2C998EE81C97DF26F90C00A3 /* ObservableConvertibleType.swift */, - F42A6C4D50D4793EB419FC568B796501 /* ObservableType.swift */, - 470B86DFF7ED33C296F43DACA490CE9C /* ObservableType+Extensions.swift */, - 6413E762A5EBA3739D651907C4AFE4AE /* ObservableType+PrimitiveSequence.swift */, - AC444D5DB3186C2696883C395754E536 /* ObserveOn.swift */, - 8157656B0734D038A9E7480F90A400FB /* ObserverBase.swift */, - 66807E6510B06C0EB6C8084D8262B245 /* ObserverType.swift */, - C91694859FC7B8E83B4294F7DEE91417 /* OperationQueueScheduler.swift */, - B9874781A641D9A2DC14AF764B2E138F /* Optional.swift */, - A1A7DA6A081CAE89BEE14C9BC4655DAA /* Platform.Darwin.swift */, - 14254979BB7DBDECF8A42729EB0DAD3A /* Platform.Linux.swift */, - 29A6E3F42A38B96DC41F4AD405047BAE /* PrimitiveSequence.swift */, - F7A9320BEA924A5F642EFD71C5422EF8 /* PrimitiveSequence+Zip+arity.swift */, - 2319471065A9D1CD76F47F65B85C2B9A /* PriorityQueue.swift */, - 36A538752EB17DCE0DB682EF8DE237B8 /* Producer.swift */, - EAED59CA25B110A7B74B373CA11A5DD7 /* PublishSubject.swift */, - 03A68F151BE54A2F04AB50E53B935D79 /* Queue.swift */, - EAEF29A6102B5568BD9AAFF638630D8D /* Range.swift */, - AA4A119E40151F454272BA8D2E6DDE07 /* Reactive.swift */, - 1933D8E0310F94603B8FD9851FD5FE1B /* RecursiveLock.swift */, - 143DC6F29498D8013E6BEC40FBA5E02C /* RecursiveScheduler.swift */, - 70768FAAD304AE8702BB00F59F1D0DC3 /* Reduce.swift */, - 3E4E005EEF95B0D83D99B6692A1350BC /* RefCountDisposable.swift */, - 953602682825A527034579F7C76FE490 /* Repeat.swift */, - E6122E3E38B44456ED3B5B47B73EB2DC /* ReplaySubject.swift */, - 54C8B8F19EE0A378AFB47AEF4F46106B /* RetryWhen.swift */, - F4DC9433907411D9872E64D72EC0EB8C /* Rx.swift */, - 63155FFB4E0398159B73FA1AB4B35DBE /* RxMutableBox.swift */, - 8B445A2DE8B41E87F9063B9231FBBF8E /* Sample.swift */, - AAA662D89BF735BEDA1820FF2B1259DD /* Scan.swift */, - 133B81FBCBE2867E65695417011A8A0F /* ScheduledDisposable.swift */, - 240BA3650D70E820ABF9412BCA527E91 /* ScheduledItem.swift */, - C53E3F10D7DBBB1C92DB551BE4E55FA3 /* ScheduledItemType.swift */, - B72A9772A6F1DAC3C6BE21ABCD1EB7A1 /* SchedulerServices+Emulation.swift */, - 25E927D100A94EBC1CFB1D2C75F540CC /* SchedulerType.swift */, - 359EF32513E15E5F9736472E34E8BA2F /* Sequence.swift */, - 50AF8513B9AB383E48A62162FCE5CDCD /* SerialDispatchQueueScheduler.swift */, - 9C481F203A3D82E046D561B227D7708B /* SerialDisposable.swift */, - FE060340E5949C3EA68028FFE2F6FAFD /* ShareReplayScope.swift */, - C0C55A49EBBDEA751964AB79B51D5144 /* Single.swift */, - 7891998A72CC5885870EAA5C1DB6090D /* SingleAssignmentDisposable.swift */, - 8BCCD69666E088C50F6C38EA6CD1AB4B /* SingleAsync.swift */, - E730DFEBE1FC3034DE9A7F4481D1B76A /* Sink.swift */, - 88384211B224E7DC58855FA587A676A7 /* Skip.swift */, - C1701A6D3E2D2886092827A97CB2B50E /* SkipUntil.swift */, - 9B28044CA00CB23EC2407CC4122C4D28 /* SkipWhile.swift */, - 87E3408C3DA17809FD2D1AF79092FB61 /* StartWith.swift */, - D1BB4BBDD3FA1FE0AB0D5CD935421FE9 /* String+Rx.swift */, - B8101628CF72189785B691AC6B4E0289 /* SubjectType.swift */, - 4B5AE0479796206409FCAA0309BF6CDF /* SubscribeOn.swift */, - 969E229627CEB3E2BB5AC2D0A021B227 /* SubscriptionDisposable.swift */, - 2F92503F46B55D4F4A3BFD15E7179C81 /* SwiftSupport.swift */, - E72D33CF85D0E14163C30C93662CCF51 /* Switch.swift */, - 1E03BA62093D7BC8C7CF21D07B63CE87 /* SwitchIfEmpty.swift */, - A7EE7E5BED1F5444680691BAC2DC2217 /* SynchronizedDisposeType.swift */, - 5F99207603EB59E03D49A87AD6985D75 /* SynchronizedOnType.swift */, - FE18D3D48A514F0873D97857ADFD5467 /* SynchronizedUnsubscribeType.swift */, - 893DFA6FA782016C4ADC97E04614AA64 /* TailRecursiveSink.swift */, - 6CEB04C02E607AA3AD97B6F71EBAFF25 /* Take.swift */, - 5FEAFE56F3ED5F6E99CF9B24253F2421 /* TakeLast.swift */, - 8E69C9350D2F7C715612EAA27FE74850 /* TakeUntil.swift */, - D14B39EDDF06E204809CFC94AFFDEB86 /* TakeWhile.swift */, - 22B1203DA40864EE94B6C1E277231E5E /* Throttle.swift */, - 4B9E8191074B83A31E03235A74753E1C /* Timeout.swift */, - 939094E692477DC2564BA8E062FD8322 /* Timer.swift */, - 6F7E207A4F51F9EB4921B778F527FD38 /* ToArray.swift */, - 3A80966CC4EC9818649F9C9E2CFC0741 /* Using.swift */, - 5A65F0423427F1590B3974881584BA82 /* VirtualTimeConverterType.swift */, - 5F1000398A937193871996A3F20A1462 /* VirtualTimeScheduler.swift */, - 84693A87C5C5D2F05C08327D2A4B001D /* Window.swift */, - 00C13AB47B67BD647DDFA8EB325A17A5 /* WithLatestFrom.swift */, - A8E5FDC2B2154419FF94FF3678B00B02 /* Zip.swift */, - 0EF5A94E2EF4108B8AAF8ED75F7A1872 /* Zip+arity.swift */, - 370E28D8AB2F773D22F0F14A4380D8D1 /* Zip+Collection.swift */, - CBC6899AF7A50C3E8797239BD8628D5E /* Support Files */, + DA8F745E1DE43B25A809E999591B6C93 /* Nimble */, + A0912208EEECD550BBFDE32C7564ADE1 /* Quick */, + DEDAC93169F2C3A4EE2CED6EA58D5E4A /* RxSwift */, ); - name = RxSwift; - path = RxSwift; + name = Pods; sourceTree = ""; }; - 36F1889F15D85BA27583E8E62FA67202 /* Support Files */ = { + 2ADB74B48E9C757ED612C2D237C50982 /* Support Files */ = { isa = PBXGroup; children = ( - 445E569FB550D10E1D62648BF25BB32D /* Info.plist */, - 399E5C6EE42A10DDD4470126DBF1B820 /* Quick.modulemap */, - F98E837E3836FD16E13D4A18CEED912B /* Quick.xcconfig */, - 80D7E59A7AB5A6E0A9F70553026A1432 /* Quick-dummy.m */, - E4A14CA2097D3428011144D158327644 /* Quick-prefix.pch */, - 6FA2AE3513A9716B710893D98246801C /* Quick-umbrella.h */, + A116D1B52080E4C877AE8FF8525C1E66 /* Nimble.modulemap */, + 3FD4ADEC48199E79E1F9D299F12BC92C /* Nimble.xcconfig */, + DD6299DF68B27F3BA2F904C06D884591 /* Nimble-dummy.m */, + F402413C0C531BA2B16496516C6C70A8 /* Nimble-Info.plist */, + 29B5670BC4705C072326DAA05F608700 /* Nimble-prefix.pch */, + 9EB1694C39E6DE003004873B619DCDE4 /* Nimble-umbrella.h */, ); name = "Support Files"; - path = "../Target Support Files/Quick"; + path = "../Target Support Files/Nimble"; sourceTree = ""; }; - 408E5B954D249322F80B1E494713717A /* iOS */ = { + 2B2B453D93117E6A5C8BD2B99D4DE1EF /* Pods-Demo */ = { isa = PBXGroup; children = ( - 4629AD8C523D2FDA5C72258FAA2846DC /* Foundation.framework */, - FFC65524FB644895BDCBBA0657F2FA07 /* XCTest.framework */, + 1CE558E6171D431907FFBC0E230BA1E1 /* Pods-Demo.modulemap */, + 5853A1F9E428570888855D70D2F62266 /* Pods-Demo-acknowledgements.markdown */, + 3AF2F451666410366F2DEB794AA75CBA /* Pods-Demo-acknowledgements.plist */, + 2E14599B8E960E81610BDD82AABE7DC8 /* Pods-Demo-dummy.m */, + 330C2F743555602F00A672BFCB32DF69 /* Pods-Demo-Info.plist */, + 1A445804FFB07BE08F37DABA6FBD5E7C /* Pods-Demo-umbrella.h */, + 6798E3801E9E92C404A5A73C9BC8D9E1 /* Pods-Demo.debug.xcconfig */, + F3986CA8C77ABE9248513C630836043A /* Pods-Demo.release.xcconfig */, ); - name = iOS; + name = "Pods-Demo"; + path = "Target Support Files/Pods-Demo"; sourceTree = ""; }; - 6F625147604D1173EF763610E131A8DB /* Development Pods */ = { + 686C3D5C13B78AE47D68A16C65AF0433 /* Support Files */ = { isa = PBXGroup; children = ( - B67F486A50FBE553DE63EBD9ABA64FA5 /* NSObject+Rx */, + 891BF6C52A161F6ED8C016969CE97BA2 /* Quick.modulemap */, + D5CBDE79352C4185F6C726CBAB8DE17F /* Quick.xcconfig */, + F0149FBB2BEDDF7D59A71B44B5BE9469 /* Quick-dummy.m */, + 9BB202E5E8D772663A53F4A8AF528512 /* Quick-Info.plist */, + 5EDFCCE9101470BB7E6D840B1A5E0913 /* Quick-prefix.pch */, + 40E134A10DD4AD633309F267288BEABA /* Quick-umbrella.h */, ); - name = "Development Pods"; + name = "Support Files"; + path = "../Target Support Files/Quick"; sourceTree = ""; }; - 71960E4308F9053FB1C91EDDE6860ECA /* Pods-DemoTests */ = { + 79B4370D3DE6EFA2AFACFC8DA35B9467 /* iOS */ = { isa = PBXGroup; children = ( - 899F7D96738B594A432CEED858F6FF94 /* Info.plist */, - CA7749509FFC4CF987FE94C109993700 /* Pods-DemoTests.modulemap */, - 137F93901D86DD727245232DB84C0501 /* Pods-DemoTests-acknowledgements.markdown */, - A90D775A3043D21572B4AF438A91629D /* Pods-DemoTests-acknowledgements.plist */, - 6B986DA8565410A1FBB275EBDC22173F /* Pods-DemoTests-dummy.m */, - 399B006E2977C12A104E16C77804FD8D /* Pods-DemoTests-frameworks.sh */, - 4CB22A9BED60505A355D13240451A9E0 /* Pods-DemoTests-resources.sh */, - 947511070799896770CAF73BCB20B722 /* Pods-DemoTests-umbrella.h */, - 9C86746B7782939999EF488A707ED793 /* Pods-DemoTests.debug.xcconfig */, - CEE8FAC3960020923D811F92029719E4 /* Pods-DemoTests.release.xcconfig */, + 9203674664692F426565EC45CDDBF5BA /* Foundation.framework */, + B48F5FB717AC6F300389C0FFBD2B9698 /* XCTest.framework */, ); - name = "Pods-DemoTests"; - path = "Target Support Files/Pods-DemoTests"; + name = iOS; sourceTree = ""; }; - 7DB346D0F39D3F0E887471402A8071AB = { + 8EE211F70FD50E405ACC1221E0BC5645 /* Support Files */ = { isa = PBXGroup; children = ( - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, - 6F625147604D1173EF763610E131A8DB /* Development Pods */, - B3BCD19CE5DB1376ED6BCF153307B567 /* Frameworks */, - 95DD4BF984F30B768395992C21F1F8BE /* Pods */, - D89AE27D1A90CC903A83BCF24DB99EC6 /* Products */, - 8BD2AF98586608E9C5E4AC2EE85150B7 /* Targets Support Files */, + E2604B6B85493BB7D113A76F39B36F98 /* RxSwift.modulemap */, + 25706706F8C3EDE14C88BED0DF4AB34F /* RxSwift.xcconfig */, + 419DEDD652E5BD17A6264BABB02A555D /* RxSwift-dummy.m */, + 527413A2EB579A7CB3F08E371A559141 /* RxSwift-Info.plist */, + 7F00072FC535659EF6F6711EE3E4F92B /* RxSwift-prefix.pch */, + D7F6BAD109E4B77AC3D38280441B5277 /* RxSwift-umbrella.h */, ); + name = "Support Files"; + path = "../Target Support Files/RxSwift"; sourceTree = ""; }; - 87C3E998A375EC91276A6CB7FE1B9115 /* Support Files */ = { + 9F379B2E41548288E34CBD9D95054C0F /* NSObject+Rx */ = { isa = PBXGroup; children = ( - A54350F518A110AD397EF8CFF0150CAD /* Info.plist */, - 1A4E7DF30B61AC226D85BBEF42D356F3 /* Nimble.modulemap */, - 7BAABE3D70B15D706F0E0BC9A5AA411C /* Nimble.xcconfig */, - 77EF7A3BA578E9A34C4A4608778AAD11 /* Nimble-dummy.m */, - 6D963093B3E8D12443FDB45479F08481 /* Nimble-prefix.pch */, - 2802F374F28EDC38A097F63405F76D6E /* Nimble-umbrella.h */, + 80572ECE5B752DA94194B3642DF15D04 /* HasDisposeBag.swift */, + 7E669816937CF59045E459D9ED49359A /* NSObject+Rx.swift */, + B4B2F4BE9B34FD5580BA5F392AABA54D /* Pod */, + C908A47B6737844C05CD22569968F750 /* Support Files */, ); - name = "Support Files"; - path = "../Target Support Files/Nimble"; + name = "NSObject+Rx"; + path = ../..; sourceTree = ""; }; - 8BD2AF98586608E9C5E4AC2EE85150B7 /* Targets Support Files */ = { + A0912208EEECD550BBFDE32C7564ADE1 /* Quick */ = { isa = PBXGroup; children = ( - BADBF3A0E4C3B3010DD70FEB4AF18153 /* Pods-Demo */, - 71960E4308F9053FB1C91EDDE6860ECA /* Pods-DemoTests */, + 27C708952D512115F713119550860048 /* Behavior.swift */, + F926472FBE78C0875B5E34AB5BDE2374 /* Callsite.swift */, + A2DD534995FC6FCBDC0EA5817B05B7E1 /* Closures.swift */, + 15E5914EF2A1F09493BAF40F329B7C9F /* Configuration.swift */, + 0EB62B53C4C45333651904E570B6B4FD /* DSL.swift */, + A4EFFAD6B5A918722C8C62CE8BB5CDF4 /* ErrorUtility.swift */, + 22278AF12F067909FA575ACD18B69E53 /* Example.swift */, + F3949BE60143D652443DDC3A6ADDED88 /* ExampleGroup.swift */, + 2FC3DB461B28F2357DB3221F6A36BACB /* ExampleHooks.swift */, + C95406072BED9A8CF9FCFA764E92282A /* ExampleMetadata.swift */, + 17C68372DD42CDEB42628569784CB9BC /* Filter.swift */, + BA05B093FF4C3C2C1BEB9D082D1089FC /* HooksPhase.swift */, + 86CB05CF1CDB882B295FF2558772B744 /* NSBundle+CurrentTestBundle.swift */, + A56AE6A582FB021ABD8CF3968D2CEEC6 /* QCKDSL.h */, + 340F762CA16D9DA5F8B769F02F1CC6C0 /* QCKDSL.m */, + 78030D0464F3ED40785E91AEE4F7B13B /* Quick.h */, + C5BD61BC458D529EC17262DE3F100F23 /* QuickConfiguration.h */, + 7A34FEA5B12FEAFE57D2706ED347939B /* QuickConfiguration.m */, + 81B348D58BBB252BA537B9BC53E5E8B9 /* QuickSelectedTestSuiteBuilder.swift */, + 0A1B74E1DB9779AA8F3DE87108D26C8A /* QuickSpec.h */, + 2492390A030EEDAB0016F4F5126DEFAF /* QuickSpec.m */, + A8A6E4406CE90AAEAE552B2E2AE682FD /* QuickSpecBase.h */, + 20D6B60706BFA445FEED480BCDA5AB30 /* QuickSpecBase.m */, + D5D1998DBCCE80042B0FD7C534021B42 /* QuickTestSuite.swift */, + B18115DA18C19A68FF96C5585CA275F7 /* String+C99ExtendedIdentifier.swift */, + F6B140DAEE98DB6D6E5FCE31C6D0AAF6 /* SuiteHooks.swift */, + 2CE692EC061E31389090FF1898F0B956 /* URL+FileName.swift */, + 54500F67CA02884681B5614FE3681225 /* World.swift */, + 0A1A01565E72028CC41B0C12ABFBEDA6 /* World+DSL.swift */, + EAD015DD8E9C07A420E036603D509788 /* XCTestSuite+QuickTestSuiteBuilder.m */, + 686C3D5C13B78AE47D68A16C65AF0433 /* Support Files */, ); - name = "Targets Support Files"; + name = Quick; + path = Quick; sourceTree = ""; }; - 95DD4BF984F30B768395992C21F1F8BE /* Pods */ = { + A4F10FA27A331F1E2216AF848ADD1218 /* Development Pods */ = { isa = PBXGroup; children = ( - E8D4F63A43597E5B057735FE3037E199 /* Nimble */, - B94E9C7AB177A25310933324ED00CEC6 /* Quick */, - 0F33FF97839F84AA56FCBC831C93EC68 /* RxSwift */, + 9F379B2E41548288E34CBD9D95054C0F /* NSObject+Rx */, ); - name = Pods; + name = "Development Pods"; sourceTree = ""; }; - B3BCD19CE5DB1376ED6BCF153307B567 /* Frameworks */ = { + B2DED95F5A5F32F5C3FB014CB9E6839B /* Products */ = { isa = PBXGroup; children = ( - CC74AA969E8AB63D1EB8807A90B9E291 /* RxSwift.framework */, - 408E5B954D249322F80B1E494713717A /* iOS */, + 01B587407E8068DE98971366D428A0FA /* Nimble.framework */, + 801A90D4FBC3C50CA5C669EF264EEB4A /* NSObject_Rx.framework */, + A6920670AC8745CF019BDE92265FBD9B /* Pods_Demo.framework */, + 8D8CAE5BC71CB290315BB8CCE54F0149 /* Pods_DemoTests.framework */, + 99B58D683D333643680081A992D5405E /* Quick.framework */, + 703E9D7D28980AA24200E4E3AFAD81D5 /* RxSwift.framework */, ); - name = Frameworks; + name = Products; sourceTree = ""; }; - B67F486A50FBE553DE63EBD9ABA64FA5 /* NSObject+Rx */ = { + B4B2F4BE9B34FD5580BA5F392AABA54D /* Pod */ = { isa = PBXGroup; children = ( - 10B10CE857DE60321E2473DA326FB12B /* HasDisposeBag.swift */, - 7DA0C14A9787B97E9C5E661EA66B8618 /* NSObject+Rx.swift */, - DE415C5497CEFD2D5E5E184469B5B3CD /* Pod */, - F8ABFC704B76502CD8EE98DE6BC6ED77 /* Support Files */, + 6CC4D50DEEAF80E5F4E7BD524FA2FBE1 /* LICENSE */, + E2A86986464892D969668BEEFB36C9BE /* NSObject+Rx.podspec */, + 50A130B45DC117C0E84097C8E9CAC997 /* Readme.md */, ); - name = "NSObject+Rx"; - path = ../..; + name = Pod; sourceTree = ""; }; - B94E9C7AB177A25310933324ED00CEC6 /* Quick */ = { + BF404B4A44F157452981CF6926F7CADE /* Pods-DemoTests */ = { isa = PBXGroup; children = ( - 92A189AEA8097CFFFDB0E5804C3C1C71 /* Behavior.swift */, - 8B0CA0F1FC4FC57170B89F6C07D3B2DE /* Callsite.swift */, - B531259A56F7748DE2B778579A87338F /* Closures.swift */, - C210218A9F8486C724AF000E9BC9C37A /* Configuration.swift */, - BB78C52CD56B4FA18B083FA7296FCB0C /* DSL.swift */, - 93E44F300CBA04F70194186384480022 /* ErrorUtility.swift */, - 7F9D0F9A639D77A50EFB45E3EEF3284E /* Example.swift */, - FBF3EE16F855C8DBB30D15A2D3D1AFDA /* ExampleGroup.swift */, - 15BB44DFD228A90F805B9FEEBA7A4E80 /* ExampleHooks.swift */, - 1C813EBE18B28E147E2D2A4E1315ED6B /* ExampleMetadata.swift */, - 16AA2AC65F9FD2C9F028886DA5DF992D /* Filter.swift */, - CE0635D052A48DC2468609F1AC2E6F7D /* HooksPhase.swift */, - FCD9AA26C47D968373890A1FB6485742 /* NSBundle+CurrentTestBundle.swift */, - D5271EE6500A485B24AB3878D7B2CA7B /* NSString+C99ExtendedIdentifier.swift */, - FFA5A3E4C4EA8083112AB03B934B3322 /* QCKDSL.h */, - 1B422D4026116E98349BC299E86A115F /* QCKDSL.m */, - DC1EC9968F9F25CDF86C277FB0995035 /* Quick.h */, - 5291FFF3A591A584E3FD0C0D57FB22B0 /* QuickConfiguration.h */, - 892AE6FA0CC8D00329D80A079A2CC781 /* QuickConfiguration.m */, - 047E23E180142B6FADC17E1E69757B2C /* QuickSelectedTestSuiteBuilder.swift */, - DA8D444BAF7554FCBEECBC80AD3B8A5F /* QuickSpec.h */, - 46A0731852D50F1DB5BAFB19F88EAB8C /* QuickSpec.m */, - D8D94B3AF1FAE7195873672682DD65CE /* QuickSpecBase.h */, - E9589240691151AB6A2D4C860573AD53 /* QuickSpecBase.m */, - 0217A0A42340465992FEC11F73C50759 /* QuickTestSuite.swift */, - B70E02E24CED64298A1B42C70BA76CA8 /* SuiteHooks.swift */, - AAA9BB2D4A6C2F84F3A205B1635BBA99 /* URL+FileName.swift */, - 8D3AA38902E6E9E06B7493AB312E5236 /* World.swift */, - 98A0F18D7BA4CD704304888CCF78EB82 /* World+DSL.swift */, - 2352A949CDB3DB99563DEEFB6A3C4B0C /* XCTestSuite+QuickTestSuiteBuilder.m */, - 36F1889F15D85BA27583E8E62FA67202 /* Support Files */, + F15FE4E192F4951399F34196FBCD8799 /* Pods-DemoTests.modulemap */, + 39C2FBBD4335AF46D3FB91038FD4A912 /* Pods-DemoTests-acknowledgements.markdown */, + 59FD319EE04B8C01BB6A46E534466872 /* Pods-DemoTests-acknowledgements.plist */, + A7F9C0A828FF93A4C5286724F02EFD3A /* Pods-DemoTests-dummy.m */, + 1282B1B0ED6B31216E1EFA67179598ED /* Pods-DemoTests-frameworks.sh */, + 2037A14401A1B4BF81E786F530D287C1 /* Pods-DemoTests-Info.plist */, + 38E7CF3EB74343DE4C7F0A783416A3C2 /* Pods-DemoTests-umbrella.h */, + 0FB3EFBA229C8E3BC633A6EE8DA748DB /* Pods-DemoTests.debug.xcconfig */, + E29DE8A204E52E82115DB7B194A3771A /* Pods-DemoTests.release.xcconfig */, ); - name = Quick; - path = Quick; + name = "Pods-DemoTests"; + path = "Target Support Files/Pods-DemoTests"; sourceTree = ""; }; - BADBF3A0E4C3B3010DD70FEB4AF18153 /* Pods-Demo */ = { + C31447361261CCBAADD06B95F2FFD3AD /* Frameworks */ = { isa = PBXGroup; children = ( - A9D57B9A5440D76082DF3AD2C1289F7B /* Info.plist */, - 4906E7F6E307512D338DAAB9808A5980 /* Pods-Demo.modulemap */, - 9035AB3B1B87BE64DA7F6D62D4004A32 /* Pods-Demo-acknowledgements.markdown */, - E591EB13105E3738351C6AB010D7A223 /* Pods-Demo-acknowledgements.plist */, - 61FCD9F5AFAA918AE18E0F1754E59089 /* Pods-Demo-dummy.m */, - 43B0514188824A8DF9BE4525F4C0AAF7 /* Pods-Demo-frameworks.sh */, - A6CB3D9F45EE9BAEB738CFCA213A7D9A /* Pods-Demo-resources.sh */, - ED4652D686FFA05E4CFD837F5DD948A0 /* Pods-Demo-umbrella.h */, - B3B1FE08B862EAB796DF4CF965FDAF54 /* Pods-Demo.debug.xcconfig */, - 8770613CD8D6FFEBC01B5906D0AE2C99 /* Pods-Demo.release.xcconfig */, + 1CF52CE2305F254C916316AE08AA41DF /* RxSwift.framework */, + 79B4370D3DE6EFA2AFACFC8DA35B9467 /* iOS */, ); - name = "Pods-Demo"; - path = "Target Support Files/Pods-Demo"; + name = Frameworks; sourceTree = ""; }; - CBC6899AF7A50C3E8797239BD8628D5E /* Support Files */ = { + C908A47B6737844C05CD22569968F750 /* Support Files */ = { isa = PBXGroup; children = ( - 91E4AEE60C203947FD25B20886A6938C /* Info.plist */, - B40B43EEE8457F3CC4D6A4F0FA11471A /* RxSwift.modulemap */, - 2D752ECA4EA765B6DC3853D1F8DE902C /* RxSwift.xcconfig */, - 8F3C35BAE591AFECEB05635881E769C9 /* RxSwift-dummy.m */, - 42CC3F1254541F29401A9CEAF5840368 /* RxSwift-prefix.pch */, - 95B816FDFB9914FDB5932A277BF49BE8 /* RxSwift-umbrella.h */, + 88C92136A05C9E40786905B32D20F90F /* NSObject+Rx.modulemap */, + C6F16D155F41C66237C1E97FE8EA6828 /* NSObject+Rx.xcconfig */, + C18CD2F7824016ABD4FE096813C8BAA6 /* NSObject+Rx-dummy.m */, + E554E11903685C6F5C1CF9CDD1571F04 /* NSObject+Rx-Info.plist */, + FD3B56B47E95664DDDD1B7AE73F89FE1 /* NSObject+Rx-prefix.pch */, + 5371702C71D5AB22A49E8DC1098CE566 /* NSObject+Rx-umbrella.h */, ); name = "Support Files"; - path = "../Target Support Files/RxSwift"; + path = "Demo/Pods/Target Support Files/NSObject+Rx"; sourceTree = ""; }; - D89AE27D1A90CC903A83BCF24DB99EC6 /* Products */ = { + CF1408CF629C7361332E53B88F7BD30C = { isa = PBXGroup; children = ( - F996C636C4BFB2FF8976D728BB62B899 /* Nimble.framework */, - AB12C0F86FEBA9F3834D32312A15B28A /* NSObject_Rx.framework */, - 7476D59404D46DDD01ACC0AF798AA489 /* Pods_Demo.framework */, - C493BBD5CFCB280EB8EF00B929156F28 /* Pods_DemoTests.framework */, - 01F89D13AB5B86376E75FEE6A9DBA004 /* Quick.framework */, - E0BCA2F92CA4AF4599FC7E2A65DD2420 /* RxSwift.framework */, + 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */, + A4F10FA27A331F1E2216AF848ADD1218 /* Development Pods */, + C31447361261CCBAADD06B95F2FFD3AD /* Frameworks */, + 136DC34A2F304BA734391B4A5978B76E /* Pods */, + B2DED95F5A5F32F5C3FB014CB9E6839B /* Products */, + D4A562471DF152C8AF683741885FFF04 /* Targets Support Files */, ); - name = Products; sourceTree = ""; }; - DE415C5497CEFD2D5E5E184469B5B3CD /* Pod */ = { + D4A562471DF152C8AF683741885FFF04 /* Targets Support Files */ = { isa = PBXGroup; children = ( - A95A9A98F76112807DB84996E09D0E14 /* LICENSE */, - 50420501293EDA6AA5A34DACAEFBB2EA /* NSObject+Rx.podspec */, - 06E620464506C8F032D83509BF8CA155 /* Readme.md */, + 2B2B453D93117E6A5C8BD2B99D4DE1EF /* Pods-Demo */, + BF404B4A44F157452981CF6926F7CADE /* Pods-DemoTests */, ); - name = Pod; + name = "Targets Support Files"; sourceTree = ""; }; - E8D4F63A43597E5B057735FE3037E199 /* Nimble */ = { + DA8F745E1DE43B25A809E999591B6C93 /* Nimble */ = { isa = PBXGroup; children = ( - 0276210F7791A98E44CF60C73E6BA118 /* AdapterProtocols.swift */, - AFA8DFA962931C0D5C66AA5C3A08F61F /* AllPass.swift */, - EBFAA7F4BF7C3113856D36AD34A1DE76 /* AssertionDispatcher.swift */, - 714F613A3647ADF3B1A3BC1CAD3DDA28 /* AssertionRecorder.swift */, - 88011BB9DEE5C83495C831B3F209E75A /* Async.swift */, - 5D15E09F59E707CE8DCFA06DA95E1955 /* Await.swift */, - CA5CA08861E3FE5683C967ACE8CB4B6E /* BeAKindOf.swift */, - B9BE8C1E97DC1056F68928312334310C /* BeAnInstanceOf.swift */, - 84F0DE87C78ADC36B83F5F95C1D79FE6 /* BeCloseTo.swift */, - 6586E98D2401323473BC5C42F6FEC090 /* BeEmpty.swift */, - EAFAF82614BD68A87F254861741C0F09 /* BeginWith.swift */, - 7C16136FA33975C0E5E721B340B54FEC /* BeGreaterThan.swift */, - 39850425D82DB5D7CEB583E418B77552 /* BeGreaterThanOrEqualTo.swift */, - A741EC25A9FAB83CC4422BE397426328 /* BeIdenticalTo.swift */, - 3692E1BE689C456EFFCA8713705DB0E0 /* BeLessThan.swift */, - B18710F2DC29EACD57A91E061B8FEC5A /* BeLessThanOrEqual.swift */, - B91C3C38EDF4C0FA75689C670E9FF69C /* BeLogical.swift */, - 95EF400AF65F8B21865F81A17A3CB4BB /* BeNil.swift */, - 0E6878F54DB7E975AF72BCA44F5186D3 /* BeVoid.swift */, - 6AF226AA1C6369E28470BFDF0B8B1811 /* Contain.swift */, - 3842DB32E06DE501958B97A857F58B82 /* ContainElementSatisfying.swift */, - EB5FAD837BE2AAE61455BFD7B32DA9F7 /* CwlBadInstructionException.swift */, - 0F83D1F29400CB3E6AC588928E3AE393 /* CwlCatchBadInstruction.swift */, - AA72A7AC13BEBC006DC6A08BE7158B77 /* CwlCatchException.h */, - 0691A529241CC719252270B5515C79F2 /* CwlCatchException.m */, - ACBE3CDD05A5487CDC82EAB5F2171E23 /* CwlCatchException.swift */, - B071A84DD47E9A2223335FED77ADF2C7 /* CwlDarwinDefinitions.swift */, - D4713B10B2644CE1F98886857CDB397E /* CwlMachBadInstructionHandler.h */, - DF5265DC9B29D8CA8FF54085E2B7DF5D /* CwlMachBadInstructionHandler.m */, - 7A331E455E604A8FD062D062BC8C2CDE /* CwlPreconditionTesting.h */, - C7DD7EC55777F14EF1925F57BDF9C1E1 /* DSL.h */, - 7667193A493030E75DFD96FE7487BAA1 /* DSL.m */, - 49742A5C11C901751E6A9D8BB806B59C /* DSL.swift */, - 240F5BB7F84055523169BA056A193790 /* DSL+Wait.swift */, - 1E119EFB1EAF08A062C6AE19BAF7AC39 /* EndWith.swift */, - 6F354095154E0131D2DBC40757AF3EA6 /* Equal.swift */, - 4C31E6FEB9D56741DB672C8382B2518A /* Errors.swift */, - F5E5FF9976441B8C4B99ADBA2B921D91 /* Expectation.swift */, - 95E460802B8FFF3BF02E54C2EA0BE9D9 /* ExpectationMessage.swift */, - C19BC99B3171B4D39B517C1C8F619EE0 /* Expression.swift */, - 7A46CC4790475C2D3E8C62106E9E87BF /* FailureMessage.swift */, - 0FB7B448FE8D14A1A1033C5B2D60297A /* Functional.swift */, - 315147E49635C8F348F328E18989C976 /* HaveCount.swift */, - 9EAF6483E08D795DEA5172EE1BC70F1B /* mach_excServer.c */, - D4D814CA1F7D55C5CE8D8A62F578BDCB /* mach_excServer.h */, - F404DBBC429942E6C3B29B82B9B33127 /* Match.swift */, - CF9F9A43FECF77D55637FBA87BE8F84C /* MatcherFunc.swift */, - E32EF20994BA990A01264A673D581032 /* MatcherProtocols.swift */, - B6CF95E05725AA13265818026FD6246B /* MatchError.swift */, - 53C19900EDD8583ACC910B537E5D5C4B /* Nimble.h */, - 7074E9CA670A4C3E1FE286964C801BB3 /* NimbleEnvironment.swift */, - B178C80B40AAE6BB62339FF0344BE272 /* NimbleXCTestHandler.swift */, - 826512B771104143AEAB0F494EEAF955 /* NMBExceptionCapture.h */, - F6A24D057CFAB8AC0F42B410E04BC8DA /* NMBExceptionCapture.m */, - 305E4331419736FD5897A2AE8C89EE97 /* NMBExpectation.swift */, - 5D0BB645A4FAFCB5F640230E7F25570B /* NMBObjCMatcher.swift */, - DA98F69D71655FD9BD126636D8287A07 /* NMBStringify.h */, - AB94114691FA364F6528B887F9CCB745 /* NMBStringify.m */, - 2011689AB7C05B7EFCB3487499B8D277 /* PostNotification.swift */, - 810E828B743FB8120679616F1A71760C /* Predicate.swift */, - 55E603428CD7A07A4FC0C6F7958B3CAC /* RaisesException.swift */, - 469C30CEF7D2A4D3C4CCF20CEE62E015 /* SatisfyAllOf.swift */, - C248DC53B42DE75A0CBD7043CB1F3BCC /* SatisfyAnyOf.swift */, - 8375E055ABF700CDD22E540C278690CA /* SourceLocation.swift */, - 6CDED84A81BE984BDBC5FC295D439898 /* Stringers.swift */, - EB58ADA89038564E8D37D27A81D9EEB3 /* ThrowAssertion.swift */, - 57B68089FB51524F2540E998F84D39F6 /* ThrowError.swift */, - 6B62414F5CC774D8C0A71BFBCFED3C28 /* ToSucceed.swift */, - 0B4F410F57910B0F6B0F18AFD2F8AF74 /* XCTestObservationCenter+Register.m */, - 87C3E998A375EC91276A6CB7FE1B9115 /* Support Files */, + 953A6880A842C07CA6C5183DA77986A1 /* AdapterProtocols.swift */, + 6C8D4932E40C1397A9C94701357D6193 /* AllPass.swift */, + DF38DA772A3242727ED2610D020467E8 /* AssertionDispatcher.swift */, + 2FCD390E1B79DD3BA4C14C38AE0A41DB /* AssertionRecorder.swift */, + F4E95BD09FCA7388EAE580AAA82C92C9 /* Async.swift */, + 971B42C48B80C86CECDF6A1C01124315 /* Await.swift */, + E161EEED24F14309AFBE4DD9689E4124 /* BeAKindOf.swift */, + EEC35933B0CDB9B68B7E57E274FE9D47 /* BeAnInstanceOf.swift */, + B0DEC1A9ADFD54566E0B0A077EA09CD7 /* BeCloseTo.swift */, + 195F882A3718E80481ADE7A265930C76 /* BeEmpty.swift */, + F9FA38E89746E40040711688C9C638E3 /* BeginWith.swift */, + 9BC2302E78E5715DF91416B09369D056 /* BeGreaterThan.swift */, + 3D0C13A90BEBB0C6CFFB0F3511874170 /* BeGreaterThanOrEqualTo.swift */, + 6F8528339456DF076461FC577F0A20EA /* BeIdenticalTo.swift */, + 8C1AD32944E19CC51BFD861D3E396779 /* BeLessThan.swift */, + E528AC40D3234F5B32D6BEB118D60DFE /* BeLessThanOrEqual.swift */, + 9DB8A6BC46F58342A40BE570A48C758D /* BeLogical.swift */, + 8230E5BB66AB17F65D15BF9B23EE3186 /* BeNil.swift */, + 96FC8E6849EECC37066F443FD2E5CA33 /* BeVoid.swift */, + 0BA070A8D8EB82400E6C4CEECC8BF706 /* Contain.swift */, + D754E73EF6F72DD1CCFE3BD8C7BEE95E /* ContainElementSatisfying.swift */, + A7A2D3D585F92FDA97D07ABCF4D6D58D /* CwlBadInstructionException.swift */, + D20E787F4CFC5733D13721FB1DA12B58 /* CwlCatchBadInstruction.swift */, + 463DC9FEBCC3FECB56439E057DCAF875 /* CwlCatchException.h */, + C6572705BFB9EFFD839B70B0D2E16933 /* CwlCatchException.m */, + 23B6F183FB63627B5D229DD879BAF6E4 /* CwlCatchException.swift */, + 083FAB3C284C8E05A1CB7C7853D722D9 /* CwlDarwinDefinitions.swift */, + 73DC08049B4577692ADDBF4061427281 /* CwlMachBadInstructionHandler.h */, + E5CCE15BBC2E9FDF93E97CFCCF26388B /* CwlMachBadInstructionHandler.m */, + 1F7DE55A32562758730BDBF5AEF1FFB6 /* CwlPreconditionTesting.h */, + 765FDD2F217C19565C263E9ED16403BB /* DSL.h */, + 172AEB1F149833D984184CE96288B146 /* DSL.m */, + 4451839469875A94743BBE0EC81F799E /* DSL.swift */, + 44226ED63CE2351598FD3761606AE007 /* DSL+Wait.swift */, + 95EF087247CBEAB5BB1F5769AADADC29 /* ElementsEqual.swift */, + 435B0B09412A7DF9097CF9F8640D2B70 /* EndWith.swift */, + 6076937CB3B94CF8BCC4268678E2DA7B /* Equal.swift */, + 8C3334FC797BB9C4584DDE37CEDAD0AB /* Errors.swift */, + 9111564BF366D0F190DD21BE04CEB3F0 /* Expectation.swift */, + 9E5757B71F28F87433D5F3F2326DD383 /* ExpectationMessage.swift */, + 7F77C855B4953D558FDD99186D1754A8 /* Expression.swift */, + 3A688FE1F18259F93E9B9ED5664A4009 /* FailureMessage.swift */, + CC738E332792A056A082C75643681536 /* Functional.swift */, + A0AE5742B155BF9E385D886F0B3B0380 /* HaveCount.swift */, + C8545D704733DF6E81F91A0129D3AF9F /* mach_excServer.c */, + 91EBCC5EA02EA118E1B15B3C4FC673C4 /* mach_excServer.h */, + 34EB90060782B713111526B30C226EF6 /* Match.swift */, + 08FD69D13E326AB5A59478A26464FE5D /* MatcherFunc.swift */, + BC571702237AF10BD4BF9BDA2C7B95C7 /* MatcherProtocols.swift */, + 9A53DEBB3ABE82DE21ADCE55D40D7F95 /* MatchError.swift */, + C365B873AC920896A7A7A74B01921478 /* Nimble.h */, + 1B361A811319AC8B1C604D47C3D3221D /* NimbleEnvironment.swift */, + 45EDAB83D40AEF7D4A49E69D910C479E /* NimbleXCTestHandler.swift */, + 35E36D81A814B979B83FA5907B56A7FB /* NMBExceptionCapture.h */, + 420FA3C42F688A80EAADC3F6B1C6351E /* NMBExceptionCapture.m */, + 34EED2A3C153C9A70C1F548325F9AAFD /* NMBExpectation.swift */, + 893B3C81DDD0AEDB5318550AAE7825C5 /* NMBObjCMatcher.swift */, + 345F9CFB17730EA512B4D93130DB9950 /* NMBStringify.h */, + 44D90AC3EEC70EF9313990274F3B9B54 /* NMBStringify.m */, + CE3D7C1A8E5B6E92D5C5E204A72A1827 /* PostNotification.swift */, + 10C27CB44E825B852933F04A0448DDF5 /* Predicate.swift */, + 8681D84A6DEF565F816AEAED2D00110C /* RaisesException.swift */, + 4435E8036A0AE62B70C00A1FD13C0E10 /* SatisfyAllOf.swift */, + 0C7525E1C10E9A6F11D2D8D014C14CD8 /* SatisfyAnyOf.swift */, + A0F313ADAF338946CF8EC0C60FFA068B /* SourceLocation.swift */, + A96D40B2EA457A03805CD8EA316348BF /* Stringers.swift */, + 0965493271A2B072B7F25DEC8F3960EC /* ThrowAssertion.swift */, + A026B36C0AAADE7B1C5BF97ABEA1EA1F /* ThrowError.swift */, + 61FE06DC15E9AAA2F46D5F928E1ED9D4 /* ToSucceed.swift */, + 6F2341B63B600E3B9C6CFA288BB3BB86 /* XCTestObservationCenter+Register.m */, + 2ADB74B48E9C757ED612C2D237C50982 /* Support Files */, ); name = Nimble; path = Nimble; sourceTree = ""; }; - F8ABFC704B76502CD8EE98DE6BC6ED77 /* Support Files */ = { + DEDAC93169F2C3A4EE2CED6EA58D5E4A /* RxSwift */ = { isa = PBXGroup; children = ( - 2795306084CC6CBA4B48D733AB0F8249 /* Info.plist */, - 87642C0C62C2F733872ED6F8967428A5 /* NSObject+Rx.modulemap */, - 5167FF8A5B2F212486CFD19AD479585A /* NSObject+Rx.xcconfig */, - BFDD89119F9756A31AAE0C61C6C392F5 /* NSObject+Rx-dummy.m */, - C54E50CCCF5E687EC58D23139DBE4815 /* NSObject+Rx-prefix.pch */, - F448C4244A86825882FEC5453730CA1F /* NSObject+Rx-umbrella.h */, + 739640B6CB464D96E93F9A7F2185648E /* AddRef.swift */, + E0735A682CD60FE6282D8AAFDE148CEA /* Amb.swift */, + 48B17F38282DCCD060FA38EE3B6EF44C /* AnonymousDisposable.swift */, + A34EF631ADBFC0FB9E01FE45DEBC48A1 /* AnonymousObserver.swift */, + 586F48AC25492C756894B35EF4E01116 /* AnyObserver.swift */, + 50B971CF6E1166AD169CB187B7513ED8 /* AsMaybe.swift */, + 23C54A2448A56E39C1E753B4B2632DDD /* AsSingle.swift */, + A9BDF0E7D5C9359579BA1055A66E603B /* AsyncLock.swift */, + 6BC23C9C171C7D46F6BD59C01D2BA05F /* AsyncSubject.swift */, + EE7F957D96604AF5FFF02EDDA6996967 /* AtomicInt.swift */, + D1B39910B76025550C09316E51CABD53 /* Bag.swift */, + 378744A6F971741B9EE4360680756EE3 /* Bag+Rx.swift */, + 662C228F137DE9248B3761A2208A61F9 /* BehaviorSubject.swift */, + D99A258CCE9551CC1D7213678DDCBAB0 /* BinaryDisposable.swift */, + 73C12FA20125292B2792A8F3473357D5 /* BooleanDisposable.swift */, + A1E2C09923DEA065AF83CF897AC210C8 /* Buffer.swift */, + 279E8909B681F6B0B61A0D2DF338D983 /* Cancelable.swift */, + 64ED03ED0B4C5DD981DA39D53E7B7983 /* Catch.swift */, + 18AA6BE89F22B7C82515AD7CC46A77F5 /* CombineLatest.swift */, + 418059AEB1C7BAD0D9D08A77D342FE6A /* CombineLatest+arity.swift */, + 9780F7DEF6EAF35A39289889ECC01073 /* CombineLatest+Collection.swift */, + 770CF6054E4D291AB95498A6D4471FBD /* CompactMap.swift */, + 007173EC56EB5DDF3E309BA654A205AB /* Completable.swift */, + B99DF630A2BB08BDA5E3C4B19D6EBBBD /* Completable+AndThen.swift */, + F019D06E4B3C576EBA0B9B2FCCFEAECF /* CompositeDisposable.swift */, + E25E9ACD6C7A8625BDB9BCC68738D856 /* Concat.swift */, + 03D979FD09AE7BD39BC9F957699CB515 /* ConcurrentDispatchQueueScheduler.swift */, + BFF4DAE78EF1BB1EAFFEFCF807CB41F0 /* ConcurrentMainScheduler.swift */, + 99E1510063771124B571F6CC51E900DE /* ConnectableObservableType.swift */, + F093AA58D0ECFDCB5D45209E2AE7975E /* Create.swift */, + DA174D3A29E55C151709E402E425E17B /* CurrentThreadScheduler.swift */, + 122591A6C078E284A3AA63B0234E1AC7 /* Date+Dispatch.swift */, + 69CDAC0156DA9DB5BF282C9DB82A82E0 /* Debounce.swift */, + F49D11949FEDEEA45CC2B54B748F02D3 /* Debug.swift */, + 5AD76329FD166FBE92988A21CCBAB7AB /* DefaultIfEmpty.swift */, + C7F3573E6BF1E0D30B2A08DF0543FDEF /* Deferred.swift */, + AAAC0F6C09C79336F353332C4A3C7C70 /* Delay.swift */, + FCC52929F7301BB1D01CD3A10C78FB4A /* DelaySubscription.swift */, + 47487CDBB7BDB0F5BECACCF955C405FB /* Dematerialize.swift */, + 2D5B6457B7CB65CC7A5B4D9DEA1BF613 /* Deprecated.swift */, + E384495CDCA6E6862479A378FD2BB9E0 /* DispatchQueue+Extensions.swift */, + 42EEEA2EBAE54BB4C13D8F15D4D298DB /* DispatchQueueConfiguration.swift */, + CA39CFD4DCD38EDFA77A991FB2ACF008 /* Disposable.swift */, + D36F786CF140C1D310179D6AC68A2BB1 /* Disposables.swift */, + 8C86B1D9DF0ED8AAED4F908B60C66454 /* DisposeBag.swift */, + 9947EE212430E0F76F04ABEAF0A65FAC /* DisposeBase.swift */, + E9B4F2F089C5DFA1BA32B3BF56152CBF /* DistinctUntilChanged.swift */, + B89E636CEECC331FE886443352E1C3ED /* Do.swift */, + 991F5D74BFCC68EA980CEC8242E55916 /* ElementAt.swift */, + EC522DB704164394EB7C4A55BEE80E4F /* Empty.swift */, + A524A8BE73EA070015863E3A303069F5 /* Enumerated.swift */, + 76E7C33532BF1CFBB387322A40FD7E5F /* Error.swift */, + 491F072013433A7A58D8B65F358D026F /* Errors.swift */, + C4AA469B510A2D075730A6C6BC5016AD /* Event.swift */, + 76895B730377EE1ADAB60122ACF3E450 /* Filter.swift */, + 5D29F4A7DE18D4FC192E77CE44742703 /* First.swift */, + 93D3D880DC6CA05FCDEDD0FAB4CF33C8 /* Generate.swift */, + 6CCCD6A748D7D3DBD7ADCEB7306E4366 /* GroupBy.swift */, + 3CC739507DFF73A8441FC1425E443FA2 /* GroupedObservable.swift */, + B3A2E620FE47D3CC7DCBCB4F2CD213B0 /* HistoricalScheduler.swift */, + EBA40696EFDEEEFEBC6BF379E8AA9571 /* HistoricalSchedulerTimeConverter.swift */, + BD8045CEEEE80C1C40E362B764CBAF93 /* ImmediateSchedulerType.swift */, + 7CF728F762A35AF084F570B67CB633D0 /* InfiniteSequence.swift */, + DC1AD732807DA62C8E1A30577D2ABE6C /* InvocableScheduledItem.swift */, + 477C25B6F5561DE9F10676AC439D09FB /* InvocableType.swift */, + 9D444CC91C409BA22228D122152F5F8D /* Just.swift */, + DC63D273B2E772CC1E4794932A104E9C /* Lock.swift */, + 3B6FFF4739881F7A932F90A810A695B4 /* LockOwnerType.swift */, + A3CACD10549C86B60E4B541F63D459E7 /* MainScheduler.swift */, + 864EA88B57A9A74D855D1AB88504CF2E /* Map.swift */, + 610F14E64877C284D3F10C8CE41EF89E /* Materialize.swift */, + C417F0901D9B4C26E1B7B6E01C4DFB03 /* Maybe.swift */, + ED737DB056A7D47F54CC4A64A4C698E0 /* Merge.swift */, + 4E45BBF074C6E712C7BB2C76EE123F46 /* Multicast.swift */, + E9E309A17917F99EE3EDDA7C6FC4631E /* Never.swift */, + D95722B7B1802FD8435155E622168012 /* NopDisposable.swift */, + DC9407E1BE6EEBEE51569EB6CED48FD8 /* Observable.swift */, + 99DE5BF6E4A651E58DA13A9BFC20B5C9 /* ObservableConvertibleType.swift */, + 1F8FED30A7EF068219D9F750C05938A5 /* ObservableType.swift */, + 3E43ED4E8723CB03438FFD8D52ECF620 /* ObservableType+Extensions.swift */, + 49E951D4FA0C5D1F4608FAE716EB6423 /* ObservableType+PrimitiveSequence.swift */, + F324E6EF493E4ED6308EE33BDF63ECBD /* ObserveOn.swift */, + 04B1369E7D7133C572D2BCF73A2E60E0 /* ObserverBase.swift */, + F2FE150B74BBAE937000858263EAE139 /* ObserverType.swift */, + 8A291ED223703BC09683E17ABC820E17 /* OperationQueueScheduler.swift */, + 095DBDFCD66DFCE4478A57B9BC654B4D /* Optional.swift */, + C1CED0DD23F664841111999586B08666 /* Platform.Darwin.swift */, + EF0EC64F9FBC94A3DD565035EB1BC6FE /* Platform.Linux.swift */, + CFDBA3A608FFDB187DA673044C0D539A /* PrimitiveSequence.swift */, + FC6C325BAE01EB3857F38A5602424012 /* PrimitiveSequence+Zip+arity.swift */, + 4655DE872F116F68D71BA26D294282E2 /* PriorityQueue.swift */, + 1698BF9491D9AF9E0D072611202F8282 /* Producer.swift */, + A50A171CA6E7F8A60D00C8B48AA063F8 /* PublishSubject.swift */, + C862873B1A4C2B34881F93A7C66C8B41 /* Queue.swift */, + A23A58D5CAE1671D168F8D2A2ADD6DEB /* Range.swift */, + A185553AF8D5EE097A2A593475615A86 /* Reactive.swift */, + 87A494DDB25746D60618F74AB302B56D /* RecursiveLock.swift */, + 169046F6F353D9FE68E8F82E5E825D53 /* RecursiveScheduler.swift */, + 70AA7E86250B1D076683EFF1FF394D0A /* Reduce.swift */, + 8BF3F614CC5C37ECA2A7BD0474CE0061 /* RefCountDisposable.swift */, + C0CDE9AE8CC17F4EF7306505AFB081D8 /* Repeat.swift */, + BED4A6A7963FC39EEC0EDE427573AEA3 /* ReplaySubject.swift */, + 28C8DE8590BE8EB0BC6766626E449868 /* RetryWhen.swift */, + 4B0749291D522211F84D19F63DCBC23B /* Rx.swift */, + 26FB5D8D479C5D23529758EC2CAA9968 /* RxMutableBox.swift */, + 179D0EEE4255E84E7E62884FA3E63463 /* Sample.swift */, + 2064AAE1E9DA13FDB1162AF2EC06FBB5 /* Scan.swift */, + 06DD76EEACF1D44371266EA4EF7030E3 /* ScheduledDisposable.swift */, + C4306B653917652B04CEC39EAD0F9243 /* ScheduledItem.swift */, + BA9A7430ADE207FADA08FBFF7C79A698 /* ScheduledItemType.swift */, + 4F09BBFF80F6478F3CC6EA98EFE72152 /* SchedulerServices+Emulation.swift */, + FFFC2994E0C251CEEB4E6EBF474A9807 /* SchedulerType.swift */, + 37E0ACB811D4E17BC094CD48454E5FC6 /* Sequence.swift */, + EF1010758638D4FDCFAFAB1CB79294B9 /* SerialDispatchQueueScheduler.swift */, + 0DE05031B38702C48126EDF418E9D10A /* SerialDisposable.swift */, + E7051E4B2C830EFAE623F564DC174C8A /* ShareReplayScope.swift */, + 38393E0581EDE5BE524ECA0118F8D96E /* Single.swift */, + 5C51164C3E4A2BEB0BF46FF69E22390B /* SingleAssignmentDisposable.swift */, + 160D768CDCFE9392110517E4A0D93764 /* SingleAsync.swift */, + DA2AA8A7B89B2F388897200471D987A3 /* Sink.swift */, + 79DFD2E90EE0F63DA2DC67AD336E739C /* Skip.swift */, + 553741506265A8B822CD579E97DD89A5 /* SkipUntil.swift */, + 07A066E0D7A1C7046AF10250E1EF1402 /* SkipWhile.swift */, + 2B4B214F9D223A5B568DC72942D886D4 /* StartWith.swift */, + 29683BBE08614F57258947E9C050A0C8 /* String+Rx.swift */, + 929B5F6DFEE1875321B18BB0F4A91E93 /* SubjectType.swift */, + 0F998F9C73474BC516D1C522E9587D6C /* SubscribeOn.swift */, + CD305D94C58742A63AD40CD3AE898D7A /* SubscriptionDisposable.swift */, + 09E2678C71840FD764A782CEE7FBF70A /* SwiftSupport.swift */, + B4D0E70501E592A560A7F99D642F8DF2 /* Switch.swift */, + 4036CE58C0921C4E1D2C23949D06804A /* SwitchIfEmpty.swift */, + 42F29017D99035B21B9C6378D0C20553 /* SynchronizedDisposeType.swift */, + 6669606A1A55F80E390F616917F55CB2 /* SynchronizedOnType.swift */, + 3470946FA7BF51F483D9AFD149C96012 /* SynchronizedUnsubscribeType.swift */, + F133CB22026F00A974203CB61CCED061 /* TailRecursiveSink.swift */, + 6AA9AE04B6D2414D8BE2E58C784DF027 /* Take.swift */, + E94E15B8094B8996E63FAEFBD6C99720 /* TakeLast.swift */, + 48E4058CD6925712AC02CAFA9AFC78D3 /* TakeUntil.swift */, + B60973C44D517664106EA2EAFECB1426 /* TakeWhile.swift */, + 40BE5F65E38F83289611D559F00895E4 /* Throttle.swift */, + FB75FAE4E6C545CB3CE7E5055296AD99 /* Timeout.swift */, + 9645E5620CD00D3A1732900485D00BE0 /* Timer.swift */, + EDD6181A1F716E62FAA1CAA57CC13BD1 /* ToArray.swift */, + 0CB1AEB6D73EB42568D027020774BA46 /* Using.swift */, + 799A44334C97C4C289A07B544B38F135 /* VirtualTimeConverterType.swift */, + 2458AECC105ACEDE6FA7C9B340B0ED60 /* VirtualTimeScheduler.swift */, + C500E0BD5E10E791A8112375E55E4F14 /* Window.swift */, + FDC6DB082462C04F43B7E12106F7F8D9 /* WithLatestFrom.swift */, + 73AE77B0CB085577A2060F18AC4EB0E8 /* Zip.swift */, + A0CA816D313D08FA9BA746BDE71AA3BE /* Zip+arity.swift */, + 56178108E601F5E0C6B619348D02A043 /* Zip+Collection.swift */, + 8EE211F70FD50E405ACC1221E0BC5645 /* Support Files */, ); - name = "Support Files"; - path = "Demo/Pods/Target Support Files/NSObject+Rx"; + name = RxSwift; + path = RxSwift; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 08E0FC17898A546C8BFDF9D0059E9B32 /* Headers */ = { + 21B1E92A491B37563661C596D581C4CD /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 25670E01BF12BAC45AB20A404F24EB91 /* Pods-DemoTests-umbrella.h in Headers */, + 9E41BE4A42783378AE4AD3A93ABB7B8F /* NSObject+Rx-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - 628D2917551CB31F2DD2E3BCBF0C61F0 /* Headers */ = { + 54B4170830571F50450C83EAA84405A0 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - E2B9A7FCED63F1F8FE196ADAB3F10E8B /* Pods-Demo-umbrella.h in Headers */, + A59E1184445DE1EC82EE24EBEE2404FF /* Pods-DemoTests-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - C9B96F4DDF06565D3B41A826AD209B1C /* Headers */ = { + 71CA2E61F7A87DAD21A9EC47A79E474B /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - F088EE1AE386EEF27AC934DE13F455BB /* CwlCatchException.h in Headers */, - BEB8082717D949400F2DE3458E75CBE3 /* CwlMachBadInstructionHandler.h in Headers */, - E984CB87ABF0DD970BD4B856DEA35E1A /* CwlPreconditionTesting.h in Headers */, - 618C13D4020EBA363997EFB60A56AC20 /* DSL.h in Headers */, - 5BA1006DAFD72ACF9F31DC95096FD054 /* mach_excServer.h in Headers */, - 9096D686AB39D3475A4227F0765C3DC4 /* Nimble-umbrella.h in Headers */, - 574F89786271FD7BAD216D075EA1E898 /* Nimble.h in Headers */, - B3C3D7DAB6567A273DA50FD2068AFF77 /* NMBExceptionCapture.h in Headers */, - 97A60F28FA1FF94422D2560002CEE407 /* NMBStringify.h in Headers */, + 61D20AE2CD6246A7B3C78F97DA8A8A60 /* Pods-Demo-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - E84FBF9281CF38B4146AEE45A1E27FE9 /* Headers */ = { + BDA11C6A1F99940E418055A23AB2B29A /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - B5C4D238942464AAF42FEDDBB3512EF7 /* NSObject+Rx-umbrella.h in Headers */, + 1303EBE21C27E82EDFFD46A69C8799EA /* QCKDSL.h in Headers */, + 501F8993912E8A0D8E396B8102BF4AFF /* Quick-umbrella.h in Headers */, + A737EA82F22134AF6A26D9257FB4A76B /* Quick.h in Headers */, + B5D1ED494A876522ED12E476B08C0469 /* QuickConfiguration.h in Headers */, + FFED0B227D5F580EFD0B905C48988B83 /* QuickSpec.h in Headers */, + CA51827D3AF68767D306B39D61EEDDF4 /* QuickSpecBase.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - E93C93D9D4FD5A19255DA598549BBCBF /* Headers */ = { + D9679AB1802F6D7F6A4675829FFA9F0B /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 2D09E756E4941FA3825047E1E2517091 /* QCKDSL.h in Headers */, - 9D4E546FF329D4109FC3C282928B02E8 /* Quick-umbrella.h in Headers */, - 3E5BF54F40548F50A634D911A92F8D18 /* Quick.h in Headers */, - 2F8837FDE943E4810DA303DB0C4D5483 /* QuickConfiguration.h in Headers */, - 076322ECD83CCD5978E82A6C27850C42 /* QuickSpec.h in Headers */, - CC6C123ABABD01D69876BB64F3F78884 /* QuickSpecBase.h in Headers */, + B597480D3D2C471B0C86260B9755486D /* RxSwift-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - FDF0B964DA151A0C6B9AAFF416F433BB /* Headers */ = { + F684E10CDA60BAC918A92251A0A1968A /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 02DD07956B014D81FC3B7E17BC237ACC /* RxSwift-umbrella.h in Headers */, + E1C5AE23F3288A2E8A13489165FD3FF2 /* CwlCatchException.h in Headers */, + 05D6872E1E4C28423550C859B6E03820 /* CwlMachBadInstructionHandler.h in Headers */, + 38FEA25D16ACC1E6F5C696CD95B41A69 /* CwlPreconditionTesting.h in Headers */, + 9EEF9E84E580920E11E06170D25F65C3 /* DSL.h in Headers */, + 6FC59CBB360B3EF8E45D151D945BCA54 /* mach_excServer.h in Headers */, + C0367D0510CE9E409A33E9B356422017 /* Nimble-umbrella.h in Headers */, + 1FA0DEC9E883929115DD91352F570F3B /* Nimble.h in Headers */, + 30966E26266F62432C8E914340871113 /* NMBExceptionCapture.h in Headers */, + 74C4A30A55AC7DB057CE14BCA15299C4 /* NMBStringify.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 30FF1B444FA5E009DFB166BDEC7B0DAA /* Pods-DemoTests */ = { + 2EC00BC1B651DF6BA1208D1D610630D0 /* RxSwift */ = { isa = PBXNativeTarget; - buildConfigurationList = ADC4463D2B4DCEB2FA24431FC1A19530 /* Build configuration list for PBXNativeTarget "Pods-DemoTests" */; + buildConfigurationList = 8B2E6174F1917F63CEB00FE79F70286D /* Build configuration list for PBXNativeTarget "RxSwift" */; buildPhases = ( - 08E0FC17898A546C8BFDF9D0059E9B32 /* Headers */, - CE5A3B1F3B202904269DA6B397D220B9 /* Sources */, - DF3AF52FC03889BB23520BD9B51A5DCC /* Frameworks */, - 8CADF621F18A2240383603A364D3A9D1 /* Resources */, + D9679AB1802F6D7F6A4675829FFA9F0B /* Headers */, + 8812EA255BB67E3087D14E8136B8A5FD /* Sources */, + D3E84765C87A533730FE9D01CF07174F /* Frameworks */, + C459EF30F1D3FDA496E43C54610962B9 /* Resources */, ); buildRules = ( ); dependencies = ( - E48535A33F851BB05FA6B47DB26F3AFB /* PBXTargetDependency */, - 1F03E2CF6E0E59504F92E741CA377B41 /* PBXTargetDependency */, - E194097AC220C28B36F989E6D9F66B21 /* PBXTargetDependency */, - 66DAB9E9AE12C2A041CB508F76BF73B5 /* PBXTargetDependency */, ); - name = "Pods-DemoTests"; - productName = "Pods-DemoTests"; - productReference = C493BBD5CFCB280EB8EF00B929156F28 /* Pods_DemoTests.framework */; + name = RxSwift; + productName = RxSwift; + productReference = 703E9D7D28980AA24200E4E3AFAD81D5 /* RxSwift.framework */; productType = "com.apple.product-type.framework"; }; - 5E269AA9A7FBCB9BFD8EA487B43AE7F9 /* Nimble */ = { + 64DF5E8859915065F0C1F8BBF04CB087 /* Pods-Demo */ = { isa = PBXNativeTarget; - buildConfigurationList = 10836172B46B0B0B73CE062C21769FF3 /* Build configuration list for PBXNativeTarget "Nimble" */; + buildConfigurationList = 7FC4717D38BEC744A930CBCCEBBDB472 /* Build configuration list for PBXNativeTarget "Pods-Demo" */; buildPhases = ( - C9B96F4DDF06565D3B41A826AD209B1C /* Headers */, - 00172CED9D8741CA7FB64BA63FDC1054 /* Sources */, - 7F682A9E296D139B5A1E649989FB51D0 /* Frameworks */, - 260DB7AEBBC86367BD11959FA116A36E /* Resources */, + 71CA2E61F7A87DAD21A9EC47A79E474B /* Headers */, + CBAAB6896A155537B1243895F3030687 /* Sources */, + 1782CC589832E1A65308BFBED178F0C1 /* Frameworks */, + F734708411744E2AAAD7011F50F34055 /* Resources */, ); buildRules = ( ); dependencies = ( ); - name = Nimble; - productName = Nimble; - productReference = F996C636C4BFB2FF8976D728BB62B899 /* Nimble.framework */; + name = "Pods-Demo"; + productName = "Pods-Demo"; + productReference = A6920670AC8745CF019BDE92265FBD9B /* Pods_Demo.framework */; productType = "com.apple.product-type.framework"; }; - 6DB514A28E386B633179B9615872C399 /* NSObject+Rx */ = { + 6C79EF9439AA49B317821C4DF077E45E /* Pods-DemoTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 59D39ADEC18E454A063B6E2651E7E53B /* Build configuration list for PBXNativeTarget "NSObject+Rx" */; + buildConfigurationList = FCFF0604EEEFF0ACCB32A0A6D115F719 /* Build configuration list for PBXNativeTarget "Pods-DemoTests" */; buildPhases = ( - E84FBF9281CF38B4146AEE45A1E27FE9 /* Headers */, - D6B1B6EDFDF8E2AE73E584AD6081223A /* Sources */, - A1DF0937E05CA7B08FF16B515B2D0108 /* Frameworks */, - 1B0C3F804F9043CEAA8A570D9C962BA6 /* Resources */, + 54B4170830571F50450C83EAA84405A0 /* Headers */, + 88C44AB8B62EDEADE5024CE600C9A7CD /* Sources */, + 3928EB848CAFE6B2A89FADAFD3998ABA /* Frameworks */, + 928B12C99D27A14565EDCF716C86B889 /* Resources */, ); buildRules = ( ); dependencies = ( - F4A1E0BE5B20A85EF0215713A8A9B3BF /* PBXTargetDependency */, + 139F84F64D91C11C8E7123E9A15CA649 /* PBXTargetDependency */, + 3B4A7E998E4458E5B6A33B880E6D2E44 /* PBXTargetDependency */, + 8A2FF22750F2EC685666946B0A1D1F42 /* PBXTargetDependency */, + BA7ADD0443C67A882967438915934532 /* PBXTargetDependency */, ); - name = "NSObject+Rx"; - productName = "NSObject+Rx"; - productReference = AB12C0F86FEBA9F3834D32312A15B28A /* NSObject_Rx.framework */; + name = "Pods-DemoTests"; + productName = "Pods-DemoTests"; + productReference = 8D8CAE5BC71CB290315BB8CCE54F0149 /* Pods_DemoTests.framework */; productType = "com.apple.product-type.framework"; }; - 9E860C72338E2D1549352501D1903C4C /* Pods-Demo */ = { + CC37898399F3CE1D13D5F03D344200F6 /* Quick */ = { isa = PBXNativeTarget; - buildConfigurationList = 45A9CE836141AB4AD8F20D23C8218FA1 /* Build configuration list for PBXNativeTarget "Pods-Demo" */; + buildConfigurationList = 4FAFFE8B8EFBB8AACD48FB251798C471 /* Build configuration list for PBXNativeTarget "Quick" */; buildPhases = ( - 628D2917551CB31F2DD2E3BCBF0C61F0 /* Headers */, - 4178138CCB22B58C4BB67FEF845A8E7D /* Sources */, - 02575E8E5526E395222B8E6986F55C36 /* Frameworks */, - F1EE10B850BD42D6521F73BDE13CB8A9 /* Resources */, + BDA11C6A1F99940E418055A23AB2B29A /* Headers */, + 5CD581978730858F5CE1A7DA18C4805B /* Sources */, + E0FF1E83143A05DF24BC4BFE5FDB7A9D /* Frameworks */, + A6DD757D3ECD124A4245F972BF6316BB /* Resources */, ); buildRules = ( ); dependencies = ( ); - name = "Pods-Demo"; - productName = "Pods-Demo"; - productReference = 7476D59404D46DDD01ACC0AF798AA489 /* Pods_Demo.framework */; + name = Quick; + productName = Quick; + productReference = 99B58D683D333643680081A992D5405E /* Quick.framework */; productType = "com.apple.product-type.framework"; }; - AB6A097ED9ED31C93AA4B971CFDBBC33 /* RxSwift */ = { + DCDAFB3810BA0828CB04917C3C9BB0D3 /* NSObject+Rx */ = { isa = PBXNativeTarget; - buildConfigurationList = 42CCCE2685AFD37697FD06271CCC2728 /* Build configuration list for PBXNativeTarget "RxSwift" */; + buildConfigurationList = A4250C01AA7223DDB22D206FCEFE97B8 /* Build configuration list for PBXNativeTarget "NSObject+Rx" */; buildPhases = ( - FDF0B964DA151A0C6B9AAFF416F433BB /* Headers */, - 668E4B9F3729C16F35FB8C5A7D6D88C7 /* Sources */, - 53AE72D620A2271AD1024079E2C920E3 /* Frameworks */, - 75BDE7950EDB6BEE0442227177A80DC6 /* Resources */, + 21B1E92A491B37563661C596D581C4CD /* Headers */, + 7D9689BBAAB8AA5E7CCCE495616B7E6C /* Sources */, + CAC69611971DF6747042F733134319AB /* Frameworks */, + 730131B6B10FBBC70FFC59B008C7FA24 /* Resources */, ); buildRules = ( ); dependencies = ( + 529362EB897B288A59310628CCC6FFD4 /* PBXTargetDependency */, ); - name = RxSwift; - productName = RxSwift; - productReference = E0BCA2F92CA4AF4599FC7E2A65DD2420 /* RxSwift.framework */; + name = "NSObject+Rx"; + productName = "NSObject+Rx"; + productReference = 801A90D4FBC3C50CA5C669EF264EEB4A /* NSObject_Rx.framework */; productType = "com.apple.product-type.framework"; }; - C86D25EC2265DA7A383D953ED7711121 /* Quick */ = { + F554EA343D656E7FB0C1ACC045EB2666 /* Nimble */ = { isa = PBXNativeTarget; - buildConfigurationList = AE53E6CAD822DA849D5BF1AFD367C08A /* Build configuration list for PBXNativeTarget "Quick" */; + buildConfigurationList = E3A98634DB5DA9D006BDFE48B5C34CB5 /* Build configuration list for PBXNativeTarget "Nimble" */; buildPhases = ( - E93C93D9D4FD5A19255DA598549BBCBF /* Headers */, - EC9C21A07385514359BB2357BDF22B6B /* Sources */, - 22249B7EC004189037EC4DC74DA5AC70 /* Frameworks */, - 9AC8B74697455856C6E8A31195858382 /* Resources */, + F684E10CDA60BAC918A92251A0A1968A /* Headers */, + 843204FEA6D0A77E8262CB3DE7F86658 /* Sources */, + F9F8CFCD3C9798C561B7623608D3C821 /* Frameworks */, + AD1799A208BE417CCE05899E167D813E /* Resources */, ); buildRules = ( ); dependencies = ( ); - name = Quick; - productName = Quick; - productReference = 01F89D13AB5B86376E75FEE6A9DBA004 /* Quick.framework */; + name = Nimble; + productName = Nimble; + productReference = 01B587407E8068DE98971366D428A0FA /* Nimble.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - D41D8CD98F00B204E9800998ECF8427E /* Project object */ = { + BFDFE7DC352907FC980B868725387E98 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0930; - LastUpgradeCheck = 0930; + LastSwiftUpdateCheck = 1020; + LastUpgradeCheck = 1020; }; - buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; + buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, ); - mainGroup = 7DB346D0F39D3F0E887471402A8071AB; - productRefGroup = D89AE27D1A90CC903A83BCF24DB99EC6 /* Products */; + mainGroup = CF1408CF629C7361332E53B88F7BD30C; + productRefGroup = B2DED95F5A5F32F5C3FB014CB9E6839B /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 5E269AA9A7FBCB9BFD8EA487B43AE7F9 /* Nimble */, - 6DB514A28E386B633179B9615872C399 /* NSObject+Rx */, - 9E860C72338E2D1549352501D1903C4C /* Pods-Demo */, - 30FF1B444FA5E009DFB166BDEC7B0DAA /* Pods-DemoTests */, - C86D25EC2265DA7A383D953ED7711121 /* Quick */, - AB6A097ED9ED31C93AA4B971CFDBBC33 /* RxSwift */, + F554EA343D656E7FB0C1ACC045EB2666 /* Nimble */, + DCDAFB3810BA0828CB04917C3C9BB0D3 /* NSObject+Rx */, + 64DF5E8859915065F0C1F8BBF04CB087 /* Pods-Demo */, + 6C79EF9439AA49B317821C4DF077E45E /* Pods-DemoTests */, + CC37898399F3CE1D13D5F03D344200F6 /* Quick */, + 2EC00BC1B651DF6BA1208D1D610630D0 /* RxSwift */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 1B0C3F804F9043CEAA8A570D9C962BA6 /* Resources */ = { + 730131B6B10FBBC70FFC59B008C7FA24 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 260DB7AEBBC86367BD11959FA116A36E /* Resources */ = { + 928B12C99D27A14565EDCF716C86B889 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 75BDE7950EDB6BEE0442227177A80DC6 /* Resources */ = { + A6DD757D3ECD124A4245F972BF6316BB /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 8CADF621F18A2240383603A364D3A9D1 /* Resources */ = { + AD1799A208BE417CCE05899E167D813E /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 9AC8B74697455856C6E8A31195858382 /* Resources */ = { + C459EF30F1D3FDA496E43C54610962B9 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - F1EE10B850BD42D6521F73BDE13CB8A9 /* Resources */ = { + F734708411744E2AAAD7011F50F34055 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -1397,331 +1400,335 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 00172CED9D8741CA7FB64BA63FDC1054 /* Sources */ = { + 5CD581978730858F5CE1A7DA18C4805B /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - CE1287DA39DB4208F5511CE47FE8298D /* AdapterProtocols.swift in Sources */, - 1AC5D2CE6FA79327468F53B53D0A9418 /* AllPass.swift in Sources */, - B6F0D7C04121F97B1D4933C0168278EF /* AssertionDispatcher.swift in Sources */, - 85107C3BD627EA89CC1EAB25859EF85D /* AssertionRecorder.swift in Sources */, - 3312F77A6C289F2CEFBF0C1D98431671 /* Async.swift in Sources */, - DEEDD0D7C0369178EC867A59373F6380 /* Await.swift in Sources */, - 6B2DF45B9BFABD4BF3DDC503F073FB71 /* BeAKindOf.swift in Sources */, - 0D74DB80E4766C505062F32B6C5A70AD /* BeAnInstanceOf.swift in Sources */, - DA257CBBCAB6C22BA5476F983AC78BB5 /* BeCloseTo.swift in Sources */, - 9C22921616DC80691662977DDEA6B2C4 /* BeEmpty.swift in Sources */, - DF7CF1941236840A89D99B233E4DC086 /* BeginWith.swift in Sources */, - 6FE504E9ED5B37C05CFC2A530019AE5D /* BeGreaterThan.swift in Sources */, - 58B249717B134855DA1DF182DF0AEDB9 /* BeGreaterThanOrEqualTo.swift in Sources */, - 97EE56F66DCD3C983D0585D8F45FDB6A /* BeIdenticalTo.swift in Sources */, - B2F5395D43472600D7BA7E26E3772069 /* BeLessThan.swift in Sources */, - 06F38DD26D80484050C9ED86478406F2 /* BeLessThanOrEqual.swift in Sources */, - DD2EB3198539280E2F07F0E360AFF324 /* BeLogical.swift in Sources */, - 8E83E547D107FFC8B596829313AAF38F /* BeNil.swift in Sources */, - 5747F17B237F1ACB862F3F2911E5CBB1 /* BeVoid.swift in Sources */, - B30FCDD03BFE82B7E9776FD9CE3A1C51 /* Contain.swift in Sources */, - 8BB7F5B7E3E77CF25E64E1EAD1A26E68 /* ContainElementSatisfying.swift in Sources */, - 9A0EB2F0A468E4576E776AE1E9221E7A /* CwlBadInstructionException.swift in Sources */, - 350C051E271508531C90540A2496684C /* CwlCatchBadInstruction.swift in Sources */, - F4EE282D8435D54A662C6DDD30A3D2CD /* CwlCatchException.m in Sources */, - 2574D09B363D42ACA6BA589B675FFA26 /* CwlCatchException.swift in Sources */, - 8050C10B78F2D1DD98A2F3E250A24AD0 /* CwlDarwinDefinitions.swift in Sources */, - 66D3DA2225488356273B3D0AB83DA268 /* CwlMachBadInstructionHandler.m in Sources */, - 42A9F49A3D23555A2EC71F3E84E435FB /* DSL+Wait.swift in Sources */, - 6985430721C89135D5B4CBE13357EC31 /* DSL.m in Sources */, - A490FAE0B78B47AF739B0DAFC1DC5AD6 /* DSL.swift in Sources */, - 74605907C211553B00F09768BEF12834 /* EndWith.swift in Sources */, - 19291565899B5113A5355002CF9C8F2F /* Equal.swift in Sources */, - 4C093ABFA796CEC3AC89C1B9DC36841D /* Errors.swift in Sources */, - A286AD495C5D4520ADF2ECE7786EF950 /* Expectation.swift in Sources */, - 1E2AE2B6202B65E712FE05FB2699BD2C /* ExpectationMessage.swift in Sources */, - E454528E8D39931207848DACBB617A4C /* Expression.swift in Sources */, - 24AC6513961FF6DC60E0FB284E8914B6 /* FailureMessage.swift in Sources */, - 4BC738EA304E6FA57294B9AAFEC56F70 /* Functional.swift in Sources */, - F32B9D0318D13B740E6D88E16709FEA3 /* HaveCount.swift in Sources */, - C5305DE0B553BCA7361C3997ACD70FFB /* mach_excServer.c in Sources */, - DDB89D0F2F9422FEFF8D3ABB4B1FC7F9 /* Match.swift in Sources */, - 44F6B7EB2EAF73218A16F56D45C877A4 /* MatcherFunc.swift in Sources */, - 6B124A4D8EB28A918E0C87F2E75D94F8 /* MatcherProtocols.swift in Sources */, - 7AA9A7388AF44BB4EB2111CEDB29A666 /* MatchError.swift in Sources */, - 79FA255F43C9E42470C9720C0604444F /* Nimble-dummy.m in Sources */, - 0C345DBBF5EF9ED046CB579FDD401A57 /* NimbleEnvironment.swift in Sources */, - 62A3D36B892ED9C9A3210134C97FE3F9 /* NimbleXCTestHandler.swift in Sources */, - 2EF89DB591335BFB29606E0706E66D9F /* NMBExceptionCapture.m in Sources */, - 223CA7D4EDF23874D61C762F6CF51C56 /* NMBExpectation.swift in Sources */, - 562B8E7BBB3176E837BEBD6D24DA7EF4 /* NMBObjCMatcher.swift in Sources */, - 3C0D99EED837A3AD705A664503EF48DE /* NMBStringify.m in Sources */, - 22948773F0660B81265C2C17A0761F0D /* PostNotification.swift in Sources */, - 935558F919649CDE3784CBD344D3C008 /* Predicate.swift in Sources */, - 5895EA4D5666103B2CD4243690487D07 /* RaisesException.swift in Sources */, - 7485AAEB633B78268D656D019B77E023 /* SatisfyAllOf.swift in Sources */, - 746D0DBAF8EB27CA816CFD021DE2A7A1 /* SatisfyAnyOf.swift in Sources */, - DA4FBA76599ECAB9A1993F119A41359D /* SourceLocation.swift in Sources */, - B7ED1B41F56087971B656A2E38322310 /* Stringers.swift in Sources */, - 37C3C6235A5DDB8E37629314CF0E8489 /* ThrowAssertion.swift in Sources */, - E85EAC40F42C10F327BE0BCF39C2DF3B /* ThrowError.swift in Sources */, - DAF21E37BBBFD5D408F514E867A5936C /* ToSucceed.swift in Sources */, - B3895E766FFE0B7DF58F4D0BE246221B /* XCTestObservationCenter+Register.m in Sources */, + 286743CF5D5D808E9414617FA7C79D6C /* Behavior.swift in Sources */, + CE80F47CF0E8E61CCE2B054FE69A912B /* Callsite.swift in Sources */, + EACEBAA1D40EA9618B95A5B90079ACF3 /* Closures.swift in Sources */, + C94795A1C0DB7BD502EC483AD3572842 /* Configuration.swift in Sources */, + 6D539350FE4E42FD2973B5008258FFD2 /* DSL.swift in Sources */, + 92806CD65D9123E9D02FB549E350A44A /* ErrorUtility.swift in Sources */, + 470A9D5B4F0ED6B06D9A0152D5ED3479 /* Example.swift in Sources */, + D4809A8D74D3C810C92FE7FEC596E7E5 /* ExampleGroup.swift in Sources */, + DE773E19794E4BB587F8A78191971389 /* ExampleHooks.swift in Sources */, + BA63F9061BDC9F2D0035403AC6435068 /* ExampleMetadata.swift in Sources */, + 01D3D0B2FE5A3D3CAEF52570612375C8 /* Filter.swift in Sources */, + 920F0B5A40AE626A151C8396AA4F34FE /* HooksPhase.swift in Sources */, + 8BC9880E7C921681D7AB3D5C42B94BD7 /* NSBundle+CurrentTestBundle.swift in Sources */, + 34CF627F0AC1430B44258758CD9D549C /* QCKDSL.m in Sources */, + 86D91D7B3B6F632E07E96F86CDBC24DC /* Quick-dummy.m in Sources */, + CF38013F48221FC7C288D1C7F6EB8120 /* QuickConfiguration.m in Sources */, + F3E03BAB16610B05E06C49EE3E5590AA /* QuickSelectedTestSuiteBuilder.swift in Sources */, + 207B72EF029C1A871E3B066CEBF115D5 /* QuickSpec.m in Sources */, + 07E769518F498C23EE106C903A8CADF3 /* QuickSpecBase.m in Sources */, + B764E73F1E0453C6C3BB5F747D23AAA1 /* QuickTestSuite.swift in Sources */, + 5B403645B70F195A2FC00A8DCCB82727 /* String+C99ExtendedIdentifier.swift in Sources */, + FBC98F20993AF83BC59BD2A677C8587D /* SuiteHooks.swift in Sources */, + C24BDE802BC880E383B2B866B0857EF0 /* URL+FileName.swift in Sources */, + 7602C3F30968CAD38EAF6BF139C35297 /* World+DSL.swift in Sources */, + D92A39045A9F582961DF39A8BB13865A /* World.swift in Sources */, + 4330B50A5B4ABCF088AF8406A597529E /* XCTestSuite+QuickTestSuiteBuilder.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 4178138CCB22B58C4BB67FEF845A8E7D /* Sources */ = { + 7D9689BBAAB8AA5E7CCCE495616B7E6C /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4FD0B668599BDAF28C3B48264646A05D /* Pods-Demo-dummy.m in Sources */, + 6B2655179ABC6C2F38995340A6F961E0 /* HasDisposeBag.swift in Sources */, + E7A4FA9182CDC050300568FFA8713D9D /* NSObject+Rx-dummy.m in Sources */, + 1B2CD81981F4205D652523F2718F3B5C /* NSObject+Rx.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 668E4B9F3729C16F35FB8C5A7D6D88C7 /* Sources */ = { + 843204FEA6D0A77E8262CB3DE7F86658 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C25FC7A56AC20E4C745248B505FB8864 /* AddRef.swift in Sources */, - 39022340BA4C753EE74695EE2C7C455D /* Amb.swift in Sources */, - 34FF932D6DEFC87B16BB8B2CE3AA5A01 /* AnonymousDisposable.swift in Sources */, - 2FDEB16F1990368152338AF2DE6D0C32 /* AnonymousObserver.swift in Sources */, - ACBDFCBB834F0381E3CC9B223F9FF40E /* AnyObserver.swift in Sources */, - 01089B3FDEFB0CDD0B67D38ED86963BB /* AsMaybe.swift in Sources */, - 6ED60AC96F8472044C00C8D7D628A0C6 /* AsSingle.swift in Sources */, - 7296E0A03EC8B756490B091FC364D56C /* AsyncLock.swift in Sources */, - 993640128A087C5D96F453A18DCD9138 /* AsyncSubject.swift in Sources */, - FB208F9C94AE4284B4695DCED66AF03F /* Bag+Rx.swift in Sources */, - 44FA2F66B24E147991026B20AEFD2158 /* Bag.swift in Sources */, - 218D5177D58A35446EF01C47A2ECC7CC /* BehaviorSubject.swift in Sources */, - A54297FF959864299C019286DDCE4E90 /* BinaryDisposable.swift in Sources */, - 1F2F8FB86E40FAB4663086CE83B7654D /* BooleanDisposable.swift in Sources */, - 5780AAD342CE3C8CCDC47ADFF96973B1 /* Buffer.swift in Sources */, - 45B3DA8C3A339E583A2BEDF6161D0592 /* Cancelable.swift in Sources */, - B34A6018FDF04D597D6E7529674C70B8 /* Catch.swift in Sources */, - 6C7793E96DD52017C4265E4AC7B7DFDC /* CombineLatest+arity.swift in Sources */, - 783623D1EBFE01DAB87B7B68F150C4C4 /* CombineLatest+Collection.swift in Sources */, - 18FAD9641B101E8EEBEB00EE431E3440 /* CombineLatest.swift in Sources */, - 682734406B4017836DFA3477E9580A75 /* Completable+AndThen.swift in Sources */, - 2443408236BFC805C0E5EC554DA4787C /* Completable.swift in Sources */, - 4949A35DFD7AF5D991FA12BA16D37A6F /* CompositeDisposable.swift in Sources */, - 5E689A3A729873D290AD5C963C4D5389 /* Concat.swift in Sources */, - 3BED04BCEE6536D8937220381EE790AA /* ConcurrentDispatchQueueScheduler.swift in Sources */, - 9832EC5987372E75A4C3F1E13CD3F372 /* ConcurrentMainScheduler.swift in Sources */, - 7371D9E42417DC2735CC0B33FCAA5B53 /* ConnectableObservableType.swift in Sources */, - 06D49CD0E284F13EC4446F702800D17B /* Create.swift in Sources */, - C798F9D3D2C528634CE1AF5B9D1A86EC /* CurrentThreadScheduler.swift in Sources */, - 983B50800F73172C0CFDBE2C9AA34CCD /* Debounce.swift in Sources */, - F4F64B5A42509E4397D3D51E13B0C4C9 /* Debug.swift in Sources */, - D288903D8382C3A45230B8E8F1ABD4A3 /* DefaultIfEmpty.swift in Sources */, - 72F5C956E3EEC102D8C074CECC6BC3FA /* Deferred.swift in Sources */, - BB02C07DFD814F2B8FD5797635B156A3 /* Delay.swift in Sources */, - EAE3244F76D911D79ED30B4A7259DFB6 /* DelaySubscription.swift in Sources */, - 08210EC63215AC1453760A6267015D98 /* Dematerialize.swift in Sources */, - EE99E3B1DCB0348F44C7499B2BA809A9 /* Deprecated.swift in Sources */, - 86DC85C7CF36987627A4A36D82C310C5 /* DeprecationWarner.swift in Sources */, - F44B8D914434D1395E2873C45587B500 /* DispatchQueue+Extensions.swift in Sources */, - CDE5591E5DC14A3BD4C44557996D0912 /* DispatchQueueConfiguration.swift in Sources */, - 3FC7EEF76396FF30EF783749C26F8C05 /* Disposable.swift in Sources */, - 94641EE53103489464DC9A221DB495A2 /* Disposables.swift in Sources */, - ADBCE6E49E093AD2C1E6366DABBBC03F /* DisposeBag.swift in Sources */, - 2CC91D1EF04393AE48463B5C9D8CAF96 /* DisposeBase.swift in Sources */, - 7ABB709BD6428FCC8793EA57479CB750 /* DistinctUntilChanged.swift in Sources */, - 2008CD2E1A5CB2AC1E02C9BD37AF8C22 /* Do.swift in Sources */, - E4E54DCF87B0DDFE063F6E4DC162BDE6 /* ElementAt.swift in Sources */, - 3DA38E69E7910F5F001F05BD09D957D1 /* Empty.swift in Sources */, - E2A16679D4DDEBA514BE2B37ED821EBC /* Enumerated.swift in Sources */, - 46238EE10297B2070114146C08FED333 /* Error.swift in Sources */, - 836BD1324E5478A3AB7542A3CE75F283 /* Errors.swift in Sources */, - 960B9B027E55F6C0481B63E25CF50EE6 /* Event.swift in Sources */, - 7F1BE590E76E43F561D8F8CF354F72F6 /* Filter.swift in Sources */, - F552462D6CD28A8074CF8746ED010AF6 /* First.swift in Sources */, - 35382B1E443979F689AB1B64A9DF839B /* Generate.swift in Sources */, - 792874E54F86CE42C62738D2A617471B /* GroupBy.swift in Sources */, - F01E5B65B40B6E3082994D09EC7A55BE /* GroupedObservable.swift in Sources */, - ACBC3FF2772BDB948D79DE4ACE4D7722 /* HistoricalScheduler.swift in Sources */, - 7876A8DBFDC1DB9B1AE2DEDE6A3215B1 /* HistoricalSchedulerTimeConverter.swift in Sources */, - BB7BDB047E44BF96B6967525A2EF0301 /* ImmediateSchedulerType.swift in Sources */, - 0D26DF5C78770563BB602E49C68DD75A /* InfiniteSequence.swift in Sources */, - F7D7D1D92A2A67BF2977AE46A48ABBF7 /* InvocableScheduledItem.swift in Sources */, - 91BBDC01F5559CD8ECBF2591ACAB7E04 /* InvocableType.swift in Sources */, - 3A9EFBA686520511F5F4E7A57643EF3B /* Just.swift in Sources */, - A274C62D7E69DB37DDBF4634D893E4BC /* Lock.swift in Sources */, - B0F913BBEE0EFA8232619A91191BF412 /* LockOwnerType.swift in Sources */, - BDDE7F52290E745F8E0ADF2F1B88B660 /* MainScheduler.swift in Sources */, - B287D5E766B234A090DCBC039E87B2D6 /* Map.swift in Sources */, - CB2070AAD7F9B9E283AD2A50624DC8E5 /* Materialize.swift in Sources */, - 8D4752D7E2883F2567EF632CC4E226C4 /* Maybe.swift in Sources */, - D7F54D1594E9B050170EAD9762901A41 /* Merge.swift in Sources */, - 5E901977E117A5D74CD1701BB665B3A0 /* Multicast.swift in Sources */, - E4D4B352127EE8DB616595CF15FA7704 /* Never.swift in Sources */, - C4F42D1DA4FF9D2A4A74B2EACBB42EEE /* NopDisposable.swift in Sources */, - C3DB1DB7DDD26BB48EDA8EA92289F398 /* Observable.swift in Sources */, - 631DE69A990BC90C4B864A9056F810A8 /* ObservableConvertibleType.swift in Sources */, - 8580697F001A38CF65562CBE91B3C3D0 /* ObservableType+Extensions.swift in Sources */, - CDE8D74CECACB82D52879CA3EFA439A9 /* ObservableType+PrimitiveSequence.swift in Sources */, - D20D415DB1DC034E1434D3265645F21D /* ObservableType.swift in Sources */, - 014C8C742FEFDB7E7542BF2436F955CA /* ObserveOn.swift in Sources */, - 42927A4F037AAE24843B79E44FE19AC9 /* ObserverBase.swift in Sources */, - FDBCBA60FA2DCFBCE0D09A484859687E /* ObserverType.swift in Sources */, - 04C3D6EA8DB704A044E57A603F8051AD /* OperationQueueScheduler.swift in Sources */, - FA47FEE3404BEA929C6B6081015CAA22 /* Optional.swift in Sources */, - A3769A79129A62719850CA2BD7F8B4BC /* Platform.Darwin.swift in Sources */, - 71620E4C41A339C58454366C0C745343 /* Platform.Linux.swift in Sources */, - 79A97F6BE246CF2D3CAF89AD701B92DA /* PrimitiveSequence+Zip+arity.swift in Sources */, - 6677FB54CA94A573E7055E91A774BAA7 /* PrimitiveSequence.swift in Sources */, - 51294689F8DD7158A89F4083A2207F60 /* PriorityQueue.swift in Sources */, - F3BD9C72BAF02A3B4B8731C95C076B69 /* Producer.swift in Sources */, - C062E295E908096B138F19EAC25F86F6 /* PublishSubject.swift in Sources */, - C25C2936C31569B3F4247170224114E3 /* Queue.swift in Sources */, - 4463FF547D5F565394B614D1A73D8877 /* Range.swift in Sources */, - 5BFF937266E4511B7365D3B5F552EE4C /* Reactive.swift in Sources */, - CF1ED281DEC16E6F808DE809FD9A4688 /* RecursiveLock.swift in Sources */, - 5B392CA36C975AC73B4ACD3FA812176D /* RecursiveScheduler.swift in Sources */, - 9837B2C2E8067FC961F5ADF7F2A70764 /* Reduce.swift in Sources */, - 694209670715D02154935BBC68357DDC /* RefCountDisposable.swift in Sources */, - 6A81D8BA95FB1AE2D08BAF2CD8722D1F /* Repeat.swift in Sources */, - 112CAE9947132F20975ED24B680C0E0A /* ReplaySubject.swift in Sources */, - 7961143C7234A4CCE19F18B3E46A3675 /* RetryWhen.swift in Sources */, - 62795B841FA47336A4A09F0B0776FDA5 /* Rx.swift in Sources */, - 54CCCCF6DE0F0196785ED239FB290146 /* RxMutableBox.swift in Sources */, - 7E4106FB6CD590CF28FB62BEF94CFC9B /* RxSwift-dummy.m in Sources */, - 7BF648A27F63C337E891EFD80CEFEDCF /* Sample.swift in Sources */, - C70836640F9BCAD036DC24CD53EAD941 /* Scan.swift in Sources */, - D469257F041DDCAF64BEED7BC8A03095 /* ScheduledDisposable.swift in Sources */, - B8A8CC77A2A845C44237B66CF0C8F022 /* ScheduledItem.swift in Sources */, - D2E59573AB346DE7A8E9492084578ED4 /* ScheduledItemType.swift in Sources */, - 5B8933F55D812751FD5DC9C962D4B880 /* SchedulerServices+Emulation.swift in Sources */, - CF344AE64DC644F7F9643462510552F0 /* SchedulerType.swift in Sources */, - 69DCD40C8C5C22615B29432BF0ADB8F1 /* Sequence.swift in Sources */, - E9051C0B4E7A242E6E97A5B5AA0404A4 /* SerialDispatchQueueScheduler.swift in Sources */, - FD164FECF087F6F23A090797CA3E9949 /* SerialDisposable.swift in Sources */, - 71E9ACE34A2AC6107D9D3FD879E54003 /* ShareReplayScope.swift in Sources */, - 28B4541F690EC0D5DEB304142D6A5CFE /* Single.swift in Sources */, - 6FC73E611DB28D56E414368C62293B35 /* SingleAssignmentDisposable.swift in Sources */, - 6789FBB44FD34F04961C57D946F303C8 /* SingleAsync.swift in Sources */, - F683E04324F4494A9FA86E8D9AB15F0A /* Sink.swift in Sources */, - F09B92DBEA01E4AC34B1936261B29D7C /* Skip.swift in Sources */, - 30151F3559071F4DFAC85F54E8A1A37A /* SkipUntil.swift in Sources */, - 2ACB6F721F83AA421857ACACBECD7BA1 /* SkipWhile.swift in Sources */, - 596E6C82A98EE40174F48463FA1BE093 /* StartWith.swift in Sources */, - 3351B401498926F2535052FC5EAF64A7 /* String+Rx.swift in Sources */, - 845A3084299A4B5366BC11E793F47FC8 /* SubjectType.swift in Sources */, - 2A8ADC8C1A772582E3F54ABAE5DFA18B /* SubscribeOn.swift in Sources */, - CB3FE477A28D5F42659E775DDADFA162 /* SubscriptionDisposable.swift in Sources */, - AD3AB11277BC8A2880794BFA14AA3327 /* SwiftSupport.swift in Sources */, - B5541AEE9C3EF1FC587FD966C696255A /* Switch.swift in Sources */, - C17F7ABA56D9CF3BCCCC099B28E2180F /* SwitchIfEmpty.swift in Sources */, - A9ED0D16B96A912902689EC0B359D695 /* SynchronizedDisposeType.swift in Sources */, - 2C06E9D96634BC6B95FAF6BF7CED54A1 /* SynchronizedOnType.swift in Sources */, - D89AD296DD7AAF395C236A8708FCE1AA /* SynchronizedUnsubscribeType.swift in Sources */, - 0584D0378A7BC566D680CA4745759AAE /* TailRecursiveSink.swift in Sources */, - D20332D3554078C7F69A22AD794F38DF /* Take.swift in Sources */, - 9CAA6C0F3A9D7BED04A08EECF400A0CE /* TakeLast.swift in Sources */, - 540670A34C103B3D2EFC67692D64D94C /* TakeUntil.swift in Sources */, - 81FEEC4A4AAE20EB19B8D499CC21F0F0 /* TakeWhile.swift in Sources */, - B16E0468AF7B79011E9E5008D74DF99D /* Throttle.swift in Sources */, - DEF90E9699C9CFF31E275EDF10E67F5A /* Timeout.swift in Sources */, - 54EFB7A3E7737C4CFF3C0E30C525B81E /* Timer.swift in Sources */, - 8F5F62256B3D0CA7C0F3C12873E5A6AE /* ToArray.swift in Sources */, - 089F2B2C34FD6211087F479001EEB544 /* Using.swift in Sources */, - 114852CA7443A6F59DC7F10854BFFE5E /* VirtualTimeConverterType.swift in Sources */, - 4349DBA2D11F7116FCA85B892C0966C5 /* VirtualTimeScheduler.swift in Sources */, - A773C0EEDBE9F7DF4D6F7F13D60C8509 /* Window.swift in Sources */, - 24E286D69C7DC48C2914448A0A7B29DC /* WithLatestFrom.swift in Sources */, - C2DB15EDDCB2D09A7BA3DADEE3E48A3E /* Zip+arity.swift in Sources */, - 6ABBC348BEF5F20DBE251EB1DA4139D8 /* Zip+Collection.swift in Sources */, - 06A8D4A5474C39C04655948F8CD31A2F /* Zip.swift in Sources */, + A9F93A9C40771906414564A30333FDB9 /* AdapterProtocols.swift in Sources */, + D4FF0990DB524278EB20490C5311E19B /* AllPass.swift in Sources */, + EB062EA45D4A3859C6CEA85DAC1ED237 /* AssertionDispatcher.swift in Sources */, + 5F154C985B9DE1085A993CF9AB332BF2 /* AssertionRecorder.swift in Sources */, + D845D55E7CD75BA58F753A5AA454E422 /* Async.swift in Sources */, + 7AA21A2A7686580BEF335C12D3D7AB81 /* Await.swift in Sources */, + 8784230CBBBC7267F29611E0E1DC961E /* BeAKindOf.swift in Sources */, + 3101D8F2678E107351E1179C14FC7BF5 /* BeAnInstanceOf.swift in Sources */, + F596D6BBE5BAD012376F7CB73D44CE6B /* BeCloseTo.swift in Sources */, + D3A571F180E2A2D8A1248890490C9E36 /* BeEmpty.swift in Sources */, + 0999B997CDAC772A41A7F70CEF4A1D49 /* BeginWith.swift in Sources */, + E421CC9222B4DCD92124CA45FBA6A247 /* BeGreaterThan.swift in Sources */, + A74CEEC58BDEB1F9A37685FCA3376746 /* BeGreaterThanOrEqualTo.swift in Sources */, + 7403EBDEC592DF5F4AA19EEFED35AC5A /* BeIdenticalTo.swift in Sources */, + 89A206D51752309E13BD5C427C35A090 /* BeLessThan.swift in Sources */, + 89D30C28183DF9BFC6C940211DA889D7 /* BeLessThanOrEqual.swift in Sources */, + 8413172B4FBB9E364EC42674F13A9FE3 /* BeLogical.swift in Sources */, + DA28D44BB7C7CE1CC8F91BEE1E89C610 /* BeNil.swift in Sources */, + 94C84E6DFA71C70DF521E9D995C1505F /* BeVoid.swift in Sources */, + 328CBB53BF5236042DF4CB4B751EA062 /* Contain.swift in Sources */, + 03705FCE353B9A436320B5798C9F7A50 /* ContainElementSatisfying.swift in Sources */, + D9FEB1F14A7C841D4BE3109A0F193843 /* CwlBadInstructionException.swift in Sources */, + 1BAA60FABBC4047372D87D9B739C4463 /* CwlCatchBadInstruction.swift in Sources */, + 888B88EF8BDEBCB1702F8BB33BCBC3B2 /* CwlCatchException.m in Sources */, + 24AD9C69B1A899FA7DB0CA4D346319C5 /* CwlCatchException.swift in Sources */, + 31DCC4FEA92A71A9FE8D881B73FC7426 /* CwlDarwinDefinitions.swift in Sources */, + 35087B8F6AC4F000C85B8D672760AFAA /* CwlMachBadInstructionHandler.m in Sources */, + 7FA411A969F1D1A7AD517C3E7B739AA6 /* DSL+Wait.swift in Sources */, + 82607C525BEE07050E18F0BFCF0AEA52 /* DSL.m in Sources */, + 3537F7CBFBE04113D495FF50BC3D6672 /* DSL.swift in Sources */, + 784DC54B4603FF9B368122FCD7D1D897 /* ElementsEqual.swift in Sources */, + DE54DDE5C5B6283DE5ADBBDAA91ED589 /* EndWith.swift in Sources */, + 43E95567704203A2DE95E07947BDF70E /* Equal.swift in Sources */, + 9C3F7FC69ADC5BFCE26D5BCB0B9234C6 /* Errors.swift in Sources */, + E74C63A506330D4E6E1DC8F3894BDC22 /* Expectation.swift in Sources */, + E80F2F25B622EBC3F1CACD1AFD851A11 /* ExpectationMessage.swift in Sources */, + D0117BC10CB96CA7F32536A69C085C49 /* Expression.swift in Sources */, + 373C57D757D6DFAC77450763C6BFA620 /* FailureMessage.swift in Sources */, + F5090F52CF4E6B768D0FB5F676B61AE9 /* Functional.swift in Sources */, + DF50C201EB25B9BDDD6363698ADE639C /* HaveCount.swift in Sources */, + C5808A46FC4C07F235753E2AE4A7511A /* mach_excServer.c in Sources */, + 83E49C3B8280FEEAE4F2A81F64A549B4 /* Match.swift in Sources */, + 966FBB84C847F2BCAED02AA147A2CFAB /* MatcherFunc.swift in Sources */, + C56CE025F6E708D6F5F11DB4EA23728C /* MatcherProtocols.swift in Sources */, + 6ED749CAF781EDB557E30C69637DBC5F /* MatchError.swift in Sources */, + DE41036F5CDFE75D351DEAC46ECD9FA9 /* Nimble-dummy.m in Sources */, + A4B6197170839BA97DE105AA9D1FAD7D /* NimbleEnvironment.swift in Sources */, + D1A4A1DD617C96759F7B2AB2A6AEB0E1 /* NimbleXCTestHandler.swift in Sources */, + B836AB3DB63144FE21C715D2944AEA07 /* NMBExceptionCapture.m in Sources */, + 075311A9B30D68479A7D7404A99B2FB1 /* NMBExpectation.swift in Sources */, + 13FBB20EA4647EA46F0CB2E7254A5F50 /* NMBObjCMatcher.swift in Sources */, + 392B6696BC59BDCD988D7C5DF3E3E1C5 /* NMBStringify.m in Sources */, + 9DB1E08337AC3FF955539F4E0D1074D2 /* PostNotification.swift in Sources */, + A51570857887E8E40B39F91C35358E2D /* Predicate.swift in Sources */, + D1FD91581D2DC0A42C9134862F569C83 /* RaisesException.swift in Sources */, + 1BAEDA109B23A9F1F66A906865309037 /* SatisfyAllOf.swift in Sources */, + 6B4197D2E87B5B445A7AAF18DBA22509 /* SatisfyAnyOf.swift in Sources */, + 0F31FA39DE65E4B1F239F8D4DC999A8A /* SourceLocation.swift in Sources */, + C7B9D1E45DDA944F4C7E372D3A20999C /* Stringers.swift in Sources */, + AC26B8C4461E89CC285F1D3273A659BC /* ThrowAssertion.swift in Sources */, + E40A6E85823CE585BF269D1DF4EF5E04 /* ThrowError.swift in Sources */, + 870471424FE3C6BA3E33C949BEF04D50 /* ToSucceed.swift in Sources */, + 4E70FE29FB2BAD7E5427532B5D2FCF26 /* XCTestObservationCenter+Register.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - CE5A3B1F3B202904269DA6B397D220B9 /* Sources */ = { + 8812EA255BB67E3087D14E8136B8A5FD /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 66B1964BB363964D6D5997D1A036AA4C /* Pods-DemoTests-dummy.m in Sources */, + 439B7DBAF82C63E4FE81F76C1DC926A3 /* AddRef.swift in Sources */, + DE28E11308041B80BE7ED204B05E1713 /* Amb.swift in Sources */, + 92156314105ABEAD97AFAE08E79E6671 /* AnonymousDisposable.swift in Sources */, + 152A5412073D29FC86307CA29DF0E3C6 /* AnonymousObserver.swift in Sources */, + BDD51FEAEA517ABA9C530B9BB0FB30A1 /* AnyObserver.swift in Sources */, + 4218C8CDDDCAF09FDD425C8BD9A8D487 /* AsMaybe.swift in Sources */, + 821231B2CFF05E5FBF9A45E596AB5D9E /* AsSingle.swift in Sources */, + 73522A93D62BDC1988911165DDD3C9C2 /* AsyncLock.swift in Sources */, + 092FA20F0D433948FE67EEDE3458B54F /* AsyncSubject.swift in Sources */, + 714F22BDA11631DF383D674E6B0F5F89 /* AtomicInt.swift in Sources */, + 5997315B6EFC3804EC64035839DBD127 /* Bag+Rx.swift in Sources */, + C3AF3B799B34CA45617AFBAC5C723BAE /* Bag.swift in Sources */, + 899AFF0012B24A1AF38A4DE92F573B55 /* BehaviorSubject.swift in Sources */, + 84CB7AE5E9C32642F502CAC37DDB6986 /* BinaryDisposable.swift in Sources */, + D71C8A2B465E5A1D610A52A7657A53E2 /* BooleanDisposable.swift in Sources */, + 70BB444AD4DC21ABDF48407F4F3114D4 /* Buffer.swift in Sources */, + EC55D8E1E24780E4E5C95AAE69C32AC4 /* Cancelable.swift in Sources */, + 3BF57A6E34107240EE60D291DF52CFF4 /* Catch.swift in Sources */, + 28D61886B4D68DF9BE7D097ED22A262B /* CombineLatest+arity.swift in Sources */, + 9735795628BA3695F1375A797D363C5D /* CombineLatest+Collection.swift in Sources */, + D955DC16333D3A49BDBCB9C629D83130 /* CombineLatest.swift in Sources */, + C2FD48442C9797B247D085636C65C913 /* CompactMap.swift in Sources */, + CFA5F472172FEE47D0E3FCC43633BA5C /* Completable+AndThen.swift in Sources */, + 1FAA12958A27E5AA0C36DDE0F1B4BF6D /* Completable.swift in Sources */, + 4ACC7AA26D1EFC94BE2E840F146C896D /* CompositeDisposable.swift in Sources */, + 2528E862042FE23A29EBE9932F91C5C0 /* Concat.swift in Sources */, + 4F4F2EF6766041064E30DD44A593197E /* ConcurrentDispatchQueueScheduler.swift in Sources */, + 7E8FA671634C3AD01E98E39F3C2846C9 /* ConcurrentMainScheduler.swift in Sources */, + 68804FE195D2B3233E3DC13575EC9393 /* ConnectableObservableType.swift in Sources */, + 40CC20434FD530CF3BA09F87FFB2DE95 /* Create.swift in Sources */, + 0A121E2F07E4C48E7BAB14213F9767C1 /* CurrentThreadScheduler.swift in Sources */, + 75D9A7BE78853E43A19D64005569CFA9 /* Date+Dispatch.swift in Sources */, + 9479B13C44947B10A62390AF1AF0EF4B /* Debounce.swift in Sources */, + BF5CE1D4C759C879037BFB67D1964D7A /* Debug.swift in Sources */, + A74BB407D18EF6E795D961FB63AB6679 /* DefaultIfEmpty.swift in Sources */, + 2774D2F1FB09F89175C53EE58288553C /* Deferred.swift in Sources */, + 7C54BE4E7B14BC495EBBB336AD33BB3F /* Delay.swift in Sources */, + 962B5DB233BCDC2975CA9C13AD07FD2F /* DelaySubscription.swift in Sources */, + 0438A36029E714EF1A08B5969F52D1A3 /* Dematerialize.swift in Sources */, + BF41738CE0366D7C0BF64459B4079B34 /* Deprecated.swift in Sources */, + 6F0645651F1A0955C54E573360440234 /* DispatchQueue+Extensions.swift in Sources */, + 580965622A993EA9485A713D5D71CA89 /* DispatchQueueConfiguration.swift in Sources */, + 9299E0D83B13837D4FB943B19818CF3B /* Disposable.swift in Sources */, + 3DF180681EFD688A1A5D5A2544F602FE /* Disposables.swift in Sources */, + FF07FD541D8D557EFF423EE7462CBFC1 /* DisposeBag.swift in Sources */, + D8227DDE3DD50DDDAA7075D62FF4301E /* DisposeBase.swift in Sources */, + FC809EA2196F623AFF31497859E25001 /* DistinctUntilChanged.swift in Sources */, + 647711A9145D2B67F5C14AD9920300DC /* Do.swift in Sources */, + 3813E280C0C2616938095B89B187B42D /* ElementAt.swift in Sources */, + 636DE207312ECEC9E011B9632F78F2CD /* Empty.swift in Sources */, + 33EA3FCF9F6FEEF8F43442D8066C9BD4 /* Enumerated.swift in Sources */, + DA59CB94170244911D780C1C3746CB23 /* Error.swift in Sources */, + 33CB3E3B60DC895E8A7AA5F68C928C4F /* Errors.swift in Sources */, + DC59B35B1F1BEB28DF96E7451797693D /* Event.swift in Sources */, + 88AB85B9E734E5DFA009CA50C70C9B98 /* Filter.swift in Sources */, + 6365C6E1F6AF291B7A2DA5B1BA1227B0 /* First.swift in Sources */, + 4AA777DB1D55F1FC940F409C8329BC8B /* Generate.swift in Sources */, + E6407B2CEA12036DE8C4C6B0708747D7 /* GroupBy.swift in Sources */, + AEFDBE936035B9EE50FEECB910186160 /* GroupedObservable.swift in Sources */, + D0D4FEC992CCC7EC3AF2D38631E26E52 /* HistoricalScheduler.swift in Sources */, + F0544B8B8299481FA44F48C804A45B8C /* HistoricalSchedulerTimeConverter.swift in Sources */, + 307FF1920F6895BD3771B49C40E61D5F /* ImmediateSchedulerType.swift in Sources */, + 07B1934FD97C7EA7F08A620890DBB3E5 /* InfiniteSequence.swift in Sources */, + F1759331988D9DFF47C9D7C66D08DFE4 /* InvocableScheduledItem.swift in Sources */, + F15BD8EC9ECB8CD62AEE60ED93458FDE /* InvocableType.swift in Sources */, + A9E520BAE196DF245610CBC9156EFE6D /* Just.swift in Sources */, + 9E9BCCD3F742CDF6C0B7ED41322F47FB /* Lock.swift in Sources */, + A3943215251A0AF61AA2B686AECEC648 /* LockOwnerType.swift in Sources */, + 15421ECBE1802FDF325E28355BEEFA6C /* MainScheduler.swift in Sources */, + 0B515B50273DE9B9512865F3F81F3655 /* Map.swift in Sources */, + EEF05428DB90B5324320E9F10FA1E936 /* Materialize.swift in Sources */, + 2FEBB7168BFD93CC7A938E18C8476AC7 /* Maybe.swift in Sources */, + D3B003C04E10F1B56DE2CD94426EAB76 /* Merge.swift in Sources */, + 02FF4329F0BA1BC3F6041C32EE62D9C1 /* Multicast.swift in Sources */, + 71C41A5F1784FE55FBA6287B438AEF49 /* Never.swift in Sources */, + EB9AABCDC67100A5E42812A2EEA571C7 /* NopDisposable.swift in Sources */, + 86E4F4DBFB87FD52170B4CBE3AD000D7 /* Observable.swift in Sources */, + 60395BFA77F80D165CC5C90FD63CEC1C /* ObservableConvertibleType.swift in Sources */, + FE65523623494850282EDCB0735FF1BF /* ObservableType+Extensions.swift in Sources */, + 9561EAAB5294ACF53D9DC7E7A2E6E46F /* ObservableType+PrimitiveSequence.swift in Sources */, + 2A712AC70477FB3C55883C27664A4ED2 /* ObservableType.swift in Sources */, + ECFA3013D7A5860B059916C371738C29 /* ObserveOn.swift in Sources */, + 952F1233D7E19DC25932627428EB6930 /* ObserverBase.swift in Sources */, + E3D18A848ABDF2641023484EFA3F61BD /* ObserverType.swift in Sources */, + 5B1BC6D53F7D9462CF33EA419CF98DCD /* OperationQueueScheduler.swift in Sources */, + 352B13E49D3F52756B78A23DF201209C /* Optional.swift in Sources */, + A93007F83A3A608E0EC7FB332F97D8E1 /* Platform.Darwin.swift in Sources */, + EF6DB9F024C96A590708CF7F1BCB7F7E /* Platform.Linux.swift in Sources */, + 144775D2B46212EAF82D9F31AB34E5DB /* PrimitiveSequence+Zip+arity.swift in Sources */, + 8223126FF3B20923489B62FC80DD2240 /* PrimitiveSequence.swift in Sources */, + 43BFCAC14F9577A11F53390BB37EA453 /* PriorityQueue.swift in Sources */, + 08D64D7CE863D44D3FB427F7C2C92D9D /* Producer.swift in Sources */, + 37C0A3D8328AE580621384421F00F455 /* PublishSubject.swift in Sources */, + AED1FFA35B2B1950B83BE97CD641A9C4 /* Queue.swift in Sources */, + CDB48F0247C3ADE596E73CE4946F9FC8 /* Range.swift in Sources */, + 7DCF2F0DA5F3AE0D756EDDD15F8ADA06 /* Reactive.swift in Sources */, + 108599C3E1008BED2A23B6624CDE4DB1 /* RecursiveLock.swift in Sources */, + BBC78F9AF751CEFB46C7EE6601FACBA3 /* RecursiveScheduler.swift in Sources */, + B15F2E64DA6AF598BEB54396872002A9 /* Reduce.swift in Sources */, + AD37336CCB9B4534847D2587C408AA4A /* RefCountDisposable.swift in Sources */, + 90DEE54A48A7E76CF37778D1C04F5F71 /* Repeat.swift in Sources */, + 96E60773237EFF4FB35C82AE89B91B27 /* ReplaySubject.swift in Sources */, + B9369949A929B490F868A189D23E9F24 /* RetryWhen.swift in Sources */, + 5C0E939DCE5E7007D9A60D417BD1AAFD /* Rx.swift in Sources */, + 9880E06BEA94E7230CC528F627ADEB81 /* RxMutableBox.swift in Sources */, + 627AA18DE0143FDB09DF788EA022E3A0 /* RxSwift-dummy.m in Sources */, + 93D24452DA6FD399E392A8F0AD89864F /* Sample.swift in Sources */, + 6F4630769E58C59D1653EAA8B8A5C2AD /* Scan.swift in Sources */, + F8B40ED7183B27B2795C8B59E7007B9D /* ScheduledDisposable.swift in Sources */, + 26B1C556D262EF5E79F770EC9576E182 /* ScheduledItem.swift in Sources */, + 1F03FBF435D83E6BD68FF7368EF9F538 /* ScheduledItemType.swift in Sources */, + 4E78B55C734693377EA13349E7630675 /* SchedulerServices+Emulation.swift in Sources */, + 23C5E2521B0474FD12A13ACCE9A95A55 /* SchedulerType.swift in Sources */, + EADC5E8DA8858F2D1C7DFE9EF5290C5C /* Sequence.swift in Sources */, + 084C081527EE23904A5F2242789A197A /* SerialDispatchQueueScheduler.swift in Sources */, + EA07C7E8EAC448DA3BF41EFE4D9D60C3 /* SerialDisposable.swift in Sources */, + FACF48E30E4F34EA0A0067BFB33910A2 /* ShareReplayScope.swift in Sources */, + F67E50D2228DB562A2E22F7A40A7877F /* Single.swift in Sources */, + ACADD12312F8C1F6FE4874503A4A804A /* SingleAssignmentDisposable.swift in Sources */, + 323C94462A9847E89F793321103FDFA4 /* SingleAsync.swift in Sources */, + 540A6C2E70CBA45C304C24C47DCD5090 /* Sink.swift in Sources */, + 714F3B880FD0FC5DAC40A13779623F95 /* Skip.swift in Sources */, + 348070A05CC41B15230199FBEDF43E51 /* SkipUntil.swift in Sources */, + 11C77BABE18E94E835C0767A050F4777 /* SkipWhile.swift in Sources */, + 144D51351559785B569309A2A8760C79 /* StartWith.swift in Sources */, + 404BC35387478E3C89A2B798F954DC29 /* String+Rx.swift in Sources */, + 682EE071D16796978937BEB8D5971DA7 /* SubjectType.swift in Sources */, + C791FEFA54FDA12CE87E8C4096E0EC20 /* SubscribeOn.swift in Sources */, + 0DB667ADE5584B0A23324D631EFCD93B /* SubscriptionDisposable.swift in Sources */, + 617D022B89E86BB1ADA234E6DD976ECE /* SwiftSupport.swift in Sources */, + 6686B242826487CD0923111B5F0C03C3 /* Switch.swift in Sources */, + 74ED9CD132927F6B4743101436B7BB49 /* SwitchIfEmpty.swift in Sources */, + 8DA5C18630C2EA960E9B47D4C958D07C /* SynchronizedDisposeType.swift in Sources */, + 0C38F0B2690DDB2B5E81FDDF3FF54C4B /* SynchronizedOnType.swift in Sources */, + 9DB412FBFF6191D49BD020E0AA9E5356 /* SynchronizedUnsubscribeType.swift in Sources */, + 4279ABC29B2508E407EBDDA5ACC8385E /* TailRecursiveSink.swift in Sources */, + 3BCEB530F8511ADDFC8200F10A44000A /* Take.swift in Sources */, + A70777FC88C21D2B635D8C6B0937408E /* TakeLast.swift in Sources */, + D5AAAC079F816850BCCF8FB559171617 /* TakeUntil.swift in Sources */, + 98C05E1E07FF53BDFC55EF5F883906BF /* TakeWhile.swift in Sources */, + 07F525BCE6ED0DB7EAC4A6E95043A3B5 /* Throttle.swift in Sources */, + FF425524D4E2775F0EA804C381956402 /* Timeout.swift in Sources */, + 39A40262339C79DCDCF9432DF16E3E4E /* Timer.swift in Sources */, + 26D3C02DFDC6BD7149116CB8ECBE91C2 /* ToArray.swift in Sources */, + 646252390176E7F531A393469CE36BCB /* Using.swift in Sources */, + 37BFF15B683F5B19389434D157237B06 /* VirtualTimeConverterType.swift in Sources */, + 07341C1184E09D43173AA6C6823E1D36 /* VirtualTimeScheduler.swift in Sources */, + 5CA3BB0A88B8A8743548B3C4B42C2DB4 /* Window.swift in Sources */, + 822408F7968E0050742BE64E216D472A /* WithLatestFrom.swift in Sources */, + E5CCA983C0C06E3C8A9EA38DAE916E85 /* Zip+arity.swift in Sources */, + C18DEDB4A3286A59EDA63418657D9118 /* Zip+Collection.swift in Sources */, + 6DBD103E103A5B3DCAD3E234C8F9DB99 /* Zip.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - D6B1B6EDFDF8E2AE73E584AD6081223A /* Sources */ = { + 88C44AB8B62EDEADE5024CE600C9A7CD /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8A07E63BB7C668B40163BA52C80E6532 /* HasDisposeBag.swift in Sources */, - 020D79365071F89CF47E8F65D60DF685 /* NSObject+Rx-dummy.m in Sources */, - EB7C68E6DCCC3500FE08F9B2F0C85F08 /* NSObject+Rx.swift in Sources */, + 1E3721725546B8B58815CFB0D07D6005 /* Pods-DemoTests-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - EC9C21A07385514359BB2357BDF22B6B /* Sources */ = { + CBAAB6896A155537B1243895F3030687 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 33044D36B602FD581BE14DEBE3A4F489 /* Behavior.swift in Sources */, - 98D381D62E332A089ACB3A59FCCE4ACF /* Callsite.swift in Sources */, - 17B386AD2B53702744C4169B5201217C /* Closures.swift in Sources */, - 3F5316B5ADE2B573B9ECEB45B5D061C0 /* Configuration.swift in Sources */, - 47542DCAC61738574E2F2BCACA6611F1 /* DSL.swift in Sources */, - 429367E7C28030B3509C31B053D17CB0 /* ErrorUtility.swift in Sources */, - E0AE698E1A4F0D9064C04882327C92F3 /* Example.swift in Sources */, - 60F93E168485BCB9AA3A157FE2CB7C41 /* ExampleGroup.swift in Sources */, - 103425C9315079FFDF4868042FE2CF79 /* ExampleHooks.swift in Sources */, - 65FF97EE04691FA9881DAA432DEAC165 /* ExampleMetadata.swift in Sources */, - D710D0C1F200BB05972529EEED15D4AE /* Filter.swift in Sources */, - 65345217D4A1DE88312F171F0251DB96 /* HooksPhase.swift in Sources */, - 93438224836AC1AFFD43A69A04501382 /* NSBundle+CurrentTestBundle.swift in Sources */, - C606BCAC386078403182F3AB0EA32A95 /* NSString+C99ExtendedIdentifier.swift in Sources */, - 3D600AC02826CE784CB7E9F88E9AC5DD /* QCKDSL.m in Sources */, - E3520A44C282726253DDE4DAC512CCA0 /* Quick-dummy.m in Sources */, - D5E2476AE4B2324B73B769C1B866D709 /* QuickConfiguration.m in Sources */, - F19DEFB017CE9B3CFB0C0A0AE9249CC4 /* QuickSelectedTestSuiteBuilder.swift in Sources */, - 3F076E5E0ACCE80863235591773EA2CD /* QuickSpec.m in Sources */, - E1ED227B3AD36380A637CA2B5980E7CC /* QuickSpecBase.m in Sources */, - F099097291330AC895E75E72028EBC0B /* QuickTestSuite.swift in Sources */, - F647E5A7CA3CDAB1EB28BB0E119FF954 /* SuiteHooks.swift in Sources */, - 9CA1B83C396A9E9AB68F7C5137B493FD /* URL+FileName.swift in Sources */, - A7EA3539CBE2EBB42D92C3132763E251 /* World+DSL.swift in Sources */, - 95971795C6F61C01410B264C4BBF3A6E /* World.swift in Sources */, - 9C736F7C9C052DFFF87DCBA83FF50599 /* XCTestSuite+QuickTestSuiteBuilder.m in Sources */, + D9CDC561FE34C512AA565ED9C9BD335F /* Pods-Demo-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 1F03E2CF6E0E59504F92E741CA377B41 /* PBXTargetDependency */ = { + 139F84F64D91C11C8E7123E9A15CA649 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "NSObject+Rx"; + target = DCDAFB3810BA0828CB04917C3C9BB0D3 /* NSObject+Rx */; + targetProxy = 8E28BEC4B4F29017BC1673563816FB1D /* PBXContainerItemProxy */; + }; + 3B4A7E998E4458E5B6A33B880E6D2E44 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Nimble; - target = 5E269AA9A7FBCB9BFD8EA487B43AE7F9 /* Nimble */; - targetProxy = 1945352C42EA3A9BB808659DF7EF5C93 /* PBXContainerItemProxy */; + target = F554EA343D656E7FB0C1ACC045EB2666 /* Nimble */; + targetProxy = 382882674E75C28CC9411D8C724B9153 /* PBXContainerItemProxy */; }; - 66DAB9E9AE12C2A041CB508F76BF73B5 /* PBXTargetDependency */ = { + 529362EB897B288A59310628CCC6FFD4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RxSwift; - target = AB6A097ED9ED31C93AA4B971CFDBBC33 /* RxSwift */; - targetProxy = 84FAAE3376CA8F3F598F8202CA76A6B5 /* PBXContainerItemProxy */; + target = 2EC00BC1B651DF6BA1208D1D610630D0 /* RxSwift */; + targetProxy = 75F09C244A3F7AAD83FBE92EFFCC784E /* PBXContainerItemProxy */; }; - E194097AC220C28B36F989E6D9F66B21 /* PBXTargetDependency */ = { + 8A2FF22750F2EC685666946B0A1D1F42 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Quick; - target = C86D25EC2265DA7A383D953ED7711121 /* Quick */; - targetProxy = 9C4E6AA93842E1B669F2567D9577B796 /* PBXContainerItemProxy */; - }; - E48535A33F851BB05FA6B47DB26F3AFB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "NSObject+Rx"; - target = 6DB514A28E386B633179B9615872C399 /* NSObject+Rx */; - targetProxy = AD4AC3E78E4C00FE6FA84A78B2B48EF9 /* PBXContainerItemProxy */; + target = CC37898399F3CE1D13D5F03D344200F6 /* Quick */; + targetProxy = AEC25B41396A99CE0DF06548A480D5C7 /* PBXContainerItemProxy */; }; - F4A1E0BE5B20A85EF0215713A8A9B3BF /* PBXTargetDependency */ = { + BA7ADD0443C67A882967438915934532 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RxSwift; - target = AB6A097ED9ED31C93AA4B971CFDBBC33 /* RxSwift */; - targetProxy = D0865859F488184744C9D0FB7CC8B06A /* PBXContainerItemProxy */; + target = 2EC00BC1B651DF6BA1208D1D610630D0 /* RxSwift */; + targetProxy = A15F253DE59A02BB37EF3BAD03923955 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 16EB0A98D24404AD14E6C0B6EEF65551 /* Release */ = { + 0CD90E32B9017277BBAA1A505014E74C /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7BAABE3D70B15D706F0E0BC9A5AA411C /* Nimble.xcconfig */; + baseConfigurationReference = E29DE8A204E52E82115DB7B194A3771A /* Pods-DemoTests.release.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -1731,20 +1738,19 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/Nimble/Nimble-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Nimble/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-DemoTests/Pods-DemoTests-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/Nimble/Nimble.modulemap"; - PRODUCT_MODULE_NAME = Nimble; - PRODUCT_NAME = Nimble; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-DemoTests/Pods-DemoTests.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1752,9 +1758,9 @@ }; name = Release; }; - 1EE094A14B5D7667CB376C3F8B36A5E3 /* Debug */ = { + 2D6A65327F1FC565E63668AE8D630ECC /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F98E837E3836FD16E13D4A18CEED912B /* Quick.xcconfig */; + baseConfigurationReference = 3FD4ADEC48199E79E1F9D299F12BC92C /* Nimble.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1765,28 +1771,28 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/Quick/Quick-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Quick/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/Nimble/Nimble-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Nimble/Nimble-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/Quick/Quick.modulemap"; - PRODUCT_MODULE_NAME = Quick; - PRODUCT_NAME = Quick; + MODULEMAP_FILE = "Target Support Files/Nimble/Nimble.modulemap"; + PRODUCT_MODULE_NAME = Nimble; + PRODUCT_NAME = Nimble; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; - 211B169ED37767918C24C3A4A06B4E85 /* Release */ = { + 35380542BC34EA61F7CDB93FD73CB005 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5167FF8A5B2F212486CFD19AD479585A /* NSObject+Rx.xcconfig */; + baseConfigurationReference = D5CBDE79352C4185F6C726CBAB8DE17F /* Quick.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1797,19 +1803,17 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/NSObject+Rx/NSObject+Rx-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/NSObject+Rx/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/Quick/Quick-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Quick/Quick-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/NSObject+Rx/NSObject+Rx.modulemap"; - PRODUCT_MODULE_NAME = NSObject_Rx; - PRODUCT_NAME = NSObject_Rx; + MODULEMAP_FILE = "Target Support Files/Quick/Quick.modulemap"; + PRODUCT_MODULE_NAME = Quick; + PRODUCT_NAME = Quick; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -1818,43 +1822,9 @@ }; name = Release; }; - 324B9C062846F5C25E2774053C7A7341 /* Release */ = { + 355058C6B2433F131461FF39DCB7A6D4 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8770613CD8D6FFEBC01B5906D0AE2C99 /* Pods-Demo.release.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-Demo/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.1; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-Demo/Pods-Demo.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - 33FD3AA7DDF995505498C9DB3C6FEF0A /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = F98E837E3836FD16E13D4A18CEED912B /* Quick.xcconfig */; + baseConfigurationReference = D5CBDE79352C4185F6C726CBAB8DE17F /* Quick.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1866,7 +1836,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_PREFIX_HEADER = "Target Support Files/Quick/Quick-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Quick/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Quick/Quick-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1876,54 +1846,16 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - 5F0383985A585AF9C7DC40DEC4A52705 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9C86746B7782939999EF488A707ED793 /* Pods-DemoTests.debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-DemoTests/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.1; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-DemoTests/Pods-DemoTests.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 60107D7EF3F4757F0F5FF5711B3B141B /* Debug */ = { + 40CC701934023652271984A1922263E7 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5167FF8A5B2F212486CFD19AD479585A /* NSObject+Rx.xcconfig */; + baseConfigurationReference = C6F16D155F41C66237C1E97FE8EA6828 /* NSObject+Rx.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1935,7 +1867,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_PREFIX_HEADER = "Target Support Files/NSObject+Rx/NSObject+Rx-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/NSObject+Rx/Info.plist"; + INFOPLIST_FILE = "Target Support Files/NSObject+Rx/NSObject+Rx-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1945,17 +1877,17 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; - 6638A516C9717D30201E40D4D47B1411 /* Release */ = { + 46E9F8B0B0B8FBE7903328F6721DBFBE /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CEE8FAC3960020923D811F92029719E4 /* Pods-DemoTests.release.xcconfig */; + baseConfigurationReference = F3986CA8C77ABE9248513C630836043A /* Pods-Demo.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CODE_SIGN_IDENTITY = ""; @@ -1967,12 +1899,12 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-DemoTests/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-Demo/Pods-Demo-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-DemoTests/Pods-DemoTests.modulemap"; + MODULEMAP_FILE = "Target Support Files/Pods-Demo/Pods-Demo.modulemap"; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; @@ -1980,8 +1912,6 @@ PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1989,9 +1919,9 @@ }; name = Release; }; - 69D740E99ADEFE05633F621B7CAEDD30 /* Debug */ = { + 5A53461CA43925D979CEE3015E02755F /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7BAABE3D70B15D706F0E0BC9A5AA411C /* Nimble.xcconfig */; + baseConfigurationReference = 25706706F8C3EDE14C88BED0DF4AB34F /* RxSwift.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -2002,28 +1932,28 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/Nimble/Nimble-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Nimble/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/RxSwift/RxSwift-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/RxSwift/RxSwift-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/Nimble/Nimble.modulemap"; - PRODUCT_MODULE_NAME = Nimble; - PRODUCT_NAME = Nimble; + MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap"; + PRODUCT_MODULE_NAME = RxSwift; + PRODUCT_NAME = RxSwift; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; - A26B9A53EACDC68208C940A7897839B3 /* Debug */ = { + 6EF36CB73C640C1F712E127E448BABDD /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B3B1FE08B862EAB796DF4CF965FDAF54 /* Pods-Demo.debug.xcconfig */; + baseConfigurationReference = 0FB3EFBA229C8E3BC633A6EE8DA748DB /* Pods-DemoTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CODE_SIGN_IDENTITY = ""; @@ -2035,12 +1965,12 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-Demo/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-DemoTests/Pods-DemoTests-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-Demo/Pods-Demo.modulemap"; + MODULEMAP_FILE = "Target Support Files/Pods-DemoTests/Pods-DemoTests.modulemap"; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; @@ -2054,9 +1984,9 @@ }; name = Debug; }; - A65EB54E0DC02895358482FAD383A44F /* Debug */ = { + 75927A4FBA3DCAD542356F7877C0FF9B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2D752ECA4EA765B6DC3853D1F8DE902C /* RxSwift.xcconfig */; + baseConfigurationReference = C6F16D155F41C66237C1E97FE8EA6828 /* NSObject+Rx.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -2067,60 +1997,25 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/RxSwift/RxSwift-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/RxSwift/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/NSObject+Rx/NSObject+Rx-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/NSObject+Rx/NSObject+Rx-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap"; - PRODUCT_MODULE_NAME = RxSwift; - PRODUCT_NAME = RxSwift; + MODULEMAP_FILE = "Target Support Files/NSObject+Rx/NSObject+Rx.modulemap"; + PRODUCT_MODULE_NAME = NSObject_Rx; + PRODUCT_NAME = NSObject_Rx; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - A80E2ED3DD64D58835D9C118CB0D8757 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 2D752ECA4EA765B6DC3853D1F8DE902C /* RxSwift.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/RxSwift/RxSwift-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/RxSwift/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap"; - PRODUCT_MODULE_NAME = RxSwift; - PRODUCT_NAME = RxSwift; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - E189E16F799384795D3A4D62BA9F34ED /* Debug */ = { + 8B68D161A685D0E9906DF2B297857921 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -2152,8 +2047,6 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGNING_ALLOWED = NO; - CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -2180,11 +2073,108 @@ PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; SYMROOT = "${SRCROOT}/../build"; }; name = Debug; }; - F9688F385912A451151A9C66654C80CB /* Release */ = { + A2E2D6C2D1E298B03095D6189FC6D655 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 25706706F8C3EDE14C88BED0DF4AB34F /* RxSwift.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/RxSwift/RxSwift-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/RxSwift/RxSwift-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap"; + PRODUCT_MODULE_NAME = RxSwift; + PRODUCT_NAME = RxSwift; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + AF799F3264B1ED74BD3F44DCD04087C6 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 6798E3801E9E92C404A5A73C9BC8D9E1 /* Pods-Demo.debug.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Target Support Files/Pods-Demo/Pods-Demo-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 9.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-Demo/Pods-Demo.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + CF389F750F700469742970304E1E1BC5 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3FD4ADEC48199E79E1F9D299F12BC92C /* Nimble.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/Nimble/Nimble-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Nimble/Nimble-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/Nimble/Nimble.modulemap"; + PRODUCT_MODULE_NAME = Nimble; + PRODUCT_NAME = Nimble; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + F5D3D0BF744B9700EA072D8A99FA80C8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -2216,8 +2206,6 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGNING_ALLOWED = NO; - CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; @@ -2239,6 +2227,9 @@ MTL_FAST_MATH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; SYMROOT = "${SRCROOT}/../build"; }; name = Release; @@ -2246,70 +2237,70 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 10836172B46B0B0B73CE062C21769FF3 /* Build configuration list for PBXNativeTarget "Nimble" */ = { + 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - 69D740E99ADEFE05633F621B7CAEDD30 /* Debug */, - 16EB0A98D24404AD14E6C0B6EEF65551 /* Release */, + 8B68D161A685D0E9906DF2B297857921 /* Debug */, + F5D3D0BF744B9700EA072D8A99FA80C8 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { + 4FAFFE8B8EFBB8AACD48FB251798C471 /* Build configuration list for PBXNativeTarget "Quick" */ = { isa = XCConfigurationList; buildConfigurations = ( - E189E16F799384795D3A4D62BA9F34ED /* Debug */, - F9688F385912A451151A9C66654C80CB /* Release */, + 355058C6B2433F131461FF39DCB7A6D4 /* Debug */, + 35380542BC34EA61F7CDB93FD73CB005 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 42CCCE2685AFD37697FD06271CCC2728 /* Build configuration list for PBXNativeTarget "RxSwift" */ = { + 7FC4717D38BEC744A930CBCCEBBDB472 /* Build configuration list for PBXNativeTarget "Pods-Demo" */ = { isa = XCConfigurationList; buildConfigurations = ( - A65EB54E0DC02895358482FAD383A44F /* Debug */, - A80E2ED3DD64D58835D9C118CB0D8757 /* Release */, + AF799F3264B1ED74BD3F44DCD04087C6 /* Debug */, + 46E9F8B0B0B8FBE7903328F6721DBFBE /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 45A9CE836141AB4AD8F20D23C8218FA1 /* Build configuration list for PBXNativeTarget "Pods-Demo" */ = { + 8B2E6174F1917F63CEB00FE79F70286D /* Build configuration list for PBXNativeTarget "RxSwift" */ = { isa = XCConfigurationList; buildConfigurations = ( - A26B9A53EACDC68208C940A7897839B3 /* Debug */, - 324B9C062846F5C25E2774053C7A7341 /* Release */, + A2E2D6C2D1E298B03095D6189FC6D655 /* Debug */, + 5A53461CA43925D979CEE3015E02755F /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 59D39ADEC18E454A063B6E2651E7E53B /* Build configuration list for PBXNativeTarget "NSObject+Rx" */ = { + A4250C01AA7223DDB22D206FCEFE97B8 /* Build configuration list for PBXNativeTarget "NSObject+Rx" */ = { isa = XCConfigurationList; buildConfigurations = ( - 60107D7EF3F4757F0F5FF5711B3B141B /* Debug */, - 211B169ED37767918C24C3A4A06B4E85 /* Release */, + 75927A4FBA3DCAD542356F7877C0FF9B /* Debug */, + 40CC701934023652271984A1922263E7 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - ADC4463D2B4DCEB2FA24431FC1A19530 /* Build configuration list for PBXNativeTarget "Pods-DemoTests" */ = { + E3A98634DB5DA9D006BDFE48B5C34CB5 /* Build configuration list for PBXNativeTarget "Nimble" */ = { isa = XCConfigurationList; buildConfigurations = ( - 5F0383985A585AF9C7DC40DEC4A52705 /* Debug */, - 6638A516C9717D30201E40D4D47B1411 /* Release */, + CF389F750F700469742970304E1E1BC5 /* Debug */, + 2D6A65327F1FC565E63668AE8D630ECC /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - AE53E6CAD822DA849D5BF1AFD367C08A /* Build configuration list for PBXNativeTarget "Quick" */ = { + FCFF0604EEEFF0ACCB32A0A6D115F719 /* Build configuration list for PBXNativeTarget "Pods-DemoTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 1EE094A14B5D7667CB376C3F8B36A5E3 /* Debug */, - 33FD3AA7DDF995505498C9DB3C6FEF0A /* Release */, + 6EF36CB73C640C1F712E127E448BABDD /* Debug */, + 0CD90E32B9017277BBAA1A505014E74C /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = D41D8CD98F00B204E9800998ECF8427E /* Project object */; + rootObject = BFDFE7DC352907FC980B868725387E98 /* Project object */; } diff --git a/Demo/Pods/Quick/README.md b/Demo/Pods/Quick/README.md index e6dc0ad..2cb397f 100644 --- a/Demo/Pods/Quick/README.md +++ b/Demo/Pods/Quick/README.md @@ -4,6 +4,7 @@ [![CocoaPods](https://img.shields.io/cocoapods/v/Quick.svg)](https://cocoapods.org/pods/Quick) [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Platforms](https://img.shields.io/cocoapods/p/Quick.svg)](https://cocoapods.org/pods/Quick) +[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com) Quick is a behavior-driven development framework for Swift and Objective-C. Inspired by [RSpec](https://github.com/rspec/rspec), [Specta](https://github.com/specta/specta), and [Ginkgo](https://github.com/onsi/ginkgo). @@ -44,7 +45,8 @@ Certain versions of Quick and Nimble only support certain versions of Swift. Dep |Swift version |Quick version |Nimble version | |:--------------------|:---------------|:--------------| -|Swift 3 |v1.0.0 or later |v5.0.0 or later| +|Swift 4.2 |v1.3.2 or later |v7.3.2 or later| +|Swift 3 / Swift 4 |v1.0.0 or later |v5.0.0 or later| |Swift 2.2 / Swift 2.3|v0.9.3 |v4.1.0 | ## Documentation diff --git a/Demo/Pods/Quick/Sources/Quick/Behavior.swift b/Demo/Pods/Quick/Sources/Quick/Behavior.swift index 1d98702..7dfefac 100644 --- a/Demo/Pods/Quick/Sources/Quick/Behavior.swift +++ b/Demo/Pods/Quick/Sources/Quick/Behavior.swift @@ -4,7 +4,7 @@ open class Behavior { - open static var name: String { return String(describing: self) } + public static var name: String { return String(describing: self) } /** override this method in your behavior to define a set of reusable examples. diff --git a/Demo/Pods/Quick/Sources/Quick/Callsite.swift b/Demo/Pods/Quick/Sources/Quick/Callsite.swift index f5e3711..47b3442 100644 --- a/Demo/Pods/Quick/Sources/Quick/Callsite.swift +++ b/Demo/Pods/Quick/Sources/Quick/Callsite.swift @@ -1,18 +1,23 @@ import Foundation -// `#if swift(>=3.2) && (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE` -// does not work as expected. -#if swift(>=3.2) - #if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE - @objcMembers - public class _CallsiteBase: NSObject {} - #else - public class _CallsiteBase: NSObject {} - #endif +#if canImport(Darwin) && !SWIFT_PACKAGE +@objcMembers +public class _CallsiteBase: NSObject {} #else public class _CallsiteBase: NSObject {} #endif +// Ideally we would always use `StaticString` as the type for tracking the file name +// in which an example is defined, for consistency with `assert` etc. from the +// stdlib, and because recent versions of the XCTest overlay require `StaticString` +// when calling `XCTFail`. Under the Objective-C runtime (i.e. building on macOS), we +// have to use `String` instead because StaticString can't be generated from Objective-C +#if SWIFT_PACKAGE +public typealias FileString = StaticString +#else +public typealias FileString = String +#endif + /** An object encapsulating the file and line number at which a particular example is defined. @@ -21,14 +26,14 @@ final public class Callsite: _CallsiteBase { /** The absolute path of the file in which an example is defined. */ - public let file: String + public let file: FileString /** The line number on which an example is defined. */ public let line: UInt - internal init(file: String, line: UInt) { + internal init(file: FileString, line: UInt) { self.file = file self.line = line } @@ -40,6 +45,6 @@ extension Callsite { If two callsites are in the same file and on the same line, they must be equal. */ @nonobjc public static func == (lhs: Callsite, rhs: Callsite) -> Bool { - return lhs.file == rhs.file && lhs.line == rhs.line + return String(describing: lhs.file) == String(describing: rhs.file) && lhs.line == rhs.line } } diff --git a/Demo/Pods/Quick/Sources/Quick/Configuration/Configuration.swift b/Demo/Pods/Quick/Sources/Quick/Configuration/Configuration.swift index dbb95f1..fe33997 100644 --- a/Demo/Pods/Quick/Sources/Quick/Configuration/Configuration.swift +++ b/Demo/Pods/Quick/Sources/Quick/Configuration/Configuration.swift @@ -72,7 +72,7 @@ final public class Configuration: NSObject { provided with metadata on the example that the closure is being run prior to. */ -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) @objc(beforeEachWithMetadata:) public func beforeEach(_ closure: @escaping BeforeExampleWithMetadataClosure) { exampleHooks.appendBefore(closure) @@ -109,7 +109,7 @@ final public class Configuration: NSObject { is provided with metadata on the example that the closure is being run after. */ -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) @objc(afterEachWithMetadata:) public func afterEach(_ closure: @escaping AfterExampleWithMetadataClosure) { exampleHooks.appendAfter(closure) diff --git a/Demo/Pods/Quick/Sources/Quick/DSL/DSL.swift b/Demo/Pods/Quick/Sources/Quick/DSL/DSL.swift index 94f20c5..284ffe1 100644 --- a/Demo/Pods/Quick/Sources/Quick/DSL/DSL.swift +++ b/Demo/Pods/Quick/Sources/Quick/DSL/DSL.swift @@ -127,7 +127,7 @@ public func afterEach(_ closure: @escaping AfterExampleWithMetadataClosure) { - parameter file: The absolute path to the file containing the example. A sensible default is provided. - parameter line: The line containing the example. A sensible default is provided. */ -public func it(_ description: String, flags: FilterFlags = [:], file: String = #file, line: UInt = #line, closure: @escaping () -> Void) { +public func it(_ description: String, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line, closure: @escaping () -> Void) { World.sharedWorld.it(description, flags: flags, file: file, line: line, closure: closure) } @@ -143,7 +143,7 @@ public func it(_ description: String, flags: FilterFlags = [:], file: String = # - parameter file: The absolute path to the file containing the current example group. A sensible default is provided. - parameter line: The line containing the current example group. A sensible default is provided. */ -public func itBehavesLike(_ name: String, flags: FilterFlags = [:], file: String = #file, line: UInt = #line) { +public func itBehavesLike(_ name: String, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line) { itBehavesLike(name, flags: flags, file: file, line: line, sharedExampleContext: { return [:] }) } @@ -163,7 +163,7 @@ public func itBehavesLike(_ name: String, flags: FilterFlags = [:], file: String - parameter file: The absolute path to the file containing the current example group. A sensible default is provided. - parameter line: The line containing the current example group. A sensible default is provided. */ -public func itBehavesLike(_ name: String, flags: FilterFlags = [:], file: String = #file, line: UInt = #line, sharedExampleContext: @escaping SharedExampleContext) { +public func itBehavesLike(_ name: String, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line, sharedExampleContext: @escaping SharedExampleContext) { World.sharedWorld.itBehavesLike(name, sharedExampleContext: sharedExampleContext, flags: flags, file: file, line: line) } @@ -179,7 +179,7 @@ public func itBehavesLike(_ name: String, flags: FilterFlags = [:], file: String - parameter file: The absolute path to the file containing the current example group. A sensible default is provided. - parameter line: The line containing the current example group. A sensible default is provided. */ -public func itBehavesLike(_ behavior: Behavior.Type, flags: FilterFlags = [:], file: String = #file, line: UInt = #line, context: @escaping () -> C) { +public func itBehavesLike(_ behavior: Behavior.Type, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line, context: @escaping () -> C) { World.sharedWorld.itBehavesLike(behavior, context: context, flags: flags, file: file, line: line) } @@ -214,7 +214,7 @@ public func xcontext(_ description: String, flags: FilterFlags, closure: () -> V Use this to quickly mark an `it` closure as pending. This disables the example and ensures the code within the closure is never run. */ -public func xit(_ description: String, flags: FilterFlags = [:], file: String = #file, line: UInt = #line, closure: @escaping () -> Void) { +public func xit(_ description: String, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line, closure: @escaping () -> Void) { World.sharedWorld.xit(description, flags: flags, file: file, line: line, closure: closure) } @@ -222,7 +222,7 @@ public func xit(_ description: String, flags: FilterFlags = [:], file: String = Use this to quicklu mark an `itBehavesLike` closure as pending. This disables the example group defined by this behavior and ensures the code within is never run. */ -public func xitBehavesLike(_ behavior: Behavior.Type, flags: FilterFlags = [:], file: String = #file, line: UInt = #line, context: @escaping () -> C) { +public func xitBehavesLike(_ behavior: Behavior.Type, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line, context: @escaping () -> C) { World.sharedWorld.xitBehavesLike(behavior, context: context, flags: flags, file: file, line: line) } /** @@ -245,27 +245,27 @@ public func fcontext(_ description: String, flags: FilterFlags = [:], closure: ( Use this to quickly focus an `it` closure, focusing the example. If any examples in the test suite are focused, only those examples are executed. */ -public func fit(_ description: String, flags: FilterFlags = [:], file: String = #file, line: UInt = #line, closure: @escaping () -> Void) { +public func fit(_ description: String, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line, closure: @escaping () -> Void) { World.sharedWorld.fit(description, flags: flags, file: file, line: line, closure: closure) } /** Use this to quickly focus an `itBehavesLike` closure. */ -public func fitBehavesLike(_ name: String, flags: FilterFlags = [:], file: String = #file, line: UInt = #line) { +public func fitBehavesLike(_ name: String, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line) { fitBehavesLike(name, flags: flags, file: file, line: line, sharedExampleContext: { return [:] }) } /** Use this to quickly focus an `itBehavesLike` closure. */ -public func fitBehavesLike(_ name: String, flags: FilterFlags = [:], file: String = #file, line: UInt = #line, sharedExampleContext: @escaping SharedExampleContext) { +public func fitBehavesLike(_ name: String, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line, sharedExampleContext: @escaping SharedExampleContext) { World.sharedWorld.fitBehavesLike(name, sharedExampleContext: sharedExampleContext, flags: flags, file: file, line: line) } /** Use this to quickly focus on `itBehavesLike` closure. */ -public func fitBehavesLike(_ behavior: Behavior.Type, flags: FilterFlags = [:], file: String = #file, line: UInt = #line, context: @escaping () -> C) { +public func fitBehavesLike(_ behavior: Behavior.Type, flags: FilterFlags = [:], file: FileString = #file, line: UInt = #line, context: @escaping () -> C) { World.sharedWorld.fitBehavesLike(behavior, context: context, flags: flags, file: file, line: line) } diff --git a/Demo/Pods/Quick/Sources/Quick/DSL/World+DSL.swift b/Demo/Pods/Quick/Sources/Quick/DSL/World+DSL.swift index 942c2e6..d331d69 100644 --- a/Demo/Pods/Quick/Sources/Quick/DSL/World+DSL.swift +++ b/Demo/Pods/Quick/Sources/Quick/DSL/World+DSL.swift @@ -56,7 +56,7 @@ extension World { currentExampleGroup.hooks.appendBefore(closure) } -#if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE +#if canImport(Darwin) && !SWIFT_PACKAGE @objc(beforeEachWithMetadata:) internal func beforeEach(closure: @escaping BeforeExampleWithMetadataClosure) { currentExampleGroup.hooks.appendBefore(closure) @@ -74,7 +74,7 @@ extension World { currentExampleGroup.hooks.appendAfter(closure) } -#if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE +#if canImport(Darwin) && !SWIFT_PACKAGE @objc(afterEachWithMetadata:) internal func afterEach(closure: @escaping AfterExampleWithMetadataClosure) { currentExampleGroup.hooks.appendAfter(closure) @@ -86,7 +86,7 @@ extension World { #endif @nonobjc - internal func it(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) { + internal func it(_ description: String, flags: FilterFlags, file: FileString, line: UInt, closure: @escaping () -> Void) { if beforesCurrentlyExecuting { raiseError("'it' cannot be used inside 'beforeEach', 'it' may only be used inside 'context' or 'describe'. ") } @@ -102,21 +102,21 @@ extension World { } @nonobjc - internal func fit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) { + internal func fit(_ description: String, flags: FilterFlags, file: FileString, line: UInt, closure: @escaping () -> Void) { var focusedFlags = flags focusedFlags[Filter.focused] = true self.it(description, flags: focusedFlags, file: file, line: line, closure: closure) } @nonobjc - internal func xit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) { + internal func xit(_ description: String, flags: FilterFlags, file: FileString, line: UInt, closure: @escaping () -> Void) { var pendingFlags = flags pendingFlags[Filter.pending] = true self.it(description, flags: pendingFlags, file: file, line: line, closure: closure) } @nonobjc - internal func itBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: String, line: UInt) { + internal func itBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: FileString, line: UInt) { guard currentExampleMetadata == nil else { raiseError("'itBehavesLike' cannot be used inside '\(currentPhase)', 'itBehavesLike' may only be used inside 'context' or 'describe'. ") } @@ -136,13 +136,13 @@ extension World { } @nonobjc - internal func fitBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: String, line: UInt) { + internal func fitBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: FileString, line: UInt) { var focusedFlags = flags focusedFlags[Filter.focused] = true self.itBehavesLike(name, sharedExampleContext: sharedExampleContext, flags: focusedFlags, file: file, line: line) } - internal func itBehavesLike(_ behavior: Behavior.Type, context: @escaping () -> C, flags: FilterFlags, file: String, line: UInt) { + internal func itBehavesLike(_ behavior: Behavior.Type, context: @escaping () -> C, flags: FilterFlags, file: FileString, line: UInt) { guard currentExampleMetadata == nil else { raiseError("'itBehavesLike' cannot be used inside '\(currentPhase)', 'itBehavesLike' may only be used inside 'context' or 'describe'. ") } @@ -160,36 +160,36 @@ extension World { } } - internal func fitBehavesLike(_ behavior: Behavior.Type, context: @escaping () -> C, flags: FilterFlags, file: String, line: UInt) { + internal func fitBehavesLike(_ behavior: Behavior.Type, context: @escaping () -> C, flags: FilterFlags, file: FileString, line: UInt) { var focusedFlags = flags focusedFlags[Filter.focused] = true self.itBehavesLike(behavior, context: context, flags: focusedFlags, file: file, line: line) } - internal func xitBehavesLike(_ behavior: Behavior.Type, context: @escaping () -> C, flags: FilterFlags, file: String, line: UInt) { + internal func xitBehavesLike(_ behavior: Behavior.Type, context: @escaping () -> C, flags: FilterFlags, file: FileString, line: UInt) { var pendingFlags = flags pendingFlags[Filter.pending] = true self.itBehavesLike(behavior, context: context, flags: pendingFlags, file: file, line: line) } -#if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE +#if canImport(Darwin) && !SWIFT_PACKAGE @objc(itWithDescription:flags:file:line:closure:) - internal func objc_it(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) { + internal func objc_it(_ description: String, flags: FilterFlags, file: FileString, line: UInt, closure: @escaping () -> Void) { it(description, flags: flags, file: file, line: line, closure: closure) } @objc(fitWithDescription:flags:file:line:closure:) - internal func objc_fit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) { + internal func objc_fit(_ description: String, flags: FilterFlags, file: FileString, line: UInt, closure: @escaping () -> Void) { fit(description, flags: flags, file: file, line: line, closure: closure) } @objc(xitWithDescription:flags:file:line:closure:) - internal func objc_xit(_ description: String, flags: FilterFlags, file: String, line: UInt, closure: @escaping () -> Void) { + internal func objc_xit(_ description: String, flags: FilterFlags, file: FileString, line: UInt, closure: @escaping () -> Void) { xit(description, flags: flags, file: file, line: line, closure: closure) } @objc(itBehavesLikeSharedExampleNamed:sharedExampleContext:flags:file:line:) - internal func objc_itBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: String, line: UInt) { + internal func objc_itBehavesLike(_ name: String, sharedExampleContext: @escaping SharedExampleContext, flags: FilterFlags, file: FileString, line: UInt) { itBehavesLike(name, sharedExampleContext: sharedExampleContext, flags: flags, file: file, line: line) } #endif diff --git a/Demo/Pods/Quick/Sources/Quick/ErrorUtility.swift b/Demo/Pods/Quick/Sources/Quick/ErrorUtility.swift index 155fefd..f13f43a 100644 --- a/Demo/Pods/Quick/Sources/Quick/ErrorUtility.swift +++ b/Demo/Pods/Quick/Sources/Quick/ErrorUtility.swift @@ -1,7 +1,7 @@ import Foundation internal func raiseError(_ message: String) -> Never { -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) NSException(name: .internalInconsistencyException, reason: message, userInfo: nil).raise() #endif diff --git a/Demo/Pods/Quick/Sources/Quick/Example.swift b/Demo/Pods/Quick/Sources/Quick/Example.swift index cf7b4a3..594efa0 100644 --- a/Demo/Pods/Quick/Sources/Quick/Example.swift +++ b/Demo/Pods/Quick/Sources/Quick/Example.swift @@ -3,15 +3,9 @@ import Foundation private var numberOfExamplesRun = 0 private var numberOfIncludedExamples = 0 -// `#if swift(>=3.2) && (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE` -// does not work as expected. -#if swift(>=3.2) - #if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE - @objcMembers - public class _ExampleBase: NSObject {} - #else - public class _ExampleBase: NSObject {} - #endif +#if canImport(Darwin) && !SWIFT_PACKAGE +@objcMembers +public class _ExampleBase: NSObject {} #else public class _ExampleBase: NSObject {} #endif diff --git a/Demo/Pods/Quick/Sources/Quick/ExampleMetadata.swift b/Demo/Pods/Quick/Sources/Quick/ExampleMetadata.swift index 3dd28ab..b07b3bd 100644 --- a/Demo/Pods/Quick/Sources/Quick/ExampleMetadata.swift +++ b/Demo/Pods/Quick/Sources/Quick/ExampleMetadata.swift @@ -1,14 +1,8 @@ import Foundation -// `#if swift(>=3.2) && (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE` -// does not work as expected. -#if swift(>=3.2) - #if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE - @objcMembers - public class _ExampleMetadataBase: NSObject {} - #else - public class _ExampleMetadataBase: NSObject {} - #endif +#if canImport(Darwin) && !SWIFT_PACKAGE +@objcMembers +public class _ExampleMetadataBase: NSObject {} #else public class _ExampleMetadataBase: NSObject {} #endif diff --git a/Demo/Pods/Quick/Sources/Quick/Filter.swift b/Demo/Pods/Quick/Sources/Quick/Filter.swift index da137f8..304f6ec 100644 --- a/Demo/Pods/Quick/Sources/Quick/Filter.swift +++ b/Demo/Pods/Quick/Sources/Quick/Filter.swift @@ -1,14 +1,8 @@ import Foundation -// `#if swift(>=3.2) && (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE` -// does not work as expected. -#if swift(>=3.2) - #if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE - @objcMembers - public class _FilterBase: NSObject {} - #else - public class _FilterBase: NSObject {} - #endif +#if canImport(Darwin) && !SWIFT_PACKAGE +@objcMembers +public class _FilterBase: NSObject {} #else public class _FilterBase: NSObject {} #endif diff --git a/Demo/Pods/Quick/Sources/Quick/NSBundle+CurrentTestBundle.swift b/Demo/Pods/Quick/Sources/Quick/NSBundle+CurrentTestBundle.swift index d7a1442..f5596cc 100644 --- a/Demo/Pods/Quick/Sources/Quick/NSBundle+CurrentTestBundle.swift +++ b/Demo/Pods/Quick/Sources/Quick/NSBundle+CurrentTestBundle.swift @@ -1,4 +1,4 @@ -#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) +#if canImport(Darwin) import Foundation @@ -17,7 +17,7 @@ extension Bundle { Module name has to be a valid "C99 extended identifier". */ internal var moduleName: String { - let fileName = bundleURL.fileName as NSString + let fileName = bundleURL.fileName return fileName.c99ExtendedIdentifier } } diff --git a/Demo/Pods/Quick/Sources/Quick/QuickSelectedTestSuiteBuilder.swift b/Demo/Pods/Quick/Sources/Quick/QuickSelectedTestSuiteBuilder.swift index 415b680..865c3ae 100644 --- a/Demo/Pods/Quick/Sources/Quick/QuickSelectedTestSuiteBuilder.swift +++ b/Demo/Pods/Quick/Sources/Quick/QuickSelectedTestSuiteBuilder.swift @@ -1,4 +1,4 @@ -#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) +#if canImport(Darwin) import Foundation /** diff --git a/Demo/Pods/Quick/Sources/Quick/QuickTestSuite.swift b/Demo/Pods/Quick/Sources/Quick/QuickTestSuite.swift index 0fe76a7..5cdc6d8 100644 --- a/Demo/Pods/Quick/Sources/Quick/QuickTestSuite.swift +++ b/Demo/Pods/Quick/Sources/Quick/QuickTestSuite.swift @@ -1,4 +1,4 @@ -#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) +#if canImport(Darwin) import XCTest diff --git a/Demo/Pods/Quick/Sources/Quick/NSString+C99ExtendedIdentifier.swift b/Demo/Pods/Quick/Sources/Quick/String+C99ExtendedIdentifier.swift similarity index 77% rename from Demo/Pods/Quick/Sources/Quick/NSString+C99ExtendedIdentifier.swift rename to Demo/Pods/Quick/Sources/Quick/String+C99ExtendedIdentifier.swift index 8d67d8d..2dcd606 100644 --- a/Demo/Pods/Quick/Sources/Quick/NSString+C99ExtendedIdentifier.swift +++ b/Demo/Pods/Quick/Sources/Quick/String+C99ExtendedIdentifier.swift @@ -1,7 +1,7 @@ -#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) +#if canImport(Darwin) import Foundation -extension NSString { +extension String { private static var invalidCharacters: CharacterSet = { var invalidCharacters = CharacterSet() @@ -21,11 +21,8 @@ extension NSString { return invalidCharacters }() - /// This API is not meant to be used outside Quick, so will be unavaialbe in - /// a next major version. - @objc(qck_c99ExtendedIdentifier) - public var c99ExtendedIdentifier: String { - let validComponents = components(separatedBy: NSString.invalidCharacters) + internal var c99ExtendedIdentifier: String { + let validComponents = components(separatedBy: String.invalidCharacters) let result = validComponents.joined(separator: "_") return result.isEmpty ? "_" : result diff --git a/Demo/Pods/Quick/Sources/Quick/World.swift b/Demo/Pods/Quick/Sources/Quick/World.swift index 59ea7e6..e652871 100644 --- a/Demo/Pods/Quick/Sources/Quick/World.swift +++ b/Demo/Pods/Quick/Sources/Quick/World.swift @@ -12,15 +12,9 @@ public typealias SharedExampleContext = () -> [String: Any] */ public typealias SharedExampleClosure = (@escaping SharedExampleContext) -> Void -// `#if swift(>=3.2) && (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE` -// does not work as expected. -#if swift(>=3.2) - #if (os(macOS) || os(iOS) || os(tvOS) || os(watchOS)) && !SWIFT_PACKAGE - @objcMembers - internal class _WorldBase: NSObject {} - #else - internal class _WorldBase: NSObject {} - #endif +#if canImport(Darwin) && !SWIFT_PACKAGE +@objcMembers +internal class _WorldBase: NSObject {} #else internal class _WorldBase: NSObject {} #endif @@ -57,7 +51,7 @@ final internal class World: _WorldBase { within this test suite. This is only true within the context of Quick functional tests. */ -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) // Convention of generating Objective-C selector has been changed on Swift 3 @objc(isRunningAdditionalSuites) internal var isRunningAdditionalSuites = false @@ -158,7 +152,7 @@ final internal class World: _WorldBase { } } -#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) +#if canImport(Darwin) @objc(examplesForSpecClass:) internal func objc_examples(_ specClass: AnyClass) -> [Example] { return examples(specClass) diff --git a/Demo/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.h b/Demo/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.h index 21bc772..ccf006e 100644 --- a/Demo/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.h +++ b/Demo/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.h @@ -49,7 +49,7 @@ /** Returns the currently executing spec. Use in specs that require XCTestCase - methds, e.g. expectationWithDescription. + methods, e.g. expectationWithDescription. */ @property (class, nonatomic, readonly) QuickSpec *current; diff --git a/Demo/Pods/RxSwift/Platform/AtomicInt.swift b/Demo/Pods/RxSwift/Platform/AtomicInt.swift new file mode 100644 index 0000000..d8d9580 --- /dev/null +++ b/Demo/Pods/RxSwift/Platform/AtomicInt.swift @@ -0,0 +1,71 @@ +// +// AtomicInt.swift +// Platform +// +// Created by Krunoslav Zaher on 10/28/18. +// Copyright © 2018 Krunoslav Zaher. All rights reserved. +// + +import class Foundation.NSLock + +final class AtomicInt: NSLock { + fileprivate var value: Int32 + public init(_ value: Int32 = 0) { + self.value = value + } +} + +@discardableResult +@inline(__always) +func add(_ this: AtomicInt, _ value: Int32) -> Int32 { + this.lock() + let oldValue = this.value + this.value += value + this.unlock() + return oldValue +} + +@discardableResult +@inline(__always) +func sub(_ this: AtomicInt, _ value: Int32) -> Int32 { + this.lock() + let oldValue = this.value + this.value -= value + this.unlock() + return oldValue +} + +@discardableResult +@inline(__always) +func fetchOr(_ this: AtomicInt, _ mask: Int32) -> Int32 { + this.lock() + let oldValue = this.value + this.value |= mask + this.unlock() + return oldValue +} + +@inline(__always) +func load(_ this: AtomicInt) -> Int32 { + this.lock() + let oldValue = this.value + this.unlock() + return oldValue +} + +@discardableResult +@inline(__always) +func increment(_ this: AtomicInt) -> Int32 { + return add(this, 1) +} + +@discardableResult +@inline(__always) +func decrement(_ this: AtomicInt) -> Int32 { + return sub(this, 1) +} + +@inline(__always) +func isFlagSet(_ this: AtomicInt, _ mask: Int32) -> Bool { + return (load(this) & mask) != 0 +} diff --git a/Demo/Pods/RxSwift/Platform/DataStructures/Bag.swift b/Demo/Pods/RxSwift/Platform/DataStructures/Bag.swift index 22d82d5..ec05a41 100644 --- a/Demo/Pods/RxSwift/Platform/DataStructures/Bag.swift +++ b/Demo/Pods/RxSwift/Platform/DataStructures/Bag.swift @@ -40,14 +40,14 @@ struct Bag : CustomDebugStringConvertible { // data // first fill inline variables - var _key0: BagKey? = nil - var _value0: T? = nil + var _key0: BagKey? + var _value0: T? // then fill "array dictionary" var _pairs = ContiguousArray() // last is sparse dictionary - var _dictionary: [BagKey : T]? = nil + var _dictionary: [BagKey: T]? var _onlyFastPath = true @@ -122,12 +122,10 @@ struct Bag : CustomDebugStringConvertible { return existingObject } - for i in 0 ..< _pairs.count { - if _pairs[i].key == key { - let value = _pairs[i].value - _pairs.remove(at: i) - return value - } + for i in 0 ..< _pairs.count where _pairs[i].key == key { + let value = _pairs[i].value + _pairs.remove(at: i) + return value } return nil @@ -173,8 +171,8 @@ extension Bag { } extension BagKey: Hashable { - var hashValue: Int { - return rawValue.hashValue + func hash(into hasher: inout Hasher) { + hasher.combine(rawValue) } } diff --git a/Demo/Pods/RxSwift/Platform/DataStructures/InfiniteSequence.swift b/Demo/Pods/RxSwift/Platform/DataStructures/InfiniteSequence.swift index 5a573a0..b6404a7 100644 --- a/Demo/Pods/RxSwift/Platform/DataStructures/InfiniteSequence.swift +++ b/Demo/Pods/RxSwift/Platform/DataStructures/InfiniteSequence.swift @@ -7,13 +7,12 @@ // /// Sequence that repeats `repeatedValue` infinite number of times. -struct InfiniteSequence : Sequence { - typealias Element = E - typealias Iterator = AnyIterator +struct InfiniteSequence : Sequence { + typealias Iterator = AnyIterator - private let _repeatedValue: E + private let _repeatedValue: Element - init(repeatedValue: E) { + init(repeatedValue: Element) { _repeatedValue = repeatedValue } diff --git a/Demo/Pods/RxSwift/Platform/DataStructures/PriorityQueue.swift b/Demo/Pods/RxSwift/Platform/DataStructures/PriorityQueue.swift index 9b2c370..f7cb99c 100644 --- a/Demo/Pods/RxSwift/Platform/DataStructures/PriorityQueue.swift +++ b/Demo/Pods/RxSwift/Platform/DataStructures/PriorityQueue.swift @@ -52,11 +52,7 @@ struct PriorityQueue { private mutating func removeAt(_ index: Int) { let removingLast = index == _elements.count - 1 if !removingLast { - #if swift(>=3.2) _elements.swapAt(index, _elements.count - 1) - #else - swap(&_elements[index], &_elements[_elements.count - 1]) - #endif } _ = _elements.popLast() @@ -76,11 +72,7 @@ struct PriorityQueue { while unbalancedIndex > 0 { let parentIndex = (unbalancedIndex - 1) / 2 guard _hasHigherPriority(_elements[unbalancedIndex], _elements[parentIndex]) else { break } - #if swift(>=3.2) _elements.swapAt(unbalancedIndex, parentIndex) - #else - swap(&_elements[unbalancedIndex], &_elements[parentIndex]) - #endif unbalancedIndex = parentIndex } } @@ -105,12 +97,8 @@ struct PriorityQueue { } guard highestPriorityIndex != unbalancedIndex else { break } - - #if swift(>=3.2) _elements.swapAt(highestPriorityIndex, unbalancedIndex) - #else - swap(&_elements[highestPriorityIndex], &_elements[unbalancedIndex]) - #endif + unbalancedIndex = highestPriorityIndex } } diff --git a/Demo/Pods/RxSwift/Platform/DeprecationWarner.swift b/Demo/Pods/RxSwift/Platform/DeprecationWarner.swift deleted file mode 100644 index 863636b..0000000 --- a/Demo/Pods/RxSwift/Platform/DeprecationWarner.swift +++ /dev/null @@ -1,43 +0,0 @@ -// -// DeprecationWarner.swift -// Platform -// -// Created by Shai Mishali on 1/9/18. -// Copyright © 2018 Krunoslav Zaher. All rights reserved. -// - -import Foundation - -#if DEBUG - class DeprecationWarner { - private static var warned = Set() - private static var _lock = NSRecursiveLock() - - static func warnIfNeeded(_ kind: Kind) { - _lock.lock(); defer { _lock.unlock() } - guard !warned.contains(kind) else { return } - - warned.insert(kind) - print("ℹ️ [DEPRECATED] \(kind.message)") - } - } - - extension DeprecationWarner { - enum Kind { - case variable - case globalTestFunctionNext - case globalTestFunctionError - case globalTestFunctionCompleted - - var message: String { - switch self { - case .variable: return "`Variable` is planned for future deprecation. Please consider `BehaviorRelay` as a replacement. Read more at: https://git.io/vNqvx" - case .globalTestFunctionNext: return "The `next()` global function is planned for future deprecation. Please use `Recorded.next()` instead." - case .globalTestFunctionError: return "The `error()` global function is planned for future deprecation. Please use `Recorded.error()` instead." - case .globalTestFunctionCompleted: return "The `completed()` global function is planned for future deprecation. Please use `Recorded.completed()` instead." - } - } - } - } -#endif - diff --git a/Demo/Pods/RxSwift/Platform/Platform.Darwin.swift b/Demo/Pods/RxSwift/Platform/Platform.Darwin.swift index d9e744f..6dc36ad 100644 --- a/Demo/Pods/RxSwift/Platform/Platform.Darwin.swift +++ b/Demo/Pods/RxSwift/Platform/Platform.Darwin.swift @@ -10,34 +10,10 @@ import Darwin import class Foundation.Thread - import func Foundation.OSAtomicCompareAndSwap32Barrier - import func Foundation.OSAtomicIncrement32Barrier - import func Foundation.OSAtomicDecrement32Barrier import protocol Foundation.NSCopying - typealias AtomicInt = Int32 - - fileprivate func castToUInt32Pointer(_ pointer: UnsafeMutablePointer) -> UnsafeMutablePointer { - let raw = UnsafeMutableRawPointer(pointer) - return raw.assumingMemoryBound(to: UInt32.self) - } - - let AtomicCompareAndSwap = OSAtomicCompareAndSwap32Barrier - let AtomicIncrement = OSAtomicIncrement32Barrier - let AtomicDecrement = OSAtomicDecrement32Barrier - func AtomicOr(_ mask: UInt32, _ theValue : UnsafeMutablePointer) -> Int32 { - return OSAtomicOr32OrigBarrier(mask, castToUInt32Pointer(theValue)) - } - func AtomicFlagSet(_ mask: UInt32, _ theValue : UnsafeMutablePointer) -> Bool { - // just used to create a barrier - OSAtomicXor32OrigBarrier(0, castToUInt32Pointer(theValue)) - return (theValue.pointee & Int32(mask)) != 0 - } - extension Thread { - - static func setThreadLocalStorageValue(_ value: T?, forKey key: NSCopying - ) { + static func setThreadLocalStorageValue(_ value: T?, forKey key: NSCopying) { let currentThread = Thread.current let threadDictionary = currentThread.threadDictionary @@ -47,8 +23,8 @@ else { threadDictionary[key] = nil } - } + static func getThreadLocalStorageValueForKey(_ key: NSCopying) -> T? { let currentThread = Thread.current let threadDictionary = currentThread.threadDictionary @@ -57,10 +33,4 @@ } } - extension AtomicInt { - func valueSnapshot() -> Int32 { - return self - } - } - #endif diff --git a/Demo/Pods/RxSwift/Platform/Platform.Linux.swift b/Demo/Pods/RxSwift/Platform/Platform.Linux.swift index 5cd07e2..a950e1c 100644 --- a/Demo/Pods/RxSwift/Platform/Platform.Linux.swift +++ b/Demo/Pods/RxSwift/Platform/Platform.Linux.swift @@ -8,90 +8,17 @@ #if os(Linux) - import XCTest - import Glibc - import SwiftShims import class Foundation.Thread - final class AtomicInt { - typealias IntegerLiteralType = Int - fileprivate var value: Int32 = 0 - fileprivate var _lock = RecursiveLock() - - func lock() { - _lock.lock() - } - func unlock() { - _lock.unlock() - } - - func valueSnapshot() -> Int32 { - return value - } - } - - extension AtomicInt: ExpressibleByIntegerLiteral { - convenience init(integerLiteral value: Int) { - self.init() - self.value = Int32(value) - } - } - - func >(lhs: AtomicInt, rhs: Int32) -> Bool { - return lhs.value > rhs - } - func ==(lhs: AtomicInt, rhs: Int32) -> Bool { - return lhs.value == rhs - } - - func AtomicFlagSet(_ mask: UInt32, _ atomic: inout AtomicInt) -> Bool { - atomic.lock(); defer { atomic.unlock() } - return (atomic.value & Int32(mask)) != 0 - } - - func AtomicOr(_ mask: UInt32, _ atomic: inout AtomicInt) -> Int32 { - atomic.lock(); defer { atomic.unlock() } - let value = atomic.value - atomic.value |= Int32(mask) - return value - } - - func AtomicIncrement(_ atomic: inout AtomicInt) -> Int32 { - atomic.lock(); defer { atomic.unlock() } - atomic.value += 1 - return atomic.value - } - - func AtomicDecrement(_ atomic: inout AtomicInt) -> Int32 { - atomic.lock(); defer { atomic.unlock() } - atomic.value -= 1 - return atomic.value - } - - func AtomicCompareAndSwap(_ l: Int32, _ r: Int32, _ atomic: inout AtomicInt) -> Bool { - atomic.lock(); defer { atomic.unlock() } - if atomic.value == l { - atomic.value = r - return true - } - - return false - } - extension Thread { static func setThreadLocalStorageValue(_ value: T?, forKey key: String) { - let currentThread = Thread.current - var threadDictionary = currentThread.threadDictionary - if let newValue = value { - threadDictionary[key] = newValue + Thread.current.threadDictionary[key] = newValue } else { - threadDictionary[key] = nil + Thread.current.threadDictionary[key] = nil } - - currentThread.threadDictionary = threadDictionary } static func getThreadLocalStorageValueForKey(_ key: String) -> T? { diff --git a/Demo/Pods/RxSwift/README.md b/Demo/Pods/RxSwift/README.md index f7952f5..83d2f6c 100644 --- a/Demo/Pods/RxSwift/README.md +++ b/Demo/Pods/RxSwift/README.md @@ -1,9 +1,7 @@ -Miss Electric Eel 2016 RxSwift: ReactiveX for Swift +Miss Electric Eel 2016 RxSwift: ReactiveX for Swift ====================================== -[![Travis CI](https://travis-ci.org/ReactiveX/RxSwift.svg?branch=master)](https://travis-ci.org/ReactiveX/RxSwift) ![platforms](https://img.shields.io/badge/platforms-iOS%20%7C%20macOS%20%7C%20tvOS%20%7C%20watchOS%20%7C%20Linux-333333.svg) ![pod](https://img.shields.io/cocoapods/v/RxSwift.svg) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Swift Package Manager compatible](https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager) - -* RxSwift 3.x / Swift 3.x can be found in [**rxswift-3.0** branch](https://github.com/ReactiveX/RxSwift/tree/rxswift-3.0). +[![Travis CI](https://travis-ci.org/ReactiveX/RxSwift.svg?branch=master)](https://travis-ci.org/ReactiveX/RxSwift) ![platforms](https://img.shields.io/badge/platforms-iOS%20%7C%20macOS%20%7C%20tvOS%20%7C%20watchOS%20%7C%20Linux-333333.svg) [![pod](https://img.shields.io/cocoapods/v/RxSwift.svg)](https://cocoapods.org/pods/RxSwift) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Swift Package Manager compatible](https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager) Rx is a [generic abstraction of computation](https://youtu.be/looJcaeboBY) expressed through `Observable` interface. @@ -23,7 +21,7 @@ KVO observing, async operations and streams are all unified under [abstraction o * [why use rx?](Documentation/Why.md) * [the basics, getting started with RxSwift](Documentation/GettingStarted.md) -* [traits](Documentation/Traits.md) - what are `Single`, `Completable`, `Maybe`, `Driver`, `ControlProperty`, and `Variable` ... and why do they exist? +* [traits](Documentation/Traits.md) - what are `Single`, `Completable`, `Maybe`, `Driver`, and `ControlProperty` ... and why do they exist? * [testing](Documentation/UnitTests.md) * [tips and common errors](Documentation/Tips.md) * [debugging](Documentation/GettingStarted.md#debugging) @@ -41,7 +39,7 @@ KVO observing, async operations and streams are all unified under [abstraction o ###### ... interact -* All of this is great, but it would be nice to talk with other people using RxSwift and exchange experiences.
[![Slack channel](http://rxswift-slack.herokuapp.com/badge.svg)](http://slack.rxswift.org) [Join Slack Channel](http://slack.rxswift.org) +* All of this is great, but it would be nice to talk with other people using RxSwift and exchange experiences.
[Join Slack Channel](http://slack.rxswift.org) * Report a problem using the library. [Open an Issue With Bug Template](.github/ISSUE_TEMPLATE.md) * Request a new feature. [Open an Issue With Feature Request Template](Documentation/NewFeatureRequestTemplate.md) * Help out [Check out contribution guide](CONTRIBUTING.md) @@ -50,6 +48,28 @@ KVO observing, async operations and streams are all unified under [abstraction o * [with other libraries](Documentation/ComparisonWithOtherLibraries.md). +###### ... understand the structure + +RxSwift comprises five separate components depending on eachother in the following way: + +```none +┌──────────────┐ ┌──────────────┐ +│ RxCocoa ├────▶ RxRelay │ +└───────┬──────┘ └──────┬───────┘ + │ │ +┌───────▼──────────────────▼───────┐ +│ RxSwift │ +└───────▲──────────────────▲───────┘ + │ │ +┌───────┴──────┐ ┌──────┴───────┐ +│ RxTest │ │ RxBlocking │ +└──────────────┘ └──────────────┘ +``` + +* **RxSwift**: The core of RxSwift, providing the Rx standard as (mostly) defined by [ReactiveX](https://reactivex.io). It has no other dependencies. +* **RxCocoa**: Provides Cocoa-specific capabilities for general iOS/macOS/watchOS & tvOS app development, such as Binders, Traits, and much more. It depends on both `RxSwift` and `RxRelay`. +* **RxRelay**: Provides `PublishRelay` and `BehaviorRelay`, two [simple wrappers around Subjects](https://github.com/ReactiveX/RxSwift/blob/master/Documentation/Subjects.md#relays). It depends on `RxSwift`. +* **RxTest** and **RxBlocking**: Provides testing capabilities for Rx-based systems. It depends on `RxSwift`. ###### ... find compatible @@ -75,7 +95,7 @@ KVO observing, async operations and streams are all unified under [abstraction o 
 let searchResults = searchBar.rx.text.orEmpty
-    .throttle(0.3, scheduler: MainScheduler.instance)
+    .throttle(.milliseconds(300), scheduler: MainScheduler.instance)
     .distinctUntilChanged()
     .flatMapLatest { query -> Observable<[Repository]> in
         if query.isEmpty {
@@ -104,10 +124,10 @@ searchResults
 
 ## Requirements
 
-* Xcode 9.0
-* Swift 4.0
-* Swift 3.x ([use `rxswift-3.0` branch](https://github.com/ReactiveX/RxSwift/tree/rxswift-3.0) instead)
-* Swift 2.3 ([use `rxswift-2.0` branch](https://github.com/ReactiveX/RxSwift/tree/rxswift-2.0) instead)
+* Xcode 10.2
+* Swift 5.0
+
+For Xcode 10.1 and below, [use RxSwift 4.5](https://github.com/ReactiveX/RxSwift/releases/tag/4.5.0).
 
 ## Installation
 
@@ -121,21 +141,19 @@ Open Rx.xcworkspace, choose `RxExample` and hit run. This method will build ever
 
 ### [CocoaPods](https://guides.cocoapods.org/using/using-cocoapods.html)
 
-**Tested with `pod --version`: `1.3.1`**
-
 ```ruby
 # Podfile
 use_frameworks!
 
 target 'YOUR_TARGET_NAME' do
-    pod 'RxSwift',    '~> 4.0'
-    pod 'RxCocoa',    '~> 4.0'
+    pod 'RxSwift', '~> 5'
+    pod 'RxCocoa', '~> 5'
 end
 
 # RxTest and RxBlocking make the most sense in the context of unit/integration tests
 target 'YOUR_TESTING_TARGET' do
-    pod 'RxBlocking', '~> 4.0'
-    pod 'RxTest',     '~> 4.0'
+    pod 'RxBlocking', '~> 5'
+    pod 'RxTest', '~> 5'
 end
 ```
 
@@ -147,12 +165,12 @@ $ pod install
 
 ### [Carthage](https://github.com/Carthage/Carthage)
 
-**Tested with `carthage version`: `0.26.2`**
+Officially supported: Carthage 0.33 and up.
 
 Add this to `Cartfile`
 
 ```
-github "ReactiveX/RxSwift" ~> 4.0
+github "ReactiveX/RxSwift" ~> 5.0
 ```
 
 ```bash
@@ -161,19 +179,17 @@ $ carthage update
 
 ### [Swift Package Manager](https://github.com/apple/swift-package-manager)
 
-**Tested with `swift build --version`: `Swift 4.0.0-dev (swiftpm-13126)`**
-
 Create a `Package.swift` file.
 
 ```swift
-// swift-tools-version:4.0
+// swift-tools-version:5.0
 
 import PackageDescription
 
 let package = Package(
   name: "RxTestProject",
   dependencies: [
-    .package(url: "https://github.com/ReactiveX/RxSwift.git", "4.0.0" ..< "5.0.0")
+    .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0")
   ],
   targets: [
     .target(name: "RxTestProject", dependencies: ["RxSwift", "RxCocoa"])
@@ -185,7 +201,7 @@ let package = Package(
 $ swift build
 ```
 
-To build or test a module with RxTest dependency, set `TEST=1`. ([RxSwift >= 3.4.2](https://github.com/ReactiveX/RxSwift/releases/tag/3.4.2))
+To build or test a module with RxTest dependency, set `TEST=1`.
 
 ```bash
 $ TEST=1 swift test
@@ -202,16 +218,15 @@ $ git submodule add git@github.com:ReactiveX/RxSwift.git
 * Drag `Rx.xcodeproj` into Project Navigator
 * Go to `Project > Targets > Build Phases > Link Binary With Libraries`, click `+` and select `RxSwift-[Platform]` and `RxCocoa-[Platform]` targets
 
-
 ## References
 
 * [http://reactivex.io/](http://reactivex.io/)
 * [Reactive Extensions GitHub (GitHub)](https://github.com/Reactive-Extensions)
-* [RxSwift RayWenderlich.com Book](https://store.raywenderlich.com/products/rxswift)
+* [RxSwift RayWenderlich.com Book](https://store.raywenderlich.com/products/rxswift-reactive-programming-with-swift)
 * [Boxue.io RxSwift Online Course](https://boxueio.com/series/rxswift-101) (Chinese 🇨🇳)
 * [Erik Meijer (Wikipedia)](http://en.wikipedia.org/wiki/Erik_Meijer_%28computer_scientist%29)
 * [Expert to Expert: Brian Beckman and Erik Meijer - Inside the .NET Reactive Framework (Rx) (video)](https://youtu.be/looJcaeboBY)
 * [Reactive Programming Overview (Jafar Husain from Netflix)](https://www.youtube.com/watch?v=dwP1TNXE6fc)
 * [Subject/Observer is Dual to Iterator (paper)](http://csl.stanford.edu/~christos/pldi2010.fit/meijer.duality.pdf)
 * [Rx standard sequence operators visualized (visualization tool)](http://rxmarbles.com/)
-* [Haskell](https://www.haskell.org/)
+* [Haskell](https://www.haskell.org/)
\ No newline at end of file
diff --git a/Demo/Pods/RxSwift/RxSwift/AnyObserver.swift b/Demo/Pods/RxSwift/RxSwift/AnyObserver.swift
index dd4f9c4..42aa09e 100644
--- a/Demo/Pods/RxSwift/RxSwift/AnyObserver.swift
+++ b/Demo/Pods/RxSwift/RxSwift/AnyObserver.swift
@@ -10,9 +10,6 @@
 ///
 /// Forwards operations to an arbitrary underlying observer with the same `Element` type, hiding the specifics of the underlying observer type.
 public struct AnyObserver : ObserverType {
-    /// The type of elements in sequence that observer can observe.
-    public typealias E = Element
-    
     /// Anonymous event handler type.
     public typealias EventHandler = (Event) -> Void
 
@@ -28,7 +25,7 @@ public struct AnyObserver : ObserverType {
     /// Construct an instance whose `on(event)` calls `observer.on(event)`
     ///
     /// - parameter observer: Observer that receives sequence events.
-    public init(_ observer: O) where O.E == Element {
+    public init(_ observer: Observer) where Observer.Element == Element {
         self.observer = observer.on
     }
     
@@ -42,21 +39,21 @@ public struct AnyObserver : ObserverType {
     /// Erases type of observer and returns canonical observer.
     ///
     /// - returns: type erased observer.
-    public func asObserver() -> AnyObserver {
+    public func asObserver() -> AnyObserver {
         return self
     }
 }
 
 extension AnyObserver {
     /// Collection of `AnyObserver`s
-    typealias s = Bag<(Event) -> ()>
+    typealias s = Bag<(Event) -> Void>
 }
 
 extension ObserverType {
     /// Erases type of observer and returns canonical observer.
     ///
     /// - returns: type erased observer.
-    public func asObserver() -> AnyObserver {
+    public func asObserver() -> AnyObserver {
         return AnyObserver(self)
     }
 
@@ -64,7 +61,7 @@ extension ObserverType {
     /// Each event sent to result observer is transformed and sent to `self`.
     ///
     /// - returns: observer that transforms events.
-    public func mapObserver(_ transform: @escaping (R) throws -> E) -> AnyObserver {
+    public func mapObserver(_ transform: @escaping (Result) throws -> Element) -> AnyObserver {
         return AnyObserver { e in
             self.on(e.map(transform))
         }
diff --git a/Demo/Pods/RxSwift/RxSwift/Concurrency/AsyncLock.swift b/Demo/Pods/RxSwift/RxSwift/Concurrency/AsyncLock.swift
index 2597078..80332db 100644
--- a/Demo/Pods/RxSwift/RxSwift/Concurrency/AsyncLock.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Concurrency/AsyncLock.swift
@@ -31,45 +31,45 @@ final class AsyncLock
 
     // lock {
     func lock() {
-        _lock.lock()
+        self._lock.lock()
     }
 
     func unlock() {
-        _lock.unlock()
+        self._lock.unlock()
     }
     // }
 
     private func enqueue(_ action: I) -> I? {
-        _lock.lock(); defer { _lock.unlock() } // {
-            if _hasFaulted {
+        self._lock.lock(); defer { self._lock.unlock() } // {
+            if self._hasFaulted {
                 return nil
             }
 
-            if _isExecuting {
-                _queue.enqueue(action)
+            if self._isExecuting {
+                self._queue.enqueue(action)
                 return nil
             }
 
-            _isExecuting = true
+            self._isExecuting = true
 
             return action
         // }
     }
 
     private func dequeue() -> I? {
-        _lock.lock(); defer { _lock.unlock() } // {
-            if _queue.count > 0 {
-                return _queue.dequeue()
+        self._lock.lock(); defer { self._lock.unlock() } // {
+            if !self._queue.isEmpty {
+                return self._queue.dequeue()
             }
             else {
-                _isExecuting = false
+                self._isExecuting = false
                 return nil
             }
         // }
     }
 
     func invoke(_ action: I) {
-        let firstEnqueuedAction = enqueue(action)
+        let firstEnqueuedAction = self.enqueue(action)
         
         if let firstEnqueuedAction = firstEnqueuedAction {
             firstEnqueuedAction.invoke()
@@ -80,7 +80,7 @@ final class AsyncLock
         }
         
         while true {
-            let nextAction = dequeue()
+            let nextAction = self.dequeue()
 
             if let nextAction = nextAction {
                 nextAction.invoke()
@@ -92,11 +92,11 @@ final class AsyncLock
     }
     
     func dispose() {
-        synchronizedDispose()
+        self.synchronizedDispose()
     }
 
     func _synchronized_dispose() {
-        _queue = Queue(capacity: 0)
-        _hasFaulted = true
+        self._queue = Queue(capacity: 0)
+        self._hasFaulted = true
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Concurrency/Lock.swift b/Demo/Pods/RxSwift/RxSwift/Concurrency/Lock.swift
index 52afc1c..b26f5b7 100644
--- a/Demo/Pods/RxSwift/RxSwift/Concurrency/Lock.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Concurrency/Lock.swift
@@ -17,19 +17,19 @@ typealias SpinLock = RecursiveLock
 extension RecursiveLock : Lock {
     @inline(__always)
     final func performLocked(_ action: () -> Void) {
-        lock(); defer { unlock() }
+        self.lock(); defer { self.unlock() }
         action()
     }
 
     @inline(__always)
     final func calculateLocked(_ action: () -> T) -> T {
-        lock(); defer { unlock() }
+        self.lock(); defer { self.unlock() }
         return action()
     }
 
     @inline(__always)
     final func calculateLockedOrFail(_ action: () throws -> T) throws -> T {
-        lock(); defer { unlock() }
+        self.lock(); defer { self.unlock() }
         let result = try action()
         return result
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Concurrency/LockOwnerType.swift b/Demo/Pods/RxSwift/RxSwift/Concurrency/LockOwnerType.swift
index eca8d8e..ed6b28a 100644
--- a/Demo/Pods/RxSwift/RxSwift/Concurrency/LockOwnerType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Concurrency/LockOwnerType.swift
@@ -12,10 +12,10 @@ protocol LockOwnerType : class, Lock {
 
 extension LockOwnerType {
     func lock() {
-        _lock.lock()
+        self._lock.lock()
     }
 
     func unlock() {
-        _lock.unlock()
+        self._lock.unlock()
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedDisposeType.swift b/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedDisposeType.swift
index af9548f..0490a69 100644
--- a/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedDisposeType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedDisposeType.swift
@@ -12,7 +12,7 @@ protocol SynchronizedDisposeType : class, Disposable, Lock {
 
 extension SynchronizedDisposeType {
     func synchronizedDispose() {
-        lock(); defer { unlock() }
-        _synchronized_dispose()
+        self.lock(); defer { self.unlock() }
+        self._synchronized_dispose()
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedOnType.swift b/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedOnType.swift
index 8dfc556..bac051b 100644
--- a/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedOnType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedOnType.swift
@@ -7,12 +7,12 @@
 //
 
 protocol SynchronizedOnType : class, ObserverType, Lock {
-    func _synchronized_on(_ event: Event)
+    func _synchronized_on(_ event: Event)
 }
 
 extension SynchronizedOnType {
-    func synchronizedOn(_ event: Event) {
-        lock(); defer { unlock() }
-        _synchronized_on(event)
+    func synchronizedOn(_ event: Event) {
+        self.lock(); defer { self.unlock() }
+        self._synchronized_on(event)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Date+Dispatch.swift b/Demo/Pods/RxSwift/RxSwift/Date+Dispatch.swift
new file mode 100644
index 0000000..0dc3ac3
--- /dev/null
+++ b/Demo/Pods/RxSwift/RxSwift/Date+Dispatch.swift
@@ -0,0 +1,65 @@
+//
+//  Date+Dispatch.swift
+//  RxSwift
+//
+//  Created by Krunoslav Zaher on 4/14/19.
+//  Copyright © 2019 Krunoslav Zaher. All rights reserved.
+//
+
+import struct Foundation.Date
+import struct Foundation.TimeInterval
+import enum Dispatch.DispatchTimeInterval
+
+extension DispatchTimeInterval {
+    var convertToSecondsFactor: Double {
+        switch self {
+        case .nanoseconds: return 1_000_000_000.0
+        case .microseconds: return 1_000_000.0
+        case .milliseconds: return 1_000.0
+        case .seconds: return 1.0
+        case .never: fatalError()
+        @unknown default: fatalError()
+        }
+    }
+ 
+    func map(_ transform: (Int, Double) -> Int) -> DispatchTimeInterval {
+        switch self {
+        case .nanoseconds(let value): return .nanoseconds(transform(value, 1_000_000_000.0))
+        case .microseconds(let value): return .microseconds(transform(value, 1_000_000.0))
+        case .milliseconds(let value): return .milliseconds(transform(value, 1_000.0))
+        case .seconds(let value): return .seconds(transform(value, 1.0))
+        case .never: return .never
+        @unknown default: fatalError()
+        }
+    }
+    
+    var isNow: Bool {
+        switch self {
+        case .nanoseconds(let value), .microseconds(let value), .milliseconds(let value), .seconds(let value): return value == 0
+        case .never: return false
+        @unknown default: fatalError()
+        }
+    }
+    
+    internal func reduceWithSpanBetween(earlierDate: Date, laterDate: Date) -> DispatchTimeInterval {
+        return self.map { value, factor in
+            let interval = laterDate.timeIntervalSince(earlierDate)
+            let remainder = Double(value) - interval * factor
+            guard remainder > 0 else { return 0 }
+            return Int(remainder.rounded(.toNearestOrAwayFromZero))
+        }
+    }
+}
+
+extension Date {
+
+    internal func addingDispatchInterval(_ dispatchInterval: DispatchTimeInterval) -> Date {
+        switch dispatchInterval {
+        case .nanoseconds(let value), .microseconds(let value), .milliseconds(let value), .seconds(let value):
+            return self.addingTimeInterval(TimeInterval(value) / dispatchInterval.convertToSecondsFactor)
+        case .never: return Date.distantFuture
+        @unknown default: fatalError()
+        }
+    }
+    
+}
diff --git a/Demo/Pods/RxSwift/RxSwift/Deprecated.swift b/Demo/Pods/RxSwift/RxSwift/Deprecated.swift
index 0337d82..5cfdf38 100644
--- a/Demo/Pods/RxSwift/RxSwift/Deprecated.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Deprecated.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2017 Krunoslav Zaher. All rights reserved.
 //
 
+import Foundation
+
 extension Observable {
     /**
      Converts a optional to an observable sequence.
@@ -16,7 +18,7 @@ extension Observable {
      - returns: An observable sequence containing the wrapped value or not from given optional.
      */
     @available(*, deprecated, message: "Implicit conversions from any type to optional type are allowed and that is causing issues with `from` operator overloading.", renamed: "from(optional:)")
-    public static func from(_ optional: E?) -> Observable {
+    public static func from(_ optional: Element?) -> Observable {
         return Observable.from(optional: optional)
     }
 
@@ -30,7 +32,7 @@ extension Observable {
      - returns: An observable sequence containing the wrapped value or not from given optional.
      */
     @available(*, deprecated, message: "Implicit conversions from any type to optional type are allowed and that is causing issues with `from` operator overloading.", renamed: "from(optional:scheduler:)")
-    public static func from(_ optional: E?, scheduler: ImmediateSchedulerType) -> Observable {
+    public static func from(_ optional: Element?, scheduler: ImmediateSchedulerType) -> Observable {
         return Observable.from(optional: optional, scheduler: scheduler)
     }
 }
@@ -46,9 +48,9 @@ extension ObservableType {
      - returns: An observable sequence whose elements are the result of invoking the transform function on each element of source.
      */
     @available(*, deprecated, message: "Please use enumerated().map()")
-    public func mapWithIndex(_ selector: @escaping (E, Int) throws -> R)
-        -> Observable {
-        return enumerated().map { try selector($0.element, $0.index) }
+    public func mapWithIndex(_ selector: @escaping (Element, Int) throws -> Result)
+        -> Observable {
+        return self.enumerated().map { try selector($0.element, $0.index) }
     }
 
 
@@ -62,9 +64,9 @@ extension ObservableType {
      - returns: An observable sequence whose elements are the result of invoking the one-to-many transform function on each element of the input sequence.
      */
     @available(*, deprecated, message: "Please use enumerated().flatMap()")
-    public func flatMapWithIndex(_ selector: @escaping (E, Int) throws -> O)
-        -> Observable {
-        return enumerated().flatMap { try selector($0.element, $0.index) }
+    public func flatMapWithIndex(_ selector: @escaping (Element, Int) throws -> Source)
+        -> Observable {
+        return self.enumerated().flatMap { try selector($0.element, $0.index) }
     }
 
     /**
@@ -78,8 +80,8 @@ extension ObservableType {
      - returns: An observable sequence that contains the elements from the input sequence starting at the first element in the linear series that does not pass the test specified by predicate.
      */
     @available(*, deprecated, message: "Please use enumerated().skipWhile().map()")
-    public func skipWhileWithIndex(_ predicate: @escaping (E, Int) throws -> Bool) -> Observable {
-        return enumerated().skipWhile { try predicate($0.element, $0.index) }.map { $0.element }
+    public func skipWhileWithIndex(_ predicate: @escaping (Element, Int) throws -> Bool) -> Observable {
+        return self.enumerated().skipWhile { try predicate($0.element, $0.index) }.map { $0.element }
     }
 
 
@@ -95,8 +97,8 @@ extension ObservableType {
      - returns: An observable sequence that contains the elements from the input sequence that occur before the element at which the test no longer passes.
      */
     @available(*, deprecated, message: "Please use enumerated().takeWhile().map()")
-    public func takeWhileWithIndex(_ predicate: @escaping (E, Int) throws -> Bool) -> Observable {
-        return enumerated().takeWhile { try predicate($0.element, $0.index) }.map { $0.element }
+    public func takeWhileWithIndex(_ predicate: @escaping (Element, Int) throws -> Bool) -> Observable {
+        return self.enumerated().takeWhile { try predicate($0.element, $0.index) }.map { $0.element }
     }
 }
 
@@ -109,7 +111,7 @@ extension Disposable {
     /// - parameter bag: `DisposeBag` to add `self` to.
     @available(*, deprecated, message: "use disposed(by:) instead", renamed: "disposed(by:)")
     public func addDisposableTo(_ bag: DisposeBag) {
-        disposed(by: bag)
+        self.disposed(by: bag)
     }
 }
 
@@ -127,8 +129,8 @@ extension ObservableType {
      */
     @available(*, deprecated, message: "use share(replay: 1) instead", renamed: "share(replay:)")
     public func shareReplayLatestWhileConnected()
-        -> Observable {
-        return share(replay: 1, scope: .whileConnected)
+        -> Observable {
+        return self.share(replay: 1, scope: .whileConnected)
     }
 }
 
@@ -147,7 +149,7 @@ extension ObservableType {
      */
     @available(*, deprecated, message: "Suggested replacement is `share(replay: 1)`. In case old 3.x behavior of `shareReplay` is required please use `share(replay: 1, scope: .forever)` instead.", renamed: "share(replay:)")
     public func shareReplay(_ bufferSize: Int)
-        -> Observable {
+        -> Observable {
         return self.share(replay: bufferSize, scope: .forever)
     }
 }
@@ -167,16 +169,14 @@ extension ObservableType {
 /// * It has an inconsistent memory management model compared to other parts of RxSwift (completes on `deinit`).
 ///
 /// Once plans are finalized, official availability attribute will be added in one of upcoming versions.
+@available(*, deprecated, message: "Variable is deprecated. Please use `BehaviorRelay` as a replacement.")
 public final class Variable {
-
-    public typealias E = Element
-
     private let _subject: BehaviorSubject
 
     private var _lock = SpinLock()
 
     // state
-    private var _value: E
+    private var _value: Element
 
     #if DEBUG
     fileprivate let _synchronizationTracker = SynchronizationTracker()
@@ -187,21 +187,21 @@ public final class Variable {
     /// Whenever a new value is set, all the observers are notified of the change.
     ///
     /// Even if the newly set value is same as the old value, observers are still notified for change.
-    public var value: E {
+    public var value: Element {
         get {
-            _lock.lock(); defer { _lock.unlock() }
-            return _value
+            self._lock.lock(); defer { self._lock.unlock() }
+            return self._value
         }
         set(newValue) {
             #if DEBUG
-                _synchronizationTracker.register(synchronizationErrorMessage: .variable)
-                defer { _synchronizationTracker.unregister() }
+                self._synchronizationTracker.register(synchronizationErrorMessage: .variable)
+                defer { self._synchronizationTracker.unregister() }
             #endif
-            _lock.lock()
-            _value = newValue
-            _lock.unlock()
+            self._lock.lock()
+            self._value = newValue
+            self._lock.unlock()
 
-            _subject.on(.next(newValue))
+            self._subject.on(.next(newValue))
         }
     }
 
@@ -209,20 +209,373 @@ public final class Variable {
     ///
     /// - parameter value: Initial variable value.
     public init(_ value: Element) {
-        #if DEBUG
-            DeprecationWarner.warnIfNeeded(.variable)
-        #endif
-
-        _value = value
-        _subject = BehaviorSubject(value: value)
+        self._value = value
+        self._subject = BehaviorSubject(value: value)
     }
 
     /// - returns: Canonical interface for push style sequence
-    public func asObservable() -> Observable {
-        return _subject
+    public func asObservable() -> Observable {
+        return self._subject
     }
 
     deinit {
-        _subject.on(.completed)
+        self._subject.on(.completed)
+    }
+}
+
+extension ObservableType {
+    /**
+     Returns an observable sequence by the source observable sequence shifted forward in time by a specified delay. Error events from the source observable sequence are not delayed.
+    
+     - seealso: [delay operator on reactivex.io](http://reactivex.io/documentation/operators/delay.html)
+    
+     - parameter dueTime: Relative time shift of the source by.
+     - parameter scheduler: Scheduler to run the subscription delay timer on.
+     - returns: the source Observable shifted in time by the specified delay.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "delay(_:scheduler:)")
+    public func delay(_ dueTime: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> Observable {
+        return self.delay(.milliseconds(Int(dueTime * 1000.0)), scheduler: scheduler)
+    }
+}
+
+extension ObservableType {
+    
+    /**
+     Applies a timeout policy for each element in the observable sequence. If the next element isn't received within the specified timeout duration starting from its predecessor, a TimeoutError is propagated to the observer.
+     
+     - seealso: [timeout operator on reactivex.io](http://reactivex.io/documentation/operators/timeout.html)
+     
+     - parameter dueTime: Maximum duration between values before a timeout occurs.
+     - parameter scheduler: Scheduler to run the timeout timer on.
+     - returns: An observable sequence with a `RxError.timeout` in case of a timeout.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "timeout(_:scheduler:)")
+    public func timeout(_ dueTime: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> Observable {
+        return timeout(.milliseconds(Int(dueTime * 1000.0)), scheduler: scheduler)
+    }
+    
+    /**
+     Applies a timeout policy for each element in the observable sequence, using the specified scheduler to run timeout timers. If the next element isn't received within the specified timeout duration starting from its predecessor, the other observable sequence is used to produce future messages from that point on.
+     
+     - seealso: [timeout operator on reactivex.io](http://reactivex.io/documentation/operators/timeout.html)
+     
+     - parameter dueTime: Maximum duration between values before a timeout occurs.
+     - parameter other: Sequence to return in case of a timeout.
+     - parameter scheduler: Scheduler to run the timeout timer on.
+     - returns: The source sequence switching to the other sequence in case of a timeout.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "timeout(_:other:scheduler:)")
+    public func timeout(_ dueTime: Foundation.TimeInterval, other: OtherSource, scheduler: SchedulerType)
+        -> Observable where Element == OtherSource.Element {
+        return timeout(.milliseconds(Int(dueTime * 1000.0)), other: other, scheduler: scheduler)
+    }
+}
+
+extension ObservableType {
+    
+    /**
+     Skips elements for the specified duration from the start of the observable source sequence, using the specified scheduler to run timers.
+     
+     - seealso: [skip operator on reactivex.io](http://reactivex.io/documentation/operators/skip.html)
+     
+     - parameter duration: Duration for skipping elements from the start of the sequence.
+     - parameter scheduler: Scheduler to run the timer on.
+     - returns: An observable sequence with the elements skipped during the specified duration from the start of the source sequence.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "skip(_:scheduler:)")
+    public func skip(_ duration: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> Observable {
+        return skip(.milliseconds(Int(duration * 1000.0)), scheduler: scheduler)
+    }
+}
+
+extension ObservableType where Element : RxAbstractInteger {
+    /**
+     Returns an observable sequence that produces a value after each period, using the specified scheduler to run timers and to send out observer messages.
+     
+     - seealso: [interval operator on reactivex.io](http://reactivex.io/documentation/operators/interval.html)
+     
+     - parameter period: Period for producing the values in the resulting sequence.
+     - parameter scheduler: Scheduler to run the timer on.
+     - returns: An observable sequence that produces a value after each period.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "interval(_:scheduler:)")
+    public static func interval(_ period: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> Observable {
+        return interval(.milliseconds(Int(period * 1000.0)), scheduler: scheduler)
+    }
+}
+
+extension ObservableType where Element: RxAbstractInteger {
+    /**
+     Returns an observable sequence that periodically produces a value after the specified initial relative due time has elapsed, using the specified scheduler to run timers.
+     
+     - seealso: [timer operator on reactivex.io](http://reactivex.io/documentation/operators/timer.html)
+     
+     - parameter dueTime: Relative time at which to produce the first value.
+     - parameter period: Period to produce subsequent values.
+     - parameter scheduler: Scheduler to run timers on.
+     - returns: An observable sequence that produces a value after due time has elapsed and then each period.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "timer(_:period:scheduler:)")
+    public static func timer(_ dueTime: Foundation.TimeInterval, period: Foundation.TimeInterval? = nil, scheduler: SchedulerType)
+        -> Observable {
+        return timer(.milliseconds(Int(dueTime * 1000.0)), period: period.map { .milliseconds(Int($0 * 1000.0)) }, scheduler: scheduler)
+    }
+}
+
+extension ObservableType {
+    
+    /**
+     Returns an Observable that emits the first and the latest item emitted by the source Observable during sequential time windows of a specified duration.
+     
+     This operator makes sure that no two elements are emitted in less then dueTime.
+     
+     - seealso: [debounce operator on reactivex.io](http://reactivex.io/documentation/operators/debounce.html)
+     
+     - parameter dueTime: Throttling duration for each element.
+     - parameter latest: Should latest element received in a dueTime wide time window since last element emission be emitted.
+     - parameter scheduler: Scheduler to run the throttle timers on.
+     - returns: The throttled sequence.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "throttle(_:latest:scheduler:)")
+    public func throttle(_ dueTime: Foundation.TimeInterval, latest: Bool = true, scheduler: SchedulerType)
+        -> Observable {
+        return throttle(.milliseconds(Int(dueTime * 1000.0)), latest: latest, scheduler: scheduler)
+    }
+}
+
+extension ObservableType {
+    
+    /**
+     Takes elements for the specified duration from the start of the observable source sequence, using the specified scheduler to run timers.
+     
+     - seealso: [take operator on reactivex.io](http://reactivex.io/documentation/operators/take.html)
+     
+     - parameter duration: Duration for taking elements from the start of the sequence.
+     - parameter scheduler: Scheduler to run the timer on.
+     - returns: An observable sequence with the elements taken during the specified duration from the start of the source sequence.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "take(_:scheduler:)")
+    public func take(_ duration: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> Observable {
+        return take(.milliseconds(Int(duration * 1000.0)), scheduler: scheduler)
+    }
+}
+
+
+extension ObservableType {
+    
+    /**
+     Time shifts the observable sequence by delaying the subscription with the specified relative time duration, using the specified scheduler to run timers.
+     
+     - seealso: [delay operator on reactivex.io](http://reactivex.io/documentation/operators/delay.html)
+     
+     - parameter dueTime: Relative time shift of the subscription.
+     - parameter scheduler: Scheduler to run the subscription delay timer on.
+     - returns: Time-shifted sequence.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "delaySubscription(_:scheduler:)")
+    public func delaySubscription(_ dueTime: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> Observable {
+        return delaySubscription(.milliseconds(Int(dueTime * 1000.0)), scheduler: scheduler)
+    }
+}
+
+extension ObservableType {
+    
+    /**
+     Projects each element of an observable sequence into a window that is completed when either it’s full or a given amount of time has elapsed.
+     
+     - seealso: [window operator on reactivex.io](http://reactivex.io/documentation/operators/window.html)
+     
+     - parameter timeSpan: Maximum time length of a window.
+     - parameter count: Maximum element count of a window.
+     - parameter scheduler: Scheduler to run windowing timers on.
+     - returns: An observable sequence of windows (instances of `Observable`).
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "window(_:)")
+    public func window(timeSpan: Foundation.TimeInterval, count: Int, scheduler: SchedulerType)
+        -> Observable> {
+            return window(timeSpan: .milliseconds(Int(timeSpan * 1000.0)), count: count, scheduler: scheduler)
+    }
+}
+
+
+extension PrimitiveSequence {
+    /**
+     Returns an observable sequence by the source observable sequence shifted forward in time by a specified delay. Error events from the source observable sequence are not delayed.
+     
+     - seealso: [delay operator on reactivex.io](http://reactivex.io/documentation/operators/delay.html)
+     
+     - parameter dueTime: Relative time shift of the source by.
+     - parameter scheduler: Scheduler to run the subscription delay timer on.
+     - returns: the source Observable shifted in time by the specified delay.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "delay(_:scheduler:)")
+    public func delay(_ dueTime: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> PrimitiveSequence {
+        return delay(.milliseconds(Int(dueTime * 1000.0)), scheduler: scheduler)
+    }
+            
+    /**
+     Time shifts the observable sequence by delaying the subscription with the specified relative time duration, using the specified scheduler to run timers.
+     
+     - seealso: [delay operator on reactivex.io](http://reactivex.io/documentation/operators/delay.html)
+     
+     - parameter dueTime: Relative time shift of the subscription.
+     - parameter scheduler: Scheduler to run the subscription delay timer on.
+     - returns: Time-shifted sequence.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "delaySubscription(_:scheduler:)")
+    public func delaySubscription(_ dueTime: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> PrimitiveSequence {
+        return delaySubscription(.milliseconds(Int(dueTime * 1000.0)), scheduler: scheduler)
+    }
+    
+    /**
+     Applies a timeout policy for each element in the observable sequence. If the next element isn't received within the specified timeout duration starting from its predecessor, a TimeoutError is propagated to the observer.
+     
+     - seealso: [timeout operator on reactivex.io](http://reactivex.io/documentation/operators/timeout.html)
+     
+     - parameter dueTime: Maximum duration between values before a timeout occurs.
+     - parameter scheduler: Scheduler to run the timeout timer on.
+     - returns: An observable sequence with a `RxError.timeout` in case of a timeout.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "timeout(_:scheduler:)")
+    public func timeout(_ dueTime: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> PrimitiveSequence {
+        return timeout(.milliseconds(Int(dueTime * 1000.0)), scheduler: scheduler)
+    }
+    
+    /**
+     Applies a timeout policy for each element in the observable sequence, using the specified scheduler to run timeout timers. If the next element isn't received within the specified timeout duration starting from its predecessor, the other observable sequence is used to produce future messages from that point on.
+     
+     - seealso: [timeout operator on reactivex.io](http://reactivex.io/documentation/operators/timeout.html)
+     
+     - parameter dueTime: Maximum duration between values before a timeout occurs.
+     - parameter other: Sequence to return in case of a timeout.
+     - parameter scheduler: Scheduler to run the timeout timer on.
+     - returns: The source sequence switching to the other sequence in case of a timeout.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "timeout(_:other:scheduler:)")
+    public func timeout(_ dueTime: Foundation.TimeInterval,
+                        other: PrimitiveSequence,
+                        scheduler: SchedulerType) -> PrimitiveSequence {
+        return timeout(.milliseconds(Int(dueTime * 1000.0)), other: other, scheduler: scheduler)
+    }
+}
+
+extension PrimitiveSequenceType where Trait == SingleTrait {
+
+    /**
+     Invokes an action for each event in the observable sequence, and propagates all observer messages through the result sequence.
+     
+     - seealso: [do operator on reactivex.io](http://reactivex.io/documentation/operators/do.html)
+     
+     - parameter onNext: Action to invoke for each element in the observable sequence.
+     - parameter onError: Action to invoke upon errored termination of the observable sequence.
+     - parameter onSubscribe: Action to invoke before subscribing to source observable sequence.
+     - parameter onSubscribed: Action to invoke after subscribing to source observable sequence.
+     - parameter onDispose: Action to invoke after subscription to source observable has been disposed for any reason. It can be either because sequence terminates for some reason or observer subscription being disposed.
+     - returns: The source sequence with the side-effecting behavior applied.
+     */
+    @available(*, deprecated, renamed: "do(onSuccess:onError:onSubscribe:onSubscribed:onDispose:)")
+    public func `do`(onNext: ((Element) throws -> Void)?,
+                     onError: ((Swift.Error) throws -> Void)? = nil,
+                     onSubscribe: (() -> Void)? = nil,
+                     onSubscribed: (() -> Void)? = nil,
+                     onDispose: (() -> Void)? = nil)
+        -> Single {
+        return self.`do`(
+            onSuccess: onNext,
+            onError: onError,
+            onSubscribe: onSubscribe,
+            onSubscribed: onSubscribed,
+            onDispose: onDispose
+        )
+    }
+}
+
+extension ObservableType {
+    /**
+     Projects each element of an observable sequence into a buffer that's sent out when either it's full or a given amount of time has elapsed, using the specified scheduler to run timers.
+     
+     A useful real-world analogy of this overload is the behavior of a ferry leaving the dock when all seats are taken, or at the scheduled time of departure, whichever event occurs first.
+     
+     - seealso: [buffer operator on reactivex.io](http://reactivex.io/documentation/operators/buffer.html)
+     
+     - parameter timeSpan: Maximum time length of a buffer.
+     - parameter count: Maximum element count of a buffer.
+     - parameter scheduler: Scheduler to run buffering timers on.
+     - returns: An observable sequence of buffers.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "buffer(timeSpan:count:scheduler:)")
+    public func buffer(timeSpan: Foundation.TimeInterval, count: Int, scheduler: SchedulerType)
+        -> Observable<[Element]> {
+        return buffer(timeSpan: .milliseconds(Int(timeSpan * 1000.0)), count: count, scheduler: scheduler)
+    }
+}
+
+extension PrimitiveSequenceType where Element: RxAbstractInteger
+{
+    /**
+     Returns an observable sequence that periodically produces a value after the specified initial relative due time has elapsed, using the specified scheduler to run timers.
+     
+     - seealso: [timer operator on reactivex.io](http://reactivex.io/documentation/operators/timer.html)
+     
+     - parameter dueTime: Relative time at which to produce the first value.
+     - parameter scheduler: Scheduler to run timers on.
+     - returns: An observable sequence that produces a value after due time has elapsed and then each period.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "timer(_:scheduler:)")
+    public static func timer(_ dueTime: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> PrimitiveSequence  {
+        return timer(.milliseconds(Int(dueTime * 1000.0)), scheduler: scheduler)
+    }
+}
+
+extension Completable {
+    /**
+     Merges the completion of all Completables from a collection into a single Completable.
+
+     - seealso: [merge operator on reactivex.io](http://reactivex.io/documentation/operators/merge.html)
+
+     - parameter sources: Collection of Completables to merge.
+     - returns: A Completable that merges the completion of all Completables.
+     */
+    @available(*, deprecated, message: "Use Completable.zip instead.", renamed: "zip")
+    public static func merge(_ sources: Collection) -> Completable
+           where Collection.Element == Completable {
+        return zip(sources)
+    }
+
+    /**
+     Merges the completion of all Completables from an array into a single Completable.
+
+     - seealso: [merge operator on reactivex.io](http://reactivex.io/documentation/operators/merge.html)
+
+     - parameter sources: Array of observable sequences to merge.
+     - returns: A Completable that merges the completion of all Completables.
+     */
+    @available(*, deprecated, message: "Use Completable.zip instead.", renamed: "zip")
+    public static func merge(_ sources: [Completable]) -> Completable {
+        return zip(sources)
+    }
+
+    /**
+     Merges the completion of all Completables into a single Completable.
+
+     - seealso: [merge operator on reactivex.io](http://reactivex.io/documentation/operators/merge.html)
+
+     - parameter sources: Collection of observable sequences to merge.
+     - returns: The observable sequence that merges the elements of the observable sequences.
+     */
+    @available(*, deprecated, message: "Use Completable.zip instead.", renamed: "zip")
+    public static func merge(_ sources: Completable...) -> Completable {
+        return zip(sources)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/AnonymousDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/AnonymousDisposable.swift
index e54532b..6fbd635 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/AnonymousDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/AnonymousDisposable.swift
@@ -12,37 +12,35 @@
 fileprivate final class AnonymousDisposable : DisposeBase, Cancelable {
     public typealias DisposeAction = () -> Void
 
-    private var _isDisposed: AtomicInt = 0
+    private let _isDisposed = AtomicInt(0)
     private var _disposeAction: DisposeAction?
 
     /// - returns: Was resource disposed.
     public var isDisposed: Bool {
-        return _isDisposed == 1
+        return isFlagSet(self._isDisposed, 1)
     }
 
     /// Constructs a new disposable with the given action used for disposal.
     ///
     /// - parameter disposeAction: Disposal action which will be run upon calling `dispose`.
     fileprivate init(_ disposeAction: @escaping DisposeAction) {
-        _disposeAction = disposeAction
+        self._disposeAction = disposeAction
         super.init()
     }
-    
+
     // Non-deprecated version of the constructor, used by `Disposables.create(with:)`
     fileprivate init(disposeAction: @escaping DisposeAction) {
-        _disposeAction = disposeAction
+        self._disposeAction = disposeAction
         super.init()
     }
-    
+
     /// Calls the disposal action if and only if the current instance hasn't been disposed yet.
     ///
     /// After invoking disposal action, disposal action will be dereferenced.
     fileprivate func dispose() {
-        if AtomicCompareAndSwap(0, 1, &_isDisposed) {
-            assert(_isDisposed == 1)
-
-            if let action = _disposeAction {
-                _disposeAction = nil
+        if fetchOr(self._isDisposed, 1) == 0 {
+            if let action = self._disposeAction {
+                self._disposeAction = nil
                 action()
             }
         }
@@ -50,12 +48,12 @@ fileprivate final class AnonymousDisposable : DisposeBase, Cancelable {
 }
 
 extension Disposables {
-    
+
     /// Constructs a new disposable with the given action used for disposal.
     ///
     /// - parameter dispose: Disposal action which will be run upon calling `dispose`.
-    public static func create(with dispose: @escaping () -> ()) -> Cancelable {
+    public static func create(with dispose: @escaping () -> Void) -> Cancelable {
         return AnonymousDisposable(disposeAction: dispose)
     }
-    
+
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/BinaryDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/BinaryDisposable.swift
index 8a518f0..5693268 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/BinaryDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/BinaryDisposable.swift
@@ -9,7 +9,7 @@
 /// Represents two disposable resources that are disposed together.
 private final class BinaryDisposable : DisposeBase, Cancelable {
 
-    private var _isDisposed: AtomicInt = 0
+    private let _isDisposed = AtomicInt(0)
 
     // state
     private var _disposable1: Disposable?
@@ -17,7 +17,7 @@ private final class BinaryDisposable : DisposeBase, Cancelable {
 
     /// - returns: Was resource disposed.
     var isDisposed: Bool {
-        return _isDisposed > 0
+        return isFlagSet(self._isDisposed, 1)
     }
 
     /// Constructs new binary disposable from two disposables.
@@ -25,8 +25,8 @@ private final class BinaryDisposable : DisposeBase, Cancelable {
     /// - parameter disposable1: First disposable
     /// - parameter disposable2: Second disposable
     init(_ disposable1: Disposable, _ disposable2: Disposable) {
-        _disposable1 = disposable1
-        _disposable2 = disposable2
+        self._disposable1 = disposable1
+        self._disposable2 = disposable2
         super.init()
     }
 
@@ -34,20 +34,20 @@ private final class BinaryDisposable : DisposeBase, Cancelable {
     ///
     /// After invoking disposal action, disposal action will be dereferenced.
     func dispose() {
-        if AtomicCompareAndSwap(0, 1, &_isDisposed) {
-            _disposable1?.dispose()
-            _disposable2?.dispose()
-            _disposable1 = nil
-            _disposable2 = nil
+        if fetchOr(self._isDisposed, 1) == 0 {
+            self._disposable1?.dispose()
+            self._disposable2?.dispose()
+            self._disposable1 = nil
+            self._disposable2 = nil
         }
     }
 }
 
 extension Disposables {
-    
+
     /// Creates a disposable with the given disposables.
     public static func create(_ disposable1: Disposable, _ disposable2: Disposable) -> Cancelable {
         return BinaryDisposable(disposable1, disposable2)
     }
-    
+
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/BooleanDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/BooleanDisposable.swift
index efae55e..a0f5c2f 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/BooleanDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/BooleanDisposable.swift
@@ -23,11 +23,11 @@ public final class BooleanDisposable : Cancelable {
     
     /// - returns: Was resource disposed.
     public var isDisposed: Bool {
-        return _isDisposed
+        return self._isDisposed
     }
     
     /// Sets the status to disposed, which can be observer through the `isDisposed` property.
     public func dispose() {
-        _isDisposed = true
+        self._isDisposed = true
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/CompositeDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/CompositeDisposable.swift
index b057817..ce0da6a 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/CompositeDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/CompositeDisposable.swift
@@ -22,8 +22,8 @@ public final class CompositeDisposable : DisposeBase, Cancelable {
     private var _disposables: Bag? = Bag()
 
     public var isDisposed: Bool {
-        _lock.lock(); defer { _lock.unlock() }
-        return _disposables == nil
+        self._lock.lock(); defer { self._lock.unlock() }
+        return self._disposables == nil
     }
     
     public override init() {
@@ -32,35 +32,35 @@ public final class CompositeDisposable : DisposeBase, Cancelable {
     /// Initializes a new instance of composite disposable with the specified number of disposables.
     public init(_ disposable1: Disposable, _ disposable2: Disposable) {
         // This overload is here to make sure we are using optimized version up to 4 arguments.
-        let _ = _disposables!.insert(disposable1)
-        let _ = _disposables!.insert(disposable2)
+        _ = self._disposables!.insert(disposable1)
+        _ = self._disposables!.insert(disposable2)
     }
     
     /// Initializes a new instance of composite disposable with the specified number of disposables.
     public init(_ disposable1: Disposable, _ disposable2: Disposable, _ disposable3: Disposable) {
         // This overload is here to make sure we are using optimized version up to 4 arguments.
-        let _ = _disposables!.insert(disposable1)
-        let _ = _disposables!.insert(disposable2)
-        let _ = _disposables!.insert(disposable3)
+        _ = self._disposables!.insert(disposable1)
+        _ = self._disposables!.insert(disposable2)
+        _ = self._disposables!.insert(disposable3)
     }
     
     /// Initializes a new instance of composite disposable with the specified number of disposables.
     public init(_ disposable1: Disposable, _ disposable2: Disposable, _ disposable3: Disposable, _ disposable4: Disposable, _ disposables: Disposable...) {
         // This overload is here to make sure we are using optimized version up to 4 arguments.
-        let _ = _disposables!.insert(disposable1)
-        let _ = _disposables!.insert(disposable2)
-        let _ = _disposables!.insert(disposable3)
-        let _ = _disposables!.insert(disposable4)
+        _ = self._disposables!.insert(disposable1)
+        _ = self._disposables!.insert(disposable2)
+        _ = self._disposables!.insert(disposable3)
+        _ = self._disposables!.insert(disposable4)
         
         for disposable in disposables {
-            let _ = _disposables!.insert(disposable)
+            _ = self._disposables!.insert(disposable)
         }
     }
     
     /// Initializes a new instance of composite disposable with the specified number of disposables.
     public init(disposables: [Disposable]) {
         for disposable in disposables {
-            let _ = _disposables!.insert(disposable)
+            _ = self._disposables!.insert(disposable)
         }
     }
 
@@ -72,7 +72,7 @@ public final class CompositeDisposable : DisposeBase, Cancelable {
      disposed `nil` will be returned.
      */
     public func insert(_ disposable: Disposable) -> DisposeKey? {
-        let key = _insert(disposable)
+        let key = self._insert(disposable)
         
         if key == nil {
             disposable.dispose()
@@ -82,42 +82,42 @@ public final class CompositeDisposable : DisposeBase, Cancelable {
     }
     
     private func _insert(_ disposable: Disposable) -> DisposeKey? {
-        _lock.lock(); defer { _lock.unlock() }
+        self._lock.lock(); defer { self._lock.unlock() }
 
-        let bagKey = _disposables?.insert(disposable)
+        let bagKey = self._disposables?.insert(disposable)
         return bagKey.map(DisposeKey.init)
     }
     
     /// - returns: Gets the number of disposables contained in the `CompositeDisposable`.
     public var count: Int {
-        _lock.lock(); defer { _lock.unlock() }
-        return _disposables?.count ?? 0
+        self._lock.lock(); defer { self._lock.unlock() }
+        return self._disposables?.count ?? 0
     }
     
     /// Removes and disposes the disposable identified by `disposeKey` from the CompositeDisposable.
     ///
     /// - parameter disposeKey: Key used to identify disposable to be removed.
     public func remove(for disposeKey: DisposeKey) {
-        _remove(for: disposeKey)?.dispose()
+        self._remove(for: disposeKey)?.dispose()
     }
     
     private func _remove(for disposeKey: DisposeKey) -> Disposable? {
-        _lock.lock(); defer { _lock.unlock() }
-        return _disposables?.removeKey(disposeKey.key)
+        self._lock.lock(); defer { self._lock.unlock() }
+        return self._disposables?.removeKey(disposeKey.key)
     }
     
     /// Disposes all disposables in the group and removes them from the group.
     public func dispose() {
-        if let disposables = _dispose() {
+        if let disposables = self._dispose() {
             disposeAll(in: disposables)
         }
     }
 
     private func _dispose() -> Bag? {
-        _lock.lock(); defer { _lock.unlock() }
+        self._lock.lock(); defer { self._lock.unlock() }
 
-        let disposeBag = _disposables
-        _disposables = nil
+        let disposeBag = self._disposables
+        self._disposables = nil
 
         return disposeBag
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBag.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBag.swift
index 9a2386d..22e5cb0 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBag.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBag.swift
@@ -44,23 +44,23 @@ public final class DisposeBag: DisposeBase {
     ///
     /// - parameter disposable: Disposable to add.
     public func insert(_ disposable: Disposable) {
-        _insert(disposable)?.dispose()
+        self._insert(disposable)?.dispose()
     }
     
     private func _insert(_ disposable: Disposable) -> Disposable? {
-        _lock.lock(); defer { _lock.unlock() }
-        if _isDisposed {
+        self._lock.lock(); defer { self._lock.unlock() }
+        if self._isDisposed {
             return disposable
         }
 
-        _disposables.append(disposable)
+        self._disposables.append(disposable)
 
         return nil
     }
 
     /// This is internal on purpose, take a look at `CompositeDisposable` instead.
     private func dispose() {
-        let oldDisposables = _dispose()
+        let oldDisposables = self._dispose()
 
         for disposable in oldDisposables {
             disposable.dispose()
@@ -68,18 +68,18 @@ public final class DisposeBag: DisposeBase {
     }
 
     private func _dispose() -> [Disposable] {
-        _lock.lock(); defer { _lock.unlock() }
+        self._lock.lock(); defer { self._lock.unlock() }
 
-        let disposables = _disposables
+        let disposables = self._disposables
         
-        _disposables.removeAll(keepingCapacity: false)
-        _isDisposed = true
+        self._disposables.removeAll(keepingCapacity: false)
+        self._isDisposed = true
         
         return disposables
     }
     
     deinit {
-        dispose()
+        self.dispose()
     }
 }
 
@@ -88,27 +88,27 @@ extension DisposeBag {
     /// Convenience init allows a list of disposables to be gathered for disposal.
     public convenience init(disposing disposables: Disposable...) {
         self.init()
-        _disposables += disposables
+        self._disposables += disposables
     }
 
     /// Convenience init allows an array of disposables to be gathered for disposal.
     public convenience init(disposing disposables: [Disposable]) {
         self.init()
-        _disposables += disposables
+        self._disposables += disposables
     }
 
     /// Convenience function allows a list of disposables to be gathered for disposal.
     public func insert(_ disposables: Disposable...) {
-        insert(disposables)
+        self.insert(disposables)
     }
 
     /// Convenience function allows an array of disposables to be gathered for disposal.
     public func insert(_ disposables: [Disposable]) {
-        _lock.lock(); defer { _lock.unlock() }
-        if _isDisposed {
+        self._lock.lock(); defer { self._lock.unlock() }
+        if self._isDisposed {
             disposables.forEach { $0.dispose() }
         } else {
-            _disposables += disposables
+            self._disposables += disposables
         }
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBase.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBase.swift
index 8c6a44f..0d4b2fb 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBase.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBase.swift
@@ -10,13 +10,13 @@
 public class DisposeBase {
     init() {
 #if TRACE_RESOURCES
-    let _ = Resources.incrementTotal()
+    _ = Resources.incrementTotal()
 #endif
     }
     
     deinit {
 #if TRACE_RESOURCES
-    let _ = Resources.decrementTotal()
+    _ = Resources.decrementTotal()
 #endif
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/RefCountDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/RefCountDisposable.swift
index a21662a..922f20a 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/RefCountDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/RefCountDisposable.swift
@@ -15,13 +15,13 @@ public final class RefCountDisposable : DisposeBase, Cancelable {
 
     /// - returns: Was resource disposed.
     public var isDisposed: Bool {
-        _lock.lock(); defer { _lock.unlock() }
-        return _disposable == nil
+        self._lock.lock(); defer { self._lock.unlock() }
+        return self._disposable == nil
     }
 
     /// Initializes a new instance of the `RefCountDisposable`.
     public init(disposable: Disposable) {
-        _disposable = disposable
+        self._disposable = disposable
         super.init()
     }
 
@@ -31,12 +31,11 @@ public final class RefCountDisposable : DisposeBase, Cancelable {
      When getter is called, a dependent disposable contributing to the reference count that manages the underlying disposable's lifetime is returned.
      */
     public func retain() -> Disposable {
-        return _lock.calculateLocked {
-            if let _ = _disposable {
-
+        return self._lock.calculateLocked {
+            if self._disposable != nil {
                 do {
-                    let _ = try incrementChecked(&_count)
-                } catch (_) {
+                    _ = try incrementChecked(&self._count)
+                } catch {
                     rxFatalError("RefCountDisposable increment failed")
                 }
 
@@ -49,14 +48,12 @@ public final class RefCountDisposable : DisposeBase, Cancelable {
 
     /// Disposes the underlying disposable only when all dependent disposables have been disposed.
     public func dispose() {
-        let oldDisposable: Disposable? = _lock.calculateLocked {
-            if let oldDisposable = _disposable, !_primaryDisposed
-            {
-                _primaryDisposed = true
-
-                if (_count == 0)
-                {
-                    _disposable = nil
+        let oldDisposable: Disposable? = self._lock.calculateLocked {
+            if let oldDisposable = self._disposable, !self._primaryDisposed {
+                self._primaryDisposed = true
+
+                if self._count == 0 {
+                    self._disposable = nil
                     return oldDisposable
                 }
             }
@@ -70,20 +67,20 @@ public final class RefCountDisposable : DisposeBase, Cancelable {
     }
 
     fileprivate func release() {
-        let oldDisposable: Disposable? = _lock.calculateLocked {
-            if let oldDisposable = _disposable {
+        let oldDisposable: Disposable? = self._lock.calculateLocked {
+            if let oldDisposable = self._disposable {
                 do {
-                    let _ = try decrementChecked(&_count)
-                } catch (_) {
+                    _ = try decrementChecked(&self._count)
+                } catch {
                     rxFatalError("RefCountDisposable decrement on release failed")
                 }
 
-                guard _count >= 0 else {
+                guard self._count >= 0 else {
                     rxFatalError("RefCountDisposable counter is lower than 0")
                 }
 
-                if _primaryDisposed && _count == 0 {
-                    _disposable = nil
+                if self._primaryDisposed && self._count == 0 {
+                    self._disposable = nil
                     return oldDisposable
                 }
             }
@@ -100,18 +97,17 @@ public final class RefCountDisposable : DisposeBase, Cancelable {
 internal final class RefCountInnerDisposable: DisposeBase, Disposable
 {
     private let _parent: RefCountDisposable
-    private var _isDisposed: AtomicInt = 0
+    private let _isDisposed = AtomicInt(0)
 
-    init(_ parent: RefCountDisposable)
-    {
-        _parent = parent
+    init(_ parent: RefCountDisposable) {
+        self._parent = parent
         super.init()
     }
 
     internal func dispose()
     {
-        if AtomicCompareAndSwap(0, 1, &_isDisposed) {
-            _parent.release()
+        if fetchOr(self._isDisposed, 1) == 0 {
+            self._parent.release()
         }
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/ScheduledDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/ScheduledDisposable.swift
index 92c220d..c834f5b 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/ScheduledDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/ScheduledDisposable.swift
@@ -15,14 +15,14 @@ private let disposeScheduledDisposable: (ScheduledDisposable) -> Disposable = {
 public final class ScheduledDisposable : Cancelable {
     public let scheduler: ImmediateSchedulerType
 
-    private var _isDisposed: AtomicInt = 0
+    private let _isDisposed = AtomicInt(0)
 
     // state
     private var _disposable: Disposable?
 
     /// - returns: Was resource disposed.
     public var isDisposed: Bool {
-        return _isDisposed == 1
+        return isFlagSet(self._isDisposed, 1)
     }
 
     /**
@@ -33,18 +33,18 @@ public final class ScheduledDisposable : Cancelable {
     */
     public init(scheduler: ImmediateSchedulerType, disposable: Disposable) {
         self.scheduler = scheduler
-        _disposable = disposable
+        self._disposable = disposable
     }
 
     /// Disposes the wrapped disposable on the provided scheduler.
     public func dispose() {
-        let _ = scheduler.schedule(self, action: disposeScheduledDisposable)
+        _ = self.scheduler.schedule(self, action: disposeScheduledDisposable)
     }
 
     func disposeInner() {
-        if AtomicCompareAndSwap(0, 1, &_isDisposed) {
-            _disposable!.dispose()
-            _disposable = nil
+        if fetchOr(self._isDisposed, 1) == 0 {
+            self._disposable!.dispose()
+            self._disposable = nil
         }
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/SerialDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/SerialDisposable.swift
index 6373d2b..22dce36 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/SerialDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/SerialDisposable.swift
@@ -16,7 +16,7 @@ public final class SerialDisposable : DisposeBase, Cancelable {
     
     /// - returns: Was resource disposed.
     public var isDisposed: Bool {
-        return _isDisposed
+        return self._isDisposed
     }
     
     /// Initializes a new instance of the `SerialDisposable`.
@@ -33,18 +33,18 @@ public final class SerialDisposable : DisposeBase, Cancelable {
     */
     public var disposable: Disposable {
         get {
-            return _lock.calculateLocked {
-                return _current ?? Disposables.create()
+            return self._lock.calculateLocked {
+                return self._current ?? Disposables.create()
             }
         }
         set (newDisposable) {
-            let disposable: Disposable? = _lock.calculateLocked {
-                if _isDisposed {
+            let disposable: Disposable? = self._lock.calculateLocked {
+                if self._isDisposed {
                     return newDisposable
                 }
                 else {
-                    let toDispose = _current
-                    _current = newDisposable
+                    let toDispose = self._current
+                    self._current = newDisposable
                     return toDispose
                 }
             }
@@ -57,18 +57,18 @@ public final class SerialDisposable : DisposeBase, Cancelable {
     
     /// Disposes the underlying disposable as well as all future replacements.
     public func dispose() {
-        _dispose()?.dispose()
+        self._dispose()?.dispose()
     }
 
     private func _dispose() -> Disposable? {
-        _lock.lock(); defer { _lock.unlock() }
-        if _isDisposed {
+        self._lock.lock(); defer { self._lock.unlock() }
+        if self._isDisposed {
             return nil
         }
         else {
-            _isDisposed = true
-            let current = _current
-            _current = nil
+            self._isDisposed = true
+            let current = self._current
+            self._current = nil
             return current
         }
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/SingleAssignmentDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/SingleAssignmentDisposable.swift
index e8ef67d..88d59db 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/SingleAssignmentDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/SingleAssignmentDisposable.swift
@@ -13,24 +13,18 @@ If an underlying disposable resource has already been set, future attempts to se
 */
 public final class SingleAssignmentDisposable : DisposeBase, Cancelable {
 
-    fileprivate enum DisposeState: UInt32 {
-        case disposed = 1
-        case disposableSet = 2
-    }
-
-    // Jeej, swift API consistency rules
-    fileprivate enum DisposeStateInt32: Int32 {
+    fileprivate enum DisposeState: Int32 {
         case disposed = 1
         case disposableSet = 2
     }
 
     // state
-    private var _state: AtomicInt = 0
+    private let _state = AtomicInt(0)
     private var _disposable = nil as Disposable?
 
     /// - returns: A value that indicates whether the object is disposed.
     public var isDisposed: Bool {
-        return AtomicFlagSet(DisposeState.disposed.rawValue, &_state)
+        return isFlagSet(self._state, DisposeState.disposed.rawValue)
     }
 
     /// Initializes a new instance of the `SingleAssignmentDisposable`.
@@ -42,34 +36,34 @@ public final class SingleAssignmentDisposable : DisposeBase, Cancelable {
     ///
     /// **Throws exception if the `SingleAssignmentDisposable` has already been assigned to.**
     public func setDisposable(_ disposable: Disposable) {
-        _disposable = disposable
+        self._disposable = disposable
+
+        let previousState = fetchOr(self._state, DisposeState.disposableSet.rawValue)
 
-        let previousState = AtomicOr(DisposeState.disposableSet.rawValue, &_state)
-        
-        if (previousState & DisposeStateInt32.disposableSet.rawValue) != 0 {
+        if (previousState & DisposeState.disposableSet.rawValue) != 0 {
             rxFatalError("oldState.disposable != nil")
         }
 
-        if (previousState & DisposeStateInt32.disposed.rawValue) != 0 {
+        if (previousState & DisposeState.disposed.rawValue) != 0 {
             disposable.dispose()
-            _disposable = nil
+            self._disposable = nil
         }
     }
 
     /// Disposes the underlying disposable.
     public func dispose() {
-        let previousState = AtomicOr(DisposeState.disposed.rawValue, &_state)
+        let previousState = fetchOr(self._state, DisposeState.disposed.rawValue)
 
-        if (previousState & DisposeStateInt32.disposed.rawValue) != 0 {
+        if (previousState & DisposeState.disposed.rawValue) != 0 {
             return
         }
 
-        if (previousState & DisposeStateInt32.disposableSet.rawValue) != 0 {
-            guard let disposable = _disposable else {
+        if (previousState & DisposeState.disposableSet.rawValue) != 0 {
+            guard let disposable = self._disposable else {
                 rxFatalError("Disposable not set")
             }
             disposable.dispose()
-            _disposable = nil
+            self._disposable = nil
         }
     }
 
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/SubscriptionDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/SubscriptionDisposable.swift
index 3ae138a..430e4c6 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/SubscriptionDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/SubscriptionDisposable.swift
@@ -11,11 +11,11 @@ struct SubscriptionDisposable : Disposable {
     private weak var _owner: T?
 
     init(owner: T, key: T.DisposeKey) {
-        _owner = owner
-        _key = key
+        self._owner = owner
+        self._key = key
     }
 
     func dispose() {
-        _owner?.synchronizedUnsubscribe(_key)
+        self._owner?.synchronizedUnsubscribe(self._key)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Event.swift b/Demo/Pods/RxSwift/RxSwift/Event.swift
index 9193e35..699e3d2 100644
--- a/Demo/Pods/RxSwift/RxSwift/Event.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Event.swift
@@ -21,7 +21,7 @@ public enum Event {
     case completed
 }
 
-extension Event : CustomDebugStringConvertible {
+extension Event: CustomDebugStringConvertible {
     /// Description of event.
     public var debugDescription: String {
         switch self {
@@ -92,13 +92,16 @@ extension Event {
 /// A type that can be converted to `Event`.
 public protocol EventConvertible {
     /// Type of element in event
-    associatedtype ElementType
+    associatedtype Element
+
+    @available(*, deprecated, message: "Use `Element` instead.")
+    typealias ElementType = Element
 
     /// Event representation of this instance
-    var event: Event { get }
+    var event: Event { get }
 }
 
-extension Event : EventConvertible {
+extension Event: EventConvertible {
     /// Event representation of this instance
     public var event: Event {
         return self
diff --git a/Demo/Pods/RxSwift/RxSwift/Extensions/Bag+Rx.swift b/Demo/Pods/RxSwift/RxSwift/Extensions/Bag+Rx.swift
index 748578d..9794683 100644
--- a/Demo/Pods/RxSwift/RxSwift/Extensions/Bag+Rx.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Extensions/Bag+Rx.swift
@@ -10,7 +10,7 @@
 // MARK: forEach
 
 @inline(__always)
-func dispatch(_ bag: Bag<(Event) -> ()>, _ event: Event) {
+func dispatch(_ bag: Bag<(Event) -> Void>, _ event: Event) {
     bag._value0?(event)
 
     if bag._onlyFastPath {
diff --git a/Demo/Pods/RxSwift/RxSwift/Extensions/String+Rx.swift b/Demo/Pods/RxSwift/RxSwift/Extensions/String+Rx.swift
index 42ef636..70d4786 100644
--- a/Demo/Pods/RxSwift/RxSwift/Extensions/String+Rx.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Extensions/String+Rx.swift
@@ -9,8 +9,8 @@
 extension String {
     /// This is needed because on Linux Swift doesn't have `rangeOfString(..., options: .BackwardsSearch)`
     func lastIndexOf(_ character: Character) -> Index? {
-        var index = endIndex
-        while index > startIndex {
+        var index = self.endIndex
+        while index > self.startIndex {
             index = self.index(before: index)
             if self[index] == character {
                 return index
diff --git a/Demo/Pods/RxSwift/RxSwift/GroupedObservable.swift b/Demo/Pods/RxSwift/RxSwift/GroupedObservable.swift
index d87e0ba..34a2fc2 100644
--- a/Demo/Pods/RxSwift/RxSwift/GroupedObservable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/GroupedObservable.swift
@@ -8,8 +8,6 @@
 
 /// Represents an observable sequence of elements that have a common key.
 public struct GroupedObservable : ObservableType {
-    public typealias E = Element
-
     /// Gets the common key.
     public let key: Key
 
@@ -26,12 +24,12 @@ public struct GroupedObservable : ObservableType {
     }
 
     /// Subscribes `observer` to receive events for this sequence.
-    public func subscribe(_ observer: O) -> Disposable where O.E == E {
+    public func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
         return self.source.subscribe(observer)
     }
 
     /// Converts `self` to `Observable` sequence. 
     public func asObservable() -> Observable {
-        return source
+        return self.source
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift b/Demo/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift
index 8dc2a85..954fbf0 100644
--- a/Demo/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift
@@ -26,7 +26,7 @@ extension ImmediateSchedulerType {
     - parameter action: Action to execute recursively. The last parameter passed to the action is used to trigger recursive scheduling of the action, passing in recursive invocation state.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public func scheduleRecursive(_ state: State, action: @escaping (_ state: State, _ recurse: (State) -> ()) -> ()) -> Disposable {
+    public func scheduleRecursive(_ state: State, action: @escaping (_ state: State, _ recurse: (State) -> Void) -> Void) -> Disposable {
         let recursiveScheduler = RecursiveImmediateScheduler(action: action, scheduler: self)
         
         recursiveScheduler.schedule(state)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observable.swift b/Demo/Pods/RxSwift/RxSwift/Observable.swift
index f0c55af..5120d23 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observable.swift
@@ -10,26 +10,23 @@
 ///
 /// It represents a push style sequence.
 public class Observable : ObservableType {
-    /// Type of elements in sequence.
-    public typealias E = Element
-    
     init() {
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
     }
     
-    public func subscribe(_ observer: O) -> Disposable where O.E == E {
+    public func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
         rxAbstractMethod()
     }
     
-    public func asObservable() -> Observable {
+    public func asObservable() -> Observable {
         return self
     }
     
     deinit {
 #if TRACE_RESOURCES
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
 #endif
     }
 
@@ -37,7 +34,7 @@ public class Observable : ObservableType {
     // Swift compiler reports "Not supported yet" when trying to override protocol extensions, so ¯\_(ツ)_/¯
 
     /// Optimizations for map operator
-    internal func composeMap(_ transform: @escaping (Element) throws -> R) -> Observable {
+    internal func composeMap(_ transform: @escaping (Element) throws -> Result) -> Observable {
         return _map(source: self, transform: transform)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/ObservableConvertibleType.swift b/Demo/Pods/RxSwift/RxSwift/ObservableConvertibleType.swift
index d89c5aa..8db16e6 100644
--- a/Demo/Pods/RxSwift/RxSwift/ObservableConvertibleType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/ObservableConvertibleType.swift
@@ -6,13 +6,16 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-/// Type that can be converted to observable sequence (`Observable`).
+/// Type that can be converted to observable sequence (`Observable`).
 public protocol ObservableConvertibleType {
     /// Type of elements in sequence.
-    associatedtype E
+    associatedtype Element
+
+    @available(*, deprecated, message: "Use `Element` instead.")
+    typealias E = Element
 
     /// Converts `self` to `Observable` sequence.
     ///
     /// - returns: Observable sequence that represents `self`.
-    func asObservable() -> Observable
+    func asObservable() -> Observable
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift b/Demo/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift
index 29ed8a2..e8875ea 100644
--- a/Demo/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift
+++ b/Demo/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift
@@ -17,7 +17,7 @@ extension ObservableType {
      - parameter on: Action to invoke for each event in the observable sequence.
      - returns: Subscription object used to unsubscribe from the observable sequence.
      */
-    public func subscribe(_ on: @escaping (Event) -> Void)
+    public func subscribe(_ on: @escaping (Event) -> Void)
         -> Disposable {
             let observer = AnonymousObserver { e in
                 on(e)
@@ -36,7 +36,7 @@ extension ObservableType {
      gracefully completed, errored, or if the generation is canceled by disposing subscription).
      - returns: Subscription object used to unsubscribe from the observable sequence.
      */
-    public func subscribe(onNext: ((E) -> Void)? = nil, onError: ((Swift.Error) -> Void)? = nil, onCompleted: (() -> Void)? = nil, onDisposed: (() -> Void)? = nil)
+    public func subscribe(onNext: ((Element) -> Void)? = nil, onError: ((Swift.Error) -> Void)? = nil, onCompleted: (() -> Void)? = nil, onDisposed: (() -> Void)? = nil)
         -> Disposable {
             let disposable: Disposable
             
@@ -53,7 +53,7 @@ extension ObservableType {
             
             let callStack = Hooks.recordCallStackOnError ? Hooks.customCaptureSubscriptionCallstack() : []
             
-            let observer = AnonymousObserver { event in
+            let observer = AnonymousObserver { event in
                 
                 #if DEBUG
                     synchronizationTracker.register(synchronizationErrorMessage: .default)
@@ -86,7 +86,7 @@ extension ObservableType {
 import class Foundation.NSRecursiveLock
 
 extension Hooks {
-    public typealias DefaultErrorHandler = (_ subscriptionCallStack: [String], _ error: Error) -> ()
+    public typealias DefaultErrorHandler = (_ subscriptionCallStack: [String], _ error: Error) -> Void
     public typealias CustomCaptureSubscriptionCallstack = () -> [String]
 
     fileprivate static let _lock = RecursiveLock()
diff --git a/Demo/Pods/RxSwift/RxSwift/ObservableType.swift b/Demo/Pods/RxSwift/RxSwift/ObservableType.swift
index e41a36a..dea9bfc 100644
--- a/Demo/Pods/RxSwift/RxSwift/ObservableType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/ObservableType.swift
@@ -7,7 +7,7 @@
 //
 
 /// Represents a push style sequence.
-public protocol ObservableType : ObservableConvertibleType {
+public protocol ObservableType: ObservableConvertibleType {
     /**
     Subscribes `observer` to receive events for this sequence.
     
@@ -31,13 +31,13 @@ public protocol ObservableType : ObservableConvertibleType {
     
     - returns: Subscription for `observer` that can be used to cancel production of sequence elements and free resources.
     */
-    func subscribe(_ observer: O) -> Disposable where O.E == E
+    func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element
 }
 
 extension ObservableType {
     
     /// Default implementation of converting `ObservableType` to `Observable`.
-    public func asObservable() -> Observable {
+    public func asObservable() -> Observable {
         // temporary workaround
         //return Observable.create(subscribe: self.subscribe)
         return Observable.create { o in
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/AddRef.swift b/Demo/Pods/RxSwift/RxSwift/Observables/AddRef.swift
index b782c13..2c937a4 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/AddRef.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/AddRef.swift
@@ -6,39 +6,38 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-final class AddRefSink : Sink, ObserverType {
-    typealias Element = O.E
+final class AddRefSink : Sink, ObserverType {
+    typealias Element = Observer.Element 
     
-    override init(observer: O, cancel: Cancelable) {
+    override init(observer: Observer, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event) {
         switch event {
-        case .next(_):
-            forwardOn(event)
-        case .completed, .error(_):
-            forwardOn(event)
-            dispose()
+        case .next:
+            self.forwardOn(event)
+        case .completed, .error:
+            self.forwardOn(event)
+            self.dispose()
         }
     }
 }
 
 final class AddRef : Producer {
-    typealias EventHandler = (Event) throws -> Void
     
     private let _source: Observable
     private let _refCount: RefCountDisposable
     
     init(source: Observable, refCount: RefCountDisposable) {
-        _source = source
-        _refCount = refCount
+        self._source = source
+        self._refCount = refCount
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let releaseDisposable = _refCount.retain()
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let releaseDisposable = self._refCount.retain()
         let sink = AddRefSink(observer: observer, cancel: cancel)
-        let subscription = Disposables.create(releaseDisposable, _source.subscribe(sink))
+        let subscription = Disposables.create(releaseDisposable, self._source.subscribe(sink))
 
         return (sink: sink, subscription: subscription)
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Amb.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Amb.swift
index 08ec04e..f8c1746 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Amb.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Amb.swift
@@ -14,9 +14,9 @@ extension ObservableType {
 
      - returns: An observable sequence that surfaces any of the given sequences, whichever reacted first.
      */
-    public static func amb(_ sequence: S) -> Observable
-        where S.Iterator.Element == Observable {
-            return sequence.reduce(Observable.never()) { a, o in
+    public static func amb(_ sequence: Sequence) -> Observable
+        where Sequence.Element == Observable {
+            return sequence.reduce(Observable.never()) { a, o in
                 return a.amb(o.asObservable())
             }
     }
@@ -34,8 +34,8 @@ extension ObservableType {
      */
     public func amb
         (_ right: O2)
-        -> Observable where O2.E == E {
-        return Amb(left: asObservable(), right: right.asObservable())
+        -> Observable where O2.Element == Element {
+        return Amb(left: self.asObservable(), right: right.asObservable())
     }
 }
 
@@ -45,10 +45,10 @@ fileprivate enum AmbState {
     case right
 }
 
-final fileprivate class AmbObserver : ObserverType {
-    typealias Element = O.E
-    typealias Parent = AmbSink
-    typealias This = AmbObserver
+final private class AmbObserver: ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = AmbSink
+    typealias This = AmbObserver
     typealias Sink = (This, Event) -> Void
     
     fileprivate let _parent: Parent
@@ -57,32 +57,32 @@ final fileprivate class AmbObserver : ObserverType {
     
     init(parent: Parent, cancel: Disposable, sink: @escaping Sink) {
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
         
-        _parent = parent
-        _sink = sink
-        _cancel = cancel
+        self._parent = parent
+        self._sink = sink
+        self._cancel = cancel
     }
     
     func on(_ event: Event) {
-        _sink(self, event)
+        self._sink(self, event)
         if event.isStopEvent {
-            _cancel.dispose()
+            self._cancel.dispose()
         }
     }
     
     deinit {
 #if TRACE_RESOURCES
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
 #endif
     }
 }
 
-final fileprivate class AmbSink : Sink {
-    typealias ElementType = O.E
-    typealias Parent = Amb
-    typealias AmbObserverType = AmbObserver
+final private class AmbSink: Sink {
+    typealias Element = Observer.Element
+    typealias Parent = Amb
+    typealias AmbObserverType = AmbObserver
 
     private let _parent: Parent
     
@@ -90,8 +90,8 @@ final fileprivate class AmbSink : Sink {
     // state
     private var _choice = AmbState.neither
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
@@ -100,14 +100,14 @@ final fileprivate class AmbSink : Sink {
         let subscription2 = SingleAssignmentDisposable()
         let disposeAll = Disposables.create(subscription1, subscription2)
         
-        let forwardEvent = { (o: AmbObserverType, event: Event) -> Void in
+        let forwardEvent = { (o: AmbObserverType, event: Event) -> Void in
             self.forwardOn(event)
             if event.isStopEvent {
                 self.dispose()
             }
         }
 
-        let decide = { (o: AmbObserverType, event: Event, me: AmbState, otherSubscription: Disposable) in
+        let decide = { (o: AmbObserverType, event: Event, me: AmbState, otherSubscription: Disposable) in
             self._lock.performLocked {
                 if self._choice == .neither {
                     self._choice = me
@@ -133,23 +133,23 @@ final fileprivate class AmbSink : Sink {
             decide(o, e, .right, subscription1)
         }
         
-        subscription1.setDisposable(_parent._left.subscribe(sink1))
-        subscription2.setDisposable(_parent._right.subscribe(sink2))
+        subscription1.setDisposable(self._parent._left.subscribe(sink1))
+        subscription2.setDisposable(self._parent._right.subscribe(sink2))
         
         return disposeAll
     }
 }
 
-final fileprivate class Amb: Producer {
+final private class Amb: Producer {
     fileprivate let _left: Observable
     fileprivate let _right: Observable
     
     init(left: Observable, right: Observable) {
-        _left = left
-        _right = right
+        self._left = left
+        self._right = right
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = AmbSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/AsMaybe.swift b/Demo/Pods/RxSwift/RxSwift/Observables/AsMaybe.swift
index 36fa685..d8371e5 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/AsMaybe.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/AsMaybe.swift
@@ -6,30 +6,29 @@
 //  Copyright © 2017 Krunoslav Zaher. All rights reserved.
 //
 
-fileprivate final class AsMaybeSink : Sink, ObserverType {
-    typealias ElementType = O.E
-    typealias E = ElementType
+fileprivate final class AsMaybeSink : Sink, ObserverType {
+    typealias Element = Observer.Element
 
-    private var _element: Event? = nil
+    private var _element: Event?
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            if _element != nil {
-                forwardOn(.error(RxError.moreThanOneElement))
-                dispose()
+            if self._element != nil {
+                self.forwardOn(.error(RxError.moreThanOneElement))
+                self.dispose()
             }
 
-            _element = event
+            self._element = event
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            if let element = _element {
-                forwardOn(element)
+            if let element = self._element {
+                self.forwardOn(element)
             }
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
@@ -38,12 +37,12 @@ final class AsMaybe: Producer {
     fileprivate let _source: Observable
 
     init(source: Observable) {
-        _source = source
+        self._source = source
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = AsMaybeSink(observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/AsSingle.swift b/Demo/Pods/RxSwift/RxSwift/Observables/AsSingle.swift
index 080aa8e..00a2686 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/AsSingle.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/AsSingle.swift
@@ -6,33 +6,32 @@
 //  Copyright © 2017 Krunoslav Zaher. All rights reserved.
 //
 
-fileprivate final class AsSingleSink : Sink, ObserverType {
-    typealias ElementType = O.E
-    typealias E = ElementType
+fileprivate final class AsSingleSink : Sink, ObserverType { 
+    typealias Element = Observer.Element
 
-    private var _element: Event? = nil
+    private var _element: Event?
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            if _element != nil {
-                forwardOn(.error(RxError.moreThanOneElement))
-                dispose()
+            if self._element != nil {
+                self.forwardOn(.error(RxError.moreThanOneElement))
+                self.dispose()
             }
 
-            _element = event
+            self._element = event
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            if let element = _element {
-                forwardOn(element)
-                forwardOn(.completed)
+            if let element = self._element {
+                self.forwardOn(element)
+                self.forwardOn(.completed)
             }
             else {
-                forwardOn(.error(RxError.noElements))
+                self.forwardOn(.error(RxError.noElements))
             }
-            dispose()
+            self.dispose()
         }
     }
 }
@@ -41,12 +40,12 @@ final class AsSingle: Producer {
     fileprivate let _source: Observable
 
     init(source: Observable) {
-        _source = source
+        self._source = source
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = AsSingleSink(observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Buffer.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Buffer.swift
index b8c33ae..0eb65f3 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Buffer.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Buffer.swift
@@ -21,12 +21,12 @@ extension ObservableType {
      - returns: An observable sequence of buffers.
      */
     public func buffer(timeSpan: RxTimeInterval, count: Int, scheduler: SchedulerType)
-        -> Observable<[E]> {
+        -> Observable<[Element]> {
         return BufferTimeCount(source: self.asObservable(), timeSpan: timeSpan, count: count, scheduler: scheduler)
     }
 }
 
-final fileprivate class BufferTimeCount : Producer<[Element]> {
+final private class BufferTimeCount: Producer<[Element]> {
     
     fileprivate let _timeSpan: RxTimeInterval
     fileprivate let _count: Int
@@ -34,26 +34,25 @@ final fileprivate class BufferTimeCount : Producer<[Element]> {
     fileprivate let _source: Observable
     
     init(source: Observable, timeSpan: RxTimeInterval, count: Int, scheduler: SchedulerType) {
-        _source = source
-        _timeSpan = timeSpan
-        _count = count
-        _scheduler = scheduler
+        self._source = source
+        self._timeSpan = timeSpan
+        self._count = count
+        self._scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == [Element] {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == [Element] {
         let sink = BufferTimeCountSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class BufferTimeCountSink
-    : Sink
+final private class BufferTimeCountSink
+    : Sink
     , LockOwnerType
     , ObserverType
-    , SynchronizedOnType where O.E == [Element] {
+    , SynchronizedOnType where Observer.Element == [Element] {
     typealias Parent = BufferTimeCount
-    typealias E = Element
     
     private let _parent: Parent
     
@@ -64,65 +63,65 @@ final fileprivate class BufferTimeCountSink
     private var _buffer = [Element]()
     private var _windowID = 0
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
  
     func run() -> Disposable {
-        createTimer(_windowID)
+        self.createTimer(self._windowID)
         return Disposables.create(_timerD, _parent._source.subscribe(self))
     }
     
     func startNewWindowAndSendCurrentOne() {
-        _windowID = _windowID &+ 1
-        let windowID = _windowID
+        self._windowID = self._windowID &+ 1
+        let windowID = self._windowID
         
-        let buffer = _buffer
-        _buffer = []
-        forwardOn(.next(buffer))
+        let buffer = self._buffer
+        self._buffer = []
+        self.forwardOn(.next(buffer))
         
-        createTimer(windowID)
+        self.createTimer(windowID)
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next(let element):
-            _buffer.append(element)
+            self._buffer.append(element)
             
-            if _buffer.count == _parent._count {
-                startNewWindowAndSendCurrentOne()
+            if self._buffer.count == self._parent._count {
+                self.startNewWindowAndSendCurrentOne()
             }
             
         case .error(let error):
-            _buffer = []
-            forwardOn(.error(error))
-            dispose()
+            self._buffer = []
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            forwardOn(.next(_buffer))
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.next(self._buffer))
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
     
     func createTimer(_ windowID: Int) {
-        if _timerD.isDisposed {
+        if self._timerD.isDisposed {
             return
         }
         
-        if _windowID != windowID {
+        if self._windowID != windowID {
             return
         }
 
         let nextTimer = SingleAssignmentDisposable()
         
-        _timerD.disposable = nextTimer
+        self._timerD.disposable = nextTimer
 
-        let disposable = _parent._scheduler.scheduleRelative(windowID, dueTime: _parent._timeSpan) { previousWindowID in
+        let disposable = self._parent._scheduler.scheduleRelative(windowID, dueTime: self._parent._timeSpan) { previousWindowID in
             self._lock.performLocked {
                 if previousWindowID != self._windowID {
                     return
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Catch.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Catch.swift
index 187eb8a..84569ec 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Catch.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Catch.swift
@@ -16,9 +16,9 @@ extension ObservableType {
      - parameter handler: Error handler function, producing another observable sequence.
      - returns: An observable sequence containing the source sequence's elements, followed by the elements produced by the handler's resulting observable sequence in case an error occurred.
      */
-    public func catchError(_ handler: @escaping (Swift.Error) throws -> Observable)
-        -> Observable {
-        return Catch(source: asObservable(), handler: handler)
+    public func catchError(_ handler: @escaping (Swift.Error) throws -> Observable)
+        -> Observable {
+        return Catch(source: self.asObservable(), handler: handler)
     }
 
     /**
@@ -29,9 +29,9 @@ extension ObservableType {
      - parameter element: Last element in an observable sequence in case error occurs.
      - returns: An observable sequence containing the source sequence's elements, followed by the `element` in case an error occurred.
      */
-    public func catchErrorJustReturn(_ element: E)
-        -> Observable {
-        return Catch(source: asObservable(), handler: { _ in Observable.just(element) })
+    public func catchErrorJustReturn(_ element: Element)
+        -> Observable {
+        return Catch(source: self.asObservable(), handler: { _ in Observable.just(element) })
     }
     
 }
@@ -44,8 +44,8 @@ extension ObservableType {
 
      - returns: An observable sequence containing elements from consecutive source sequences until a source sequence terminates successfully.
      */
-    public static func catchError(_ sequence: S) -> Observable
-        where S.Iterator.Element == Observable {
+    public static func catchError(_ sequence: Sequence) -> Observable
+        where Sequence.Element == Observable {
         return CatchSequence(sources: sequence)
     }
 }
@@ -61,7 +61,7 @@ extension ObservableType {
 
      - returns: Observable sequence to repeat until it successfully terminates.
      */
-    public func retry() -> Observable {
+    public func retry() -> Observable {
         return CatchSequence(sources: InfiniteSequence(repeatedValue: self.asObservable()))
     }
 
@@ -76,90 +76,90 @@ extension ObservableType {
      - returns: An observable sequence producing the elements of the given sequence repeatedly until it terminates successfully.
      */
     public func retry(_ maxAttemptCount: Int)
-        -> Observable {
+        -> Observable {
         return CatchSequence(sources: Swift.repeatElement(self.asObservable(), count: maxAttemptCount))
     }
 }
 
 // catch with callback
 
-final fileprivate class CatchSinkProxy : ObserverType {
-    typealias E = O.E
-    typealias Parent = CatchSink
+final private class CatchSinkProxy: ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = CatchSink
     
     private let _parent: Parent
     
     init(parent: Parent) {
-        _parent = parent
+        self._parent = parent
     }
     
-    func on(_ event: Event) {
-        _parent.forwardOn(event)
+    func on(_ event: Event) {
+        self._parent.forwardOn(event)
         
         switch event {
         case .next:
             break
         case .error, .completed:
-            _parent.dispose()
+            self._parent.dispose()
         }
     }
 }
 
-final fileprivate class CatchSink : Sink, ObserverType {
-    typealias E = O.E
-    typealias Parent = Catch
+final private class CatchSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = Catch
     
     private let _parent: Parent
     private let _subscription = SerialDisposable()
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
         let d1 = SingleAssignmentDisposable()
-        _subscription.disposable = d1
-        d1.setDisposable(_parent._source.subscribe(self))
+        self._subscription.disposable = d1
+        d1.setDisposable(self._parent._source.subscribe(self))
 
-        return _subscription
+        return self._subscription
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            forwardOn(event)
+            self.forwardOn(event)
         case .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .error(let error):
             do {
-                let catchSequence = try _parent._handler(error)
+                let catchSequence = try self._parent._handler(error)
 
                 let observer = CatchSinkProxy(parent: self)
                 
-                _subscription.disposable = catchSequence.subscribe(observer)
+                self._subscription.disposable = catchSequence.subscribe(observer)
             }
             catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
             }
         }
     }
 }
 
-final fileprivate class Catch : Producer {
+final private class Catch: Producer {
     typealias Handler = (Swift.Error) throws -> Observable
     
     fileprivate let _source: Observable
     fileprivate let _handler: Handler
     
     init(source: Observable, handler: @escaping Handler) {
-        _source = source
-        _handler = handler
+        self._source = source
+        self._handler = handler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = CatchSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -168,48 +168,48 @@ final fileprivate class Catch : Producer {
 
 // catch enumerable
 
-final fileprivate class CatchSequenceSink
-    : TailRecursiveSink
-    , ObserverType where S.Iterator.Element : ObservableConvertibleType, S.Iterator.Element.E == O.E {
-    typealias Element = O.E
-    typealias Parent = CatchSequence
-    
+final private class CatchSequenceSink
+    : TailRecursiveSink
+    , ObserverType where Sequence.Element: ObservableConvertibleType, Sequence.Element.Element == Observer.Element {
+    typealias Element = Observer.Element
+    typealias Parent = CatchSequence
+
     private var _lastError: Swift.Error?
     
-    override init(observer: O, cancel: Cancelable) {
+    override init(observer: Observer, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event) {
         switch event {
         case .next:
-            forwardOn(event)
+            self.forwardOn(event)
         case .error(let error):
-            _lastError = error
-            schedule(.moveNext)
+            self._lastError = error
+            self.schedule(.moveNext)
         case .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
 
-    override func subscribeToNext(_ source: Observable) -> Disposable {
+    override func subscribeToNext(_ source: Observable) -> Disposable {
         return source.subscribe(self)
     }
     
     override func done() {
-        if let lastError = _lastError {
-            forwardOn(.error(lastError))
+        if let lastError = self._lastError {
+            self.forwardOn(.error(lastError))
         }
         else {
-            forwardOn(.completed)
+            self.forwardOn(.completed)
         }
         
         self.dispose()
     }
     
     override func extract(_ observable: Observable) -> SequenceGenerator? {
-        if let onError = observable as? CatchSequence {
+        if let onError = observable as? CatchSequence {
             return (onError.sources.makeIterator(), nil)
         }
         else {
@@ -218,17 +218,17 @@ final fileprivate class CatchSequenceSink
     }
 }
 
-final fileprivate class CatchSequence : Producer where S.Iterator.Element : ObservableConvertibleType {
-    typealias Element = S.Iterator.Element.E
+final private class CatchSequence: Producer where Sequence.Element: ObservableConvertibleType {
+    typealias Element = Sequence.Element.Element
     
-    let sources: S
+    let sources: Sequence
     
-    init(sources: S) {
+    init(sources: Sequence) {
         self.sources = sources
     }
-    
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let sink = CatchSequenceSink(observer: observer, cancel: cancel)
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = CatchSequenceSink(observer: observer, cancel: cancel)
         let subscription = sink.run((self.sources.makeIterator(), nil))
         return (sink: sink, subscription: subscription)
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+Collection.swift b/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+Collection.swift
index 45e0173..f81c704 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+Collection.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+Collection.swift
@@ -15,8 +15,8 @@ extension ObservableType {
      - parameter resultSelector: Function to invoke whenever any of the sources produces an element.
      - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
      */
-    public static func combineLatest(_ collection: C, _ resultSelector: @escaping ([C.Iterator.Element.E]) throws -> E) -> Observable
-        where C.Iterator.Element: ObservableType {
+    public static func combineLatest(_ collection: Collection, resultSelector: @escaping ([Collection.Element.Element]) throws -> Element) -> Observable
+        where Collection.Element: ObservableType {
         return CombineLatestCollectionType(sources: collection, resultSelector: resultSelector)
     }
 
@@ -27,17 +27,17 @@ extension ObservableType {
 
      - returns: An observable sequence containing the result of combining elements of the sources.
      */
-    public static func combineLatest(_ collection: C) -> Observable<[E]>
-        where C.Iterator.Element: ObservableType, C.Iterator.Element.E == E {
+    public static func combineLatest(_ collection: Collection) -> Observable<[Element]>
+        where Collection.Element: ObservableType, Collection.Element.Element == Element {
         return CombineLatestCollectionType(sources: collection, resultSelector: { $0 })
     }
 }
 
-final fileprivate class CombineLatestCollectionTypeSink
-    : Sink where C.Iterator.Element : ObservableConvertibleType {
-    typealias R = O.E
-    typealias Parent = CombineLatestCollectionType
-    typealias SourceElement = C.Iterator.Element.E
+final private class CombineLatestCollectionTypeSink
+    : Sink where Collection.Element: ObservableConvertibleType {
+    typealias Result = Observer.Element 
+    typealias Parent = CombineLatestCollectionType
+    typealias SourceElement = Collection.Element.Element
     
     let _parent: Parent
     
@@ -50,65 +50,65 @@ final fileprivate class CombineLatestCollectionTypeSink()
-        _subscriptions.reserveCapacity(parent._count)
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._values = [SourceElement?](repeating: nil, count: parent._count)
+        self._isDone = [Bool](repeating: false, count: parent._count)
+        self._subscriptions = [SingleAssignmentDisposable]()
+        self._subscriptions.reserveCapacity(parent._count)
         
         for _ in 0 ..< parent._count {
-            _subscriptions.append(SingleAssignmentDisposable())
+            self._subscriptions.append(SingleAssignmentDisposable())
         }
         
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event, atIndex: Int) {
-        _lock.lock(); defer { _lock.unlock() } // {
+        self._lock.lock(); defer { self._lock.unlock() } // {
             switch event {
             case .next(let element):
-                if _values[atIndex] == nil {
-                   _numberOfValues += 1
+                if self._values[atIndex] == nil {
+                   self._numberOfValues += 1
                 }
                 
-                _values[atIndex] = element
+                self._values[atIndex] = element
                 
-                if _numberOfValues < _parent._count {
-                    let numberOfOthersThatAreDone = self._numberOfDone - (_isDone[atIndex] ? 1 : 0)
+                if self._numberOfValues < self._parent._count {
+                    let numberOfOthersThatAreDone = self._numberOfDone - (self._isDone[atIndex] ? 1 : 0)
                     if numberOfOthersThatAreDone == self._parent._count - 1 {
-                        forwardOn(.completed)
-                        dispose()
+                        self.forwardOn(.completed)
+                        self.dispose()
                     }
                     return
                 }
                 
                 do {
-                    let result = try _parent._resultSelector(_values.map { $0! })
-                    forwardOn(.next(result))
+                    let result = try self._parent._resultSelector(self._values.map { $0! })
+                    self.forwardOn(.next(result))
                 }
                 catch let error {
-                    forwardOn(.error(error))
-                    dispose()
+                    self.forwardOn(.error(error))
+                    self.dispose()
                 }
                 
             case .error(let error):
-                forwardOn(.error(error))
-                dispose()
+                self.forwardOn(.error(error))
+                self.dispose()
             case .completed:
-                if _isDone[atIndex] {
+                if self._isDone[atIndex] {
                     return
                 }
                 
-                _isDone[atIndex] = true
-                _numberOfDone += 1
+                self._isDone[atIndex] = true
+                self._numberOfDone += 1
                 
-                if _numberOfDone == self._parent._count {
-                    forwardOn(.completed)
-                    dispose()
+                if self._numberOfDone == self._parent._count {
+                    self.forwardOn(.completed)
+                    self.dispose()
                 }
                 else {
-                    _subscriptions[atIndex].dispose()
+                    self._subscriptions[atIndex].dispose()
                 }
             }
         // }
@@ -116,40 +116,49 @@ final fileprivate class CombineLatestCollectionTypeSink Disposable {
         var j = 0
-        for i in _parent._sources {
+        for i in self._parent._sources {
             let index = j
             let source = i.asObservable()
             let disposable = source.subscribe(AnyObserver { event in
                 self.on(event, atIndex: index)
             })
 
-            _subscriptions[j].setDisposable(disposable)
+            self._subscriptions[j].setDisposable(disposable)
             
             j += 1
         }
 
-        if _parent._sources.isEmpty {
-            self.forwardOn(.completed)
+        if self._parent._sources.isEmpty {
+            do {
+                let result = try self._parent._resultSelector([])
+                self.forwardOn(.next(result))
+                self.forwardOn(.completed)
+                self.dispose()
+            }
+            catch let error {
+                self.forwardOn(.error(error))
+                self.dispose()
+            }
         }
         
         return Disposables.create(_subscriptions)
     }
 }
 
-final fileprivate class CombineLatestCollectionType : Producer where C.Iterator.Element : ObservableConvertibleType {
-    typealias ResultSelector = ([C.Iterator.Element.E]) throws -> R
+final private class CombineLatestCollectionType: Producer where Collection.Element: ObservableConvertibleType {
+    typealias ResultSelector = ([Collection.Element.Element]) throws -> Result
     
-    let _sources: C
+    let _sources: Collection
     let _resultSelector: ResultSelector
     let _count: Int
 
-    init(sources: C, resultSelector: @escaping ResultSelector) {
-        _sources = sources
-        _resultSelector = resultSelector
-        _count = Int(Int64(self._sources.count))
+    init(sources: Collection, resultSelector: @escaping ResultSelector) {
+        self._sources = sources
+        self._resultSelector = resultSelector
+        self._count = self._sources.count
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestCollectionTypeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+arity.swift b/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+arity.swift
index aad2255..ece5802 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+arity.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+arity.swift
@@ -21,8 +21,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func combineLatest
-        (_ source1: O1, _ source2: O2, resultSelector: @escaping (O1.E, O2.E) throws -> E)
-            -> Observable {
+        (_ source1: O1, _ source2: O2, resultSelector: @escaping (O1.Element, O2.Element) throws -> Element)
+            -> Observable {
         return CombineLatest2(
             source1: source1.asObservable(), source2: source2.asObservable(),
             resultSelector: resultSelector
@@ -30,7 +30,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever any of the observable sequences produces an element.
 
@@ -40,7 +40,7 @@ extension ObservableType where E == Any {
     */
     public static func combineLatest
         (_ source1: O1, _ source2: O2)
-            -> Observable<(O1.E, O2.E)> {
+            -> Observable<(O1.Element, O2.Element)> {
         return CombineLatest2(
             source1: source1.asObservable(), source2: source2.asObservable(),
             resultSelector: { ($0, $1) }
@@ -48,17 +48,17 @@ extension ObservableType where E == Any {
     }
 }
 
-final class CombineLatestSink2_ : CombineLatestSink {
-    typealias R = O.E
-    typealias Parent = CombineLatest2
+final class CombineLatestSink2_ : CombineLatestSink {
+    typealias Result = Observer.Element
+    typealias Parent = CombineLatest2
 
     let _parent: Parent
 
     var _latestElement1: E1! = nil
     var _latestElement2: E2! = nil
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 2, observer: observer, cancel: cancel)
     }
 
@@ -66,11 +66,11 @@ final class CombineLatestSink2_ : CombineLatestSink
         let subscription1 = SingleAssignmentDisposable()
         let subscription2 = SingleAssignmentDisposable()
 
-        let observer1 = CombineLatestObserver(lock: _lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
-        let observer2 = CombineLatestObserver(lock: _lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
+        let observer1 = CombineLatestObserver(lock: self._lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
+        let observer2 = CombineLatestObserver(lock: self._lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
 
-         subscription1.setDisposable(_parent._source1.subscribe(observer1))
-         subscription2.setDisposable(_parent._source2.subscribe(observer2))
+         subscription1.setDisposable(self._parent._source1.subscribe(observer1))
+         subscription2.setDisposable(self._parent._source2.subscribe(observer2))
 
         return Disposables.create([
                 subscription1,
@@ -78,13 +78,13 @@ final class CombineLatestSink2_ : CombineLatestSink
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_latestElement1, _latestElement2)
+    override func getResult() throws-> Result {
+        return try self._parent._resultSelector(self._latestElement1, self._latestElement2)
     }
 }
 
-final class CombineLatest2 : Producer {
-    typealias ResultSelector = (E1, E2) throws -> R
+final class CombineLatest2 : Producer {
+    typealias ResultSelector = (E1, E2) throws -> Result
 
     let _source1: Observable
     let _source2: Observable
@@ -92,13 +92,13 @@ final class CombineLatest2 : Producer {
     let _resultSelector: ResultSelector
 
     init(source1: Observable, source2: Observable, resultSelector: @escaping ResultSelector) {
-        _source1 = source1
-        _source2 = source2
+        self._source1 = source1
+        self._source2 = source2
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestSink2_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -119,8 +119,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func combineLatest
-        (_ source1: O1, _ source2: O2, _ source3: O3, resultSelector: @escaping (O1.E, O2.E, O3.E) throws -> E)
-            -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, resultSelector: @escaping (O1.Element, O2.Element, O3.Element) throws -> Element)
+            -> Observable {
         return CombineLatest3(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(),
             resultSelector: resultSelector
@@ -128,7 +128,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever any of the observable sequences produces an element.
 
@@ -138,7 +138,7 @@ extension ObservableType where E == Any {
     */
     public static func combineLatest
         (_ source1: O1, _ source2: O2, _ source3: O3)
-            -> Observable<(O1.E, O2.E, O3.E)> {
+            -> Observable<(O1.Element, O2.Element, O3.Element)> {
         return CombineLatest3(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(),
             resultSelector: { ($0, $1, $2) }
@@ -146,9 +146,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class CombineLatestSink3_ : CombineLatestSink {
-    typealias R = O.E
-    typealias Parent = CombineLatest3
+final class CombineLatestSink3_ : CombineLatestSink {
+    typealias Result = Observer.Element
+    typealias Parent = CombineLatest3
 
     let _parent: Parent
 
@@ -156,8 +156,8 @@ final class CombineLatestSink3_ : CombineLatestSink
     var _latestElement2: E2! = nil
     var _latestElement3: E3! = nil
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 3, observer: observer, cancel: cancel)
     }
 
@@ -166,13 +166,13 @@ final class CombineLatestSink3_ : CombineLatestSink
         let subscription2 = SingleAssignmentDisposable()
         let subscription3 = SingleAssignmentDisposable()
 
-        let observer1 = CombineLatestObserver(lock: _lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
-        let observer2 = CombineLatestObserver(lock: _lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
-        let observer3 = CombineLatestObserver(lock: _lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
+        let observer1 = CombineLatestObserver(lock: self._lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
+        let observer2 = CombineLatestObserver(lock: self._lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
+        let observer3 = CombineLatestObserver(lock: self._lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
 
-         subscription1.setDisposable(_parent._source1.subscribe(observer1))
-         subscription2.setDisposable(_parent._source2.subscribe(observer2))
-         subscription3.setDisposable(_parent._source3.subscribe(observer3))
+         subscription1.setDisposable(self._parent._source1.subscribe(observer1))
+         subscription2.setDisposable(self._parent._source2.subscribe(observer2))
+         subscription3.setDisposable(self._parent._source3.subscribe(observer3))
 
         return Disposables.create([
                 subscription1,
@@ -181,13 +181,13 @@ final class CombineLatestSink3_ : CombineLatestSink
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_latestElement1, _latestElement2, _latestElement3)
+    override func getResult() throws-> Result {
+        return try self._parent._resultSelector(self._latestElement1, self._latestElement2, self._latestElement3)
     }
 }
 
-final class CombineLatest3 : Producer {
-    typealias ResultSelector = (E1, E2, E3) throws -> R
+final class CombineLatest3 : Producer {
+    typealias ResultSelector = (E1, E2, E3) throws-> Result
 
     let _source1: Observable
     let _source2: Observable
@@ -196,14 +196,14 @@ final class CombineLatest3 : Producer {
     let _resultSelector: ResultSelector
 
     init(source1: Observable, source2: Observable, source3: Observable, resultSelector: @escaping ResultSelector) {
-        _source1 = source1
-        _source2 = source2
-        _source3 = source3
+        self._source1 = source1
+        self._source2 = source2
+        self._source3 = source3
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestSink3_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -224,8 +224,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func combineLatest
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E) throws -> E)
-            -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element) throws -> Element)
+            -> Observable {
         return CombineLatest4(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(),
             resultSelector: resultSelector
@@ -233,7 +233,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever any of the observable sequences produces an element.
 
@@ -243,7 +243,7 @@ extension ObservableType where E == Any {
     */
     public static func combineLatest
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4)
-            -> Observable<(O1.E, O2.E, O3.E, O4.E)> {
+            -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element)> {
         return CombineLatest4(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(),
             resultSelector: { ($0, $1, $2, $3) }
@@ -251,9 +251,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class CombineLatestSink4_ : CombineLatestSink {
-    typealias R = O.E
-    typealias Parent = CombineLatest4
+final class CombineLatestSink4_ : CombineLatestSink {
+    typealias Result = Observer.Element
+    typealias Parent = CombineLatest4
 
     let _parent: Parent
 
@@ -262,8 +262,8 @@ final class CombineLatestSink4_ : CombineLatest
     var _latestElement3: E3! = nil
     var _latestElement4: E4! = nil
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 4, observer: observer, cancel: cancel)
     }
 
@@ -273,15 +273,15 @@ final class CombineLatestSink4_ : CombineLatest
         let subscription3 = SingleAssignmentDisposable()
         let subscription4 = SingleAssignmentDisposable()
 
-        let observer1 = CombineLatestObserver(lock: _lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
-        let observer2 = CombineLatestObserver(lock: _lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
-        let observer3 = CombineLatestObserver(lock: _lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
-        let observer4 = CombineLatestObserver(lock: _lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
+        let observer1 = CombineLatestObserver(lock: self._lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
+        let observer2 = CombineLatestObserver(lock: self._lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
+        let observer3 = CombineLatestObserver(lock: self._lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
+        let observer4 = CombineLatestObserver(lock: self._lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
 
-         subscription1.setDisposable(_parent._source1.subscribe(observer1))
-         subscription2.setDisposable(_parent._source2.subscribe(observer2))
-         subscription3.setDisposable(_parent._source3.subscribe(observer3))
-         subscription4.setDisposable(_parent._source4.subscribe(observer4))
+         subscription1.setDisposable(self._parent._source1.subscribe(observer1))
+         subscription2.setDisposable(self._parent._source2.subscribe(observer2))
+         subscription3.setDisposable(self._parent._source3.subscribe(observer3))
+         subscription4.setDisposable(self._parent._source4.subscribe(observer4))
 
         return Disposables.create([
                 subscription1,
@@ -291,13 +291,13 @@ final class CombineLatestSink4_ : CombineLatest
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_latestElement1, _latestElement2, _latestElement3, _latestElement4)
+    override func getResult() throws-> Result {
+        return try self._parent._resultSelector(self._latestElement1, self._latestElement2, self._latestElement3, self._latestElement4)
     }
 }
 
-final class CombineLatest4 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4) throws -> R
+final class CombineLatest4 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4) throws-> Result
 
     let _source1: Observable
     let _source2: Observable
@@ -307,15 +307,15 @@ final class CombineLatest4 : Producer {
     let _resultSelector: ResultSelector
 
     init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, resultSelector: @escaping ResultSelector) {
-        _source1 = source1
-        _source2 = source2
-        _source3 = source3
-        _source4 = source4
+        self._source1 = source1
+        self._source2 = source2
+        self._source3 = source3
+        self._source4 = source4
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestSink4_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -336,8 +336,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func combineLatest
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E) throws -> E)
-            -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element) throws -> Element)
+            -> Observable {
         return CombineLatest5(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(),
             resultSelector: resultSelector
@@ -345,7 +345,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever any of the observable sequences produces an element.
 
@@ -355,7 +355,7 @@ extension ObservableType where E == Any {
     */
     public static func combineLatest
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5)
-            -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E)> {
+            -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element)> {
         return CombineLatest5(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4) }
@@ -363,9 +363,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class CombineLatestSink5_ : CombineLatestSink {
-    typealias R = O.E
-    typealias Parent = CombineLatest5
+final class CombineLatestSink5_ : CombineLatestSink {
+    typealias Result = Observer.Element
+    typealias Parent = CombineLatest5
 
     let _parent: Parent
 
@@ -375,8 +375,8 @@ final class CombineLatestSink5_ : CombineLa
     var _latestElement4: E4! = nil
     var _latestElement5: E5! = nil
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 5, observer: observer, cancel: cancel)
     }
 
@@ -387,17 +387,17 @@ final class CombineLatestSink5_ : CombineLa
         let subscription4 = SingleAssignmentDisposable()
         let subscription5 = SingleAssignmentDisposable()
 
-        let observer1 = CombineLatestObserver(lock: _lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
-        let observer2 = CombineLatestObserver(lock: _lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
-        let observer3 = CombineLatestObserver(lock: _lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
-        let observer4 = CombineLatestObserver(lock: _lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
-        let observer5 = CombineLatestObserver(lock: _lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
+        let observer1 = CombineLatestObserver(lock: self._lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
+        let observer2 = CombineLatestObserver(lock: self._lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
+        let observer3 = CombineLatestObserver(lock: self._lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
+        let observer4 = CombineLatestObserver(lock: self._lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
+        let observer5 = CombineLatestObserver(lock: self._lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
 
-         subscription1.setDisposable(_parent._source1.subscribe(observer1))
-         subscription2.setDisposable(_parent._source2.subscribe(observer2))
-         subscription3.setDisposable(_parent._source3.subscribe(observer3))
-         subscription4.setDisposable(_parent._source4.subscribe(observer4))
-         subscription5.setDisposable(_parent._source5.subscribe(observer5))
+         subscription1.setDisposable(self._parent._source1.subscribe(observer1))
+         subscription2.setDisposable(self._parent._source2.subscribe(observer2))
+         subscription3.setDisposable(self._parent._source3.subscribe(observer3))
+         subscription4.setDisposable(self._parent._source4.subscribe(observer4))
+         subscription5.setDisposable(self._parent._source5.subscribe(observer5))
 
         return Disposables.create([
                 subscription1,
@@ -408,13 +408,13 @@ final class CombineLatestSink5_ : CombineLa
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_latestElement1, _latestElement2, _latestElement3, _latestElement4, _latestElement5)
+    override func getResult() throws-> Result {
+        return try self._parent._resultSelector(self._latestElement1, self._latestElement2, self._latestElement3, self._latestElement4, self._latestElement5)
     }
 }
 
-final class CombineLatest5 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5) throws -> R
+final class CombineLatest5 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5) throws-> Result
 
     let _source1: Observable
     let _source2: Observable
@@ -425,16 +425,16 @@ final class CombineLatest5 : Producer {
     let _resultSelector: ResultSelector
 
     init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, resultSelector: @escaping ResultSelector) {
-        _source1 = source1
-        _source2 = source2
-        _source3 = source3
-        _source4 = source4
-        _source5 = source5
+        self._source1 = source1
+        self._source2 = source2
+        self._source3 = source3
+        self._source4 = source4
+        self._source5 = source5
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestSink5_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -455,8 +455,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func combineLatest
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E) throws -> E)
-            -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element) throws -> Element)
+            -> Observable {
         return CombineLatest6(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(),
             resultSelector: resultSelector
@@ -464,7 +464,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever any of the observable sequences produces an element.
 
@@ -474,7 +474,7 @@ extension ObservableType where E == Any {
     */
     public static func combineLatest
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6)
-            -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E, O6.E)> {
+            -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element)> {
         return CombineLatest6(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4, $5) }
@@ -482,9 +482,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class CombineLatestSink6_ : CombineLatestSink {
-    typealias R = O.E
-    typealias Parent = CombineLatest6
+final class CombineLatestSink6_ : CombineLatestSink {
+    typealias Result = Observer.Element
+    typealias Parent = CombineLatest6
 
     let _parent: Parent
 
@@ -495,8 +495,8 @@ final class CombineLatestSink6_ : Combi
     var _latestElement5: E5! = nil
     var _latestElement6: E6! = nil
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 6, observer: observer, cancel: cancel)
     }
 
@@ -508,19 +508,19 @@ final class CombineLatestSink6_ : Combi
         let subscription5 = SingleAssignmentDisposable()
         let subscription6 = SingleAssignmentDisposable()
 
-        let observer1 = CombineLatestObserver(lock: _lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
-        let observer2 = CombineLatestObserver(lock: _lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
-        let observer3 = CombineLatestObserver(lock: _lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
-        let observer4 = CombineLatestObserver(lock: _lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
-        let observer5 = CombineLatestObserver(lock: _lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
-        let observer6 = CombineLatestObserver(lock: _lock, parent: self, index: 5, setLatestValue: { (e: E6) -> Void in self._latestElement6 = e }, this: subscription6)
+        let observer1 = CombineLatestObserver(lock: self._lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
+        let observer2 = CombineLatestObserver(lock: self._lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
+        let observer3 = CombineLatestObserver(lock: self._lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
+        let observer4 = CombineLatestObserver(lock: self._lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
+        let observer5 = CombineLatestObserver(lock: self._lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
+        let observer6 = CombineLatestObserver(lock: self._lock, parent: self, index: 5, setLatestValue: { (e: E6) -> Void in self._latestElement6 = e }, this: subscription6)
 
-         subscription1.setDisposable(_parent._source1.subscribe(observer1))
-         subscription2.setDisposable(_parent._source2.subscribe(observer2))
-         subscription3.setDisposable(_parent._source3.subscribe(observer3))
-         subscription4.setDisposable(_parent._source4.subscribe(observer4))
-         subscription5.setDisposable(_parent._source5.subscribe(observer5))
-         subscription6.setDisposable(_parent._source6.subscribe(observer6))
+         subscription1.setDisposable(self._parent._source1.subscribe(observer1))
+         subscription2.setDisposable(self._parent._source2.subscribe(observer2))
+         subscription3.setDisposable(self._parent._source3.subscribe(observer3))
+         subscription4.setDisposable(self._parent._source4.subscribe(observer4))
+         subscription5.setDisposable(self._parent._source5.subscribe(observer5))
+         subscription6.setDisposable(self._parent._source6.subscribe(observer6))
 
         return Disposables.create([
                 subscription1,
@@ -532,13 +532,13 @@ final class CombineLatestSink6_ : Combi
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_latestElement1, _latestElement2, _latestElement3, _latestElement4, _latestElement5, _latestElement6)
+    override func getResult() throws-> Result {
+        return try self._parent._resultSelector(self._latestElement1, self._latestElement2, self._latestElement3, self._latestElement4, self._latestElement5, self._latestElement6)
     }
 }
 
-final class CombineLatest6 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6) throws -> R
+final class CombineLatest6 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5, E6) throws-> Result
 
     let _source1: Observable
     let _source2: Observable
@@ -550,17 +550,17 @@ final class CombineLatest6 : Producer {
     let _resultSelector: ResultSelector
 
     init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, source6: Observable, resultSelector: @escaping ResultSelector) {
-        _source1 = source1
-        _source2 = source2
-        _source3 = source3
-        _source4 = source4
-        _source5 = source5
-        _source6 = source6
+        self._source1 = source1
+        self._source2 = source2
+        self._source3 = source3
+        self._source4 = source4
+        self._source5 = source5
+        self._source6 = source6
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestSink6_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -581,8 +581,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func combineLatest
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E) throws -> E)
-            -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element) throws -> Element)
+            -> Observable {
         return CombineLatest7(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(),
             resultSelector: resultSelector
@@ -590,7 +590,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever any of the observable sequences produces an element.
 
@@ -600,7 +600,7 @@ extension ObservableType where E == Any {
     */
     public static func combineLatest
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7)
-            -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E)> {
+            -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element)> {
         return CombineLatest7(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4, $5, $6) }
@@ -608,9 +608,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class CombineLatestSink7_ : CombineLatestSink {
-    typealias R = O.E
-    typealias Parent = CombineLatest7
+final class CombineLatestSink7_ : CombineLatestSink {
+    typealias Result = Observer.Element
+    typealias Parent = CombineLatest7
 
     let _parent: Parent
 
@@ -622,8 +622,8 @@ final class CombineLatestSink7_ : C
     var _latestElement6: E6! = nil
     var _latestElement7: E7! = nil
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 7, observer: observer, cancel: cancel)
     }
 
@@ -636,21 +636,21 @@ final class CombineLatestSink7_ : C
         let subscription6 = SingleAssignmentDisposable()
         let subscription7 = SingleAssignmentDisposable()
 
-        let observer1 = CombineLatestObserver(lock: _lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
-        let observer2 = CombineLatestObserver(lock: _lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
-        let observer3 = CombineLatestObserver(lock: _lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
-        let observer4 = CombineLatestObserver(lock: _lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
-        let observer5 = CombineLatestObserver(lock: _lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
-        let observer6 = CombineLatestObserver(lock: _lock, parent: self, index: 5, setLatestValue: { (e: E6) -> Void in self._latestElement6 = e }, this: subscription6)
-        let observer7 = CombineLatestObserver(lock: _lock, parent: self, index: 6, setLatestValue: { (e: E7) -> Void in self._latestElement7 = e }, this: subscription7)
-
-         subscription1.setDisposable(_parent._source1.subscribe(observer1))
-         subscription2.setDisposable(_parent._source2.subscribe(observer2))
-         subscription3.setDisposable(_parent._source3.subscribe(observer3))
-         subscription4.setDisposable(_parent._source4.subscribe(observer4))
-         subscription5.setDisposable(_parent._source5.subscribe(observer5))
-         subscription6.setDisposable(_parent._source6.subscribe(observer6))
-         subscription7.setDisposable(_parent._source7.subscribe(observer7))
+        let observer1 = CombineLatestObserver(lock: self._lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
+        let observer2 = CombineLatestObserver(lock: self._lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
+        let observer3 = CombineLatestObserver(lock: self._lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
+        let observer4 = CombineLatestObserver(lock: self._lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
+        let observer5 = CombineLatestObserver(lock: self._lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
+        let observer6 = CombineLatestObserver(lock: self._lock, parent: self, index: 5, setLatestValue: { (e: E6) -> Void in self._latestElement6 = e }, this: subscription6)
+        let observer7 = CombineLatestObserver(lock: self._lock, parent: self, index: 6, setLatestValue: { (e: E7) -> Void in self._latestElement7 = e }, this: subscription7)
+
+         subscription1.setDisposable(self._parent._source1.subscribe(observer1))
+         subscription2.setDisposable(self._parent._source2.subscribe(observer2))
+         subscription3.setDisposable(self._parent._source3.subscribe(observer3))
+         subscription4.setDisposable(self._parent._source4.subscribe(observer4))
+         subscription5.setDisposable(self._parent._source5.subscribe(observer5))
+         subscription6.setDisposable(self._parent._source6.subscribe(observer6))
+         subscription7.setDisposable(self._parent._source7.subscribe(observer7))
 
         return Disposables.create([
                 subscription1,
@@ -663,13 +663,13 @@ final class CombineLatestSink7_ : C
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_latestElement1, _latestElement2, _latestElement3, _latestElement4, _latestElement5, _latestElement6, _latestElement7)
+    override func getResult() throws-> Result {
+        return try self._parent._resultSelector(self._latestElement1, self._latestElement2, self._latestElement3, self._latestElement4, self._latestElement5, self._latestElement6, self._latestElement7)
     }
 }
 
-final class CombineLatest7 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7) throws -> R
+final class CombineLatest7 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7) throws-> Result
 
     let _source1: Observable
     let _source2: Observable
@@ -682,18 +682,18 @@ final class CombineLatest7 : Producer {
     let _resultSelector: ResultSelector
 
     init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, source6: Observable, source7: Observable, resultSelector: @escaping ResultSelector) {
-        _source1 = source1
-        _source2 = source2
-        _source3 = source3
-        _source4 = source4
-        _source5 = source5
-        _source6 = source6
-        _source7 = source7
+        self._source1 = source1
+        self._source2 = source2
+        self._source3 = source3
+        self._source4 = source4
+        self._source5 = source5
+        self._source6 = source6
+        self._source7 = source7
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestSink7_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -714,8 +714,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func combineLatest
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E, O8.E) throws -> E)
-            -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element, O8.Element) throws -> Element)
+            -> Observable {
         return CombineLatest8(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(), source8: source8.asObservable(),
             resultSelector: resultSelector
@@ -723,7 +723,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever any of the observable sequences produces an element.
 
@@ -733,7 +733,7 @@ extension ObservableType where E == Any {
     */
     public static func combineLatest
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8)
-            -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E, O8.E)> {
+            -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element, O8.Element)> {
         return CombineLatest8(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(), source8: source8.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4, $5, $6, $7) }
@@ -741,9 +741,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class CombineLatestSink8_ : CombineLatestSink {
-    typealias R = O.E
-    typealias Parent = CombineLatest8
+final class CombineLatestSink8_ : CombineLatestSink {
+    typealias Result = Observer.Element
+    typealias Parent = CombineLatest8
 
     let _parent: Parent
 
@@ -756,8 +756,8 @@ final class CombineLatestSink8_
     var _latestElement7: E7! = nil
     var _latestElement8: E8! = nil
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 8, observer: observer, cancel: cancel)
     }
 
@@ -771,23 +771,23 @@ final class CombineLatestSink8_
         let subscription7 = SingleAssignmentDisposable()
         let subscription8 = SingleAssignmentDisposable()
 
-        let observer1 = CombineLatestObserver(lock: _lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
-        let observer2 = CombineLatestObserver(lock: _lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
-        let observer3 = CombineLatestObserver(lock: _lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
-        let observer4 = CombineLatestObserver(lock: _lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
-        let observer5 = CombineLatestObserver(lock: _lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
-        let observer6 = CombineLatestObserver(lock: _lock, parent: self, index: 5, setLatestValue: { (e: E6) -> Void in self._latestElement6 = e }, this: subscription6)
-        let observer7 = CombineLatestObserver(lock: _lock, parent: self, index: 6, setLatestValue: { (e: E7) -> Void in self._latestElement7 = e }, this: subscription7)
-        let observer8 = CombineLatestObserver(lock: _lock, parent: self, index: 7, setLatestValue: { (e: E8) -> Void in self._latestElement8 = e }, this: subscription8)
-
-         subscription1.setDisposable(_parent._source1.subscribe(observer1))
-         subscription2.setDisposable(_parent._source2.subscribe(observer2))
-         subscription3.setDisposable(_parent._source3.subscribe(observer3))
-         subscription4.setDisposable(_parent._source4.subscribe(observer4))
-         subscription5.setDisposable(_parent._source5.subscribe(observer5))
-         subscription6.setDisposable(_parent._source6.subscribe(observer6))
-         subscription7.setDisposable(_parent._source7.subscribe(observer7))
-         subscription8.setDisposable(_parent._source8.subscribe(observer8))
+        let observer1 = CombineLatestObserver(lock: self._lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
+        let observer2 = CombineLatestObserver(lock: self._lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
+        let observer3 = CombineLatestObserver(lock: self._lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
+        let observer4 = CombineLatestObserver(lock: self._lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
+        let observer5 = CombineLatestObserver(lock: self._lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
+        let observer6 = CombineLatestObserver(lock: self._lock, parent: self, index: 5, setLatestValue: { (e: E6) -> Void in self._latestElement6 = e }, this: subscription6)
+        let observer7 = CombineLatestObserver(lock: self._lock, parent: self, index: 6, setLatestValue: { (e: E7) -> Void in self._latestElement7 = e }, this: subscription7)
+        let observer8 = CombineLatestObserver(lock: self._lock, parent: self, index: 7, setLatestValue: { (e: E8) -> Void in self._latestElement8 = e }, this: subscription8)
+
+         subscription1.setDisposable(self._parent._source1.subscribe(observer1))
+         subscription2.setDisposable(self._parent._source2.subscribe(observer2))
+         subscription3.setDisposable(self._parent._source3.subscribe(observer3))
+         subscription4.setDisposable(self._parent._source4.subscribe(observer4))
+         subscription5.setDisposable(self._parent._source5.subscribe(observer5))
+         subscription6.setDisposable(self._parent._source6.subscribe(observer6))
+         subscription7.setDisposable(self._parent._source7.subscribe(observer7))
+         subscription8.setDisposable(self._parent._source8.subscribe(observer8))
 
         return Disposables.create([
                 subscription1,
@@ -801,13 +801,13 @@ final class CombineLatestSink8_
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_latestElement1, _latestElement2, _latestElement3, _latestElement4, _latestElement5, _latestElement6, _latestElement7, _latestElement8)
+    override func getResult() throws-> Result {
+        return try self._parent._resultSelector(self._latestElement1, self._latestElement2, self._latestElement3, self._latestElement4, self._latestElement5, self._latestElement6, self._latestElement7, self._latestElement8)
     }
 }
 
-final class CombineLatest8 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7, E8) throws -> R
+final class CombineLatest8 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7, E8) throws-> Result
 
     let _source1: Observable
     let _source2: Observable
@@ -821,19 +821,19 @@ final class CombineLatest8 : Producer {
     let _resultSelector: ResultSelector
 
     init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, source6: Observable, source7: Observable, source8: Observable, resultSelector: @escaping ResultSelector) {
-        _source1 = source1
-        _source2 = source2
-        _source3 = source3
-        _source4 = source4
-        _source5 = source5
-        _source6 = source6
-        _source7 = source7
-        _source8 = source8
+        self._source1 = source1
+        self._source2 = source2
+        self._source3 = source3
+        self._source4 = source4
+        self._source5 = source5
+        self._source6 = source6
+        self._source7 = source7
+        self._source8 = source8
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestSink8_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest.swift b/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest.swift
index 8c03e8c..7d6fa7f 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest.swift
@@ -12,10 +12,10 @@ protocol CombineLatestProtocol : class {
     func done(_ index: Int)
 }
 
-class CombineLatestSink
-    : Sink
+class CombineLatestSink
+    : Sink
     , CombineLatestProtocol {
-    typealias Element = O.E
+    typealias Element = Observer.Element 
    
     let _lock = RecursiveLock()
 
@@ -25,10 +25,10 @@ class CombineLatestSink
     private var _hasValue: [Bool]
     private var _isDone: [Bool]
    
-    init(arity: Int, observer: O, cancel: Cancelable) {
-        _arity = arity
-        _hasValue = [Bool](repeating: false, count: arity)
-        _isDone = [Bool](repeating: false, count: arity)
+    init(arity: Int, observer: Observer, cancel: Cancelable) {
+        self._arity = arity
+        self._hasValue = [Bool](repeating: false, count: arity)
+        self._isDone = [Bool](repeating: false, count: arity)
         
         super.init(observer: observer, cancel: cancel)
     }
@@ -38,63 +38,62 @@ class CombineLatestSink
     }
     
     func next(_ index: Int) {
-        if !_hasValue[index] {
-            _hasValue[index] = true
-            _numberOfValues += 1
+        if !self._hasValue[index] {
+            self._hasValue[index] = true
+            self._numberOfValues += 1
         }
 
-        if _numberOfValues == _arity {
+        if self._numberOfValues == self._arity {
             do {
-                let result = try getResult()
-                forwardOn(.next(result))
+                let result = try self.getResult()
+                self.forwardOn(.next(result))
             }
             catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
             }
         }
         else {
             var allOthersDone = true
 
-            for i in 0 ..< _arity {
-                if i != index && !_isDone[i] {
+            for i in 0 ..< self._arity {
+                if i != index && !self._isDone[i] {
                     allOthersDone = false
                     break
                 }
             }
             
             if allOthersDone {
-                forwardOn(.completed)
-                dispose()
+                self.forwardOn(.completed)
+                self.dispose()
             }
         }
     }
     
     func fail(_ error: Swift.Error) {
-        forwardOn(.error(error))
-        dispose()
+        self.forwardOn(.error(error))
+        self.dispose()
     }
     
     func done(_ index: Int) {
-        if _isDone[index] {
+        if self._isDone[index] {
             return
         }
 
-        _isDone[index] = true
-        _numberOfDone += 1
+        self._isDone[index] = true
+        self._numberOfDone += 1
 
-        if _numberOfDone == _arity {
-            forwardOn(.completed)
-            dispose()
+        if self._numberOfDone == self._arity {
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
 
-final class CombineLatestObserver
+final class CombineLatestObserver
     : ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias Element = ElementType
     typealias ValueSetter = (Element) -> Void
     
     private let _parent: CombineLatestProtocol
@@ -105,28 +104,28 @@ final class CombineLatestObserver
     private let _setLatestValue: ValueSetter
     
     init(lock: RecursiveLock, parent: CombineLatestProtocol, index: Int, setLatestValue: @escaping ValueSetter, this: Disposable) {
-        _lock = lock
-        _parent = parent
-        _index = index
-        _this = this
-        _setLatestValue = setLatestValue
+        self._lock = lock
+        self._parent = parent
+        self._index = index
+        self._this = this
+        self._setLatestValue = setLatestValue
     }
     
     func on(_ event: Event) {
-        synchronizedOn(event)
+        self.synchronizedOn(event)
     }
 
     func _synchronized_on(_ event: Event) {
         switch event {
         case .next(let value):
-            _setLatestValue(value)
-            _parent.next(_index)
+            self._setLatestValue(value)
+            self._parent.next(self._index)
         case .error(let error):
-            _this.dispose()
-            _parent.fail(error)
+            self._this.dispose()
+            self._parent.fail(error)
         case .completed:
-            _this.dispose()
-            _parent.done(_index)
+            self._this.dispose()
+            self._parent.done(self._index)
         }
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/CompactMap.swift b/Demo/Pods/RxSwift/RxSwift/Observables/CompactMap.swift
new file mode 100644
index 0000000..09cd3a9
--- /dev/null
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/CompactMap.swift
@@ -0,0 +1,82 @@
+//
+//  CompactMap.swift
+//  RxSwift
+//
+//  Created by Michael Long on 04/09/2019.
+//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
+//
+
+extension ObservableType {
+
+    /**
+     Projects each element of an observable sequence into an optional form and filters all optional results.
+
+     Equivalent to:
+
+     func compactMap(_ transform: @escaping (Self.E) throws -> Result?) -> RxSwift.Observable {
+        return self.map { try? transform($0) }.filter { $0 != nil }.map { $0! }
+     }
+
+     - parameter transform: A transform function to apply to each source element and which returns an element or nil.
+     - returns: An observable sequence whose elements are the result of filtering the transform function for each element of the source.
+
+     */
+    public func compactMap(_ transform: @escaping (Element) throws -> Result?)
+        -> Observable {
+            return CompactMap(source: self.asObservable(), transform: transform)
+    }
+}
+
+final private class CompactMapSink: Sink, ObserverType {
+    typealias Transform = (SourceType) throws -> ResultType?
+
+    typealias ResultType = Observer.Element 
+    typealias Element = SourceType
+
+    private let _transform: Transform
+
+    init(transform: @escaping Transform, observer: Observer, cancel: Cancelable) {
+        self._transform = transform
+        super.init(observer: observer, cancel: cancel)
+    }
+
+    func on(_ event: Event) {
+        switch event {
+        case .next(let element):
+            do {
+                if let mappedElement = try self._transform(element) {
+                    self.forwardOn(.next(mappedElement))
+                }
+            }
+            catch let e {
+                self.forwardOn(.error(e))
+                self.dispose()
+            }
+        case .error(let error):
+            self.forwardOn(.error(error))
+            self.dispose()
+        case .completed:
+            self.forwardOn(.completed)
+            self.dispose()
+        }
+    }
+}
+
+final private class CompactMap: Producer {
+    typealias Transform = (SourceType) throws -> ResultType?
+
+    private let _source: Observable
+
+    private let _transform: Transform
+
+    init(source: Observable, transform: @escaping Transform) {
+        self._source = source
+        self._transform = transform
+    }
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == ResultType {
+        let sink = CompactMapSink(transform: self._transform, observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
+        return (sink: sink, subscription: subscription)
+    }
+}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Concat.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Concat.swift
index 35ef0e1..6d76a04 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Concat.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Concat.swift
@@ -16,7 +16,7 @@ extension ObservableType {
      - parameter second: Second observable sequence.
      - returns: An observable sequence that contains the elements of `self`, followed by those of the second sequence.
      */
-    public func concat(_ second: O) -> Observable where O.E == E {
+    public func concat(_ second: Source) -> Observable where Source.Element == Element {
         return Observable.concat([self.asObservable(), second.asObservable()])
     }
 }
@@ -35,8 +35,8 @@ extension ObservableType {
 
      - returns: An observable sequence that contains the elements of each given sequence, in sequential order.
      */
-    public static func concat(_ sequence: S) -> Observable
-        where S.Iterator.Element == Observable {
+    public static func concat(_ sequence: Sequence) -> Observable
+        where Sequence.Element == Observable {
             return Concat(sources: sequence, count: nil)
     }
 
@@ -53,8 +53,8 @@ extension ObservableType {
 
      - returns: An observable sequence that contains the elements of each given sequence, in sequential order.
      */
-    public static func concat(_ collection: S) -> Observable
-        where S.Iterator.Element == Observable {
+    public static func concat(_ collection: Collection) -> Observable
+        where Collection.Element == Observable {
             return Concat(sources: collection, count: Int64(collection.count))
     }
 
@@ -71,38 +71,38 @@ extension ObservableType {
 
      - returns: An observable sequence that contains the elements of each given sequence, in sequential order.
      */
-    public static func concat(_ sources: Observable ...) -> Observable {
+    public static func concat(_ sources: Observable ...) -> Observable {
         return Concat(sources: sources, count: Int64(sources.count))
     }
 }
 
-final fileprivate class ConcatSink
-    : TailRecursiveSink
-    , ObserverType where S.Iterator.Element : ObservableConvertibleType, S.Iterator.Element.E == O.E {
-    typealias Element = O.E
+final private class ConcatSink
+    : TailRecursiveSink
+    , ObserverType where Sequence.Element: ObservableConvertibleType, Sequence.Element.Element == Observer.Element {
+    typealias Element = Observer.Element 
     
-    override init(observer: O, cancel: Cancelable) {
+    override init(observer: Observer, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event){
         switch event {
         case .next:
-            forwardOn(event)
+            self.forwardOn(event)
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            schedule(.moveNext)
+            self.schedule(.moveNext)
         }
     }
 
-    override func subscribeToNext(_ source: Observable) -> Disposable {
+    override func subscribeToNext(_ source: Observable) -> Disposable {
         return source.subscribe(self)
     }
     
-    override func extract(_ observable: Observable) -> SequenceGenerator? {
-        if let source = observable as? Concat {
+    override func extract(_ observable: Observable) -> SequenceGenerator? {
+        if let source = observable as? Concat {
             return (source._sources.makeIterator(), source._count)
         }
         else {
@@ -111,20 +111,20 @@ final fileprivate class ConcatSink
     }
 }
 
-final fileprivate class Concat : Producer where S.Iterator.Element : ObservableConvertibleType {
-    typealias Element = S.Iterator.Element.E
+final private class Concat: Producer where Sequence.Element: ObservableConvertibleType {
+    typealias Element = Sequence.Element.Element
     
-    fileprivate let _sources: S
+    fileprivate let _sources: Sequence
     fileprivate let _count: IntMax?
 
-    init(sources: S, count: IntMax?) {
-        _sources = sources
-        _count = count
+    init(sources: Sequence, count: IntMax?) {
+        self._sources = sources
+        self._count = count
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let sink = ConcatSink(observer: observer, cancel: cancel)
-        let subscription = sink.run((_sources.makeIterator(), _count))
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = ConcatSink(observer: observer, cancel: cancel)
+        let subscription = sink.run((self._sources.makeIterator(), self._count))
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Create.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Create.swift
index 4a1804a..30eae4c 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Create.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Create.swift
@@ -17,41 +17,41 @@ extension ObservableType {
      - parameter subscribe: Implementation of the resulting observable sequence's `subscribe` method.
      - returns: The observable sequence with the specified implementation for the `subscribe` method.
      */
-    public static func create(_ subscribe: @escaping (AnyObserver) -> Disposable) -> Observable {
+    public static func create(_ subscribe: @escaping (AnyObserver) -> Disposable) -> Observable {
         return AnonymousObservable(subscribe)
     }
 }
 
-final fileprivate class AnonymousObservableSink : Sink, ObserverType {
-    typealias E = O.E
-    typealias Parent = AnonymousObservable
+final private class AnonymousObservableSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = AnonymousObservable
 
     // state
-    private var _isStopped: AtomicInt = 0
+    private let _isStopped = AtomicInt(0)
 
     #if DEBUG
         fileprivate let _synchronizationTracker = SynchronizationTracker()
     #endif
 
-    override init(observer: O, cancel: Cancelable) {
+    override init(observer: Observer, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         #if DEBUG
-            _synchronizationTracker.register(synchronizationErrorMessage: .default)
-            defer { _synchronizationTracker.unregister() }
+            self._synchronizationTracker.register(synchronizationErrorMessage: .default)
+            defer { self._synchronizationTracker.unregister() }
         #endif
         switch event {
         case .next:
-            if _isStopped == 1 {
+            if load(self._isStopped) == 1 {
                 return
             }
-            forwardOn(event)
+            self.forwardOn(event)
         case .error, .completed:
-            if AtomicCompareAndSwap(0, 1, &_isStopped) {
-                forwardOn(event)
-                dispose()
+            if fetchOr(self._isStopped, 1) == 0 {
+                self.forwardOn(event)
+                self.dispose()
             }
         }
     }
@@ -61,16 +61,16 @@ final fileprivate class AnonymousObservableSink : Sink, Obse
     }
 }
 
-final fileprivate class AnonymousObservable : Producer {
+final private class AnonymousObservable: Producer {
     typealias SubscribeHandler = (AnyObserver) -> Disposable
 
     let _subscribeHandler: SubscribeHandler
 
     init(_ subscribeHandler: @escaping SubscribeHandler) {
-        _subscribeHandler = subscribeHandler
+        self._subscribeHandler = subscribeHandler
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = AnonymousObservableSink(observer: observer, cancel: cancel)
         let subscription = sink.run(self)
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Debounce.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Debounce.swift
index 866427a..6f84711 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Debounce.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Debounce.swift
@@ -18,17 +18,17 @@ extension ObservableType {
      - returns: The throttled sequence.
      */
     public func debounce(_ dueTime: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
             return Debounce(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler)
     }
 }
 
-final fileprivate class DebounceSink
-    : Sink
+final private class DebounceSink
+    : Sink
     , ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias Element = O.E
+    typealias Element = Observer.Element 
     typealias ParentType = Debounce
 
     private let _parent: ParentType
@@ -37,80 +37,79 @@ final fileprivate class DebounceSink
 
     // state
     private var _id = 0 as UInt64
-    private var _value: Element? = nil
+    private var _value: Element?
 
     let cancellable = SerialDisposable()
 
-    init(parent: ParentType, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: ParentType, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
 
         super.init(observer: observer, cancel: cancel)
     }
 
     func run() -> Disposable {
-        let subscription = _parent._source.subscribe(self)
+        let subscription = self._parent._source.subscribe(self)
 
         return Disposables.create(subscription, cancellable)
     }
 
     func on(_ event: Event) {
-        synchronizedOn(event)
+        self.synchronizedOn(event)
     }
 
     func _synchronized_on(_ event: Event) {
         switch event {
         case .next(let element):
-            _id = _id &+ 1
-            let currentId = _id
-            _value = element
+            self._id = self._id &+ 1
+            let currentId = self._id
+            self._value = element
 
 
-            let scheduler = _parent._scheduler
-            let dueTime = _parent._dueTime
+            let scheduler = self._parent._scheduler
+            let dueTime = self._parent._dueTime
 
             let d = SingleAssignmentDisposable()
             self.cancellable.disposable = d
             d.setDisposable(scheduler.scheduleRelative(currentId, dueTime: dueTime, action: self.propagate))
         case .error:
-            _value = nil
-            forwardOn(event)
-            dispose()
+            self._value = nil
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            if let value = _value {
-                _value = nil
-                forwardOn(.next(value))
+            if let value = self._value {
+                self._value = nil
+                self.forwardOn(.next(value))
             }
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 
     func propagate(_ currentId: UInt64) -> Disposable {
-        _lock.lock(); defer { _lock.unlock() } // {
-        let originalValue = _value
+        self._lock.lock(); defer { self._lock.unlock() } // {
+        let originalValue = self._value
 
-        if let value = originalValue, _id == currentId {
-            _value = nil
-            forwardOn(.next(value))
+        if let value = originalValue, self._id == currentId {
+            self._value = nil
+            self.forwardOn(.next(value))
         }
         // }
         return Disposables.create()
     }
 }
 
-final fileprivate class Debounce : Producer {
-
+final private class Debounce: Producer {
     fileprivate let _source: Observable
     fileprivate let _dueTime: RxTimeInterval
     fileprivate let _scheduler: SchedulerType
 
     init(source: Observable, dueTime: RxTimeInterval, scheduler: SchedulerType) {
-        _source = source
-        _dueTime = dueTime
-        _scheduler = scheduler
+        self._source = source
+        self._dueTime = dueTime
+        self._scheduler = scheduler
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = DebounceSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Debug.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Debug.swift
index 85b8af7..103c6e8 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Debug.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Debug.swift
@@ -21,7 +21,7 @@ extension ObservableType {
      - returns: An observable sequence whose events are printed to standard output.
      */
     public func debug(_ identifier: String? = nil, trimOutput: Bool = false, file: String = #file, line: UInt = #line, function: String = #function)
-        -> Observable {
+        -> Observable {
             return Debug(source: self, identifier: identifier, trimOutput: trimOutput, file: file, line: line, function: function)
     }
 }
@@ -32,18 +32,18 @@ fileprivate func logEvent(_ identifier: String, dateFormat: DateFormatter, conte
     print("\(dateFormat.string(from: Date())): \(identifier) -> \(content)")
 }
 
-final fileprivate class DebugSink : Sink, ObserverType where O.E == Source.E {
-    typealias Element = O.E
+final private class DebugSink: Sink, ObserverType where Observer.Element == Source.Element {
+    typealias Element = Observer.Element 
     typealias Parent = Debug
     
     private let _parent: Parent
     private let _timestampFormatter = DateFormatter()
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _timestampFormatter.dateFormat = dateFormat
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._timestampFormatter.dateFormat = dateFormat
 
-        logEvent(_parent._identifier, dateFormat: _timestampFormatter, content: "subscribed")
+        logEvent(self._parent._identifier, dateFormat: self._timestampFormatter, content: "subscribed")
 
         super.init(observer: observer, cancel: cancel)
     }
@@ -52,35 +52,35 @@ final fileprivate class DebugSink : Sin
         let maxEventTextLength = 40
         let eventText = "\(event)"
 
-        let eventNormalized = (eventText.count > maxEventTextLength) && _parent._trimOutput
+        let eventNormalized = (eventText.count > maxEventTextLength) && self._parent._trimOutput
             ? String(eventText.prefix(maxEventTextLength / 2)) + "..." + String(eventText.suffix(maxEventTextLength / 2))
             : eventText
 
-        logEvent(_parent._identifier, dateFormat: _timestampFormatter, content: "Event \(eventNormalized)")
+        logEvent(self._parent._identifier, dateFormat: self._timestampFormatter, content: "Event \(eventNormalized)")
 
-        forwardOn(event)
+        self.forwardOn(event)
         if event.isStopEvent {
-            dispose()
+            self.dispose()
         }
     }
     
     override func dispose() {
         if !self.disposed {
-            logEvent(_parent._identifier, dateFormat: _timestampFormatter, content: "isDisposed")
+            logEvent(self._parent._identifier, dateFormat: self._timestampFormatter, content: "isDisposed")
         }
         super.dispose()
     }
 }
 
-final fileprivate class Debug : Producer {
+final private class Debug: Producer {
     fileprivate let _identifier: String
     fileprivate let _trimOutput: Bool
     fileprivate let _source: Source
 
     init(source: Source, identifier: String?, trimOutput: Bool, file: String, line: UInt, function: String) {
-        _trimOutput = trimOutput
+        self._trimOutput = trimOutput
         if let identifier = identifier {
-            _identifier = identifier
+            self._identifier = identifier
         }
         else {
             let trimmedFile: String
@@ -90,14 +90,14 @@ final fileprivate class Debug : Producer {
             else {
                 trimmedFile = file
             }
-            _identifier = "\(trimmedFile):\(line) (\(function))"
+            self._identifier = "\(trimmedFile):\(line) (\(function))"
         }
-        _source = source
+        self._source = source
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Source.E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Source.Element {
         let sink = DebugSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/DefaultIfEmpty.swift b/Demo/Pods/RxSwift/RxSwift/Observables/DefaultIfEmpty.swift
index 696361f..5ad1bef 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/DefaultIfEmpty.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/DefaultIfEmpty.swift
@@ -16,51 +16,51 @@ extension ObservableType {
      - parameter default: Default element to be sent if the source does not emit any elements
      - returns: An observable sequence which emits default element end completes in case the original sequence is empty
      */
-    public func ifEmpty(default: E) -> Observable {
+    public func ifEmpty(default: Element) -> Observable {
         return DefaultIfEmpty(source: self.asObservable(), default: `default`)
     }
 }
 
-final fileprivate class DefaultIfEmptySink: Sink, ObserverType {
-    typealias E = O.E
-    private let _default: E
+final private class DefaultIfEmptySink: Sink, ObserverType {
+    typealias Element = Observer.Element 
+    private let _default: Element
     private var _isEmpty = true
     
-    init(default: E, observer: O, cancel: Cancelable) {
-        _default = `default`
+    init(default: Element, observer: Observer, cancel: Cancelable) {
+        self._default = `default`
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
-        case .next(_):
-            _isEmpty = false
-            forwardOn(event)
-        case .error(_):
-            forwardOn(event)
-            dispose()
+        case .next:
+            self._isEmpty = false
+            self.forwardOn(event)
+        case .error:
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            if _isEmpty {
-                forwardOn(.next(_default))
+            if self._isEmpty {
+                self.forwardOn(.next(self._default))
             }
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class DefaultIfEmpty: Producer {
+final private class DefaultIfEmpty: Producer {
     private let _source: Observable
     private let _default: SourceType
     
     init(source: Observable, `default`: SourceType) {
-        _source = source
-        _default = `default`
+        self._source = source
+        self._default = `default`
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceType {
-        let sink = DefaultIfEmptySink(default: _default, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == SourceType {
+        let sink = DefaultIfEmptySink(default: self._default, observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Deferred.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Deferred.swift
index 947f604..8152f5c 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Deferred.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Deferred.swift
@@ -15,59 +15,60 @@ extension ObservableType {
      - parameter observableFactory: Observable factory function to invoke for each observer that subscribes to the resulting sequence.
      - returns: An observable sequence whose observers trigger an invocation of the given observable factory function.
      */
-    public static func deferred(_ observableFactory: @escaping () throws -> Observable)
-        -> Observable {
+    public static func deferred(_ observableFactory: @escaping () throws -> Observable)
+        -> Observable {
         return Deferred(observableFactory: observableFactory)
     }
 }
 
-final fileprivate class DeferredSink : Sink, ObserverType where S.E == O.E {
-    typealias E = O.E
+final private class DeferredSink: Sink, ObserverType where Source.Element == Observer.Element {
+    typealias Element = Observer.Element 
 
-    private let _observableFactory: () throws -> S
+    private let _observableFactory: () throws -> Source
 
-    init(observableFactory: @escaping () throws -> S, observer: O, cancel: Cancelable) {
-        _observableFactory = observableFactory
+    init(observableFactory: @escaping () throws -> Source, observer: Observer, cancel: Cancelable) {
+        self._observableFactory = observableFactory
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
         do {
-            let result = try _observableFactory()
+            let result = try self._observableFactory()
             return result.subscribe(self)
         }
         catch let e {
-            forwardOn(.error(e))
-            dispose()
+            self.forwardOn(.error(e))
+            self.dispose()
             return Disposables.create()
         }
     }
     
-    func on(_ event: Event) {
-        forwardOn(event)
+    func on(_ event: Event) {
+        self.forwardOn(event)
         
         switch event {
         case .next:
             break
         case .error:
-            dispose()
+            self.dispose()
         case .completed:
-            dispose()
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Deferred : Producer {
-    typealias Factory = () throws -> S
+final private class Deferred: Producer {
+    typealias Factory = () throws -> Source
     
     private let _observableFactory : Factory
     
     init(observableFactory: @escaping Factory) {
-        _observableFactory = observableFactory
+        self._observableFactory = observableFactory
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
-        let sink = DeferredSink(observableFactory: _observableFactory, observer: observer, cancel: cancel)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable)
+             where Observer.Element == Source.Element {
+        let sink = DeferredSink(observableFactory: self._observableFactory, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Delay.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Delay.swift
index 13955a3..1c00a49 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Delay.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Delay.swift
@@ -20,16 +20,16 @@ extension ObservableType {
      - returns: the source Observable shifted in time by the specified delay.
      */
     public func delay(_ dueTime: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
             return Delay(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler)
     }
 }
 
-final fileprivate class DelaySink
-    : Sink
+final private class DelaySink
+    : Sink
     , ObserverType {
-    typealias E = O.E
-    typealias Source = Observable
+    typealias Element = Observer.Element 
+    typealias Source = Observable
     typealias DisposeKey = Bag.KeyType
     
     private let _lock = RecursiveLock()
@@ -44,15 +44,15 @@ final fileprivate class DelaySink
     private var _active = false
     // is "run loop" on different scheduler running
     private var _running = false
-    private var _errorEvent: Event? = nil
+    private var _errorEvent: Event?
 
     // state
-    private var _queue = Queue<(eventTime: RxTime, event: Event)>(capacity: 0)
+    private var _queue = Queue<(eventTime: RxTime, event: Event)>(capacity: 0)
     private var _disposed = false
     
-    init(observer: O, dueTime: RxTimeInterval, scheduler: SchedulerType, cancel: Cancelable) {
-        _dueTime = dueTime
-        _scheduler = scheduler
+    init(observer: Observer, dueTime: RxTimeInterval, scheduler: SchedulerType, cancel: Cancelable) {
+        self._dueTime = dueTime
+        self._scheduler = scheduler
         super.init(observer: observer, cancel: cancel)
     }
 
@@ -63,12 +63,12 @@ final fileprivate class DelaySink
     // Another complication is that scheduler is potentially concurrent so internal queue is used.
     func drainQueue(state: (), scheduler: AnyRecursiveScheduler<()>) {
 
-        _lock.lock()    // {
-            let hasFailed = _errorEvent != nil
+        self._lock.lock()    // {
+            let hasFailed = self._errorEvent != nil
             if !hasFailed {
-                _running = true
+                self._running = true
             }
-        _lock.unlock()  // }
+        self._lock.unlock()  // }
 
         if hasFailed {
             return
@@ -77,26 +77,24 @@ final fileprivate class DelaySink
         var ranAtLeastOnce = false
 
         while true {
-            _lock.lock() // {
-                let errorEvent = _errorEvent
+            self._lock.lock() // {
+                let errorEvent = self._errorEvent
 
-                let eventToForwardImmediately = ranAtLeastOnce ? nil : _queue.dequeue()?.event
-                let nextEventToScheduleOriginalTime: Date? = ranAtLeastOnce && !_queue.isEmpty ? _queue.peek().eventTime : nil
+                let eventToForwardImmediately = ranAtLeastOnce ? nil : self._queue.dequeue()?.event
+                let nextEventToScheduleOriginalTime: Date? = ranAtLeastOnce && !self._queue.isEmpty ? self._queue.peek().eventTime : nil
 
-                if let _ = errorEvent {
-                }
-                else  {
-                    if let _ = eventToForwardImmediately {
+                if errorEvent == nil {
+                    if eventToForwardImmediately != nil {
                     }
-                    else if let _ = nextEventToScheduleOriginalTime {
-                        _running = false
+                    else if nextEventToScheduleOriginalTime != nil {
+                        self._running = false
                     }
                     else {
-                        _running = false
-                        _active = false
+                        self._running = false
+                        self._active = false
                     }
                 }
-            _lock.unlock() // {
+            self._lock.unlock() // {
 
             if let errorEvent = errorEvent {
                 self.forwardOn(errorEvent)
@@ -113,10 +111,7 @@ final fileprivate class DelaySink
                     }
                 }
                 else if let nextEventToScheduleOriginalTime = nextEventToScheduleOriginalTime {
-                    let elapsedTime = _scheduler.now.timeIntervalSince(nextEventToScheduleOriginalTime)
-                    let interval = _dueTime - elapsedTime
-                    let normalizedInterval = interval < 0.0 ? 0.0 : interval
-                    scheduler.schedule((), dueTime: normalizedInterval)
+                    scheduler.schedule((), dueTime: self._dueTime.reduceWithSpanBetween(earlierDate: nextEventToScheduleOriginalTime, laterDate: self._scheduler.now))
                     return
                 }
                 else {
@@ -126,56 +121,56 @@ final fileprivate class DelaySink
         }
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         if event.isStopEvent {
-            _sourceSubscription.dispose()
+            self._sourceSubscription.dispose()
         }
 
         switch event {
-        case .error(_):
-            _lock.lock()    // {
-                let shouldSendImmediately = !_running
-                _queue = Queue(capacity: 0)
-                _errorEvent = event
-            _lock.unlock()  // }
+        case .error:
+            self._lock.lock()    // {
+                let shouldSendImmediately = !self._running
+                self._queue = Queue(capacity: 0)
+                self._errorEvent = event
+            self._lock.unlock()  // }
 
             if shouldSendImmediately {
-                forwardOn(event)
-                dispose()
+                self.forwardOn(event)
+                self.dispose()
             }
         default:
-            _lock.lock()    // {
-                let shouldSchedule = !_active
-                _active = true
-                _queue.enqueue((_scheduler.now, event))
-            _lock.unlock()  // }
+            self._lock.lock()    // {
+                let shouldSchedule = !self._active
+                self._active = true
+                self._queue.enqueue((self._scheduler.now, event))
+            self._lock.unlock()  // }
 
             if shouldSchedule {
-                _cancelable.disposable = _scheduler.scheduleRecursive((), dueTime: _dueTime, action: self.drainQueue)
+                self._cancelable.disposable = self._scheduler.scheduleRecursive((), dueTime: self._dueTime, action: self.drainQueue)
             }
         }
     }
     
-    func run(source: Observable) -> Disposable {
-        _sourceSubscription.setDisposable(source.subscribe(self))
+    func run(source: Observable) -> Disposable {
+        self._sourceSubscription.setDisposable(source.subscribe(self))
         return Disposables.create(_sourceSubscription, _cancelable)
     }
 }
 
-final fileprivate class Delay: Producer {
+final private class Delay: Producer {
     private let _source: Observable
     private let _dueTime: RxTimeInterval
     private let _scheduler: SchedulerType
     
     init(source: Observable, dueTime: RxTimeInterval, scheduler: SchedulerType) {
-        _source = source
-        _dueTime = dueTime
-        _scheduler = scheduler
+        self._source = source
+        self._dueTime = dueTime
+        self._scheduler = scheduler
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let sink = DelaySink(observer: observer, dueTime: _dueTime, scheduler: _scheduler, cancel: cancel)
-        let subscription = sink.run(source: _source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = DelaySink(observer: observer, dueTime: self._dueTime, scheduler: self._scheduler, cancel: cancel)
+        let subscription = sink.run(source: self._source)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/DelaySubscription.swift b/Demo/Pods/RxSwift/RxSwift/Observables/DelaySubscription.swift
index 9225a19..a329d60 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/DelaySubscription.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/DelaySubscription.swift
@@ -18,46 +18,38 @@ extension ObservableType {
      - returns: Time-shifted sequence.
      */
     public func delaySubscription(_ dueTime: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
         return DelaySubscription(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler)
     }
 }
 
-final fileprivate class DelaySubscriptionSink
-    : Sink, ObserverType {
-    typealias E = O.E
-    typealias Parent = DelaySubscription
+final private class DelaySubscriptionSink
+    : Sink, ObserverType {
+    typealias Element = Observer.Element 
     
-    private let _parent: Parent
-    
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        forwardOn(event)
+    func on(_ event: Event) {
+        self.forwardOn(event)
         if event.isStopEvent {
-            dispose()
+            self.dispose()
         }
     }
     
 }
 
-final fileprivate class DelaySubscription: Producer {
+final private class DelaySubscription: Producer {
     private let _source: Observable
     private let _dueTime: RxTimeInterval
     private let _scheduler: SchedulerType
     
     init(source: Observable, dueTime: RxTimeInterval, scheduler: SchedulerType) {
-        _source = source
-        _dueTime = dueTime
-        _scheduler = scheduler
+        self._source = source
+        self._dueTime = dueTime
+        self._scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let sink = DelaySubscriptionSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _scheduler.scheduleRelative((), dueTime: _dueTime) { _ in
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = DelaySubscriptionSink(observer: observer, cancel: cancel)
+        let subscription = self._scheduler.scheduleRelative((), dueTime: self._dueTime) { _ in
             return self._source.subscribe(sink)
         }
 
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Dematerialize.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Dematerialize.swift
index d142249..8337311 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Dematerialize.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Dematerialize.swift
@@ -6,46 +6,46 @@
 //  Copyright © 2017 Krunoslav Zaher. All rights reserved.
 //
 
-extension ObservableType where E: EventConvertible {
+extension ObservableType where Element: EventConvertible {
     /**
      Convert any previously materialized Observable into it's original form.
      - seealso: [materialize operator on reactivex.io](http://reactivex.io/documentation/operators/materialize-dematerialize.html)
      - returns: The dematerialized observable sequence.
      */
-    public func dematerialize() -> Observable {
+    public func dematerialize() -> Observable {
         return Dematerialize(source: self.asObservable())
     }
 
 }
 
-fileprivate final class DematerializeSink: Sink, ObserverType where O.E == Element.ElementType {
-    fileprivate func on(_ event: Event) {
+fileprivate final class DematerializeSink: Sink, ObserverType where Observer.Element == T.Element {
+    fileprivate func on(_ event: Event) {
         switch event {
         case .next(let element):
-            forwardOn(element.event)
+            self.forwardOn(element.event)
             if element.event.isStopEvent {
-                dispose()
+                self.dispose()
             }
         case .completed:
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         case .error(let error):
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Dematerialize: Producer  {
-    private let _source: Observable
-    
-    init(source: Observable) {
-        _source = source
+final private class Dematerialize: Producer {
+    private let _source: Observable
+
+    init(source: Observable) {
+        self._source = source
     }
-    
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element.ElementType {
-        let sink = DematerializeSink(observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == T.Element {
+        let sink = DematerializeSink(observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/DistinctUntilChanged.swift b/Demo/Pods/RxSwift/RxSwift/Observables/DistinctUntilChanged.swift
index f72f520..5bf38d6 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/DistinctUntilChanged.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/DistinctUntilChanged.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-extension ObservableType where E: Equatable {
+extension ObservableType where Element: Equatable {
 
     /**
      Returns an observable sequence that contains only distinct contiguous elements according to equality operator.
@@ -16,7 +16,7 @@ extension ObservableType where E: Equatable {
      - returns: An observable sequence only containing the distinct contiguous elements, based on equality operator, from the source sequence.
      */
     public func distinctUntilChanged()
-        -> Observable {
+        -> Observable {
             return self.distinctUntilChanged({ $0 }, comparer: { ($0 == $1) })
     }
 }
@@ -30,8 +30,8 @@ extension ObservableType {
      - parameter keySelector: A function to compute the comparison key for each element.
      - returns: An observable sequence only containing the distinct contiguous elements, based on a computed key value, from the source sequence.
      */
-    public func distinctUntilChanged(_ keySelector: @escaping (E) throws -> K)
-        -> Observable {
+    public func distinctUntilChanged(_ keySelector: @escaping (Element) throws -> Key)
+        -> Observable {
             return self.distinctUntilChanged(keySelector, comparer: { $0 == $1 })
     }
 
@@ -43,8 +43,8 @@ extension ObservableType {
      - parameter comparer: Equality comparer for computed key values.
      - returns: An observable sequence only containing the distinct contiguous elements, based on `comparer`, from the source sequence.
      */
-    public func distinctUntilChanged(_ comparer: @escaping (E, E) throws -> Bool)
-        -> Observable {
+    public func distinctUntilChanged(_ comparer: @escaping (Element, Element) throws -> Bool)
+        -> Observable {
             return self.distinctUntilChanged({ $0 }, comparer: comparer)
     }
 
@@ -57,53 +57,53 @@ extension ObservableType {
      - parameter comparer: Equality comparer for computed key values.
      - returns: An observable sequence only containing the distinct contiguous elements, based on a computed key value and the comparer, from the source sequence.
      */
-    public func distinctUntilChanged(_ keySelector: @escaping (E) throws -> K, comparer: @escaping (K, K) throws -> Bool)
-        -> Observable {
+    public func distinctUntilChanged(_ keySelector: @escaping (Element) throws -> K, comparer: @escaping (K, K) throws -> Bool)
+        -> Observable {
             return DistinctUntilChanged(source: self.asObservable(), selector: keySelector, comparer: comparer)
     }
 }
 
-final fileprivate class DistinctUntilChangedSink: Sink, ObserverType {
-    typealias E = O.E
+final private class DistinctUntilChangedSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
     
-    private let _parent: DistinctUntilChanged
-    private var _currentKey: Key? = nil
+    private let _parent: DistinctUntilChanged
+    private var _currentKey: Key?
     
-    init(parent: DistinctUntilChanged, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: DistinctUntilChanged, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next(let value):
             do {
-                let key = try _parent._selector(value)
+                let key = try self._parent._selector(value)
                 var areEqual = false
-                if let currentKey = _currentKey {
-                    areEqual = try _parent._comparer(currentKey, key)
+                if let currentKey = self._currentKey {
+                    areEqual = try self._parent._comparer(currentKey, key)
                 }
                 
                 if areEqual {
                     return
                 }
                 
-                _currentKey = key
+                self._currentKey = key
                 
-                forwardOn(event)
+                self.forwardOn(event)
             }
             catch let error {
-                forwardOn(.error(error))
-                dispose()
+                self.forwardOn(.error(error))
+                self.dispose()
             }
         case .error, .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class DistinctUntilChanged: Producer {
+final private class DistinctUntilChanged: Producer {
     typealias KeySelector = (Element) throws -> Key
     typealias EqualityComparer = (Key, Key) throws -> Bool
     
@@ -112,14 +112,14 @@ final fileprivate class DistinctUntilChanged: Producer {
     fileprivate let _comparer: EqualityComparer
     
     init(source: Observable, selector: @escaping KeySelector, comparer: @escaping EqualityComparer) {
-        _source = source
-        _selector = selector
-        _comparer = comparer
+        self._source = source
+        self._selector = selector
+        self._comparer = comparer
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = DistinctUntilChangedSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Do.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Do.swift
index 2be6d58..8f0c228 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Do.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Do.swift
@@ -13,15 +13,18 @@ extension ObservableType {
      - seealso: [do operator on reactivex.io](http://reactivex.io/documentation/operators/do.html)
 
      - parameter onNext: Action to invoke for each element in the observable sequence.
+     - parameter afterNext: Action to invoke for each element after the observable has passed an onNext event along to its downstream.
      - parameter onError: Action to invoke upon errored termination of the observable sequence.
+     - parameter afterError: Action to invoke after errored termination of the observable sequence.
      - parameter onCompleted: Action to invoke upon graceful termination of the observable sequence.
+     - parameter afterCompleted: Action to invoke after graceful termination of the observable sequence.
      - parameter onSubscribe: Action to invoke before subscribing to source observable sequence.
      - parameter onSubscribed: Action to invoke after subscribing to source observable sequence.
      - parameter onDispose: Action to invoke after subscription to source observable has been disposed for any reason. It can be either because sequence terminates for some reason or observer subscription being disposed.
      - returns: The source sequence with the side-effecting behavior applied.
      */
-    public func `do`(onNext: ((E) throws -> Void)? = nil, onError: ((Swift.Error) throws -> Void)? = nil, onCompleted: (() throws -> Void)? = nil, onSubscribe: (() -> ())? = nil, onSubscribed: (() -> ())? = nil, onDispose: (() -> ())? = nil)
-        -> Observable {
+    public func `do`(onNext: ((Element) throws -> Void)? = nil, afterNext: ((Element) throws -> Void)? = nil, onError: ((Swift.Error) throws -> Void)? = nil, afterError: ((Swift.Error) throws -> Void)? = nil, onCompleted: (() throws -> Void)? = nil, afterCompleted: (() throws -> Void)? = nil, onSubscribe: (() -> Void)? = nil, onSubscribed: (() -> Void)? = nil, onDispose: (() -> Void)? = nil)
+        -> Observable {
             return Do(source: self.asObservable(), eventHandler: { e in
                 switch e {
                 case .next(let element):
@@ -31,59 +34,75 @@ extension ObservableType {
                 case .completed:
                     try onCompleted?()
                 }
+            }, afterEventHandler: { e in
+                switch e {
+                case .next(let element):
+                    try afterNext?(element)
+                case .error(let e):
+                    try afterError?(e)
+                case .completed:
+                    try afterCompleted?()
+                }
             }, onSubscribe: onSubscribe, onSubscribed: onSubscribed, onDispose: onDispose)
     }
 }
 
-final fileprivate class DoSink : Sink, ObserverType {
-    typealias Element = O.E
+final private class DoSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
     typealias EventHandler = (Event) throws -> Void
+    typealias AfterEventHandler = (Event) throws -> Void
     
     private let _eventHandler: EventHandler
+    private let _afterEventHandler: AfterEventHandler
     
-    init(eventHandler: @escaping EventHandler, observer: O, cancel: Cancelable) {
-        _eventHandler = eventHandler
+    init(eventHandler: @escaping EventHandler, afterEventHandler: @escaping AfterEventHandler, observer: Observer, cancel: Cancelable) {
+        self._eventHandler = eventHandler
+        self._afterEventHandler = afterEventHandler
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event) {
         do {
-            try _eventHandler(event)
-            forwardOn(event)
+            try self._eventHandler(event)
+            self.forwardOn(event)
+            try self._afterEventHandler(event)
             if event.isStopEvent {
-                dispose()
+                self.dispose()
             }
         }
         catch let error {
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Do : Producer {
+final private class Do: Producer {
     typealias EventHandler = (Event) throws -> Void
+    typealias AfterEventHandler = (Event) throws -> Void
     
     fileprivate let _source: Observable
     fileprivate let _eventHandler: EventHandler
-    fileprivate let _onSubscribe: (() -> ())?
-    fileprivate let _onSubscribed: (() -> ())?
-    fileprivate let _onDispose: (() -> ())?
+    fileprivate let _afterEventHandler: AfterEventHandler
+    fileprivate let _onSubscribe: (() -> Void)?
+    fileprivate let _onSubscribed: (() -> Void)?
+    fileprivate let _onDispose: (() -> Void)?
     
-    init(source: Observable, eventHandler: @escaping EventHandler, onSubscribe: (() -> ())?, onSubscribed: (() -> ())?, onDispose: (() -> ())?) {
-        _source = source
-        _eventHandler = eventHandler
-        _onSubscribe = onSubscribe
-        _onSubscribed = onSubscribed
-        _onDispose = onDispose
+    init(source: Observable, eventHandler: @escaping EventHandler, afterEventHandler: @escaping AfterEventHandler, onSubscribe: (() -> Void)?, onSubscribed: (() -> Void)?, onDispose: (() -> Void)?) {
+        self._source = source
+        self._eventHandler = eventHandler
+        self._afterEventHandler = afterEventHandler
+        self._onSubscribe = onSubscribe
+        self._onSubscribed = onSubscribed
+        self._onDispose = onDispose
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        _onSubscribe?()
-        let sink = DoSink(eventHandler: _eventHandler, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
-        _onSubscribed?()
-        let onDispose = _onDispose
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        self._onSubscribe?()
+        let sink = DoSink(eventHandler: self._eventHandler, afterEventHandler: self._afterEventHandler, observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
+        self._onSubscribed?()
+        let onDispose = self._onDispose
         let allSubscriptions = Disposables.create {
             subscription.dispose()
             onDispose?()
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/ElementAt.swift b/Demo/Pods/RxSwift/RxSwift/Observables/ElementAt.swift
index 500a044..f8750f0 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/ElementAt.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/ElementAt.swift
@@ -17,51 +17,51 @@ extension ObservableType {
      - returns: An observable sequence that emits the desired element as its own sole emission.
      */
     public func elementAt(_ index: Int)
-        -> Observable {
-        return ElementAt(source: asObservable(), index: index, throwOnEmpty: true)
+        -> Observable {
+        return ElementAt(source: self.asObservable(), index: index, throwOnEmpty: true)
     }
 }
 
-final fileprivate class ElementAtSink : Sink, ObserverType {
-    typealias SourceType = O.E
+final private class ElementAtSink: Sink, ObserverType {
+    typealias SourceType = Observer.Element
     typealias Parent = ElementAt
     
     let _parent: Parent
     var _i: Int
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _i = parent._index
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._i = parent._index
         
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event) {
         switch event {
-        case .next(_):
+        case .next:
 
-            if (_i == 0) {
-                forwardOn(event)
-                forwardOn(.completed)
+            if self._i == 0 {
+                self.forwardOn(event)
+                self.forwardOn(.completed)
                 self.dispose()
             }
             
             do {
-                let _ = try decrementChecked(&_i)
-            } catch(let e) {
-                forwardOn(.error(e))
-                dispose()
+                _ = try decrementChecked(&self._i)
+            } catch let e {
+                self.forwardOn(.error(e))
+                self.dispose()
                 return
             }
             
         case .error(let e):
-            forwardOn(.error(e))
+            self.forwardOn(.error(e))
             self.dispose()
         case .completed:
-            if (_parent._throwOnEmpty) {
-                forwardOn(.error(RxError.argumentOutOfRange))
+            if self._parent._throwOnEmpty {
+                self.forwardOn(.error(RxError.argumentOutOfRange))
             } else {
-                forwardOn(.completed)
+                self.forwardOn(.completed)
             }
             
             self.dispose()
@@ -69,8 +69,7 @@ final fileprivate class ElementAtSink : Sink, ObserverType {
     }
 }
 
-final fileprivate class ElementAt : Producer {
-    
+final private class ElementAt: Producer {
     let _source: Observable
     let _throwOnEmpty: Bool
     let _index: Int
@@ -85,9 +84,9 @@ final fileprivate class ElementAt : Producer {
         self._throwOnEmpty = throwOnEmpty
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceType {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == SourceType {
         let sink = ElementAtSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Empty.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Empty.swift
index d2dcdb0..4ea2995 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Empty.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Empty.swift
@@ -14,13 +14,13 @@ extension ObservableType {
 
      - returns: An observable sequence with no elements.
      */
-    public static func empty() -> Observable {
-        return EmptyProducer()
+    public static func empty() -> Observable {
+        return EmptyProducer()
     }
 }
 
-final fileprivate class EmptyProducer : Producer {
-    override func subscribe(_ observer: O) -> Disposable where O.E == Element {
+final private class EmptyProducer: Producer {
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
         observer.on(.completed)
         return Disposables.create()
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Enumerated.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Enumerated.swift
index 2a6cd98..bd92381 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Enumerated.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Enumerated.swift
@@ -16,47 +16,46 @@ extension ObservableType {
      - returns: An observable sequence that contains tuples of source sequence elements and their indexes.
      */
     public func enumerated()
-        -> Observable<(index: Int, element: E)> {
+        -> Observable<(index: Int, element: Element)> {
         return Enumerated(source: self.asObservable())
     }
 }
 
-final fileprivate class EnumeratedSink: Sink, ObserverType where O.E == (index: Int, element: Element) {
-    typealias E = Element
+final private class EnumeratedSink: Sink, ObserverType where Observer.Element == (index: Int, element: Element) {
     var index = 0
     
     func on(_ event: Event) {
         switch event {
         case .next(let value):
             do {
-                let nextIndex = try incrementChecked(&index)
+                let nextIndex = try incrementChecked(&self.index)
                 let next = (index: nextIndex, element: value)
-                forwardOn(.next(next))
+                self.forwardOn(.next(next))
             }
             catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
             }
         case .completed:
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         case .error(let error):
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Enumerated : Producer<(index: Int, element: Element)> {
+final private class Enumerated: Producer<(index: Int, element: Element)> {
     private let _source: Observable
 
     init(source: Observable) {
-        _source = source
+        self._source = source
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == (index: Int, element: Element) {
-        let sink = EnumeratedSink(observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == (index: Int, element: Element) {
+        let sink = EnumeratedSink(observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Error.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Error.swift
index a15942b..530fe3e 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Error.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Error.swift
@@ -14,20 +14,20 @@ extension ObservableType {
 
      - returns: The observable sequence that terminates with specified error.
      */
-    public static func error(_ error: Swift.Error) -> Observable {
+    public static func error(_ error: Swift.Error) -> Observable {
         return ErrorProducer(error: error)
     }
 }
 
-final fileprivate class ErrorProducer : Producer {
+final private class ErrorProducer: Producer {
     private let _error: Swift.Error
     
     init(error: Swift.Error) {
-        _error = error
+        self._error = error
     }
     
-    override func subscribe(_ observer: O) -> Disposable where O.E == Element {
-        observer.on(.error(_error))
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        observer.on(.error(self._error))
         return Disposables.create()
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Filter.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Filter.swift
index 05dc8a4..5f787d6 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Filter.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Filter.swift
@@ -16,9 +16,9 @@ extension ObservableType {
      - parameter predicate: A function to test each source element for a condition.
      - returns: An observable sequence that contains elements from the input sequence that satisfy the condition.
      */
-    public func filter(_ predicate: @escaping (E) throws -> Bool)
-        -> Observable {
-        return Filter(source: asObservable(), predicate: predicate)
+    public func filter(_ predicate: @escaping (Element) throws -> Bool)
+        -> Observable {
+        return Filter(source: self.asObservable(), predicate: predicate)
     }
 }
 
@@ -33,58 +33,58 @@ extension ObservableType {
      */
     public func ignoreElements()
         -> Completable {
-            return flatMap { _ in
+            return self.flatMap { _ in
                 return Observable.empty()
             }
             .asCompletable()
     }
 }
 
-final fileprivate class FilterSink: Sink, ObserverType {
+final private class FilterSink: Sink, ObserverType {
     typealias Predicate = (Element) throws -> Bool
-    typealias Element = O.E
+    typealias Element = Observer.Element
     
     private let _predicate: Predicate
     
-    init(predicate: @escaping Predicate, observer: O, cancel: Cancelable) {
-        _predicate = predicate
+    init(predicate: @escaping Predicate, observer: Observer, cancel: Cancelable) {
+        self._predicate = predicate
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event) {
         switch event {
-            case .next(let value):
-                do {
-                    let satisfies = try _predicate(value)
-                    if satisfies {
-                        forwardOn(.next(value))
-                    }
+        case .next(let value):
+            do {
+                let satisfies = try self._predicate(value)
+                if satisfies {
+                    self.forwardOn(.next(value))
                 }
-                catch let e {
-                    forwardOn(.error(e))
-                    dispose()
-                }
-            case .completed, .error:
-                forwardOn(event)
-                dispose()
+            }
+            catch let e {
+                self.forwardOn(.error(e))
+                self.dispose()
+            }
+        case .completed, .error:
+            self.forwardOn(event)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Filter : Producer {
+final private class Filter: Producer {
     typealias Predicate = (Element) throws -> Bool
     
     private let _source: Observable
     private let _predicate: Predicate
     
     init(source: Observable, predicate: @escaping Predicate) {
-        _source = source
-        _predicate = predicate
+        self._source = source
+        self._predicate = predicate
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let sink = FilterSink(predicate: _predicate, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = FilterSink(predicate: self._predicate, observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/First.swift b/Demo/Pods/RxSwift/RxSwift/Observables/First.swift
index 4a72ba0..4c56223 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/First.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/First.swift
@@ -6,23 +6,22 @@
 //  Copyright © 2017 Krunoslav Zaher. All rights reserved.
 //
 
-fileprivate final class FirstSink : Sink, ObserverType where O.E == Element? {
-    typealias E = Element
-    typealias Parent = First
+fileprivate final class FirstSink : Sink, ObserverType where Observer.Element == Element? {
+    typealias Parent = First
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next(let value):
-            forwardOn(.next(value))
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.next(value))
+            self.forwardOn(.completed)
+            self.dispose()
         case .error(let error):
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            forwardOn(.next(nil))
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.next(nil))
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
@@ -31,12 +30,12 @@ final class First: Producer {
     fileprivate let _source: Observable
 
     init(source: Observable) {
-        _source = source
+        self._source = source
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element? {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element? {
         let sink = FirstSink(observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Generate.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Generate.swift
index 6469937..5c9d0c1 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Generate.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Generate.swift
@@ -19,26 +19,26 @@ extension ObservableType {
      - parameter scheduler: Scheduler on which to run the generator loop.
      - returns: The generated sequence.
      */
-    public static func generate(initialState: E, condition: @escaping (E) throws -> Bool, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance, iterate: @escaping (E) throws -> E) -> Observable {
+    public static func generate(initialState: Element, condition: @escaping (Element) throws -> Bool, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance, iterate: @escaping (Element) throws -> Element) -> Observable {
         return Generate(initialState: initialState, condition: condition, iterate: iterate, resultSelector: { $0 }, scheduler: scheduler)
     }
 }
 
-final fileprivate class GenerateSink : Sink {
-    typealias Parent = Generate
+final private class GenerateSink: Sink {
+    typealias Parent = Generate
     
     private let _parent: Parent
     
-    private var _state: S
+    private var _state: Sequence
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _state = parent._initialState
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._state = parent._initialState
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
-        return _parent._scheduler.scheduleRecursive(true) { (isFirst, recurse) -> Void in
+        return self._parent._scheduler.scheduleRecursive(true) { isFirst, recurse -> Void in
             do {
                 if !isFirst {
                     self._state = try self._parent._iterate(self._state)
@@ -63,23 +63,23 @@ final fileprivate class GenerateSink : Sink {
     }
 }
 
-final fileprivate class Generate : Producer {
-    fileprivate let _initialState: S
-    fileprivate let _condition: (S) throws -> Bool
-    fileprivate let _iterate: (S) throws -> S
-    fileprivate let _resultSelector: (S) throws -> E
+final private class Generate: Producer {
+    fileprivate let _initialState: Sequence
+    fileprivate let _condition: (Sequence) throws -> Bool
+    fileprivate let _iterate: (Sequence) throws -> Sequence
+    fileprivate let _resultSelector: (Sequence) throws -> Element
     fileprivate let _scheduler: ImmediateSchedulerType
     
-    init(initialState: S, condition: @escaping (S) throws -> Bool, iterate: @escaping (S) throws -> S, resultSelector: @escaping (S) throws -> E, scheduler: ImmediateSchedulerType) {
-        _initialState = initialState
-        _condition = condition
-        _iterate = iterate
-        _resultSelector = resultSelector
-        _scheduler = scheduler
+    init(initialState: Sequence, condition: @escaping (Sequence) throws -> Bool, iterate: @escaping (Sequence) throws -> Sequence, resultSelector: @escaping (Sequence) throws -> Element, scheduler: ImmediateSchedulerType) {
+        self._initialState = initialState
+        self._condition = condition
+        self._iterate = iterate
+        self._resultSelector = resultSelector
+        self._scheduler = scheduler
         super.init()
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = GenerateSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/GroupBy.swift b/Demo/Pods/RxSwift/RxSwift/Observables/GroupBy.swift
index a8a0e78..6ae101c 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/GroupBy.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/GroupBy.swift
@@ -15,34 +15,33 @@ extension ObservableType {
      - parameter keySelector: A function to extract the key for each element.
      - returns: A sequence of observable groups, each of which corresponds to a unique key value, containing all elements that share that same key value.
      */
-    public func groupBy(keySelector: @escaping (E) throws -> K)
-        -> Observable> {
+    public func groupBy(keySelector: @escaping (Element) throws -> Key)
+        -> Observable> {
         return GroupBy(source: self.asObservable(), selector: keySelector)
     }
 }
 
-final fileprivate class GroupedObservableImpl : Observable {
+final private class GroupedObservableImpl: Observable {
     private var _subject: PublishSubject
     private var _refCount: RefCountDisposable
     
-    init(key: Key, subject: PublishSubject, refCount: RefCountDisposable) {
-        _subject = subject
-        _refCount = refCount
+    init(subject: PublishSubject, refCount: RefCountDisposable) {
+        self._subject = subject
+        self._refCount = refCount
     }
 
-    override public func subscribe(_ observer: O) -> Disposable where O.E == E {
-        let release = _refCount.retain()
-        let subscription = _subject.subscribe(observer)
+    override public func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        let release = self._refCount.retain()
+        let subscription = self._subject.subscribe(observer)
         return Disposables.create(release, subscription)
     }
 }
 
 
-final fileprivate class GroupBySink
-    : Sink
-    , ObserverType where O.E == GroupedObservable {
-    typealias E = Element
-    typealias ResultType = O.E
+final private class GroupBySink
+    : Sink
+    , ObserverType where Observer.Element == GroupedObservable {
+    typealias ResultType = Observer.Element 
     typealias Parent = GroupBy
 
     private let _parent: Parent
@@ -50,33 +49,33 @@ final fileprivate class GroupBySink
     private var _refCountDisposable: RefCountDisposable!
     private var _groupedSubjectTable: [Key: PublishSubject]
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _groupedSubjectTable = [Key: PublishSubject]()
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._groupedSubjectTable = [Key: PublishSubject]()
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
-        _refCountDisposable = RefCountDisposable(disposable: _subscription)
+        self._refCountDisposable = RefCountDisposable(disposable: self._subscription)
         
-        _subscription.setDisposable(_parent._source.subscribe(self))
+        self._subscription.setDisposable(self._parent._source.subscribe(self))
         
-        return _refCountDisposable
+        return self._refCountDisposable
     }
     
     private func onGroupEvent(key: Key, value: Element) {
-        if let writer = _groupedSubjectTable[key] {
+        if let writer = self._groupedSubjectTable[key] {
             writer.on(.next(value))
         } else {
             let writer = PublishSubject()
-            _groupedSubjectTable[key] = writer
+            self._groupedSubjectTable[key] = writer
             
             let group = GroupedObservable(
                 key: key,
-                source: GroupedObservableImpl(key: key, subject: writer, refCount: _refCountDisposable)
+                source: GroupedObservableImpl(subject: writer, refCount: _refCountDisposable)
             )
             
-            forwardOn(.next(group))
+            self.forwardOn(.next(group))
             writer.on(.next(value))
         }
     }
@@ -85,49 +84,49 @@ final fileprivate class GroupBySink
         switch event {
         case let .next(value):
             do {
-                let groupKey = try _parent._selector(value)
-                onGroupEvent(key: groupKey, value: value)
+                let groupKey = try self._parent._selector(value)
+                self.onGroupEvent(key: groupKey, value: value)
             }
             catch let e {
-                error(e)
+                self.error(e)
                 return
             }
         case let .error(e):
-            error(e)
+            self.error(e)
         case .completed:
-            forwardOnGroups(event: .completed)
-            forwardOn(.completed)
-            _subscription.dispose()
-            dispose()
+            self.forwardOnGroups(event: .completed)
+            self.forwardOn(.completed)
+            self._subscription.dispose()
+            self.dispose()
         }
     }
 
     final func error(_ error: Swift.Error) {
-        forwardOnGroups(event: .error(error))
-        forwardOn(.error(error))
-        _subscription.dispose()
-        dispose()
+        self.forwardOnGroups(event: .error(error))
+        self.forwardOn(.error(error))
+        self._subscription.dispose()
+        self.dispose()
     }
     
     final func forwardOnGroups(event: Event) {
-        for writer in _groupedSubjectTable.values {
+        for writer in self._groupedSubjectTable.values {
             writer.on(event)
         }
     }
 }
 
-final fileprivate class GroupBy: Producer> {
+final private class GroupBy: Producer> {
     typealias KeySelector = (Element) throws -> Key
 
     fileprivate let _source: Observable
     fileprivate let _selector: KeySelector
     
     init(source: Observable, selector: @escaping KeySelector) {
-        _source = source
-        _selector = selector
+        self._source = source
+        self._selector = selector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == GroupedObservable {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == GroupedObservable {
         let sink = GroupBySink(parent: self, observer: observer, cancel: cancel)
         return (sink: sink, subscription: sink.run())
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Just.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Just.swift
index 4e49059..df4f302 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Just.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Just.swift
@@ -15,7 +15,7 @@ extension ObservableType {
      - parameter element: Single element in the resulting observable sequence.
      - returns: An observable sequence containing the single specified element.
      */
-    public static func just(_ element: E) -> Observable {
+    public static func just(_ element: Element) -> Observable {
         return Just(element: element)
     }
 
@@ -28,24 +28,24 @@ extension ObservableType {
      - parameter scheduler: Scheduler to send the single element on.
      - returns: An observable sequence containing the single specified element.
      */
-    public static func just(_ element: E, scheduler: ImmediateSchedulerType) -> Observable {
+    public static func just(_ element: Element, scheduler: ImmediateSchedulerType) -> Observable {
         return JustScheduled(element: element, scheduler: scheduler)
     }
 }
 
-final fileprivate class JustScheduledSink : Sink {
-    typealias Parent = JustScheduled
+final private class JustScheduledSink: Sink {
+    typealias Parent = JustScheduled
 
     private let _parent: Parent
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
 
     func run() -> Disposable {
-        let scheduler = _parent._scheduler
-        return scheduler.schedule(_parent._element) { element in
+        let scheduler = self._parent._scheduler
+        return scheduler.schedule(self._parent._element) { element in
             self.forwardOn(.next(element))
             return scheduler.schedule(()) { _ in
                 self.forwardOn(.completed)
@@ -56,31 +56,31 @@ final fileprivate class JustScheduledSink : Sink {
     }
 }
 
-final fileprivate class JustScheduled : Producer {
+final private class JustScheduled: Producer {
     fileprivate let _scheduler: ImmediateSchedulerType
     fileprivate let _element: Element
 
     init(element: Element, scheduler: ImmediateSchedulerType) {
-        _scheduler = scheduler
-        _element = element
+        self._scheduler = scheduler
+        self._element = element
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = JustScheduledSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class Just : Producer {
+final private class Just: Producer {
     private let _element: Element
     
     init(element: Element) {
-        _element = element
+        self._element = element
     }
     
-    override func subscribe(_ observer: O) -> Disposable where O.E == Element {
-        observer.on(.next(_element))
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        observer.on(.next(self._element))
         observer.on(.completed)
         return Disposables.create()
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Map.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Map.swift
index df0e0d1..315f375 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Map.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Map.swift
@@ -17,22 +17,22 @@ extension ObservableType {
      - returns: An observable sequence whose elements are the result of invoking the transform function on each element of source.
 
      */
-    public func map(_ transform: @escaping (E) throws -> R)
-        -> Observable {
+    public func map(_ transform: @escaping (Element) throws -> Result)
+        -> Observable {
         return self.asObservable().composeMap(transform)
     }
 }
 
-final fileprivate class MapSink : Sink, ObserverType {
+final private class MapSink: Sink, ObserverType {
     typealias Transform = (SourceType) throws -> ResultType
 
-    typealias ResultType = O.E
+    typealias ResultType = Observer.Element 
     typealias Element = SourceType
 
     private let _transform: Transform
-    
-    init(transform: @escaping Transform, observer: O, cancel: Cancelable) {
-        _transform = transform
+
+    init(transform: @escaping Transform, observer: Observer, cancel: Cancelable) {
+        self._transform = transform
         super.init(observer: observer, cancel: cancel)
     }
 
@@ -40,37 +40,37 @@ final fileprivate class MapSink : Sink, Observe
         switch event {
         case .next(let element):
             do {
-                let mappedElement = try _transform(element)
-                forwardOn(.next(mappedElement))
+                let mappedElement = try self._transform(element)
+                self.forwardOn(.next(mappedElement))
             }
             catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
             }
         case .error(let error):
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
 
 #if TRACE_RESOURCES
-    fileprivate var _numberOfMapOperators: AtomicInt = 0
+    fileprivate let _numberOfMapOperators = AtomicInt(0)
     extension Resources {
         public static var numberOfMapOperators: Int32 {
-            return _numberOfMapOperators.valueSnapshot()
+            return load(_numberOfMapOperators)
         }
     }
 #endif
 
-internal func _map(source: Observable, transform: @escaping (Element) throws -> R) -> Observable {
+internal func _map(source: Observable, transform: @escaping (Element) throws -> Result) -> Observable {
     return Map(source: source, transform: transform)
 }
 
-final fileprivate class Map: Producer {
+final private class Map: Producer {
     typealias Transform = (SourceType) throws -> ResultType
 
     private let _source: Observable
@@ -78,31 +78,31 @@ final fileprivate class Map: Producer {
     private let _transform: Transform
 
     init(source: Observable, transform: @escaping Transform) {
-        _source = source
-        _transform = transform
+        self._source = source
+        self._transform = transform
 
 #if TRACE_RESOURCES
-        let _ = AtomicIncrement(&_numberOfMapOperators)
+        _ = increment(_numberOfMapOperators)
 #endif
     }
 
-    override func composeMap(_ selector: @escaping (ResultType) throws -> R) -> Observable {
-        let originalSelector = _transform
-        return Map(source: _source, transform: { (s: SourceType) throws -> R in
+    override func composeMap(_ selector: @escaping (ResultType) throws -> Result) -> Observable {
+        let originalSelector = self._transform
+        return Map(source: self._source, transform: { (s: SourceType) throws -> Result in
             let r: ResultType = try originalSelector(s)
             return try selector(r)
         })
     }
-    
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == ResultType {
-        let sink = MapSink(transform: _transform, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == ResultType {
+        let sink = MapSink(transform: self._transform, observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 
     #if TRACE_RESOURCES
     deinit {
-        let _ = AtomicDecrement(&_numberOfMapOperators)
+        _ = decrement(_numberOfMapOperators)
     }
     #endif
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Materialize.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Materialize.swift
index cf19b6d..e035e96 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Materialize.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Materialize.swift
@@ -12,32 +12,32 @@ extension ObservableType {
      - seealso: [materialize operator on reactivex.io](http://reactivex.io/documentation/operators/materialize-dematerialize.html)
      - returns: An observable sequence that wraps events in an Event. The returned Observable never errors, but it does complete after observing all of the events of the underlying Observable.
      */
-    public func materialize() -> Observable> {
+    public func materialize() -> Observable> {
         return Materialize(source: self.asObservable())
     }
 }
 
-fileprivate final class MaterializeSink: Sink, ObserverType where O.E == Event {
-    
+fileprivate final class MaterializeSink: Sink, ObserverType where Observer.Element == Event {
+
     func on(_ event: Event) {
-        forwardOn(.next(event))
+        self.forwardOn(.next(event))
         if event.isStopEvent {
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Materialize: Producer> {
-    private let _source: Observable
-    
-    init(source: Observable) {
-        _source = source
+final private class Materialize: Producer> {
+    private let _source: Observable
+
+    init(source: Observable) {
+        self._source = source
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = MaterializeSink(observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
 
         return (sink: sink, subscription: subscription)
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Merge.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Merge.swift
index b2f9a0d..3bc7943 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Merge.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Merge.swift
@@ -16,9 +16,9 @@ extension ObservableType {
      - parameter selector: A transform function to apply to each element.
      - returns: An observable sequence whose elements are the result of invoking the one-to-many transform function on each element of the input sequence.
      */
-    public func flatMap(_ selector: @escaping (E) throws -> O)
-        -> Observable {
-            return FlatMap(source: asObservable(), selector: selector)
+    public func flatMap(_ selector: @escaping (Element) throws -> Source)
+        -> Observable {
+            return FlatMap(source: self.asObservable(), selector: selector)
     }
 
 }
@@ -34,13 +34,13 @@ extension ObservableType {
      - parameter selector: A transform function to apply to element that was observed while no observable is executing in parallel.
      - returns: An observable sequence whose elements are the result of invoking the one-to-many transform function on each element of the input sequence that was received while no other sequence was being calculated.
      */
-    public func flatMapFirst(_ selector: @escaping (E) throws -> O)
-        -> Observable {
-            return FlatMapFirst(source: asObservable(), selector: selector)
+    public func flatMapFirst(_ selector: @escaping (Element) throws -> Source)
+        -> Observable {
+            return FlatMapFirst(source: self.asObservable(), selector: selector)
     }
 }
 
-extension ObservableType where E : ObservableConvertibleType {
+extension ObservableType where Element : ObservableConvertibleType {
 
     /**
      Merges elements from all observable sequences in the given enumerable sequence into a single observable sequence.
@@ -49,8 +49,8 @@ extension ObservableType where E : ObservableConvertibleType {
 
      - returns: The observable sequence that merges the elements of the observable sequences.
      */
-    public func merge() -> Observable {
-        return Merge(source: asObservable())
+    public func merge() -> Observable {
+        return Merge(source: self.asObservable())
     }
 
     /**
@@ -62,12 +62,12 @@ extension ObservableType where E : ObservableConvertibleType {
      - returns: The observable sequence that merges the elements of the inner sequences.
      */
     public func merge(maxConcurrent: Int)
-        -> Observable {
-        return MergeLimited(source: asObservable(), maxConcurrent: maxConcurrent)
+        -> Observable {
+        return MergeLimited(source: self.asObservable(), maxConcurrent: maxConcurrent)
     }
 }
 
-extension ObservableType where E : ObservableConvertibleType {
+extension ObservableType where Element : ObservableConvertibleType {
 
     /**
      Concatenates all inner observable sequences, as long as the previous observable sequence terminated successfully.
@@ -76,8 +76,8 @@ extension ObservableType where E : ObservableConvertibleType {
 
      - returns: An observable sequence that contains the elements of each observed inner sequence, in sequential order.
      */
-    public func concat() -> Observable {
-        return merge(maxConcurrent: 1)
+    public func concat() -> Observable {
+        return self.merge(maxConcurrent: 1)
     }
 }
 
@@ -90,7 +90,7 @@ extension ObservableType {
      - parameter sources: Collection of observable sequences to merge.
      - returns: The observable sequence that merges the elements of the observable sequences.
      */
-    public static func merge(_ sources: C) -> Observable where C.Iterator.Element == Observable {
+    public static func merge(_ sources: Collection) -> Observable where Collection.Element == Observable {
         return MergeArray(sources: Array(sources))
     }
 
@@ -102,7 +102,7 @@ extension ObservableType {
      - parameter sources: Array of observable sequences to merge.
      - returns: The observable sequence that merges the elements of the observable sequences.
      */
-    public static func merge(_ sources: [Observable]) -> Observable {
+    public static func merge(_ sources: [Observable]) -> Observable {
         return MergeArray(sources: sources)
     }
 
@@ -114,7 +114,7 @@ extension ObservableType {
      - parameter sources: Collection of observable sequences to merge.
      - returns: The observable sequence that merges the elements of the observable sequences.
      */
-    public static func merge(_ sources: Observable...) -> Observable {
+    public static func merge(_ sources: Observable...) -> Observable {
         return MergeArray(sources: sources)
     }
 }
@@ -130,17 +130,17 @@ extension ObservableType {
      - returns: An observable sequence that contains the elements of each observed inner sequence, in sequential order.
      */
     
-    public func concatMap(_ selector: @escaping (E) throws -> O)
-        -> Observable {
-            return ConcatMap(source: asObservable(), selector: selector)
+    public func concatMap(_ selector: @escaping (Element) throws -> Source)
+        -> Observable {
+            return ConcatMap(source: self.asObservable(), selector: selector)
     }
 }
 
 fileprivate final class MergeLimitedSinkIter
     : ObserverType
     , LockOwnerType
-    , SynchronizedOnType where SourceSequence.E == Observer.E {
-    typealias E = Observer.E
+    , SynchronizedOnType where SourceSequence.Element == Observer.Element {
+    typealias Element = Observer.Element
     typealias DisposeKey = CompositeDisposable.DisposeKey
     typealias Parent = MergeLimitedSink
     
@@ -148,67 +148,67 @@ fileprivate final class MergeLimitedSinkIter) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next:
-            _parent.forwardOn(event)
+            self._parent.forwardOn(event)
         case .error:
-            _parent.forwardOn(event)
-            _parent.dispose()
+            self._parent.forwardOn(event)
+            self._parent.dispose()
         case .completed:
-            _parent._group.remove(for: _disposeKey)
-            if let next = _parent._queue.dequeue() {
-                _parent.subscribe(next, group: _parent._group)
+            self._parent._group.remove(for: self._disposeKey)
+            if let next = self._parent._queue.dequeue() {
+                self._parent.subscribe(next, group: self._parent._group)
             }
             else {
-                _parent._activeCount = _parent._activeCount - 1
+                self._parent._activeCount -= 1
                 
-                if _parent._stopped && _parent._activeCount == 0 {
-                    _parent.forwardOn(.completed)
-                    _parent.dispose()
+                if self._parent._stopped && self._parent._activeCount == 0 {
+                    self._parent.forwardOn(.completed)
+                    self._parent.dispose()
                 }
             }
         }
     }
 }
 
-fileprivate final class ConcatMapSink: MergeLimitedSink where Observer.E == SourceSequence.E {
+fileprivate final class ConcatMapSink: MergeLimitedSink where Observer.Element == SourceSequence.Element {
     typealias Selector = (SourceElement) throws -> SourceSequence
     
     private let _selector: Selector
     
     init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
-        _selector = selector
+        self._selector = selector
         super.init(maxConcurrent: 1, observer: observer, cancel: cancel)
     }
     
     override func performMap(_ element: SourceElement) throws -> SourceSequence {
-        return try _selector(element)
+        return try self._selector(element)
     }
 }
 
-fileprivate final class MergeLimitedBasicSink: MergeLimitedSink where Observer.E == SourceSequence.E {
+fileprivate final class MergeLimitedBasicSink: MergeLimitedSink where Observer.Element == SourceSequence.Element {
     
     override func performMap(_ element: SourceSequence) throws -> SourceSequence {
         return element
     }
 }
 
-fileprivate class MergeLimitedSink
+private class MergeLimitedSink
     : Sink
-    , ObserverType where Observer.E == SourceSequence.E  {
+    , ObserverType where Observer.Element == SourceSequence.Element {
     typealias QueueType = Queue
 
     let _maxConcurrent: Int
@@ -224,16 +224,16 @@ fileprivate class MergeLimitedSink) -> Disposable {
-        let _ = _group.insert(_sourceSubscription)
+        _ = self._group.insert(self._sourceSubscription)
         
         let disposable = source.subscribe(self)
-        _sourceSubscription.setDisposable(disposable)
-        return _group
+        self._sourceSubscription.setDisposable(disposable)
+        return self._group
     }
     
     func subscribe(_ innerSource: SourceSequence, group: CompositeDisposable) {
@@ -255,29 +255,29 @@ fileprivate class MergeLimitedSink SourceSequence? {
-        _lock.lock(); defer { _lock.unlock() } // {
+        self._lock.lock(); defer { self._lock.unlock() } // {
             let subscribe: Bool
-            if _activeCount < _maxConcurrent {
-                _activeCount += 1
+            if self._activeCount < self._maxConcurrent {
+                self._activeCount += 1
                 subscribe = true
             }
             else {
                 do {
-                    let value = try performMap(element)
-                    _queue.enqueue(value)
+                    let value = try self.performMap(element)
+                    self._queue.enqueue(value)
                 } catch {
-                    forwardOn(.error(error))
-                    dispose()
+                    self.forwardOn(.error(error))
+                    self.dispose()
                 }
                 subscribe = false
             }
 
             if subscribe {
                 do {
-                    return try performMap(element)
+                    return try self.performMap(element)
                 } catch {
-                    forwardOn(.error(error))
-                    dispose()
+                    self.forwardOn(.error(error))
+                    self.dispose()
                 }
             }
 
@@ -289,126 +289,126 @@ fileprivate class MergeLimitedSink : Producer {
+final private class MergeLimited: Producer {
     private let _source: Observable
     private let _maxConcurrent: Int
     
     init(source: Observable, maxConcurrent: Int) {
-        _source = source
-        _maxConcurrent = maxConcurrent
+        self._source = source
+        self._maxConcurrent = maxConcurrent
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
-        let sink = MergeLimitedBasicSink(maxConcurrent: _maxConcurrent, observer: observer, cancel: cancel)
-        let subscription = sink.run(_source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == SourceSequence.Element {
+        let sink = MergeLimitedBasicSink(maxConcurrent: self._maxConcurrent, observer: observer, cancel: cancel)
+        let subscription = sink.run(self._source)
         return (sink: sink, subscription: subscription)
     }
 }
 
 // MARK: Merge
 
-fileprivate final class MergeBasicSink : MergeSink where O.E == S.E {
-    override func performMap(_ element: S) throws -> S {
+fileprivate final class MergeBasicSink : MergeSink where Observer.Element == Source.Element {
+    override func performMap(_ element: Source) throws -> Source {
         return element
     }
 }
 
 // MARK: flatMap
 
-fileprivate final class FlatMapSink : MergeSink where Observer.E == SourceSequence.E {
+fileprivate final class FlatMapSink : MergeSink where Observer.Element == SourceSequence.Element {
     typealias Selector = (SourceElement) throws -> SourceSequence
 
     private let _selector: Selector
 
     init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
-        _selector = selector
+        self._selector = selector
         super.init(observer: observer, cancel: cancel)
     }
 
     override func performMap(_ element: SourceElement) throws -> SourceSequence {
-        return try _selector(element)
+        return try self._selector(element)
     }
 }
 
 // MARK: FlatMapFirst
 
-fileprivate final class FlatMapFirstSink : MergeSink where Observer.E == SourceSequence.E {
+fileprivate final class FlatMapFirstSink : MergeSink where Observer.Element == SourceSequence.Element {
     typealias Selector = (SourceElement) throws -> SourceSequence
 
     private let _selector: Selector
 
     override var subscribeNext: Bool {
-        return _activeCount == 0
+        return self._activeCount == 0
     }
 
     init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
-        _selector = selector
+        self._selector = selector
         super.init(observer: observer, cancel: cancel)
     }
 
     override func performMap(_ element: SourceElement) throws -> SourceSequence {
-        return try _selector(element)
+        return try self._selector(element)
     }
 }
 
-fileprivate final class MergeSinkIter : ObserverType where Observer.E == SourceSequence.E {
+fileprivate final class MergeSinkIter : ObserverType where Observer.Element == SourceSequence.Element {
     typealias Parent = MergeSink
     typealias DisposeKey = CompositeDisposable.DisposeKey
-    typealias E = Observer.E
+    typealias Element = Observer.Element
     
     private let _parent: Parent
     private let _disposeKey: DisposeKey
 
     init(parent: Parent, disposeKey: DisposeKey) {
-        _parent = parent
-        _disposeKey = disposeKey
+        self._parent = parent
+        self._disposeKey = disposeKey
     }
     
-    func on(_ event: Event) {
-        _parent._lock.lock(); defer { _parent._lock.unlock() } // lock {
+    func on(_ event: Event) {
+        self._parent._lock.lock(); defer { self._parent._lock.unlock() } // lock {
             switch event {
             case .next(let value):
-                _parent.forwardOn(.next(value))
+                self._parent.forwardOn(.next(value))
             case .error(let error):
-                _parent.forwardOn(.error(error))
-                _parent.dispose()
+                self._parent.forwardOn(.error(error))
+                self._parent.dispose()
             case .completed:
-                _parent._group.remove(for: _disposeKey)
-                _parent._activeCount -= 1
-                _parent.checkCompleted()
+                self._parent._group.remove(for: self._disposeKey)
+                self._parent._activeCount -= 1
+                self._parent.checkCompleted()
             }
         // }
     }
 }
 
 
-fileprivate class MergeSink
+private class MergeSink
     : Sink
-    , ObserverType where Observer.E == SourceSequence.E {
-    typealias ResultType = Observer.E
+    , ObserverType where Observer.Element == SourceSequence.Element {
+    typealias ResultType = Observer.Element
     typealias Element = SourceElement
 
     let _lock = RecursiveLock()
@@ -434,19 +434,19 @@ fileprivate class MergeSink SourceSequence? {
-        _lock.lock(); defer { _lock.unlock() } // {
-            if !subscribeNext {
+        self._lock.lock(); defer { self._lock.unlock() } // {
+            if !self.subscribeNext {
                 return nil
             }
 
             do {
-                let value = try performMap(element)
-                _activeCount += 1
+                let value = try self.performMap(element)
+                self._activeCount += 1
                 return value
             }
             catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
                 return nil
             }
         // }
@@ -455,65 +455,65 @@ fileprivate class MergeSink) {
         switch event {
         case .next(let element):
-            if let value = nextElementArrived(element: element) {
-                subscribeInner(value.asObservable())
+            if let value = self.nextElementArrived(element: element) {
+                self.subscribeInner(value.asObservable())
             }
         case .error(let error):
-            _lock.lock(); defer { _lock.unlock() }
-            forwardOn(.error(error))
-            dispose()
+            self._lock.lock(); defer { self._lock.unlock() }
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            _lock.lock(); defer { _lock.unlock() }
-            _stopped = true
-            _sourceSubscription.dispose()
-            checkCompleted()
+            self._lock.lock(); defer { self._lock.unlock() }
+            self._stopped = true
+            self._sourceSubscription.dispose()
+            self.checkCompleted()
         }
     }
 
-    func subscribeInner(_ source: Observable) {
+    func subscribeInner(_ source: Observable) {
         let iterDisposable = SingleAssignmentDisposable()
-        if let disposeKey = _group.insert(iterDisposable) {
+        if let disposeKey = self._group.insert(iterDisposable) {
             let iter = MergeSinkIter(parent: self, disposeKey: disposeKey)
             let subscription = source.subscribe(iter)
             iterDisposable.setDisposable(subscription)
         }
     }
 
-    func run(_ sources: [Observable]) -> Disposable {
-        _activeCount += sources.count
+    func run(_ sources: [Observable]) -> Disposable {
+        self._activeCount += sources.count
 
         for source in sources {
-            subscribeInner(source)
+            self.subscribeInner(source)
         }
 
-        _stopped = true
+        self._stopped = true
 
-        checkCompleted()
+        self.checkCompleted()
 
-        return _group
+        return self._group
     }
 
     @inline(__always)
     func checkCompleted() {
-        if _stopped && _activeCount == 0 {
+        if self._stopped && self._activeCount == 0 {
             self.forwardOn(.completed)
             self.dispose()
         }
     }
     
     func run(_ source: Observable) -> Disposable {
-        let _ = _group.insert(_sourceSubscription)
+        _ = self._group.insert(self._sourceSubscription)
 
         let subscription = source.subscribe(self)
-        _sourceSubscription.setDisposable(subscription)
+        self._sourceSubscription.setDisposable(subscription)
         
-        return _group
+        return self._group
     }
 }
 
 // MARK: Producers
 
-final fileprivate class FlatMap: Producer {
+final private class FlatMap: Producer {
     typealias Selector = (SourceElement) throws -> SourceSequence
 
     private let _source: Observable
@@ -521,18 +521,18 @@ final fileprivate class FlatMap, selector: @escaping Selector) {
-        _source = source
-        _selector = selector
+        self._source = source
+        self._selector = selector
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
-        let sink = FlatMapSink(selector: _selector, observer: observer, cancel: cancel)
-        let subscription = sink.run(_source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == SourceSequence.Element {
+        let sink = FlatMapSink(selector: self._selector, observer: observer, cancel: cancel)
+        let subscription = sink.run(self._source)
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class FlatMapFirst: Producer {
+final private class FlatMapFirst: Producer {
     typealias Selector = (SourceElement) throws -> SourceSequence
 
     private let _source: Observable
@@ -540,59 +540,59 @@ final fileprivate class FlatMapFirst, selector: @escaping Selector) {
-        _source = source
-        _selector = selector
+        self._source = source
+        self._selector = selector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
-        let sink = FlatMapFirstSink(selector: _selector, observer: observer, cancel: cancel)
-        let subscription = sink.run(_source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == SourceSequence.Element {
+        let sink = FlatMapFirstSink(selector: self._selector, observer: observer, cancel: cancel)
+        let subscription = sink.run(self._source)
         return (sink: sink, subscription: subscription)
     }
 }
 
-final class ConcatMap: Producer {
+final class ConcatMap: Producer {
     typealias Selector = (SourceElement) throws -> SourceSequence
     
     private let _source: Observable
     private let _selector: Selector
     
     init(source: Observable, selector: @escaping Selector) {
-        _source = source
-        _selector = selector
+        self._source = source
+        self._selector = selector
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
-        let sink = ConcatMapSink(selector: _selector, observer: observer, cancel: cancel)
-        let subscription = sink.run(_source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == SourceSequence.Element {
+        let sink = ConcatMapSink(selector: self._selector, observer: observer, cancel: cancel)
+        let subscription = sink.run(self._source)
         return (sink: sink, subscription: subscription)
     }
 }
 
-final class Merge : Producer {
+final class Merge : Producer {
     private let _source: Observable
 
     init(source: Observable) {
-        _source = source
+        self._source = source
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
-        let sink = MergeBasicSink(observer: observer, cancel: cancel)
-        let subscription = sink.run(_source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == SourceSequence.Element {
+        let sink = MergeBasicSink(observer: observer, cancel: cancel)
+        let subscription = sink.run(self._source)
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class MergeArray : Producer {
+final private class MergeArray: Producer {
     private let _sources: [Observable]
 
     init(sources: [Observable]) {
-        _sources = sources
+        self._sources = sources
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
-        let sink = MergeBasicSink, O>(observer: observer, cancel: cancel)
-        let subscription = sink.run(_sources)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = MergeBasicSink, Observer>(observer: observer, cancel: cancel)
+        let subscription = sink.run(self._sources)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Multicast.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Multicast.swift
index a027c4f..ca90548 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Multicast.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Multicast.swift
@@ -24,22 +24,22 @@ public class ConnectableObservable
 }
 
 extension ObservableType {
-    
+
     /**
-    Multicasts the source sequence notifications through an instantiated subject into all uses of the sequence within a selector function. 
-    
+    Multicasts the source sequence notifications through an instantiated subject into all uses of the sequence within a selector function.
+
     Each subscription to the resulting sequence causes a separate multicast invocation, exposing the sequence resulting from the selector function's invocation.
 
     For specializations with fixed subject types, see `publish` and `replay`.
 
     - seealso: [multicast operator on reactivex.io](http://reactivex.io/documentation/operators/publish.html)
-    
+
     - parameter subjectSelector: Factory function to create an intermediate subject through which the source sequence's elements will be multicast to the selector function.
     - parameter selector: Selector function which can use the multicasted source sequence subject to the policies enforced by the created subject.
     - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence within a selector function.
     */
-    public func multicast(_ subjectSelector: @escaping () throws -> S, selector: @escaping (Observable) throws -> Observable)
-        -> Observable where S.SubjectObserverType.E == E {
+    public func multicast(_ subjectSelector: @escaping () throws -> Subject, selector: @escaping (Observable) throws -> Observable)
+        -> Observable where Subject.Observer.Element == Element {
         return Multicast(
             source: self.asObservable(),
             subjectSelector: subjectSelector,
@@ -49,17 +49,17 @@ extension ObservableType {
 }
 
 extension ObservableType {
-    
+
     /**
-    Returns a connectable observable sequence that shares a single subscription to the underlying sequence. 
-    
+    Returns a connectable observable sequence that shares a single subscription to the underlying sequence.
+
     This operator is a specialization of `multicast` using a `PublishSubject`.
 
     - seealso: [publish operator on reactivex.io](http://reactivex.io/documentation/operators/publish.html)
-    
+
     - returns: A connectable observable sequence that shares a single subscription to the underlying sequence.
     */
-    public func publish() -> ConnectableObservable {
+    public func publish() -> ConnectableObservable {
         return self.multicast { PublishSubject() }
     }
 }
@@ -77,7 +77,7 @@ extension ObservableType {
      - returns: A connectable observable sequence that shares a single subscription to the underlying sequence.
      */
     public func replay(_ bufferSize: Int)
-        -> ConnectableObservable {
+        -> ConnectableObservable {
         return self.multicast { ReplaySubject.create(bufferSize: bufferSize) }
     }
 
@@ -91,21 +91,21 @@ extension ObservableType {
      - returns: A connectable observable sequence that shares a single subscription to the underlying sequence.
      */
     public func replayAll()
-        -> ConnectableObservable {
+        -> ConnectableObservable {
         return self.multicast { ReplaySubject.createUnbounded() }
     }
 }
 
 extension ConnectableObservableType {
-    
+
     /**
     Returns an observable sequence that stays connected to the source as long as there is at least one subscription to the observable sequence.
 
     - seealso: [refCount operator on reactivex.io](http://reactivex.io/documentation/operators/refcount.html)
-    
+
     - returns: An observable sequence that stays connected to the source as long as there is at least one subscription to the observable sequence.
     */
-    public func refCount() -> Observable {
+    public func refCount() -> Observable {
         return RefCount(source: self)
     }
 }
@@ -124,8 +124,8 @@ extension ObservableType {
      - parameter subject: Subject to push source elements into.
      - returns: A connectable observable sequence that upon connection causes the source sequence to push results into the specified subject.
      */
-    public func multicast(_ subject: S)
-        -> ConnectableObservable where S.SubjectObserverType.E == E {
+    public func multicast(_ subject: Subject)
+        -> ConnectableObservable where Subject.Observer.Element == Element {
         return ConnectableObservableAdapter(source: self.asObservable(), makeSubject: { subject })
     }
 
@@ -133,7 +133,7 @@ extension ObservableType {
      Multicasts the source sequence notifications through an instantiated subject to the resulting connectable observable.
 
      Upon connection of the connectable observable, the subject is subscribed to the source exactly one, and messages are forwarded to the observers registered with the connectable observable.
-     
+
      Subject is cleared on connection disposal or in case source sequence produces terminal event.
 
      - seealso: [multicast operator on reactivex.io](http://reactivex.io/documentation/operators/publish.html)
@@ -141,43 +141,43 @@ extension ObservableType {
      - parameter makeSubject: Factory function used to instantiate a subject for each connection.
      - returns: A connectable observable sequence that upon connection causes the source sequence to push results into the specified subject.
      */
-    public func multicast(makeSubject: @escaping () -> S)
-        -> ConnectableObservable where S.SubjectObserverType.E == E {
+    public func multicast(makeSubject: @escaping () -> Subject)
+        -> ConnectableObservable where Subject.Observer.Element == Element {
         return ConnectableObservableAdapter(source: self.asObservable(), makeSubject: makeSubject)
     }
 }
 
-final fileprivate class Connection : ObserverType, Disposable {
-    typealias E = S.SubjectObserverType.E
+final private class Connection: ObserverType, Disposable {
+    typealias Element = Subject.Observer.Element
 
     private var _lock: RecursiveLock
     // state
-    private var _parent: ConnectableObservableAdapter?
+    private var _parent: ConnectableObservableAdapter?
     private var _subscription : Disposable?
-    private var _subjectObserver: S.SubjectObserverType
+    private var _subjectObserver: Subject.Observer
 
-    private var _disposed: Bool = false
+    private let _disposed = AtomicInt(0)
 
-    init(parent: ConnectableObservableAdapter, subjectObserver: S.SubjectObserverType, lock: RecursiveLock, subscription: Disposable) {
-        _parent = parent
-        _subscription = subscription
-        _lock = lock
-        _subjectObserver = subjectObserver
+    init(parent: ConnectableObservableAdapter, subjectObserver: Subject.Observer, lock: RecursiveLock, subscription: Disposable) {
+        self._parent = parent
+        self._subscription = subscription
+        self._lock = lock
+        self._subjectObserver = subjectObserver
     }
 
-    func on(_ event: Event) {
-        if _disposed {
+    func on(_ event: Event) {
+        if isFlagSet(self._disposed, 1) {
             return
         }
         if event.isStopEvent {
             self.dispose()
         }
-        _subjectObserver.on(event)
+        self._subjectObserver.on(event)
     }
 
     func dispose() {
         _lock.lock(); defer { _lock.unlock() } // {
-        _disposed = true
+        fetchOr(self._disposed, 1)
         guard let parent = _parent else {
             return
         }
@@ -186,95 +186,95 @@ final fileprivate class Connection : ObserverType, Disposable {
             parent._connection = nil
             parent._subject = nil
         }
-        _parent = nil
+        self._parent = nil
 
-        _subscription?.dispose()
-        _subscription = nil
+        self._subscription?.dispose()
+        self._subscription = nil
         // }
     }
 }
 
-final fileprivate class ConnectableObservableAdapter
-    : ConnectableObservable {
-    typealias ConnectionType = Connection
+final private class ConnectableObservableAdapter
+    : ConnectableObservable {
+    typealias ConnectionType = Connection
 
-    fileprivate let _source: Observable
-    fileprivate let _makeSubject: () -> S
+    fileprivate let _source: Observable
+    fileprivate let _makeSubject: () -> Subject
 
     fileprivate let _lock = RecursiveLock()
-    fileprivate var _subject: S?
+    fileprivate var _subject: Subject?
 
     // state
     fileprivate var _connection: ConnectionType?
 
-    init(source: Observable, makeSubject: @escaping () -> S) {
-        _source = source
-        _makeSubject = makeSubject
-        _subject = nil
-        _connection = nil
+    init(source: Observable, makeSubject: @escaping () -> Subject) {
+        self._source = source
+        self._makeSubject = makeSubject
+        self._subject = nil
+        self._connection = nil
     }
 
     override func connect() -> Disposable {
-        return _lock.calculateLocked {
-            if let connection = _connection {
+        return self._lock.calculateLocked {
+            if let connection = self._connection {
                 return connection
             }
 
             let singleAssignmentDisposable = SingleAssignmentDisposable()
-            let connection = Connection(parent: self, subjectObserver: self.lazySubject.asObserver(), lock: _lock, subscription: singleAssignmentDisposable)
-            _connection = connection
-            let subscription = _source.subscribe(connection)
+            let connection = Connection(parent: self, subjectObserver: self.lazySubject.asObserver(), lock: self._lock, subscription: singleAssignmentDisposable)
+            self._connection = connection
+            let subscription = self._source.subscribe(connection)
             singleAssignmentDisposable.setDisposable(subscription)
             return connection
         }
     }
 
-    fileprivate var lazySubject: S {
+    fileprivate var lazySubject: Subject {
         if let subject = self._subject {
             return subject
         }
 
-        let subject = _makeSubject()
+        let subject = self._makeSubject()
         self._subject = subject
         return subject
     }
 
-    override func subscribe(_ observer: O) -> Disposable where O.E == S.E {
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Subject.Element {
         return self.lazySubject.subscribe(observer)
     }
 }
 
-final fileprivate class RefCountSink
-    : Sink
-    , ObserverType where CO.E == O.E {
-    typealias Element = O.E
-    typealias Parent = RefCount
+final private class RefCountSink
+    : Sink
+    , ObserverType where ConnectableSource.Element == Observer.Element {
+    typealias Element = Observer.Element 
+    typealias Parent = RefCount
 
     private let _parent: Parent
 
     private var _connectionIdSnapshot: Int64 = -1
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
 
     func run() -> Disposable {
-        let subscription = _parent._source.subscribe(self)
-        _parent._lock.lock(); defer { _parent._lock.unlock() } // {
+        let subscription = self._parent._source.subscribe(self)
+        self._parent._lock.lock(); defer { self._parent._lock.unlock() } // {
 
-        _connectionIdSnapshot = _parent._connectionId
+        self._connectionIdSnapshot = self._parent._connectionId
 
         if self.disposed {
             return Disposables.create()
         }
 
-        if _parent._count == 0 {
-            _parent._count = 1
-            _parent._connectableSubscription = _parent._source.connect()
+        if self._parent._count == 0 {
+            self._parent._count = 1
+            self._parent._connectableSubscription = self._parent._source.connect()
         }
         else {
-            _parent._count = _parent._count + 1
+            self._parent._count += 1
         }
         // }
 
@@ -294,7 +294,7 @@ final fileprivate class RefCountSink 1 {
-                self._parent._count = self._parent._count - 1
+                self._parent._count -= 1
             }
             else {
                 rxFatalError("Something went wrong with RefCount disposing mechanism")
@@ -306,25 +306,25 @@ final fileprivate class RefCountSink) {
         switch event {
         case .next:
-            forwardOn(event)
+            self.forwardOn(event)
         case .error, .completed:
-            _parent._lock.lock() // {
-                if _parent._connectionId == self._connectionIdSnapshot {
-                    let connection = _parent._connectableSubscription
+            self._parent._lock.lock() // {
+                if self._parent._connectionId == self._connectionIdSnapshot {
+                    let connection = self._parent._connectableSubscription
                     defer { connection?.dispose() }
-                    _parent._count = 0
-                    _parent._connectionId = _parent._connectionId &+ 1
-                    _parent._connectableSubscription = nil
+                    self._parent._count = 0
+                    self._parent._connectionId = self._parent._connectionId &+ 1
+                    self._parent._connectableSubscription = nil
                 }
             // }
-            _parent._lock.unlock()
-            forwardOn(event)
-            dispose()
+            self._parent._lock.unlock()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class RefCount: Producer {
+final private class RefCount: Producer {
     fileprivate let _lock = RecursiveLock()
 
     // state
@@ -332,75 +332,76 @@ final fileprivate class RefCount: Producer
     fileprivate var _connectionId: Int64 = 0
     fileprivate var _connectableSubscription = nil as Disposable?
 
-    fileprivate let _source: CO
+    fileprivate let _source: ConnectableSource
 
-    init(source: CO) {
-        _source = source
+    init(source: ConnectableSource) {
+        self._source = source
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == CO.E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable)
+             where Observer.Element == ConnectableSource.Element {
         let sink = RefCountSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class MulticastSink: Sink, ObserverType {
-    typealias Element = O.E
+final private class MulticastSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
     typealias ResultType = Element
-    typealias MutlicastType = Multicast
-    
+    typealias MutlicastType = Multicast
+
     private let _parent: MutlicastType
-    
-    init(parent: MutlicastType, observer: O, cancel: Cancelable) {
-        _parent = parent
+
+    init(parent: MutlicastType, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         do {
-            let subject = try _parent._subjectSelector()
-            let connectable = ConnectableObservableAdapter(source: _parent._source, makeSubject: { subject })
-            
-            let observable = try _parent._selector(connectable)
-            
+            let subject = try self._parent._subjectSelector()
+            let connectable = ConnectableObservableAdapter(source: self._parent._source, makeSubject: { subject })
+
+            let observable = try self._parent._selector(connectable)
+
             let subscription = observable.subscribe(self)
             let connection = connectable.connect()
-                
+
             return Disposables.create(subscription, connection)
         }
         catch let e {
-            forwardOn(.error(e))
-            dispose()
+            self.forwardOn(.error(e))
+            self.dispose()
             return Disposables.create()
         }
     }
-    
+
     func on(_ event: Event) {
-        forwardOn(event)
+        self.forwardOn(event)
         switch event {
-            case .next: break
-            case .error, .completed:
-                dispose()
+        case .next: break
+        case .error, .completed:
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Multicast: Producer {
-    typealias SubjectSelectorType = () throws -> S
-    typealias SelectorType = (Observable) throws -> Observable
-    
-    fileprivate let _source: Observable
+final private class Multicast: Producer {
+    typealias SubjectSelectorType = () throws -> Subject
+    typealias SelectorType = (Observable) throws -> Observable
+
+    fileprivate let _source: Observable
     fileprivate let _subjectSelector: SubjectSelectorType
     fileprivate let _selector: SelectorType
-    
-    init(source: Observable, subjectSelector: @escaping SubjectSelectorType, selector: @escaping SelectorType) {
-        _source = source
-        _subjectSelector = subjectSelector
-        _selector = selector
+
+    init(source: Observable, subjectSelector: @escaping SubjectSelectorType, selector: @escaping SelectorType) {
+        self._source = source
+        self._subjectSelector = subjectSelector
+        self._selector = selector
     }
-    
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = MulticastSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Never.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Never.swift
index d98a7a8..c56e567 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Never.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Never.swift
@@ -15,13 +15,13 @@ extension ObservableType {
 
      - returns: An observable sequence whose observers will never get called.
      */
-    public static func never() -> Observable {
+    public static func never() -> Observable {
         return NeverProducer()
     }
 }
 
-final fileprivate class NeverProducer : Producer {
-    override func subscribe(_ observer: O) -> Disposable where O.E == Element {
+final private class NeverProducer: Producer {
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
         return Disposables.create()
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/ObserveOn.swift b/Demo/Pods/RxSwift/RxSwift/Observables/ObserveOn.swift
index ce2a0d4..5121150 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/ObserveOn.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/ObserveOn.swift
@@ -20,7 +20,7 @@ extension ObservableType {
      - returns: The source sequence whose observations happen on the specified scheduler.
      */
     public func observeOn(_ scheduler: ImmediateSchedulerType)
-        -> Observable {
+        -> Observable {
             if let scheduler = scheduler as? SerialDispatchQueueScheduler {
                 return ObserveOnSerialDispatchQueue(source: self.asObservable(), scheduler: scheduler)
             }
@@ -30,28 +30,28 @@ extension ObservableType {
     }
 }
 
-final fileprivate class ObserveOn : Producer {
+final private class ObserveOn: Producer {
     let scheduler: ImmediateSchedulerType
-    let source: Observable
-    
-    init(source: Observable, scheduler: ImmediateSchedulerType) {
+    let source: Observable
+
+    init(source: Observable, scheduler: ImmediateSchedulerType) {
         self.scheduler = scheduler
         self.source = source
-        
+
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
     }
-    
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
-        let sink = ObserveOnSink(scheduler: scheduler, observer: observer, cancel: cancel)
-        let subscription = source.subscribe(sink)
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = ObserveOnSink(scheduler: self.scheduler, observer: observer, cancel: cancel)
+        let subscription = self.source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
-    
+
 #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
     }
 #endif
 }
@@ -63,31 +63,31 @@ enum ObserveOnState : Int32 {
     case running = 1
 }
 
-final fileprivate class ObserveOnSink : ObserverBase {
-    typealias E = O.E
-    
+final private class ObserveOnSink: ObserverBase {
+    typealias Element = Observer.Element 
+
     let _scheduler: ImmediateSchedulerType
 
     var _lock = SpinLock()
-    let _observer: O
+    let _observer: Observer
 
     // state
     var _state = ObserveOnState.stopped
-    var _queue = Queue>(capacity: 10)
+    var _queue = Queue>(capacity: 10)
 
     let _scheduleDisposable = SerialDisposable()
     let _cancel: Cancelable
 
-    init(scheduler: ImmediateSchedulerType, observer: O, cancel: Cancelable) {
-        _scheduler = scheduler
-        _observer = observer
-        _cancel = cancel
+    init(scheduler: ImmediateSchedulerType, observer: Observer, cancel: Cancelable) {
+        self._scheduler = scheduler
+        self._observer = observer
+        self._cancel = cancel
     }
 
-    override func onCore(_ event: Event) {
-        let shouldStart = _lock.calculateLocked { () -> Bool in
+    override func onCore(_ event: Event) {
+        let shouldStart = self._lock.calculateLocked { () -> Bool in
             self._queue.enqueue(event)
-            
+
             switch self._state {
             case .stopped:
                 self._state = .running
@@ -96,15 +96,15 @@ final fileprivate class ObserveOnSink : ObserverBase {
                 return false
             }
         }
-        
+
         if shouldStart {
-            _scheduleDisposable.disposable = self._scheduler.scheduleRecursive((), action: self.run)
+            self._scheduleDisposable.disposable = self._scheduler.scheduleRecursive((), action: self.run)
         }
     }
-    
-    func run(_ state: (), _ recurse: (()) -> ()) {
-        let (nextEvent, observer) = self._lock.calculateLocked { () -> (Event?, O) in
-            if self._queue.count > 0 {
+
+    func run(_ state: (), _ recurse: (()) -> Void) {
+        let (nextEvent, observer) = self._lock.calculateLocked { () -> (Event?, Observer) in
+            if !self._queue.isEmpty {
                 return (self._queue.dequeue(), self._observer)
             }
             else {
@@ -113,17 +113,17 @@ final fileprivate class ObserveOnSink : ObserverBase {
             }
         }
 
-        if let nextEvent = nextEvent, !_cancel.isDisposed {
+        if let nextEvent = nextEvent, !self._cancel.isDisposed {
             observer.on(nextEvent)
             if nextEvent.isStopEvent {
-                dispose()
+                self.dispose()
             }
         }
         else {
             return
         }
 
-        let shouldContinue = _shouldContinue_synchronized()
+        let shouldContinue = self._shouldContinue_synchronized()
 
         if shouldContinue {
             recurse(())
@@ -131,8 +131,8 @@ final fileprivate class ObserveOnSink : ObserverBase {
     }
 
     func _shouldContinue_synchronized() -> Bool {
-        _lock.lock(); defer { _lock.unlock() } // {
-            if self._queue.count > 0 {
+        self._lock.lock(); defer { self._lock.unlock() } // {
+            if !self._queue.isEmpty {
                 return true
             }
             else {
@@ -141,17 +141,17 @@ final fileprivate class ObserveOnSink : ObserverBase {
             }
         // }
     }
-    
+
     override func dispose() {
         super.dispose()
 
-        _cancel.dispose()
-        _scheduleDisposable.dispose()
+        self._cancel.dispose()
+        self._scheduleDisposable.dispose()
     }
 }
 
 #if TRACE_RESOURCES
-    fileprivate var _numberOfSerialDispatchQueueObservables: AtomicInt = 0
+    fileprivate let _numberOfSerialDispatchQueueObservables = AtomicInt(0)
     extension Resources {
         /**
          Counts number of `SerialDispatchQueueObservables`.
@@ -159,26 +159,28 @@ final fileprivate class ObserveOnSink : ObserverBase {
          Purposed for unit tests.
          */
         public static var numberOfSerialDispatchQueueObservables: Int32 {
-            return _numberOfSerialDispatchQueueObservables.valueSnapshot()
+            return load(_numberOfSerialDispatchQueueObservables)
         }
     }
 #endif
 
-final fileprivate class ObserveOnSerialDispatchQueueSink : ObserverBase {
+final private class ObserveOnSerialDispatchQueueSink: ObserverBase {
     let scheduler: SerialDispatchQueueScheduler
-    let observer: O
+    let observer: Observer
 
     let cancel: Cancelable
 
-    var cachedScheduleLambda: (((sink: ObserveOnSerialDispatchQueueSink, event: Event)) -> Disposable)!
+    var cachedScheduleLambda: (((sink: ObserveOnSerialDispatchQueueSink, event: Event)) -> Disposable)!
 
-    init(scheduler: SerialDispatchQueueScheduler, observer: O, cancel: Cancelable) {
+    init(scheduler: SerialDispatchQueueScheduler, observer: Observer, cancel: Cancelable) {
         self.scheduler = scheduler
         self.observer = observer
         self.cancel = cancel
         super.init()
 
-        cachedScheduleLambda = { pair in
+        self.cachedScheduleLambda = { pair in
+            guard !cancel.isDisposed else { return Disposables.create() }
+
             pair.sink.observer.on(pair.event)
 
             if pair.event.isStopEvent {
@@ -189,41 +191,41 @@ final fileprivate class ObserveOnSerialDispatchQueueSink : Obse
         }
     }
 
-    override func onCore(_ event: Event) {
-        let _ = self.scheduler.schedule((self, event), action: cachedScheduleLambda!)
+    override func onCore(_ event: Event) {
+        _ = self.scheduler.schedule((self, event), action: self.cachedScheduleLambda!)
     }
 
     override func dispose() {
         super.dispose()
 
-        cancel.dispose()
+        self.cancel.dispose()
     }
 }
 
-final fileprivate class ObserveOnSerialDispatchQueue : Producer {
+final private class ObserveOnSerialDispatchQueue: Producer {
     let scheduler: SerialDispatchQueueScheduler
-    let source: Observable
+    let source: Observable
 
-    init(source: Observable, scheduler: SerialDispatchQueueScheduler) {
+    init(source: Observable, scheduler: SerialDispatchQueueScheduler) {
         self.scheduler = scheduler
         self.source = source
 
         #if TRACE_RESOURCES
-            let _ = Resources.incrementTotal()
-            let _ = AtomicIncrement(&_numberOfSerialDispatchQueueObservables)
+            _ = Resources.incrementTotal()
+            _ = increment(_numberOfSerialDispatchQueueObservables)
         #endif
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
-        let sink = ObserveOnSerialDispatchQueueSink(scheduler: scheduler, observer: observer, cancel: cancel)
-        let subscription = source.subscribe(sink)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = ObserveOnSerialDispatchQueueSink(scheduler: self.scheduler, observer: observer, cancel: cancel)
+        let subscription = self.source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 
     #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
-        let _ = AtomicDecrement(&_numberOfSerialDispatchQueueObservables)
+        _ = Resources.decrementTotal()
+        _ = decrement(_numberOfSerialDispatchQueueObservables)
     }
     #endif
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Optional.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Optional.swift
index 8cd6a16..9bf5b1c 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Optional.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Optional.swift
@@ -15,7 +15,7 @@ extension ObservableType {
      - parameter optional: Optional element in the resulting observable sequence.
      - returns: An observable sequence containing the wrapped value or not from given optional.
      */
-    public static func from(optional: E?) -> Observable {
+    public static func from(optional: Element?) -> Observable {
         return ObservableOptional(optional: optional)
     }
 
@@ -28,24 +28,24 @@ extension ObservableType {
      - parameter scheduler: Scheduler to send the optional element on.
      - returns: An observable sequence containing the wrapped value or not from given optional.
      */
-    public static func from(optional: E?, scheduler: ImmediateSchedulerType) -> Observable {
+    public static func from(optional: Element?, scheduler: ImmediateSchedulerType) -> Observable {
         return ObservableOptionalScheduled(optional: optional, scheduler: scheduler)
     }
 }
 
-final fileprivate class ObservableOptionalScheduledSink : Sink {
-    typealias E = O.E
-    typealias Parent = ObservableOptionalScheduled
+final private class ObservableOptionalScheduledSink: Sink {
+    typealias Element = Observer.Element 
+    typealias Parent = ObservableOptionalScheduled
 
     private let _parent: Parent
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
 
     func run() -> Disposable {
-        return _parent._scheduler.schedule(_parent._optional) { (optional: E?) -> Disposable in
+        return self._parent._scheduler.schedule(self._parent._optional) { (optional: Element?) -> Disposable in
             if let next = optional {
                 self.forwardOn(.next(next))
                 return self._parent._scheduler.schedule(()) { _ in
@@ -62,31 +62,31 @@ final fileprivate class ObservableOptionalScheduledSink : Sink<
     }
 }
 
-final fileprivate class ObservableOptionalScheduled : Producer {
-    fileprivate let _optional: E?
+final private class ObservableOptionalScheduled: Producer {
+    fileprivate let _optional: Element?
     fileprivate let _scheduler: ImmediateSchedulerType
 
-    init(optional: E?, scheduler: ImmediateSchedulerType) {
-        _optional = optional
-        _scheduler = scheduler
+    init(optional: Element?, scheduler: ImmediateSchedulerType) {
+        self._optional = optional
+        self._scheduler = scheduler
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = ObservableOptionalScheduledSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class ObservableOptional: Producer {
-    private let _optional: E?
+final private class ObservableOptional: Producer {
+    private let _optional: Element?
     
-    init(optional: E?) {
-        _optional = optional
+    init(optional: Element?) {
+        self._optional = optional
     }
     
-    override func subscribe(_ observer: O) -> Disposable where O.E == E {
-        if let element = _optional {
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        if let element = self._optional {
             observer.on(.next(element))
         }
         observer.on(.completed)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Producer.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Producer.swift
index 996b011..f78d9a6 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Producer.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Producer.swift
@@ -10,12 +10,12 @@ class Producer : Observable {
     override init() {
         super.init()
     }
-    
-    override func subscribe(_ observer: O) -> Disposable where O.E == Element {
+
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
         if !CurrentThreadScheduler.isScheduleRequired {
             // The returned disposable needs to release all references once it was disposed.
             let disposer = SinkDisposer()
-            let sinkAndSubscription = run(observer, cancel: disposer)
+            let sinkAndSubscription = self.run(observer, cancel: disposer)
             disposer.setSinkAndSubscription(sink: sinkAndSubscription.sink, subscription: sinkAndSubscription.subscription)
 
             return disposer
@@ -30,69 +30,63 @@ class Producer : Observable {
             }
         }
     }
-    
-    func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         rxAbstractMethod()
     }
 }
 
 fileprivate final class SinkDisposer: Cancelable {
-    fileprivate enum DisposeState: UInt32 {
+    fileprivate enum DisposeState: Int32 {
         case disposed = 1
         case sinkAndSubscriptionSet = 2
     }
 
-    // Jeej, swift API consistency rules
-    fileprivate enum DisposeStateInt32: Int32 {
-        case disposed = 1
-        case sinkAndSubscriptionSet = 2
-    }
-    
-    private var _state: AtomicInt = 0
-    private var _sink: Disposable? = nil
-    private var _subscription: Disposable? = nil
+    private let _state = AtomicInt(0)
+    private var _sink: Disposable?
+    private var _subscription: Disposable?
 
     var isDisposed: Bool {
-        return AtomicFlagSet(DisposeState.disposed.rawValue, &_state)
+        return isFlagSet(self._state, DisposeState.disposed.rawValue)
     }
 
     func setSinkAndSubscription(sink: Disposable, subscription: Disposable) {
-        _sink = sink
-        _subscription = subscription
+        self._sink = sink
+        self._subscription = subscription
 
-        let previousState = AtomicOr(DisposeState.sinkAndSubscriptionSet.rawValue, &_state)
-        if (previousState & DisposeStateInt32.sinkAndSubscriptionSet.rawValue) != 0 {
+        let previousState = fetchOr(self._state, DisposeState.sinkAndSubscriptionSet.rawValue)
+        if (previousState & DisposeState.sinkAndSubscriptionSet.rawValue) != 0 {
             rxFatalError("Sink and subscription were already set")
         }
 
-        if (previousState & DisposeStateInt32.disposed.rawValue) != 0 {
+        if (previousState & DisposeState.disposed.rawValue) != 0 {
             sink.dispose()
             subscription.dispose()
-            _sink = nil
-            _subscription = nil
+            self._sink = nil
+            self._subscription = nil
         }
     }
-    
+
     func dispose() {
-        let previousState = AtomicOr(DisposeState.disposed.rawValue, &_state)
+        let previousState = fetchOr(self._state, DisposeState.disposed.rawValue)
 
-        if (previousState & DisposeStateInt32.disposed.rawValue) != 0 {
+        if (previousState & DisposeState.disposed.rawValue) != 0 {
             return
         }
 
-        if (previousState & DisposeStateInt32.sinkAndSubscriptionSet.rawValue) != 0 {
-            guard let sink = _sink else {
+        if (previousState & DisposeState.sinkAndSubscriptionSet.rawValue) != 0 {
+            guard let sink = self._sink else {
                 rxFatalError("Sink not set")
             }
-            guard let subscription = _subscription else {
+            guard let subscription = self._subscription else {
                 rxFatalError("Subscription not set")
             }
 
             sink.dispose()
             subscription.dispose()
 
-            _sink = nil
-            _subscription = nil
+            self._sink = nil
+            self._subscription = nil
         }
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Range.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Range.swift
index 9b85554..f88c999 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Range.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Range.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-extension ObservableType where E : RxAbstractInteger {
+extension ObservableType where Element : RxAbstractInteger {
     /**
      Generates an observable sequence of integral numbers within a specified range, using the specified scheduler to generate and send out observer messages.
 
@@ -17,49 +17,49 @@ extension ObservableType where E : RxAbstractInteger {
      - parameter scheduler: Scheduler to run the generator loop on.
      - returns: An observable sequence that contains a range of sequential integral numbers.
      */
-    public static func range(start: E, count: E, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
-        return RangeProducer(start: start, count: count, scheduler: scheduler)
+    public static func range(start: Element, count: Element, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
+        return RangeProducer(start: start, count: count, scheduler: scheduler)
     }
 }
 
-final fileprivate class RangeProducer : Producer {
-    fileprivate let _start: E
-    fileprivate let _count: E
+final private class RangeProducer: Producer {
+    fileprivate let _start: Element
+    fileprivate let _count: Element
     fileprivate let _scheduler: ImmediateSchedulerType
 
-    init(start: E, count: E, scheduler: ImmediateSchedulerType) {
-        if count < 0 {
+    init(start: Element, count: Element, scheduler: ImmediateSchedulerType) {
+        guard count >= 0 else {
             rxFatalError("count can't be negative")
         }
 
-        if start &+ (count - 1) < start {
+        guard start &+ (count - 1) >= start || count == 0 else {
             rxFatalError("overflow of count")
         }
 
-        _start = start
-        _count = count
-        _scheduler = scheduler
+        self._start = start
+        self._count = count
+        self._scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = RangeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class RangeSink : Sink where O.E: RxAbstractInteger {
-    typealias Parent = RangeProducer
+final private class RangeSink: Sink where Observer.Element: RxAbstractInteger {
+    typealias Parent = RangeProducer
     
     private let _parent: Parent
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
-        return _parent._scheduler.scheduleRecursive(0 as O.E) { i, recurse in
+        return self._parent._scheduler.scheduleRecursive(0 as Observer.Element) { i, recurse in
             if i < self._parent._count {
                 self.forwardOn(.next(self._parent._start + i))
                 recurse(i + 1)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Reduce.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Reduce.swift
index 3e4a7b9..7814c6a 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Reduce.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Reduce.swift
@@ -20,8 +20,8 @@ extension ObservableType {
     - parameter mapResult: A function to transform the final accumulator value into the result value.
     - returns: An observable sequence containing a single element with the final accumulator value.
     */
-    public func reduce(_ seed: A, accumulator: @escaping (A, E) throws -> A, mapResult: @escaping (A) throws -> R)
-        -> Observable {
+    public func reduce(_ seed: A, accumulator: @escaping (A, Element) throws -> A, mapResult: @escaping (A) throws -> Result)
+        -> Observable {
         return Reduce(source: self.asObservable(), seed: seed, accumulator: accumulator, mapResult: mapResult)
     }
 
@@ -36,22 +36,22 @@ extension ObservableType {
     - parameter accumulator: A accumulator function to be invoked on each element.
     - returns: An observable sequence containing a single element with the final accumulator value.
     */
-    public func reduce(_ seed: A, accumulator: @escaping (A, E) throws -> A)
+    public func reduce(_ seed: A, accumulator: @escaping (A, Element) throws -> A)
         -> Observable {
         return Reduce(source: self.asObservable(), seed: seed, accumulator: accumulator, mapResult: { $0 })
     }
 }
 
-final fileprivate class ReduceSink : Sink, ObserverType {
-    typealias ResultType = O.E
+final private class ReduceSink: Sink, ObserverType {
+    typealias ResultType = Observer.Element 
     typealias Parent = Reduce
     
     private let _parent: Parent
     private var _accumulation: AccumulateType
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _accumulation = parent._seed
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._accumulation = parent._seed
         
         super.init(observer: observer, cancel: cancel)
     }
@@ -60,31 +60,31 @@ final fileprivate class ReduceSink
         switch event {
         case .next(let value):
             do {
-                _accumulation = try _parent._accumulator(_accumulation, value)
+                self._accumulation = try self._parent._accumulator(self._accumulation, value)
             }
             catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
             }
         case .error(let e):
-            forwardOn(.error(e))
-            dispose()
+            self.forwardOn(.error(e))
+            self.dispose()
         case .completed:
             do {
-                let result = try _parent._mapResult(_accumulation)
-                forwardOn(.next(result))
-                forwardOn(.completed)
-                dispose()
+                let result = try self._parent._mapResult(self._accumulation)
+                self.forwardOn(.next(result))
+                self.forwardOn(.completed)
+                self.dispose()
             }
             catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
             }
         }
     }
 }
 
-final fileprivate class Reduce : Producer {
+final private class Reduce: Producer {
     typealias AccumulatorType = (AccumulateType, SourceType) throws -> AccumulateType
     typealias ResultSelectorType = (AccumulateType) throws -> ResultType
     
@@ -94,15 +94,15 @@ final fileprivate class Reduce : Produce
     fileprivate let _mapResult: ResultSelectorType
     
     init(source: Observable, seed: AccumulateType, accumulator: @escaping AccumulatorType, mapResult: @escaping ResultSelectorType) {
-        _source = source
-        _seed = seed
-        _accumulator = accumulator
-        _mapResult = mapResult
+        self._source = source
+        self._seed = seed
+        self._accumulator = accumulator
+        self._mapResult = mapResult
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == ResultType {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == ResultType {
         let sink = ReduceSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Repeat.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Repeat.swift
index 6892ec1..4fed45c 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Repeat.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Repeat.swift
@@ -16,21 +16,21 @@ extension ObservableType {
      - parameter scheduler: Scheduler to run the producer loop on.
      - returns: An observable sequence that repeats the given element infinitely.
      */
-    public static func repeatElement(_ element: E, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
+    public static func repeatElement(_ element: Element, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
         return RepeatElement(element: element, scheduler: scheduler)
     }
 }
 
-final fileprivate class RepeatElement : Producer {
+final private class RepeatElement: Producer {
     fileprivate let _element: Element
     fileprivate let _scheduler: ImmediateSchedulerType
     
     init(element: Element, scheduler: ImmediateSchedulerType) {
-        _element = element
-        _scheduler = scheduler
+        self._element = element
+        self._scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = RepeatElementSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
 
@@ -38,18 +38,18 @@ final fileprivate class RepeatElement : Producer {
     }
 }
 
-final fileprivate class RepeatElementSink : Sink {
-    typealias Parent = RepeatElement
+final private class RepeatElementSink: Sink {
+    typealias Parent = RepeatElement
     
     private let _parent: Parent
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
-        return _parent._scheduler.scheduleRecursive(_parent._element) { e, recurse in
+        return self._parent._scheduler.scheduleRecursive(self._parent._element) { e, recurse in
             self.forwardOn(.next(e))
             recurse(e)
         }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift b/Demo/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift
index 268b399..decd309 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift
@@ -18,7 +18,7 @@ extension ObservableType {
      - returns: An observable sequence producing the elements of the given sequence repeatedly until it terminates successfully or is notified to error or complete.
      */
     public func retryWhen(_ notificationHandler: @escaping (Observable) -> TriggerObservable)
-        -> Observable {
+        -> Observable {
         return RetryWhenSequence(sources: InfiniteSequence(repeatedValue: self.asObservable()), notificationHandler: notificationHandler)
     }
 
@@ -32,88 +32,88 @@ extension ObservableType {
      - returns: An observable sequence producing the elements of the given sequence repeatedly until it terminates successfully or is notified to error or complete.
      */
     public func retryWhen(_ notificationHandler: @escaping (Observable) -> TriggerObservable)
-        -> Observable {
+        -> Observable {
         return RetryWhenSequence(sources: InfiniteSequence(repeatedValue: self.asObservable()), notificationHandler: notificationHandler)
     }
 }
 
-final fileprivate class RetryTriggerSink
-    : ObserverType where S.Iterator.Element : ObservableType, S.Iterator.Element.E == O.E {
-    typealias E = TriggerObservable.E
+final private class RetryTriggerSink
+    : ObserverType where Sequence.Element: ObservableType, Sequence.Element.Element == Observer.Element {
+    typealias Element = TriggerObservable.Element
     
-    typealias Parent = RetryWhenSequenceSinkIter
+    typealias Parent = RetryWhenSequenceSinkIter
     
     fileprivate let _parent: Parent
 
     init(parent: Parent) {
-        _parent = parent
+        self._parent = parent
     }
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            _parent._parent._lastError = nil
-            _parent._parent.schedule(.moveNext)
+            self._parent._parent._lastError = nil
+            self._parent._parent.schedule(.moveNext)
         case .error(let e):
-            _parent._parent.forwardOn(.error(e))
-            _parent._parent.dispose()
+            self._parent._parent.forwardOn(.error(e))
+            self._parent._parent.dispose()
         case .completed:
-            _parent._parent.forwardOn(.completed)
-            _parent._parent.dispose()
+            self._parent._parent.forwardOn(.completed)
+            self._parent._parent.dispose()
         }
     }
 }
 
-final fileprivate class RetryWhenSequenceSinkIter
+final private class RetryWhenSequenceSinkIter
     : ObserverType
-    , Disposable where S.Iterator.Element : ObservableType, S.Iterator.Element.E == O.E {
-    typealias E = O.E
-    typealias Parent = RetryWhenSequenceSink
+    , Disposable where Sequence.Element: ObservableType, Sequence.Element.Element == Observer.Element {
+    typealias Element = Observer.Element 
+    typealias Parent = RetryWhenSequenceSink
 
     fileprivate let _parent: Parent
     fileprivate let _errorHandlerSubscription = SingleAssignmentDisposable()
     fileprivate let _subscription: Disposable
 
     init(parent: Parent, subscription: Disposable) {
-        _parent = parent
-        _subscription = subscription
+        self._parent = parent
+        self._subscription = subscription
     }
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            _parent.forwardOn(event)
+            self._parent.forwardOn(event)
         case .error(let error):
-            _parent._lastError = error
+            self._parent._lastError = error
 
             if let failedWith = error as? Error {
                 // dispose current subscription
-                _subscription.dispose()
+                self._subscription.dispose()
 
-                let errorHandlerSubscription = _parent._notifier.subscribe(RetryTriggerSink(parent: self))
-                _errorHandlerSubscription.setDisposable(errorHandlerSubscription)
-                _parent._errorSubject.on(.next(failedWith))
+                let errorHandlerSubscription = self._parent._notifier.subscribe(RetryTriggerSink(parent: self))
+                self._errorHandlerSubscription.setDisposable(errorHandlerSubscription)
+                self._parent._errorSubject.on(.next(failedWith))
             }
             else {
-                _parent.forwardOn(.error(error))
-                _parent.dispose()
+                self._parent.forwardOn(.error(error))
+                self._parent.dispose()
             }
         case .completed:
-            _parent.forwardOn(event)
-            _parent.dispose()
+            self._parent.forwardOn(event)
+            self._parent.dispose()
         }
     }
 
     final func dispose() {
-        _subscription.dispose()
-        _errorHandlerSubscription.dispose()
+        self._subscription.dispose()
+        self._errorHandlerSubscription.dispose()
     }
 }
 
-final fileprivate class RetryWhenSequenceSink
-    : TailRecursiveSink where S.Iterator.Element : ObservableType, S.Iterator.Element.E == O.E {
-    typealias Element = O.E
-    typealias Parent = RetryWhenSequence
+final private class RetryWhenSequenceSink
+    : TailRecursiveSink where Sequence.Element: ObservableType, Sequence.Element.Element == Observer.Element {
+    typealias Element = Observer.Element 
+    typealias Parent = RetryWhenSequence
     
     let _lock = RecursiveLock()
     
@@ -121,35 +121,35 @@ final fileprivate class RetryWhenSequenceSink()
-    fileprivate let _handler: Observable
-    fileprivate let _notifier = PublishSubject()
+    fileprivate let _handler: Observable
+    fileprivate let _notifier = PublishSubject()
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _handler = parent._notificationHandler(_errorSubject).asObservable()
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._handler = parent._notificationHandler(self._errorSubject).asObservable()
         super.init(observer: observer, cancel: cancel)
     }
     
     override func done() {
-        if let lastError = _lastError {
-            forwardOn(.error(lastError))
-            _lastError = nil
+        if let lastError = self._lastError {
+            self.forwardOn(.error(lastError))
+            self._lastError = nil
         }
         else {
-            forwardOn(.completed)
+            self.forwardOn(.completed)
         }
 
-        dispose()
+        self.dispose()
     }
     
-    override func extract(_ observable: Observable) -> SequenceGenerator? {
+    override func extract(_ observable: Observable) -> SequenceGenerator? {
         // It is important to always return `nil` here because there are sideffects in the `run` method
         // that are dependant on particular `retryWhen` operator so single operator stack can't be reused in this
         // case.
         return nil
     }
 
-    override func subscribeToNext(_ source: Observable) -> Disposable {
+    override func subscribeToNext(_ source: Observable) -> Disposable {
         let subscription = SingleAssignmentDisposable()
         let iter = RetryWhenSequenceSinkIter(parent: self, subscription: subscription)
         subscription.setDisposable(source.subscribe(iter))
@@ -157,25 +157,25 @@ final fileprivate class RetryWhenSequenceSink Disposable {
-        let triggerSubscription = _handler.subscribe(_notifier.asObserver())
+        let triggerSubscription = self._handler.subscribe(self._notifier.asObserver())
         let superSubscription = super.run(sources)
         return Disposables.create(superSubscription, triggerSubscription)
     }
 }
 
-final fileprivate class RetryWhenSequence : Producer where S.Iterator.Element : ObservableType {
-    typealias Element = S.Iterator.Element.E
+final private class RetryWhenSequence: Producer where Sequence.Element: ObservableType {
+    typealias Element = Sequence.Element.Element
     
-    fileprivate let _sources: S
+    fileprivate let _sources: Sequence
     fileprivate let _notificationHandler: (Observable) -> TriggerObservable
     
-    init(sources: S, notificationHandler: @escaping (Observable) -> TriggerObservable) {
-        _sources = sources
-        _notificationHandler = notificationHandler
+    init(sources: Sequence, notificationHandler: @escaping (Observable) -> TriggerObservable) {
+        self._sources = sources
+        self._notificationHandler = notificationHandler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let sink = RetryWhenSequenceSink(parent: self, observer: observer, cancel: cancel)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = RetryWhenSequenceSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run((self._sources.makeIterator(), nil))
         return (sink: sink, subscription: subscription)
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Sample.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Sample.swift
index 31f8b62..4fab683 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Sample.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Sample.swift
@@ -20,68 +20,59 @@ extension ObservableType {
      - parameter sampler: Sampling tick sequence.
      - returns: Sampled observable sequence.
      */
-    public func sample(_ sampler: O)
-        -> Observable {
+    public func sample(_ sampler: Source)
+        -> Observable {
             return Sample(source: self.asObservable(), sampler: sampler.asObservable())
     }
 }
 
-final fileprivate class SamplerSink
+final private class SamplerSink
     : ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias E = SampleType
+    typealias Element = SampleType
     
-    typealias Parent = SampleSequenceSink
+    typealias Parent = SampleSequenceSink
     
     fileprivate let _parent: Parent
 
     var _lock: RecursiveLock {
-        return _parent._lock
+        return self._parent._lock
     }
     
     init(parent: Parent) {
-        _parent = parent
+        self._parent = parent
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
-        case .next:
+        case .next, .completed:
             if let element = _parent._element {
-                _parent._element = nil
-                _parent.forwardOn(.next(element))
+                self._parent._element = nil
+                self._parent.forwardOn(.next(element))
             }
 
-            if _parent._atEnd {
-                _parent.forwardOn(.completed)
-                _parent.dispose()
+            if self._parent._atEnd {
+                self._parent.forwardOn(.completed)
+                self._parent.dispose()
             }
         case .error(let e):
-            _parent.forwardOn(.error(e))
-            _parent.dispose()
-        case .completed:
-            if let element = _parent._element {
-                _parent._element = nil
-                _parent.forwardOn(.next(element))
-            }
-            if _parent._atEnd {
-                _parent.forwardOn(.completed)
-                _parent.dispose()
-            }
+            self._parent.forwardOn(.error(e))
+            self._parent.dispose()
         }
     }
 }
 
-final fileprivate class SampleSequenceSink
-    : Sink
+final private class SampleSequenceSink
+    : Sink
     , ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias Element = O.E
+    typealias Element = Observer.Element 
     typealias Parent = Sample
     
     fileprivate let _parent: Parent
@@ -94,47 +85,47 @@ final fileprivate class SampleSequenceSink
     
     fileprivate let _sourceSubscription = SingleAssignmentDisposable()
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
-        _sourceSubscription.setDisposable(_parent._source.subscribe(self))
-        let samplerSubscription = _parent._sampler.subscribe(SamplerSink(parent: self))
+        self._sourceSubscription.setDisposable(self._parent._source.subscribe(self))
+        let samplerSubscription = self._parent._sampler.subscribe(SamplerSink(parent: self))
         
         return Disposables.create(_sourceSubscription, samplerSubscription)
     }
     
     func on(_ event: Event) {
-        synchronizedOn(event)
+        self.synchronizedOn(event)
     }
 
     func _synchronized_on(_ event: Event) {
         switch event {
         case .next(let element):
-            _element = element
+            self._element = element
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            _atEnd = true
-            _sourceSubscription.dispose()
+            self._atEnd = true
+            self._sourceSubscription.dispose()
         }
     }
     
 }
 
-final fileprivate class Sample : Producer {
+final private class Sample: Producer {
     fileprivate let _source: Observable
     fileprivate let _sampler: Observable
 
     init(source: Observable, sampler: Observable) {
-        _source = source
-        _sampler = sampler
+        self._source = source
+        self._sampler = sampler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = SampleSequenceSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Scan.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Scan.swift
index 39d5e92..7920ae9 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Scan.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Scan.swift
@@ -19,7 +19,7 @@ extension ObservableType {
      - parameter accumulator: An accumulator function to be invoked on each element.
      - returns: An observable sequence containing the accumulated values.
      */
-    public func scan(into seed: A, accumulator: @escaping (inout A, E) throws -> ())
+    public func scan(into seed: A, accumulator: @escaping (inout A, Element) throws -> Void)
         -> Observable {
         return Scan(source: self.asObservable(), seed: seed, accumulator: accumulator)
     }
@@ -35,7 +35,7 @@ extension ObservableType {
      - parameter accumulator: An accumulator function to be invoked on each element.
      - returns: An observable sequence containing the accumulated values.
      */
-    public func scan(_ seed: A, accumulator: @escaping (A, E) throws -> A)
+    public func scan(_ seed: A, accumulator: @escaping (A, Element) throws -> A)
         -> Observable {
         return Scan(source: self.asObservable(), seed: seed) { acc, element in
             let currentAcc = acc
@@ -44,58 +44,57 @@ extension ObservableType {
     }
 }
 
-final fileprivate class ScanSink : Sink, ObserverType {
-    typealias Accumulate = O.E
-    typealias Parent = Scan
-    typealias E = ElementType
-    
+final private class ScanSink: Sink, ObserverType {
+    typealias Accumulate = Observer.Element 
+    typealias Parent = Scan
+
     fileprivate let _parent: Parent
     fileprivate var _accumulate: Accumulate
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _accumulate = parent._seed
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._accumulate = parent._seed
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next(let element):
             do {
-                try _parent._accumulator(&_accumulate, element)
-                forwardOn(.next(_accumulate))
+                try self._parent._accumulator(&self._accumulate, element)
+                self.forwardOn(.next(self._accumulate))
             }
             catch let error {
-                forwardOn(.error(error))
-                dispose()
+                self.forwardOn(.error(error))
+                self.dispose()
             }
         case .error(let error):
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
     
 }
 
-final fileprivate class Scan: Producer {
-    typealias Accumulator = (inout Accumulate, Element) throws -> ()
+final private class Scan: Producer {
+    typealias Accumulator = (inout Accumulate, Element) throws -> Void
     
     fileprivate let _source: Observable
     fileprivate let _seed: Accumulate
     fileprivate let _accumulator: Accumulator
     
     init(source: Observable, seed: Accumulate, accumulator: @escaping Accumulator) {
-        _source = source
-        _seed = seed
-        _accumulator = accumulator
+        self._source = source
+        self._seed = seed
+        self._accumulator = accumulator
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Accumulate {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Accumulate {
         let sink = ScanSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Sequence.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Sequence.swift
index e141bc7..f158565 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Sequence.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Sequence.swift
@@ -18,7 +18,7 @@ extension ObservableType {
      - parameter scheduler: Scheduler to send elements on. If `nil`, elements are sent immediately on subscription.
      - returns: The observable sequence whose elements are pulled from the given arguments.
      */
-    public static func of(_ elements: E ..., scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
+    public static func of(_ elements: Element ..., scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
         return ObservableSequence(elements: elements, scheduler: scheduler)
     }
 }
@@ -31,7 +31,7 @@ extension ObservableType {
 
      - returns: The observable sequence whose elements are pulled from the given enumerable sequence.
      */
-    public static func from(_ array: [E], scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
+    public static func from(_ array: [Element], scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
         return ObservableSequence(elements: array, scheduler: scheduler)
     }
 
@@ -42,25 +42,25 @@ extension ObservableType {
 
      - returns: The observable sequence whose elements are pulled from the given enumerable sequence.
      */
-    public static func from(_ sequence: S, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable where S.Iterator.Element == E {
+    public static func from(_ sequence: Sequence, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable where Sequence.Element == Element {
         return ObservableSequence(elements: sequence, scheduler: scheduler)
     }
 }
 
-final fileprivate class ObservableSequenceSink : Sink where S.Iterator.Element == O.E {
-    typealias Parent = ObservableSequence
+final private class ObservableSequenceSink: Sink where Sequence.Element == Observer.Element {
+    typealias Parent = ObservableSequence
 
     private let _parent: Parent
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
 
     func run() -> Disposable {
-        return _parent._scheduler.scheduleRecursive((_parent._elements.makeIterator(), _parent._elements)) { (iterator, recurse) in
+        return self._parent._scheduler.scheduleRecursive(self._parent._elements.makeIterator()) { iterator, recurse in
             var mutableIterator = iterator
-            if let next = mutableIterator.0.next() {
+            if let next = mutableIterator.next() {
                 self.forwardOn(.next(next))
                 recurse(mutableIterator)
             }
@@ -72,16 +72,16 @@ final fileprivate class ObservableSequenceSink : S
     }
 }
 
-final fileprivate class ObservableSequence : Producer {
-    fileprivate let _elements: S
+final private class ObservableSequence: Producer {
+    fileprivate let _elements: Sequence
     fileprivate let _scheduler: ImmediateSchedulerType
 
-    init(elements: S, scheduler: ImmediateSchedulerType) {
-        _elements = elements
-        _scheduler = scheduler
+    init(elements: Sequence, scheduler: ImmediateSchedulerType) {
+        self._elements = elements
+        self._scheduler = scheduler
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = ObservableSequenceSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift b/Demo/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
index 5af102f..9565a49 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
@@ -139,7 +139,7 @@ extension ObservableType {
      - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
      */
     public func share(replay: Int = 0, scope: SubjectLifetimeScope = .whileConnected)
-        -> Observable {
+        -> Observable {
         switch scope {
         case .forever:
             switch replay {
@@ -159,7 +159,6 @@ extension ObservableType {
 fileprivate final class ShareReplay1WhileConnectedConnection
     : ObserverType
     , SynchronizedUnsubscribeType {
-    typealias E = Element
     typealias Observers = AnyObserver.s
     typealias DisposeKey = Observers.KeyType
 
@@ -173,66 +172,66 @@ fileprivate final class ShareReplay1WhileConnectedConnection
     fileprivate var _element: Element?
 
     init(parent: Parent, lock: RecursiveLock) {
-        _parent = parent
-        _lock = lock
+        self._parent = parent
+        self._lock = lock
 
         #if TRACE_RESOURCES
             _ = Resources.incrementTotal()
         #endif
     }
 
-    final func on(_ event: Event) {
-        _lock.lock()
-        let observers = _synchronized_on(event)
-        _lock.unlock()
+    final func on(_ event: Event) {
+        self._lock.lock()
+        let observers = self._synchronized_on(event)
+        self._lock.unlock()
         dispatch(observers, event)
     }
 
-    final private func _synchronized_on(_ event: Event) -> Observers {
-        if _disposed {
+    final private func _synchronized_on(_ event: Event) -> Observers {
+        if self._disposed {
             return Observers()
         }
 
         switch event {
         case .next(let element):
-            _element = element
-            return _observers
+            self._element = element
+            return self._observers
         case .error, .completed:
-            let observers = _observers
+            let observers = self._observers
             self._synchronized_dispose()
             return observers
         }
     }
 
     final func connect() {
-        _subscription.setDisposable(_parent._source.subscribe(self))
+        self._subscription.setDisposable(self._parent._source.subscribe(self))
     }
 
-    final func _synchronized_subscribe(_ observer: O) -> Disposable where O.E == Element {
-        _lock.lock(); defer { _lock.unlock() }
-        if let element = _element {
+    final func _synchronized_subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        self._lock.lock(); defer { self._lock.unlock() }
+        if let element = self._element {
             observer.on(.next(element))
         }
 
-        let disposeKey = _observers.insert(observer.on)
+        let disposeKey = self._observers.insert(observer.on)
 
         return SubscriptionDisposable(owner: self, key: disposeKey)
     }
 
     final private func _synchronized_dispose() {
-        _disposed = true
-        if _parent._connection === self {
-            _parent._connection = nil
+        self._disposed = true
+        if self._parent._connection === self {
+            self._parent._connection = nil
         }
-        _observers = Observers()
+        self._observers = Observers()
     }
 
     final func synchronizedUnsubscribe(_ disposeKey: DisposeKey) {
-        _lock.lock()
-        let shouldDisconnect = _synchronized_unsubscribe(disposeKey)
-        _lock.unlock()
+        self._lock.lock()
+        let shouldDisconnect = self._synchronized_unsubscribe(disposeKey)
+        self._lock.unlock()
         if shouldDisconnect {
-            _subscription.dispose()
+            self._subscription.dispose()
         }
     }
 
@@ -243,8 +242,8 @@ fileprivate final class ShareReplay1WhileConnectedConnection
             return false
         }
 
-        if _observers.count == 0 {
-            _synchronized_dispose()
+        if self._observers.count == 0 {
+            self._synchronized_dispose()
             return true
         }
 
@@ -259,7 +258,7 @@ fileprivate final class ShareReplay1WhileConnectedConnection
 }
 
 // optimized version of share replay for most common case
-final fileprivate class ShareReplay1WhileConnected
+final private class ShareReplay1WhileConnected
     : Observable {
 
     fileprivate typealias Connection = ShareReplay1WhileConnectedConnection
@@ -274,15 +273,15 @@ final fileprivate class ShareReplay1WhileConnected
         self._source = source
     }
 
-    override func subscribe(_ observer: O) -> Disposable where O.E == E {
-        _lock.lock()
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        self._lock.lock()
 
-        let connection = _synchronized_subscribe(observer)
+        let connection = self._synchronized_subscribe(observer)
         let count = connection._observers.count
 
         let disposable = connection._synchronized_subscribe(observer)
 
-        _lock.unlock()
+        self._lock.unlock()
         
         if count == 0 {
             connection.connect()
@@ -292,17 +291,17 @@ final fileprivate class ShareReplay1WhileConnected
     }
 
     @inline(__always)
-    private func _synchronized_subscribe(_ observer: O) -> Connection where O.E == E {
+    private func _synchronized_subscribe(_ observer: Observer) -> Connection where Observer.Element == Element {
         let connection: Connection
 
-        if let existingConnection = _connection {
+        if let existingConnection = self._connection {
             connection = existingConnection
         }
         else {
             connection = ShareReplay1WhileConnectedConnection(
                 parent: self,
-                lock: _lock)
-            _connection = connection
+                lock: self._lock)
+            self._connection = connection
         }
 
         return connection
@@ -312,7 +311,6 @@ final fileprivate class ShareReplay1WhileConnected
 fileprivate final class ShareWhileConnectedConnection
     : ObserverType
     , SynchronizedUnsubscribeType {
-    typealias E = Element
     typealias Observers = AnyObserver.s
     typealias DisposeKey = Observers.KeyType
 
@@ -325,62 +323,62 @@ fileprivate final class ShareWhileConnectedConnection
     fileprivate var _observers = Observers()
 
     init(parent: Parent, lock: RecursiveLock) {
-        _parent = parent
-        _lock = lock
+        self._parent = parent
+        self._lock = lock
 
         #if TRACE_RESOURCES
             _ = Resources.incrementTotal()
         #endif
     }
 
-    final func on(_ event: Event) {
-        _lock.lock()
-        let observers = _synchronized_on(event)
-        _lock.unlock()
+    final func on(_ event: Event) {
+        self._lock.lock()
+        let observers = self._synchronized_on(event)
+        self._lock.unlock()
         dispatch(observers, event)
     }
 
-    final private func _synchronized_on(_ event: Event) -> Observers {
-        if _disposed {
+    final private func _synchronized_on(_ event: Event) -> Observers {
+        if self._disposed {
             return Observers()
         }
 
         switch event {
         case .next:
-            return _observers
+            return self._observers
         case .error, .completed:
-            let observers = _observers
+            let observers = self._observers
             self._synchronized_dispose()
             return observers
         }
     }
 
     final func connect() {
-        _subscription.setDisposable(_parent._source.subscribe(self))
+        self._subscription.setDisposable(self._parent._source.subscribe(self))
     }
 
-    final func _synchronized_subscribe(_ observer: O) -> Disposable where O.E == Element {
-        _lock.lock(); defer { _lock.unlock() }
+    final func _synchronized_subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        self._lock.lock(); defer { self._lock.unlock() }
 
-        let disposeKey = _observers.insert(observer.on)
+        let disposeKey = self._observers.insert(observer.on)
 
         return SubscriptionDisposable(owner: self, key: disposeKey)
     }
 
     final private func _synchronized_dispose() {
-        _disposed = true
-        if _parent._connection === self {
-            _parent._connection = nil
+        self._disposed = true
+        if self._parent._connection === self {
+            self._parent._connection = nil
         }
-        _observers = Observers()
+        self._observers = Observers()
     }
 
     final func synchronizedUnsubscribe(_ disposeKey: DisposeKey) {
-        _lock.lock()
-        let shouldDisconnect = _synchronized_unsubscribe(disposeKey)
-        _lock.unlock()
+        self._lock.lock()
+        let shouldDisconnect = self._synchronized_unsubscribe(disposeKey)
+        self._lock.unlock()
         if shouldDisconnect {
-            _subscription.dispose()
+            self._subscription.dispose()
         }
     }
 
@@ -391,8 +389,8 @@ fileprivate final class ShareWhileConnectedConnection
             return false
         }
 
-        if _observers.count == 0 {
-            _synchronized_dispose()
+        if self._observers.count == 0 {
+            self._synchronized_dispose()
             return true
         }
 
@@ -407,7 +405,7 @@ fileprivate final class ShareWhileConnectedConnection
 }
 
 // optimized version of share replay for most common case
-final fileprivate class ShareWhileConnected
+final private class ShareWhileConnected
     : Observable {
 
     fileprivate typealias Connection = ShareWhileConnectedConnection
@@ -422,15 +420,15 @@ final fileprivate class ShareWhileConnected
         self._source = source
     }
 
-    override func subscribe(_ observer: O) -> Disposable where O.E == E {
-        _lock.lock()
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        self._lock.lock()
 
-        let connection = _synchronized_subscribe(observer)
+        let connection = self._synchronized_subscribe(observer)
         let count = connection._observers.count
 
         let disposable = connection._synchronized_subscribe(observer)
 
-        _lock.unlock()
+        self._lock.unlock()
 
         if count == 0 {
             connection.connect()
@@ -440,17 +438,17 @@ final fileprivate class ShareWhileConnected
     }
 
     @inline(__always)
-    private func _synchronized_subscribe(_ observer: O) -> Connection where O.E == E {
+    private func _synchronized_subscribe(_ observer: Observer) -> Connection where Observer.Element == Element {
         let connection: Connection
 
-        if let existingConnection = _connection {
+        if let existingConnection = self._connection {
             connection = existingConnection
         }
         else {
             connection = ShareWhileConnectedConnection(
                 parent: self,
-                lock: _lock)
-            _connection = connection
+                lock: self._lock)
+            self._connection = connection
         }
         
         return connection
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift
index 1419a93..e50a9be 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift
@@ -17,8 +17,8 @@ extension ObservableType {
      - returns: An observable sequence that emits a single element or throws an exception if more (or none) of them are emitted.
      */
     public func single()
-        -> Observable {
-        return SingleAsync(source: asObservable())
+        -> Observable {
+        return SingleAsync(source: self.asObservable())
     }
 
     /**
@@ -30,58 +30,57 @@ extension ObservableType {
      - parameter predicate: A function to test each source element for a condition.
      - returns: An observable sequence that emits a single element or throws an exception if more (or none) of them are emitted.
      */
-    public func single(_ predicate: @escaping (E) throws -> Bool)
-        -> Observable {
-        return SingleAsync(source: asObservable(), predicate: predicate)
+    public func single(_ predicate: @escaping (Element) throws -> Bool)
+        -> Observable {
+        return SingleAsync(source: self.asObservable(), predicate: predicate)
     }
 }
 
-fileprivate final class SingleAsyncSink : Sink, ObserverType {
-    typealias ElementType = O.E
-    typealias Parent = SingleAsync
-    typealias E = ElementType
+fileprivate final class SingleAsyncSink : Sink, ObserverType {
+    typealias Element = Observer.Element
+    typealias Parent = SingleAsync
     
     private let _parent: Parent
     private var _seenValue: Bool = false
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next(let value):
             do {
-                let forward = try _parent._predicate?(value) ?? true
+                let forward = try self._parent._predicate?(value) ?? true
                 if !forward {
                     return
                 }
             }
             catch let error {
-                forwardOn(.error(error as Swift.Error))
-                dispose()
+                self.forwardOn(.error(error as Swift.Error))
+                self.dispose()
                 return
             }
 
-            if _seenValue {
-                forwardOn(.error(RxError.moreThanOneElement))
-                dispose()
+            if self._seenValue {
+                self.forwardOn(.error(RxError.moreThanOneElement))
+                self.dispose()
                 return
             }
 
-            _seenValue = true
-            forwardOn(.next(value))
+            self._seenValue = true
+            self.forwardOn(.next(value))
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            if (_seenValue) {
-                forwardOn(.completed)
+            if self._seenValue {
+                self.forwardOn(.completed)
             } else {
-                forwardOn(.error(RxError.noElements))
+                self.forwardOn(.error(RxError.noElements))
             }
-            dispose()
+            self.dispose()
         }
     }
 }
@@ -93,13 +92,13 @@ final class SingleAsync: Producer {
     fileprivate let _predicate: Predicate?
     
     init(source: Observable, predicate: Predicate? = nil) {
-        _source = source
-        _predicate = predicate
+        self._source = source
+        self._predicate = predicate
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = SingleAsyncSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Sink.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Sink.swift
index 214cfda..1305d1b 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Sink.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Sink.swift
@@ -6,71 +6,70 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-class Sink : Disposable {
-    fileprivate let _observer: O
+class Sink : Disposable {
+    fileprivate let _observer: Observer
     fileprivate let _cancel: Cancelable
-    fileprivate var _disposed: Bool
+    fileprivate let _disposed = AtomicInt(0)
 
     #if DEBUG
         fileprivate let _synchronizationTracker = SynchronizationTracker()
     #endif
 
-    init(observer: O, cancel: Cancelable) {
+    init(observer: Observer, cancel: Cancelable) {
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
-        _observer = observer
-        _cancel = cancel
-        _disposed = false
+        self._observer = observer
+        self._cancel = cancel
     }
-    
-    final func forwardOn(_ event: Event) {
+
+    final func forwardOn(_ event: Event) {
         #if DEBUG
-            _synchronizationTracker.register(synchronizationErrorMessage: .default)
-            defer { _synchronizationTracker.unregister() }
+            self._synchronizationTracker.register(synchronizationErrorMessage: .default)
+            defer { self._synchronizationTracker.unregister() }
         #endif
-        if _disposed {
+        if isFlagSet(self._disposed, 1) {
             return
         }
-        _observer.on(event)
+        self._observer.on(event)
     }
-    
-    final func forwarder() -> SinkForward {
+
+    final func forwarder() -> SinkForward {
         return SinkForward(forward: self)
     }
 
     final var disposed: Bool {
-        return _disposed
+        return isFlagSet(self._disposed, 1)
     }
 
     func dispose() {
-        _disposed = true
-        _cancel.dispose()
+        fetchOr(self._disposed, 1)
+        self._cancel.dispose()
     }
 
     deinit {
 #if TRACE_RESOURCES
-       let _ =  Resources.decrementTotal()
+       _ =  Resources.decrementTotal()
 #endif
     }
 }
 
-final class SinkForward: ObserverType {
-    typealias E = O.E
-    
-    private let _forward: Sink
-    
-    init(forward: Sink) {
-        _forward = forward
+final class SinkForward: ObserverType {
+    typealias Element = Observer.Element 
+
+    private let _forward: Sink
+
+    init(forward: Sink) {
+        self._forward = forward
     }
-    
-    final func on(_ event: Event) {
+
+    final func on(_ event: Event) {
         switch event {
         case .next:
-            _forward._observer.on(event)
+            self._forward._observer.on(event)
         case .error, .completed:
-            _forward._observer.on(event)
-            _forward._cancel.dispose()
+            self._forward._observer.on(event)
+            self._forward._cancel.dispose()
         }
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Skip.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Skip.swift
index fcac9d4..3076f9c 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Skip.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Skip.swift
@@ -17,8 +17,8 @@ extension ObservableType {
      - returns: An observable sequence that contains the elements that occur after the specified index in the input sequence.
      */
     public func skip(_ count: Int)
-        -> Observable {
-        return SkipCount(source: asObservable(), count: count)
+        -> Observable {
+        return SkipCount(source: self.asObservable(), count: count)
     }
 }
 
@@ -34,22 +34,22 @@ extension ObservableType {
      - returns: An observable sequence with the elements skipped during the specified duration from the start of the source sequence.
      */
     public func skip(_ duration: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
         return SkipTime(source: self.asObservable(), duration: duration, scheduler: scheduler)
     }
 }
 
 // count version
 
-final fileprivate class SkipCountSink : Sink, ObserverType {
-    typealias Element = O.E
+final private class SkipCountSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
     typealias Parent = SkipCount
     
     let parent: Parent
     
     var remaining: Int
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
         self.parent = parent
         self.remaining = parent.count
         super.init(observer: observer, cancel: cancel)
@@ -59,24 +59,24 @@ final fileprivate class SkipCountSink : Sink, ObserverType {
         switch event {
         case .next(let value):
             
-            if remaining <= 0 {
-                forwardOn(.next(value))
+            if self.remaining <= 0 {
+                self.forwardOn(.next(value))
             }
             else {
-                remaining -= 1
+                self.remaining -= 1
             }
         case .error:
-            forwardOn(event)
+            self.forwardOn(event)
             self.dispose()
         case .completed:
-            forwardOn(event)
+            self.forwardOn(event)
             self.dispose()
         }
     }
     
 }
 
-final fileprivate class SkipCount: Producer {
+final private class SkipCount: Producer {
     let source: Observable
     let count: Int
     
@@ -85,9 +85,9 @@ final fileprivate class SkipCount: Producer {
         self.count = count
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = SkipCountSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = source.subscribe(sink)
+        let subscription = self.source.subscribe(sink)
 
         return (sink: sink, subscription: subscription)
     }
@@ -95,16 +95,15 @@ final fileprivate class SkipCount: Producer {
 
 // time version
 
-final fileprivate class SkipTimeSink : Sink, ObserverType where O.E == ElementType {
-    typealias Parent = SkipTime
-    typealias Element = ElementType
+final private class SkipTimeSink: Sink, ObserverType where Observer.Element == Element {
+    typealias Parent = SkipTime
 
     let parent: Parent
     
     // state
     var open = false
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
         self.parent = parent
         super.init(observer: observer, cancel: cancel)
     }
@@ -112,35 +111,35 @@ final fileprivate class SkipTimeSink : Sink, Ob
     func on(_ event: Event) {
         switch event {
         case .next(let value):
-            if open {
-                forwardOn(.next(value))
+            if self.open {
+                self.forwardOn(.next(value))
             }
         case .error:
-            forwardOn(event)
+            self.forwardOn(event)
             self.dispose()
         case .completed:
-            forwardOn(event)
+            self.forwardOn(event)
             self.dispose()
         }
     }
     
     func tick() {
-        open = true
+        self.open = true
     }
     
     func run() -> Disposable {
-        let disposeTimer = parent.scheduler.scheduleRelative((), dueTime: self.parent.duration) { _ in 
+        let disposeTimer = self.parent.scheduler.scheduleRelative((), dueTime: self.parent.duration) { _ in 
             self.tick()
             return Disposables.create()
         }
         
-        let disposeSubscription = parent.source.subscribe(self)
+        let disposeSubscription = self.parent.source.subscribe(self)
         
         return Disposables.create(disposeTimer, disposeSubscription)
     }
 }
 
-final fileprivate class SkipTime: Producer {
+final private class SkipTime: Producer {
     let source: Observable
     let duration: RxTimeInterval
     let scheduler: SchedulerType
@@ -151,7 +150,7 @@ final fileprivate class SkipTime: Producer {
         self.duration = duration
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = SkipTimeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift
index f35f1fd..056d795 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift
@@ -16,67 +16,67 @@ extension ObservableType {
      - parameter other: Observable sequence that starts propagation of elements of the source sequence.
      - returns: An observable sequence containing the elements of the source sequence that are emitted after the other sequence emits an item.
      */
-    public func skipUntil(_ other: O)
-        -> Observable {
-        return SkipUntil(source: asObservable(), other: other.asObservable())
+    public func skipUntil(_ other: Source)
+        -> Observable {
+        return SkipUntil(source: self.asObservable(), other: other.asObservable())
     }
 }
 
-final fileprivate class SkipUntilSinkOther
+final private class SkipUntilSinkOther
     : ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias Parent = SkipUntilSink
-    typealias E = Other
+    typealias Parent = SkipUntilSink
+    typealias Element = Other
     
     fileprivate let _parent: Parent
 
     var _lock: RecursiveLock {
-        return _parent._lock
+        return self._parent._lock
     }
     
     let _subscription = SingleAssignmentDisposable()
 
     init(parent: Parent) {
-        _parent = parent
+        self._parent = parent
         #if TRACE_RESOURCES
-            let _ = Resources.incrementTotal()
+            _ = Resources.incrementTotal()
         #endif
     }
 
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next:
-            _parent._forwardElements = true
-            _subscription.dispose()
+            self._parent._forwardElements = true
+            self._subscription.dispose()
         case .error(let e):
-            _parent.forwardOn(.error(e))
-            _parent.dispose()
+            self._parent.forwardOn(.error(e))
+            self._parent.dispose()
         case .completed:
-            _subscription.dispose()
+            self._subscription.dispose()
         }
     }
     
     #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
     }
     #endif
 
 }
 
 
-final fileprivate class SkipUntilSink
-    : Sink
+final private class SkipUntilSink
+    : Sink
     , ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias E = O.E
-    typealias Parent = SkipUntil
+    typealias Element = Observer.Element 
+    typealias Parent = SkipUntil
     
     let _lock = RecursiveLock()
     fileprivate let _parent: Parent
@@ -84,54 +84,54 @@ final fileprivate class SkipUntilSink
     
     fileprivate let _sourceSubscription = SingleAssignmentDisposable()
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next:
-            if _forwardElements {
-                forwardOn(event)
+            if self._forwardElements {
+                self.forwardOn(event)
             }
         case .error:
-            forwardOn(event)
+            self.forwardOn(event)
             self.dispose()
         case .completed:
-            if _forwardElements {
-                forwardOn(event)
+            if self._forwardElements {
+                self.forwardOn(event)
             }
             self.dispose()
         }
     }
     
     func run() -> Disposable {
-        let sourceSubscription = _parent._source.subscribe(self)
+        let sourceSubscription = self._parent._source.subscribe(self)
         let otherObserver = SkipUntilSinkOther(parent: self)
-        let otherSubscription = _parent._other.subscribe(otherObserver)
-        _sourceSubscription.setDisposable(sourceSubscription)
+        let otherSubscription = self._parent._other.subscribe(otherObserver)
+        self._sourceSubscription.setDisposable(sourceSubscription)
         otherObserver._subscription.setDisposable(otherSubscription)
         
         return Disposables.create(_sourceSubscription, otherObserver._subscription)
     }
 }
 
-final fileprivate class SkipUntil: Producer {
+final private class SkipUntil: Producer {
     
     fileprivate let _source: Observable
     fileprivate let _other: Observable
     
     init(source: Observable, other: Observable) {
-        _source = source
-        _other = other
+        self._source = source
+        self._other = other
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = SkipUntilSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift
index 4bb394b..db9f5a6 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift
@@ -16,62 +16,60 @@ extension ObservableType {
      - parameter predicate: A function to test each element for a condition.
      - returns: An observable sequence that contains the elements from the input sequence starting at the first element in the linear series that does not pass the test specified by predicate.
      */
-    public func skipWhile(_ predicate: @escaping (E) throws -> Bool) -> Observable {
-        return SkipWhile(source: asObservable(), predicate: predicate)
+    public func skipWhile(_ predicate: @escaping (Element) throws -> Bool) -> Observable {
+        return SkipWhile(source: self.asObservable(), predicate: predicate)
     }
 }
 
-final fileprivate class SkipWhileSink : Sink, ObserverType {
-
-    typealias Element = O.E
+final private class SkipWhileSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
     typealias Parent = SkipWhile
 
     fileprivate let _parent: Parent
     fileprivate var _running = false
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
 
     func on(_ event: Event) {
         switch event {
         case .next(let value):
-            if !_running {
+            if !self._running {
                 do {
-                    _running = try !_parent._predicate(value)
+                    self._running = try !self._parent._predicate(value)
                 } catch let e {
-                    forwardOn(.error(e))
-                    dispose()
+                    self.forwardOn(.error(e))
+                    self.dispose()
                     return
                 }
             }
 
-            if _running {
-                forwardOn(.next(value))
+            if self._running {
+                self.forwardOn(.next(value))
             }
         case .error, .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class SkipWhile: Producer {
+final private class SkipWhile: Producer {
     typealias Predicate = (Element) throws -> Bool
-    typealias PredicateWithIndex = (Element, Int) throws -> Bool
 
     fileprivate let _source: Observable
     fileprivate let _predicate: Predicate
 
     init(source: Observable, predicate: @escaping Predicate) {
-        _source = source
-        _predicate = predicate
+        self._source = source
+        self._predicate = predicate
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = SkipWhileSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/StartWith.swift b/Demo/Pods/RxSwift/RxSwift/Observables/StartWith.swift
index 14776f9..13fb31d 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/StartWith.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/StartWith.swift
@@ -16,13 +16,13 @@ extension ObservableType {
      - parameter elements: Elements to prepend to the specified sequence.
      - returns: The source sequence prepended with the specified values.
      */
-    public func startWith(_ elements: E ...)
-        -> Observable {
+    public func startWith(_ elements: Element ...)
+        -> Observable {
             return StartWith(source: self.asObservable(), elements: elements)
     }
 }
 
-final fileprivate class StartWith: Producer {
+final private class StartWith: Producer {
     let elements: [Element]
     let source: Observable
 
@@ -32,11 +32,11 @@ final fileprivate class StartWith: Producer {
         super.init()
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        for e in elements {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        for e in self.elements {
             observer.on(.next(e))
         }
 
-        return (sink: Disposables.create(), subscription: source.subscribe(observer))
+        return (sink: Disposables.create(), subscription: self.source.subscribe(observer))
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift
index 2a33e03..5f7be0b 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift
@@ -24,24 +24,24 @@ extension ObservableType {
      - returns: The source sequence whose subscriptions and unsubscriptions happen on the specified scheduler.
      */
     public func subscribeOn(_ scheduler: ImmediateSchedulerType)
-        -> Observable {
+        -> Observable {
         return SubscribeOn(source: self, scheduler: scheduler)
     }
 }
 
-final fileprivate class SubscribeOnSink : Sink, ObserverType where Ob.E == O.E {
-    typealias Element = O.E
+final private class SubscribeOnSink: Sink, ObserverType where Ob.Element == Observer.Element {
+    typealias Element = Observer.Element 
     typealias Parent = SubscribeOn
     
     let parent: Parent
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
         self.parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event) {
-        forwardOn(event)
+        self.forwardOn(event)
         
         if event.isStopEvent {
             self.dispose()
@@ -54,7 +54,7 @@ final fileprivate class SubscribeOnSink : S
         
         disposeEverything.disposable = cancelSchedule
         
-        let disposeSchedule = parent.scheduler.schedule(()) { (_) -> Disposable in
+        let disposeSchedule = self.parent.scheduler.schedule(()) { _ -> Disposable in
             let subscription = self.parent.source.subscribe(self)
             disposeEverything.disposable = ScheduledDisposable(scheduler: self.parent.scheduler, disposable: subscription)
             return Disposables.create()
@@ -66,7 +66,7 @@ final fileprivate class SubscribeOnSink : S
     }
 }
 
-final fileprivate class SubscribeOn : Producer {
+final private class SubscribeOn: Producer {
     let source: Ob
     let scheduler: ImmediateSchedulerType
     
@@ -75,7 +75,7 @@ final fileprivate class SubscribeOn : Producer {
         self.scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Ob.E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Ob.Element {
         let sink = SubscribeOnSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Switch.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Switch.swift
index 2da1000..ac12f2f 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Switch.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Switch.swift
@@ -19,13 +19,13 @@ extension ObservableType {
      - returns: An observable sequence whose elements are the result of invoking the transform function on each element of source producing an
      Observable of Observable sequences and that at any point in time produces the elements of the most recent inner observable sequence that has been received.
      */
-    public func flatMapLatest(_ selector: @escaping (E) throws -> O)
-        -> Observable {
-            return FlatMapLatest(source: asObservable(), selector: selector)
+    public func flatMapLatest(_ selector: @escaping (Element) throws -> Source)
+        -> Observable {
+            return FlatMapLatest(source: self.asObservable(), selector: selector)
     }
 }
 
-extension ObservableType where E : ObservableConvertibleType {
+extension ObservableType where Element : ObservableConvertibleType {
 
     /**
      Transforms an observable sequence of observable sequences into an observable sequence
@@ -38,15 +38,15 @@ extension ObservableType where E : ObservableConvertibleType {
 
      - returns: The observable sequence that at any point in time produces the elements of the most recent inner observable sequence that has been received.
      */
-    public func switchLatest() -> Observable {
-        return Switch(source: asObservable())
+    public func switchLatest() -> Observable {
+        return Switch(source: self.asObservable())
     }
 }
 
-fileprivate class SwitchSink
-    : Sink
-    , ObserverType where S.E == O.E {
-    typealias E = SourceType
+private class SwitchSink
+    : Sink
+    , ObserverType where Source.Element == Observer.Element {
+    typealias Element = SourceType
 
     fileprivate let _subscriptions: SingleAssignmentDisposable = SingleAssignmentDisposable()
     fileprivate let _innerSubscription: SerialDisposable = SerialDisposable()
@@ -58,114 +58,114 @@ fileprivate class SwitchSink) -> Disposable {
         let subscription = source.subscribe(self)
-        _subscriptions.setDisposable(subscription)
+        self._subscriptions.setDisposable(subscription)
         return Disposables.create(_subscriptions, _innerSubscription)
     }
 
-    func performMap(_ element: SourceType) throws -> S {
+    func performMap(_ element: SourceType) throws -> Source {
         rxAbstractMethod()
     }
 
     @inline(__always)
-    final private func nextElementArrived(element: E) -> (Int, Observable)? {
-        _lock.lock(); defer { _lock.unlock() } // {
+    final private func nextElementArrived(element: Element) -> (Int, Observable)? {
+        self._lock.lock(); defer { self._lock.unlock() } // {
             do {
-                let observable = try performMap(element).asObservable()
-                _hasLatest = true
-                _latest = _latest &+ 1
-                return (_latest, observable)
+                let observable = try self.performMap(element).asObservable()
+                self._hasLatest = true
+                self._latest = self._latest &+ 1
+                return (self._latest, observable)
             }
             catch let error {
-                forwardOn(.error(error))
-                dispose()
+                self.forwardOn(.error(error))
+                self.dispose()
             }
 
             return nil
         // }
     }
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next(let element):
-            if let (latest, observable) = nextElementArrived(element: element) {
+            if let (latest, observable) = self.nextElementArrived(element: element) {
                 let d = SingleAssignmentDisposable()
-                _innerSubscription.disposable = d
+                self._innerSubscription.disposable = d
                    
                 let observer = SwitchSinkIter(parent: self, id: latest, _self: d)
                 let disposable = observable.subscribe(observer)
                 d.setDisposable(disposable)
             }
         case .error(let error):
-            _lock.lock(); defer { _lock.unlock() }
-            forwardOn(.error(error))
-            dispose()
+            self._lock.lock(); defer { self._lock.unlock() }
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            _lock.lock(); defer { _lock.unlock() }
-            _stopped = true
+            self._lock.lock(); defer { self._lock.unlock() }
+            self._stopped = true
             
-            _subscriptions.dispose()
+            self._subscriptions.dispose()
             
-            if !_hasLatest {
-                forwardOn(.completed)
-                dispose()
+            if !self._hasLatest {
+                self.forwardOn(.completed)
+                self.dispose()
             }
         }
     }
 }
 
-final fileprivate class SwitchSinkIter
+final private class SwitchSinkIter
     : ObserverType
     , LockOwnerType
-    , SynchronizedOnType where S.E == O.E {
-    typealias E = S.E
-    typealias Parent = SwitchSink
+    , SynchronizedOnType where Source.Element == Observer.Element {
+    typealias Element = Source.Element
+    typealias Parent = SwitchSink
     
     fileprivate let _parent: Parent
     fileprivate let _id: Int
     fileprivate let _self: Disposable
 
     var _lock: RecursiveLock {
-        return _parent._lock
+        return self._parent._lock
     }
 
     init(parent: Parent, id: Int, _self: Disposable) {
-        _parent = parent
-        _id = id
+        self._parent = parent
+        self._id = id
         self._self = _self
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next: break
         case .error, .completed:
-            _self.dispose()
+            self._self.dispose()
         }
         
-        if _parent._latest != _id {
+        if self._parent._latest != self._id {
             return
         }
        
         switch event {
         case .next:
-            _parent.forwardOn(event)
+            self._parent.forwardOn(event)
         case .error:
-            _parent.forwardOn(event)
-            _parent.dispose()
+            self._parent.forwardOn(event)
+            self._parent.dispose()
         case .completed:
-            _parent._hasLatest = false
-            if _parent._stopped {
-                _parent.forwardOn(event)
-                _parent.dispose()
+            self._parent._hasLatest = false
+            if self._parent._stopped {
+                self._parent.forwardOn(event)
+                self._parent.dispose()
             }
         }
     }
@@ -173,61 +173,62 @@ final fileprivate class SwitchSinkIter : SwitchSink where O.E == S.E {
-    override init(observer: O, cancel: Cancelable) {
+final private class SwitchIdentitySink: SwitchSink
+    where Observer.Element == Source.Element {
+    override init(observer: Observer, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
 
-    override func performMap(_ element: S) throws -> S {
+    override func performMap(_ element: Source) throws -> Source {
         return element
     }
 }
 
-final fileprivate class MapSwitchSink : SwitchSink where O.E == S.E {
-    typealias Selector = (SourceType) throws -> S
+final private class MapSwitchSink: SwitchSink where Observer.Element == Source.Element {
+    typealias Selector = (SourceType) throws -> Source
 
     fileprivate let _selector: Selector
 
-    init(selector: @escaping Selector, observer: O, cancel: Cancelable) {
-        _selector = selector
+    init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
+        self._selector = selector
         super.init(observer: observer, cancel: cancel)
     }
 
-    override func performMap(_ element: SourceType) throws -> S {
-        return try _selector(element)
+    override func performMap(_ element: SourceType) throws -> Source {
+        return try self._selector(element)
     }
 }
 
 // MARK: Producers
 
-final fileprivate class Switch : Producer {
-    fileprivate let _source: Observable
+final private class Switch: Producer {
+    fileprivate let _source: Observable
     
-    init(source: Observable) {
-        _source = source
+    init(source: Observable) {
+        self._source = source
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
-        let sink = SwitchIdentitySink(observer: observer, cancel: cancel)
-        let subscription = sink.run(_source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Source.Element {
+        let sink = SwitchIdentitySink(observer: observer, cancel: cancel)
+        let subscription = sink.run(self._source)
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class FlatMapLatest : Producer {
-    typealias Selector = (SourceType) throws -> S
+final private class FlatMapLatest: Producer {
+    typealias Selector = (SourceType) throws -> Source
 
     fileprivate let _source: Observable
     fileprivate let _selector: Selector
 
     init(source: Observable, selector: @escaping Selector) {
-        _source = source
-        _selector = selector
+        self._source = source
+        self._selector = selector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
-        let sink = MapSwitchSink(selector: _selector, observer: observer, cancel: cancel)
-        let subscription = sink.run(_source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Source.Element {
+        let sink = MapSwitchSink(selector: self._selector, observer: observer, cancel: cancel)
+        let subscription = sink.run(self._source)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift
index 0b10dc6..5ead0f2 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift
@@ -15,90 +15,90 @@ extension ObservableType {
      - parameter switchTo: Observable sequence being returned when source sequence is empty.
      - returns: Observable sequence that contains elements from switchTo sequence if source is empty, otherwise returns source sequence elements.
      */
-    public func ifEmpty(switchTo other: Observable) -> Observable {
-        return SwitchIfEmpty(source: asObservable(), ifEmpty: other)
+    public func ifEmpty(switchTo other: Observable) -> Observable {
+        return SwitchIfEmpty(source: self.asObservable(), ifEmpty: other)
     }
 }
 
-final fileprivate class SwitchIfEmpty: Producer {
+final private class SwitchIfEmpty: Producer {
     
-    private let _source: Observable
-    private let _ifEmpty: Observable
+    private let _source: Observable
+    private let _ifEmpty: Observable
     
-    init(source: Observable, ifEmpty: Observable) {
-        _source = source
-        _ifEmpty = ifEmpty
+    init(source: Observable, ifEmpty: Observable) {
+        self._source = source
+        self._ifEmpty = ifEmpty
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let sink = SwitchIfEmptySink(ifEmpty: _ifEmpty,
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = SwitchIfEmptySink(ifEmpty: self._ifEmpty,
                                      observer: observer,
                                      cancel: cancel)
-        let subscription = sink.run(_source.asObservable())
+        let subscription = sink.run(self._source.asObservable())
         
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class SwitchIfEmptySink: Sink
+final private class SwitchIfEmptySink: Sink
     , ObserverType {
-    typealias E = O.E
+    typealias Element = Observer.Element
     
-    private let _ifEmpty: Observable
+    private let _ifEmpty: Observable
     private var _isEmpty = true
     private let _ifEmptySubscription = SingleAssignmentDisposable()
     
-    init(ifEmpty: Observable, observer: O, cancel: Cancelable) {
-        _ifEmpty = ifEmpty
+    init(ifEmpty: Observable, observer: Observer, cancel: Cancelable) {
+        self._ifEmpty = ifEmpty
         super.init(observer: observer, cancel: cancel)
     }
     
-    func run(_ source: Observable) -> Disposable {
+    func run(_ source: Observable) -> Disposable {
         let subscription = source.subscribe(self)
         return Disposables.create(subscription, _ifEmptySubscription)
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            _isEmpty = false
-            forwardOn(event)
+            self._isEmpty = false
+            self.forwardOn(event)
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            guard _isEmpty else {
-                forwardOn(.completed)
-                dispose()
+            guard self._isEmpty else {
+                self.forwardOn(.completed)
+                self.dispose()
                 return
             }
             let ifEmptySink = SwitchIfEmptySinkIter(parent: self)
-            _ifEmptySubscription.setDisposable(_ifEmpty.subscribe(ifEmptySink))
+            self._ifEmptySubscription.setDisposable(self._ifEmpty.subscribe(ifEmptySink))
         }
     }
 }
 
-final fileprivate class SwitchIfEmptySinkIter
+final private class SwitchIfEmptySinkIter
     : ObserverType {
-    typealias E = O.E
-    typealias Parent = SwitchIfEmptySink
+    typealias Element = Observer.Element
+    typealias Parent = SwitchIfEmptySink
     
     private let _parent: Parent
 
     init(parent: Parent) {
-        _parent = parent
+        self._parent = parent
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            _parent.forwardOn(event)
+            self._parent.forwardOn(event)
         case .error:
-            _parent.forwardOn(event)
-            _parent.dispose()
+            self._parent.forwardOn(event)
+            self._parent.dispose()
         case .completed:
-            _parent.forwardOn(event)
-            _parent.dispose()
+            self._parent.forwardOn(event)
+            self._parent.dispose()
         }
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Take.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Take.swift
index 661f858..95b0b60 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Take.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Take.swift
@@ -17,12 +17,12 @@ extension ObservableType {
      - returns: An observable sequence that contains the specified number of elements from the start of the input sequence.
      */
     public func take(_ count: Int)
-        -> Observable {
+        -> Observable {
         if count == 0 {
             return Observable.empty()
         }
         else {
-            return TakeCount(source: asObservable(), count: count)
+            return TakeCount(source: self.asObservable(), count: count)
         }
     }
 }
@@ -39,53 +39,53 @@ extension ObservableType {
      - returns: An observable sequence with the elements taken during the specified duration from the start of the source sequence.
      */
     public func take(_ duration: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
         return TakeTime(source: self.asObservable(), duration: duration, scheduler: scheduler)
     }
 }
 
 // count version
 
-final fileprivate class TakeCountSink : Sink, ObserverType {
-    typealias E = O.E
-    typealias Parent = TakeCount
+final private class TakeCountSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = TakeCount
     
     private let _parent: Parent
     
     private var _remaining: Int
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _remaining = parent._count
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._remaining = parent._count
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next(let value):
             
-            if _remaining > 0 {
-                _remaining -= 1
+            if self._remaining > 0 {
+                self._remaining -= 1
                 
-                forwardOn(.next(value))
+                self.forwardOn(.next(value))
             
-                if _remaining == 0 {
-                    forwardOn(.completed)
-                    dispose()
+                if self._remaining == 0 {
+                    self.forwardOn(.completed)
+                    self.dispose()
                 }
             }
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
     
 }
 
-final fileprivate class TakeCount: Producer {
+final private class TakeCount: Producer {
     fileprivate let _source: Observable
     fileprivate let _count: Int
     
@@ -93,73 +93,72 @@ final fileprivate class TakeCount: Producer {
         if count < 0 {
             rxFatalError("count can't be negative")
         }
-        _source = source
-        _count = count
+        self._source = source
+        self._count = count
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = TakeCountSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
 
 // time version
 
-final fileprivate class TakeTimeSink
-    : Sink
+final private class TakeTimeSink
+    : Sink
     , LockOwnerType
     , ObserverType
-    , SynchronizedOnType where O.E == ElementType {
-    typealias Parent = TakeTime
-    typealias E = ElementType
+    , SynchronizedOnType where Observer.Element == Element {
+    typealias Parent = TakeTime
 
     fileprivate let _parent: Parent
     
     let _lock = RecursiveLock()
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next(let value):
-            forwardOn(.next(value))
+            self.forwardOn(.next(value))
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
     
     func tick() {
-        _lock.lock(); defer { _lock.unlock() }
+        self._lock.lock(); defer { self._lock.unlock() }
 
-        forwardOn(.completed)
-        dispose()
+        self.forwardOn(.completed)
+        self.dispose()
     }
     
     func run() -> Disposable {
-        let disposeTimer = _parent._scheduler.scheduleRelative((), dueTime: _parent._duration) { _ in
+        let disposeTimer = self._parent._scheduler.scheduleRelative((), dueTime: self._parent._duration) { _ in
             self.tick()
             return Disposables.create()
         }
         
-        let disposeSubscription = _parent._source.subscribe(self)
+        let disposeSubscription = self._parent._source.subscribe(self)
         
         return Disposables.create(disposeTimer, disposeSubscription)
     }
 }
 
-final fileprivate class TakeTime : Producer {
+final private class TakeTime: Producer {
     typealias TimeInterval = RxTimeInterval
     
     fileprivate let _source: Observable
@@ -167,12 +166,12 @@ final fileprivate class TakeTime : Producer {
     fileprivate let _scheduler: SchedulerType
     
     init(source: Observable, duration: TimeInterval, scheduler: SchedulerType) {
-        _source = source
-        _scheduler = scheduler
-        _duration = duration
+        self._source = source
+        self._scheduler = scheduler
+        self._duration = duration
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = TakeTimeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/TakeLast.swift b/Demo/Pods/RxSwift/RxSwift/Observables/TakeLast.swift
index 7bf1664..5a5d684 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/TakeLast.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/TakeLast.swift
@@ -19,46 +19,46 @@ extension ObservableType {
      - returns: An observable sequence containing the specified number of elements from the end of the source sequence.
      */
     public func takeLast(_ count: Int)
-        -> Observable {
-        return TakeLast(source: asObservable(), count: count)
+        -> Observable {
+        return TakeLast(source: self.asObservable(), count: count)
     }
 }
 
-final fileprivate class TakeLastSink : Sink, ObserverType {
-    typealias E = O.E
-    typealias Parent = TakeLast
+final private class TakeLastSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = TakeLast
     
     private let _parent: Parent
     
-    private var _elements: Queue
+    private var _elements: Queue
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _elements = Queue(capacity: parent._count + 1)
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._elements = Queue(capacity: parent._count + 1)
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next(let value):
-            _elements.enqueue(value)
-            if _elements.count > self._parent._count {
-                let _ = _elements.dequeue()
+            self._elements.enqueue(value)
+            if self._elements.count > self._parent._count {
+                _ = self._elements.dequeue()
             }
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            for e in _elements {
-                forwardOn(.next(e))
+            for e in self._elements {
+                self.forwardOn(.next(e))
             }
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class TakeLast: Producer {
+final private class TakeLast: Producer {
     fileprivate let _source: Observable
     fileprivate let _count: Int
     
@@ -66,13 +66,13 @@ final fileprivate class TakeLast: Producer {
         if count < 0 {
             rxFatalError("count can't be negative")
         }
-        _source = source
-        _count = count
+        self._source = source
+        self._count = count
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = TakeLastSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift b/Demo/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift
index f2e5f98..f6490d4 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift
@@ -16,116 +16,212 @@ extension ObservableType {
      - parameter other: Observable sequence that terminates propagation of elements of the source sequence.
      - returns: An observable sequence containing the elements of the source sequence up to the point the other sequence interrupted further propagation.
      */
-    public func takeUntil(_ other: O)
-        -> Observable {
-        return TakeUntil(source: asObservable(), other: other.asObservable())
+    public func takeUntil(_ other: Source)
+        -> Observable {
+        return TakeUntil(source: self.asObservable(), other: other.asObservable())
+    }
+
+    /**
+     Returns elements from an observable sequence until the specified condition is true.
+
+     - seealso: [takeUntil operator on reactivex.io](http://reactivex.io/documentation/operators/takeuntil.html)
+
+     - parameter behavior: Whether or not to include the last element matching the predicate.
+     - parameter predicate: A function to test each element for a condition.
+     - returns: An observable sequence that contains the elements from the input sequence that occur before the element at which the test passes.
+     */
+    public func takeUntil(_ behavior: TakeUntilBehavior,
+                          predicate: @escaping (Element) throws -> Bool)
+        -> Observable {
+        return TakeUntilPredicate(source: self.asObservable(),
+                                  behavior: behavior,
+                                  predicate: predicate)
     }
 }
 
-final fileprivate class TakeUntilSinkOther
+/// Behaviors for the `takeUntil(_ behavior:predicate:)` operator.
+public enum TakeUntilBehavior {
+    /// Include the last element matching the predicate.
+    case inclusive
+
+    /// Exclude the last element matching the predicate.
+    case exclusive
+}
+
+// MARK: - TakeUntil Observable
+final private class TakeUntilSinkOther
     : ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias Parent = TakeUntilSink
-    typealias E = Other
+    typealias Parent = TakeUntilSink
+    typealias Element = Other
     
     fileprivate let _parent: Parent
 
     var _lock: RecursiveLock {
-        return _parent._lock
+        return self._parent._lock
     }
     
     fileprivate let _subscription = SingleAssignmentDisposable()
     
     init(parent: Parent) {
-        _parent = parent
+        self._parent = parent
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next:
-            _parent.forwardOn(.completed)
-            _parent.dispose()
+            self._parent.forwardOn(.completed)
+            self._parent.dispose()
         case .error(let e):
-            _parent.forwardOn(.error(e))
-            _parent.dispose()
+            self._parent.forwardOn(.error(e))
+            self._parent.dispose()
         case .completed:
-            _subscription.dispose()
+            self._subscription.dispose()
         }
     }
     
 #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
     }
 #endif
 }
 
-final fileprivate class TakeUntilSink
-    : Sink
+final private class TakeUntilSink
+    : Sink
     , LockOwnerType
     , ObserverType
     , SynchronizedOnType {
-    typealias E = O.E
-    typealias Parent = TakeUntil
+    typealias Element = Observer.Element 
+    typealias Parent = TakeUntil
     
     fileprivate let _parent: Parent
  
     let _lock = RecursiveLock()
     
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next:
-            forwardOn(event)
+            self.forwardOn(event)
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
     
     func run() -> Disposable {
         let otherObserver = TakeUntilSinkOther(parent: self)
-        let otherSubscription = _parent._other.subscribe(otherObserver)
+        let otherSubscription = self._parent._other.subscribe(otherObserver)
         otherObserver._subscription.setDisposable(otherSubscription)
-        let sourceSubscription = _parent._source.subscribe(self)
+        let sourceSubscription = self._parent._source.subscribe(self)
         
         return Disposables.create(sourceSubscription, otherObserver._subscription)
     }
 }
 
-final fileprivate class TakeUntil: Producer {
+final private class TakeUntil: Producer {
     
     fileprivate let _source: Observable
     fileprivate let _other: Observable
     
     init(source: Observable, other: Observable) {
-        _source = source
-        _other = other
+        self._source = source
+        self._other = other
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = TakeUntilSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
+
+// MARK: - TakeUntil Predicate
+final private class TakeUntilPredicateSink
+    : Sink, ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = TakeUntilPredicate
+
+    fileprivate let _parent: Parent
+    fileprivate var _running = true
+
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        super.init(observer: observer, cancel: cancel)
+    }
+
+    func on(_ event: Event) {
+        switch event {
+        case .next(let value):
+            if !self._running {
+                return
+            }
+
+            do {
+                self._running = try !self._parent._predicate(value)
+            } catch let e {
+                self.forwardOn(.error(e))
+                self.dispose()
+                return
+            }
+
+            if self._running {
+                self.forwardOn(.next(value))
+            } else {
+                if self._parent._behavior == .inclusive {
+                    self.forwardOn(.next(value))
+                }
+
+                self.forwardOn(.completed)
+                self.dispose()
+            }
+        case .error, .completed:
+            self.forwardOn(event)
+            self.dispose()
+        }
+    }
+
+}
+
+final private class TakeUntilPredicate: Producer {
+    typealias Predicate = (Element) throws -> Bool
+
+    fileprivate let _source: Observable
+    fileprivate let _predicate: Predicate
+    fileprivate let _behavior: TakeUntilBehavior
+
+    init(source: Observable,
+         behavior: TakeUntilBehavior,
+         predicate: @escaping Predicate) {
+        self._source = source
+        self._behavior = behavior
+        self._predicate = predicate
+    }
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = TakeUntilPredicateSink(parent: self, observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
+        return (sink: sink, subscription: subscription)
+    }
+}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift b/Demo/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift
index 2b7b551..efd5311 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift
@@ -16,70 +16,70 @@ extension ObservableType {
      - parameter predicate: A function to test each element for a condition.
      - returns: An observable sequence that contains the elements from the input sequence that occur before the element at which the test no longer passes.
      */
-    public func takeWhile(_ predicate: @escaping (E) throws -> Bool)
-        -> Observable {
-        return TakeWhile(source: asObservable(), predicate: predicate)
+    public func takeWhile(_ predicate: @escaping (Element) throws -> Bool)
+        -> Observable {
+        return TakeWhile(source: self.asObservable(), predicate: predicate)
     }
 }
 
-final fileprivate class TakeWhileSink
-    : Sink
+final private class TakeWhileSink
+    : Sink
     , ObserverType {
-    typealias Element = O.E
+    typealias Element = Observer.Element 
     typealias Parent = TakeWhile
 
     fileprivate let _parent: Parent
 
     fileprivate var _running = true
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event) {
         switch event {
         case .next(let value):
-            if !_running {
+            if !self._running {
                 return
             }
             
             do {
-                _running = try _parent._predicate(value)
+                self._running = try self._parent._predicate(value)
             } catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
                 return
             }
             
-            if _running {
-                forwardOn(.next(value))
+            if self._running {
+                self.forwardOn(.next(value))
             } else {
-                forwardOn(.completed)
-                dispose()
+                self.forwardOn(.completed)
+                self.dispose()
             }
         case .error, .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
     
 }
 
-final fileprivate class TakeWhile: Producer {
+final private class TakeWhile: Producer {
     typealias Predicate = (Element) throws -> Bool
 
     fileprivate let _source: Observable
     fileprivate let _predicate: Predicate
 
     init(source: Observable, predicate: @escaping Predicate) {
-        _source = source
-        _predicate = predicate
+        self._source = source
+        self._predicate = predicate
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = TakeWhileSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Throttle.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Throttle.swift
index 0c4ca74..f682433 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Throttle.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Throttle.swift
@@ -23,17 +23,17 @@ extension ObservableType {
      - returns: The throttled sequence.
      */
     public func throttle(_ dueTime: RxTimeInterval, latest: Bool = true, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
         return Throttle(source: self.asObservable(), dueTime: dueTime, latest: latest, scheduler: scheduler)
     }
 }
 
-final fileprivate class ThrottleSink
-    : Sink
+final private class ThrottleSink
+    : Sink
     , ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias Element = O.E
+    typealias Element = Observer.Element 
     typealias ParentType = Throttle
     
     private let _parent: ParentType
@@ -41,120 +41,116 @@ final fileprivate class ThrottleSink
     let _lock = RecursiveLock()
     
     // state
-    private var _lastUnsentElement: Element? = nil
-    private var _lastSentTime: Date? = nil
+    private var _lastUnsentElement: Element?
+    private var _lastSentTime: Date?
     private var _completed: Bool = false
 
     let cancellable = SerialDisposable()
     
-    init(parent: ParentType, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: ParentType, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
-        let subscription = _parent._source.subscribe(self)
+        let subscription = self._parent._source.subscribe(self)
         
         return Disposables.create(subscription, cancellable)
     }
 
     func on(_ event: Event) {
-        synchronizedOn(event)
+        self.synchronizedOn(event)
     }
 
     func _synchronized_on(_ event: Event) {
         switch event {
         case .next(let element):
-            let now = _parent._scheduler.now
+            let now = self._parent._scheduler.now
 
-            let timeIntervalSinceLast: RxTimeInterval
+            let reducedScheduledTime: RxTimeInterval
 
-            if let lastSendingTime = _lastSentTime {
-                timeIntervalSinceLast = now.timeIntervalSince(lastSendingTime)
+            if let lastSendingTime = self._lastSentTime {
+                reducedScheduledTime = self._parent._dueTime.reduceWithSpanBetween(earlierDate: lastSendingTime, laterDate: now)
             }
             else {
-                timeIntervalSinceLast = _parent._dueTime
+                reducedScheduledTime = .nanoseconds(0)
             }
 
-            let couldSendNow = timeIntervalSinceLast >= _parent._dueTime
-
-            if couldSendNow {
+            if reducedScheduledTime.isNow {
                 self.sendNow(element: element)
                 return
             }
 
-            if !_parent._latest {
+            if !self._parent._latest {
                 return
             }
 
-            let isThereAlreadyInFlightRequest = _lastUnsentElement != nil
+            let isThereAlreadyInFlightRequest = self._lastUnsentElement != nil
             
-            _lastUnsentElement = element
+            self._lastUnsentElement = element
 
             if isThereAlreadyInFlightRequest {
                 return
             }
 
-            let scheduler = _parent._scheduler
-            let dueTime = _parent._dueTime
+            let scheduler = self._parent._scheduler
 
             let d = SingleAssignmentDisposable()
             self.cancellable.disposable = d
 
-            d.setDisposable(scheduler.scheduleRelative(0, dueTime: dueTime - timeIntervalSinceLast, action: self.propagate))
+            d.setDisposable(scheduler.scheduleRelative(0, dueTime: reducedScheduledTime, action: self.propagate))
         case .error:
-            _lastUnsentElement = nil
-            forwardOn(event)
-            dispose()
+            self._lastUnsentElement = nil
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            if let _ = _lastUnsentElement {
-                _completed = true
+            if self._lastUnsentElement != nil {
+                self._completed = true
             }
             else {
-                forwardOn(.completed)
-                dispose()
+                self.forwardOn(.completed)
+                self.dispose()
             }
         }
     }
 
     private func sendNow(element: Element) {
-        _lastUnsentElement = nil
+        self._lastUnsentElement = nil
         self.forwardOn(.next(element))
         // in case element processing takes a while, this should give some more room
-        _lastSentTime = _parent._scheduler.now
+        self._lastSentTime = self._parent._scheduler.now
     }
     
     func propagate(_: Int) -> Disposable {
-        _lock.lock(); defer { _lock.unlock() } // {
-            if let lastUnsentElement = _lastUnsentElement {
-                sendNow(element: lastUnsentElement)
+        self._lock.lock(); defer { self._lock.unlock() } // {
+            if let lastUnsentElement = self._lastUnsentElement {
+                self.sendNow(element: lastUnsentElement)
             }
 
-            if _completed {
-                forwardOn(.completed)
-                dispose()
+            if self._completed {
+                self.forwardOn(.completed)
+                self.dispose()
             }
         // }
         return Disposables.create()
     }
 }
 
-final fileprivate class Throttle : Producer {
-    
+final private class Throttle: Producer {
     fileprivate let _source: Observable
     fileprivate let _dueTime: RxTimeInterval
     fileprivate let _latest: Bool
     fileprivate let _scheduler: SchedulerType
 
     init(source: Observable, dueTime: RxTimeInterval, latest: Bool, scheduler: SchedulerType) {
-        _source = source
-        _dueTime = dueTime
-        _latest = latest
-        _scheduler = scheduler
+        self._source = source
+        self._dueTime = dueTime
+        self._latest = latest
+        self._scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = ThrottleSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Timeout.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Timeout.swift
index 7008de8..3177c42 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Timeout.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Timeout.swift
@@ -18,7 +18,7 @@ extension ObservableType {
      - returns: An observable sequence with a `RxError.timeout` in case of a timeout.
      */
     public func timeout(_ dueTime: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
             return Timeout(source: self.asObservable(), dueTime: dueTime, other: Observable.error(RxError.timeout), scheduler: scheduler)
     }
 
@@ -32,15 +32,15 @@ extension ObservableType {
      - parameter scheduler: Scheduler to run the timeout timer on.
      - returns: The source sequence switching to the other sequence in case of a timeout.
      */
-    public func timeout(_ dueTime: RxTimeInterval, other: O, scheduler: SchedulerType)
-        -> Observable where E == O.E {
+    public func timeout(_ dueTime: RxTimeInterval, other: Source, scheduler: SchedulerType)
+        -> Observable where Element == Source.Element {
             return Timeout(source: self.asObservable(), dueTime: dueTime, other: other.asObservable(), scheduler: scheduler)
     }
 }
 
-final fileprivate class TimeoutSink: Sink, LockOwnerType, ObserverType {
-    typealias E = O.E
-    typealias Parent = Timeout
+final private class TimeoutSink: Sink, LockOwnerType, ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = Timeout
     
     private let _parent: Parent
     
@@ -52,28 +52,28 @@ final fileprivate class TimeoutSink: Sink, LockOwnerType, Ob
     private var _id = 0
     private var _switched = false
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
         let original = SingleAssignmentDisposable()
-        _subscription.disposable = original
+        self._subscription.disposable = original
         
-        _createTimeoutTimer()
+        self._createTimeoutTimer()
         
-        original.setDisposable(_parent._source.subscribe(self))
+        original.setDisposable(self._parent._source.subscribe(self))
         
         return Disposables.create(_subscription, _timerD)
     }
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
             var onNextWins = false
             
-            _lock.performLocked() {
+            self._lock.performLocked {
                 onNextWins = !self._switched
                 if onNextWins {
                     self._id = self._id &+ 1
@@ -81,13 +81,13 @@ final fileprivate class TimeoutSink: Sink, LockOwnerType, Ob
             }
             
             if onNextWins {
-                forwardOn(event)
+                self.forwardOn(event)
                 self._createTimeoutTimer()
             }
         case .error, .completed:
             var onEventWins = false
             
-            _lock.performLocked() {
+            self._lock.performLocked {
                 onEventWins = !self._switched
                 if onEventWins {
                     self._id = self._id &+ 1
@@ -95,25 +95,25 @@ final fileprivate class TimeoutSink: Sink, LockOwnerType, Ob
             }
             
             if onEventWins {
-                forwardOn(event)
+                self.forwardOn(event)
                 self.dispose()
             }
         }
     }
     
     private func _createTimeoutTimer() {
-        if _timerD.isDisposed {
+        if self._timerD.isDisposed {
             return
         }
         
         let nextTimer = SingleAssignmentDisposable()
-        _timerD.disposable = nextTimer
+        self._timerD.disposable = nextTimer
         
-        let disposeSchedule = _parent._scheduler.scheduleRelative(_id, dueTime: _parent._dueTime) { state in
+        let disposeSchedule = self._parent._scheduler.scheduleRelative(self._id, dueTime: self._parent._dueTime) { state in
             
             var timerWins = false
             
-            self._lock.performLocked() {
+            self._lock.performLocked {
                 self._switched = (state == self._id)
                 timerWins = self._switched
             }
@@ -130,21 +130,20 @@ final fileprivate class TimeoutSink: Sink, LockOwnerType, Ob
 }
 
 
-final fileprivate class Timeout : Producer {
-    
+final private class Timeout: Producer {
     fileprivate let _source: Observable
     fileprivate let _dueTime: RxTimeInterval
     fileprivate let _other: Observable
     fileprivate let _scheduler: SchedulerType
     
     init(source: Observable, dueTime: RxTimeInterval, other: Observable, scheduler: SchedulerType) {
-        _source = source
-        _dueTime = dueTime
-        _other = other
-        _scheduler = scheduler
+        self._source = source
+        self._dueTime = dueTime
+        self._other = other
+        self._scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = TimeoutSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Timer.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Timer.swift
index dec69e1..7b29bca 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Timer.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Timer.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-extension ObservableType where E : RxAbstractInteger {
+extension ObservableType where Element : RxAbstractInteger {
     /**
      Returns an observable sequence that produces a value after each period, using the specified scheduler to run timers and to send out observer messages.
 
@@ -17,15 +17,16 @@ extension ObservableType where E : RxAbstractInteger {
      - returns: An observable sequence that produces a value after each period.
      */
     public static func interval(_ period: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
-        return Timer(dueTime: period,
-                     period: period,
-                     scheduler: scheduler
+        -> Observable {
+        return Timer(
+            dueTime: period,
+            period: period,
+            scheduler: scheduler
         )
     }
 }
 
-extension ObservableType where E: RxAbstractInteger {
+extension ObservableType where Element: RxAbstractInteger {
     /**
      Returns an observable sequence that periodically produces a value after the specified initial relative due time has elapsed, using the specified scheduler to run timers.
 
@@ -37,7 +38,7 @@ extension ObservableType where E: RxAbstractInteger {
      - returns: An observable sequence that produces a value after due time has elapsed and then each period.
      */
     public static func timer(_ dueTime: RxTimeInterval, period: RxTimeInterval? = nil, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
         return Timer(
             dueTime: dueTime,
             period: period,
@@ -46,36 +47,40 @@ extension ObservableType where E: RxAbstractInteger {
     }
 }
 
-final fileprivate class TimerSink : Sink where O.E : RxAbstractInteger  {
-    typealias Parent = Timer
-    
+import Foundation
+
+final private class TimerSink : Sink where Observer.Element : RxAbstractInteger  {
+    typealias Parent = Timer
+
     private let _parent: Parent
-    
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    private let _lock = RecursiveLock()
+
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
-        return _parent._scheduler.schedulePeriodic(0 as O.E, startAfter: _parent._dueTime, period: _parent._period!) { state in
+        return self._parent._scheduler.schedulePeriodic(0 as Observer.Element, startAfter: self._parent._dueTime, period: self._parent._period!) { state in
+            self._lock.lock(); defer { self._lock.unlock() }
             self.forwardOn(.next(state))
             return state &+ 1
         }
     }
 }
 
-final fileprivate class TimerOneOffSink : Sink where O.E : RxAbstractInteger {
-    typealias Parent = Timer
-    
+final private class TimerOneOffSink: Sink where Observer.Element: RxAbstractInteger {
+    typealias Parent = Timer
+
     private let _parent: Parent
-    
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
-        return _parent._scheduler.scheduleRelative(self, dueTime: _parent._dueTime) { (`self`) -> Disposable in
+        return self._parent._scheduler.scheduleRelative(self, dueTime: self._parent._dueTime) { [unowned self] _ -> Disposable in
             self.forwardOn(.next(0))
             self.forwardOn(.completed)
             self.dispose()
@@ -85,19 +90,19 @@ final fileprivate class TimerOneOffSink : Sink where O.E : R
     }
 }
 
-final fileprivate class Timer: Producer {
+final private class Timer: Producer {
     fileprivate let _scheduler: SchedulerType
     fileprivate let _dueTime: RxTimeInterval
     fileprivate let _period: RxTimeInterval?
-    
+
     init(dueTime: RxTimeInterval, period: RxTimeInterval?, scheduler: SchedulerType) {
-        _scheduler = scheduler
-        _dueTime = dueTime
-        _period = period
+        self._scheduler = scheduler
+        self._dueTime = dueTime
+        self._period = period
     }
-    
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
-        if let _ = _period {
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        if self._period != nil {
             let sink = TimerSink(parent: self, observer: observer, cancel: cancel)
             let subscription = sink.run()
             return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/ToArray.swift b/Demo/Pods/RxSwift/RxSwift/Observables/ToArray.swift
index 93fcb80..2821a60 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/ToArray.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/ToArray.swift
@@ -10,28 +10,28 @@
 extension ObservableType {
 
     /**
-    Converts an Observable into another Observable that emits the whole sequence as a single array and then terminates.
+    Converts an Observable into a Single that emits the whole sequence as a single array and then terminates.
     
     For aggregation behavior see `reduce`.
 
     - seealso: [toArray operator on reactivex.io](http://reactivex.io/documentation/operators/to.html)
     
-    - returns: An observable sequence containing all the emitted elements as array.
+    - returns: A Single sequence containing all the emitted elements as array.
     */
     public func toArray()
-        -> Observable<[E]> {
-        return ToArray(source: self.asObservable())
+        -> Single<[Element]> {
+        return PrimitiveSequence(raw: ToArray(source: self.asObservable()))
     }
 }
 
-final fileprivate class ToArraySink : Sink, ObserverType where O.E == [SourceType] {
+final private class ToArraySink: Sink, ObserverType where Observer.Element == [SourceType] {
     typealias Parent = ToArray
     
     let _parent: Parent
-    var _list = Array()
+    var _list = [SourceType]()
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         
         super.init(observer: observer, cancel: cancel)
     }
@@ -41,26 +41,26 @@ final fileprivate class ToArraySink : Sink, Obse
         case .next(let value):
             self._list.append(value)
         case .error(let e):
-            forwardOn(.error(e))
+            self.forwardOn(.error(e))
             self.dispose()
         case .completed:
-            forwardOn(.next(_list))
-            forwardOn(.completed)
+            self.forwardOn(.next(self._list))
+            self.forwardOn(.completed)
             self.dispose()
         }
     }
 }
 
-final fileprivate class ToArray : Producer<[SourceType]> {
+final private class ToArray: Producer<[SourceType]> {
     let _source: Observable
 
     init(source: Observable) {
-        _source = source
+        self._source = source
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == [SourceType] {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == [SourceType] {
         let sink = ToArraySink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Using.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Using.swift
index 8ea8326..14c5698 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Using.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Using.swift
@@ -16,19 +16,19 @@ extension ObservableType {
      - parameter observableFactory: Factory function to obtain an observable sequence that depends on the obtained resource.
      - returns: An observable sequence whose lifetime controls the lifetime of the dependent resource object.
      */
-    public static func using(_ resourceFactory: @escaping () throws -> Resource, observableFactory: @escaping (Resource) throws -> Observable) -> Observable {
+    public static func using(_ resourceFactory: @escaping () throws -> Resource, observableFactory: @escaping (Resource) throws -> Observable) -> Observable {
         return Using(resourceFactory: resourceFactory, observableFactory: observableFactory)
     }
 }
 
-final fileprivate class UsingSink : Sink, ObserverType {
-    typealias SourceType = O.E
+final private class UsingSink: Sink, ObserverType {
+    typealias SourceType = Observer.Element 
     typealias Parent = Using
 
     private let _parent: Parent
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
@@ -36,9 +36,9 @@ final fileprivate class UsingSink : S
         var disposable = Disposables.create()
         
         do {
-            let resource = try _parent._resourceFactory()
+            let resource = try self._parent._resourceFactory()
             disposable = resource
-            let source = try _parent._observableFactory(resource)
+            let source = try self._parent._observableFactory(resource)
             
             return Disposables.create(
                 source.subscribe(self),
@@ -55,20 +55,20 @@ final fileprivate class UsingSink : S
     func on(_ event: Event) {
         switch event {
         case let .next(value):
-            forwardOn(.next(value))
+            self.forwardOn(.next(value))
         case let .error(error):
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Using: Producer {
+final private class Using: Producer {
     
-    typealias E = SourceType
+    typealias Element = SourceType
     
     typealias ResourceFactory = () throws -> ResourceType
     typealias ObservableFactory = (ResourceType) throws -> Observable
@@ -78,11 +78,11 @@ final fileprivate class Using: Producer(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = UsingSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Window.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Window.swift
index c862dfb..b93cfa6 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Window.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Window.swift
@@ -19,18 +19,17 @@ extension ObservableType {
      - returns: An observable sequence of windows (instances of `Observable`).
      */
     public func window(timeSpan: RxTimeInterval, count: Int, scheduler: SchedulerType)
-        -> Observable> {
+        -> Observable> {
             return WindowTimeCount(source: self.asObservable(), timeSpan: timeSpan, count: count, scheduler: scheduler)
     }
 }
 
-final fileprivate class WindowTimeCountSink
-    : Sink
+final private class WindowTimeCountSink
+    : Sink
     , ObserverType
     , LockOwnerType
-    , SynchronizedOnType where O.E == Observable {
+    , SynchronizedOnType where Observer.Element == Observable {
     typealias Parent = WindowTimeCount
-    typealias E = Element
     
     private let _parent: Parent
     
@@ -44,87 +43,87 @@ final fileprivate class WindowTimeCountSink
     private let _refCountDisposable: RefCountDisposable
     private let _groupDisposable = CompositeDisposable()
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         
-        let _ = _groupDisposable.insert(_timerD)
+        _ = self._groupDisposable.insert(self._timerD)
         
-        _refCountDisposable = RefCountDisposable(disposable: _groupDisposable)
+        self._refCountDisposable = RefCountDisposable(disposable: self._groupDisposable)
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
         
-        forwardOn(.next(AddRef(source: _subject, refCount: _refCountDisposable).asObservable()))
-        createTimer(_windowId)
+        self.forwardOn(.next(AddRef(source: self._subject, refCount: self._refCountDisposable).asObservable()))
+        self.createTimer(self._windowId)
         
-        let _ = _groupDisposable.insert(_parent._source.subscribe(self))
-        return _refCountDisposable
+        _ = self._groupDisposable.insert(self._parent._source.subscribe(self))
+        return self._refCountDisposable
     }
     
     func startNewWindowAndCompleteCurrentOne() {
-        _subject.on(.completed)
-        _subject = PublishSubject()
+        self._subject.on(.completed)
+        self._subject = PublishSubject()
         
-        forwardOn(.next(AddRef(source: _subject, refCount: _refCountDisposable).asObservable()))
+        self.forwardOn(.next(AddRef(source: self._subject, refCount: self._refCountDisposable).asObservable()))
     }
 
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         var newWindow = false
         var newId = 0
         
         switch event {
         case .next(let element):
-            _subject.on(.next(element))
+            self._subject.on(.next(element))
             
             do {
-                let _ = try incrementChecked(&_count)
-            } catch (let e) {
-                _subject.on(.error(e as Swift.Error))
-                dispose()
+                _ = try incrementChecked(&self._count)
+            } catch let e {
+                self._subject.on(.error(e as Swift.Error))
+                self.dispose()
             }
             
-            if (_count == _parent._count) {
+            if self._count == self._parent._count {
                 newWindow = true
-                _count = 0
-                _windowId += 1
-                newId = _windowId
+                self._count = 0
+                self._windowId += 1
+                newId = self._windowId
                 self.startNewWindowAndCompleteCurrentOne()
             }
             
         case .error(let error):
-            _subject.on(.error(error))
-            forwardOn(.error(error))
-            dispose()
+            self._subject.on(.error(error))
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            _subject.on(.completed)
-            forwardOn(.completed)
-            dispose()
+            self._subject.on(.completed)
+            self.forwardOn(.completed)
+            self.dispose()
         }
 
         if newWindow {
-            createTimer(newId)
+            self.createTimer(newId)
         }
     }
     
     func createTimer(_ windowId: Int) {
-        if _timerD.isDisposed {
+        if self._timerD.isDisposed {
             return
         }
         
-        if _windowId != windowId {
+        if self._windowId != windowId {
             return
         }
 
         let nextTimer = SingleAssignmentDisposable()
 
-        _timerD.disposable = nextTimer
+        self._timerD.disposable = nextTimer
 
-        let scheduledRelative = _parent._scheduler.scheduleRelative(windowId, dueTime: _parent._timeSpan) { previousWindowId in
+        let scheduledRelative = self._parent._scheduler.scheduleRelative(windowId, dueTime: self._parent._timeSpan) { previousWindowId in
             
             var newId = 0
             
@@ -148,21 +147,20 @@ final fileprivate class WindowTimeCountSink
     }
 }
 
-final fileprivate class WindowTimeCount : Producer> {
-    
+final private class WindowTimeCount: Producer> {
     fileprivate let _timeSpan: RxTimeInterval
     fileprivate let _count: Int
     fileprivate let _scheduler: SchedulerType
     fileprivate let _source: Observable
     
     init(source: Observable, timeSpan: RxTimeInterval, count: Int, scheduler: SchedulerType) {
-        _source = source
-        _timeSpan = timeSpan
-        _count = count
-        _scheduler = scheduler
+        self._source = source
+        self._timeSpan = timeSpan
+        self._count = count
+        self._scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Observable {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Observable {
         let sink = WindowTimeCountSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift b/Demo/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift
index bd22e2f..b471f29 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift
@@ -17,8 +17,8 @@ extension ObservableType {
      - parameter resultSelector: Function to invoke for each element from the self combined with the latest element from the second source, if any.
      - returns: An observable sequence containing the result of combining each element of the self  with the latest element from the second source, if any, using the specified result selector function.
      */
-    public func withLatestFrom(_ second: SecondO, resultSelector: @escaping (E, SecondO.E) throws -> ResultType) -> Observable {
-        return WithLatestFrom(first: asObservable(), second: second.asObservable(), resultSelector: resultSelector)
+    public func withLatestFrom(_ second: Source, resultSelector: @escaping (Element, Source.Element) throws -> ResultType) -> Observable {
+        return WithLatestFrom(first: self.asObservable(), second: second.asObservable(), resultSelector: resultSelector)
     }
 
     /**
@@ -29,27 +29,27 @@ extension ObservableType {
      - parameter second: Second observable source.
      - returns: An observable sequence containing the result of combining each element of the self  with the latest element from the second source, if any, using the specified result selector function.
      */
-    public func withLatestFrom(_ second: SecondO) -> Observable {
-        return WithLatestFrom(first: asObservable(), second: second.asObservable(), resultSelector: { $1 })
+    public func withLatestFrom(_ second: Source) -> Observable {
+        return WithLatestFrom(first: self.asObservable(), second: second.asObservable(), resultSelector: { $1 })
     }
 }
 
-final fileprivate class WithLatestFromSink
-    : Sink
+final private class WithLatestFromSink
+    : Sink
     , ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias ResultType = O.E
+    typealias ResultType = Observer.Element
     typealias Parent = WithLatestFrom
-    typealias E = FirstType
+    typealias Element = FirstType
     
     fileprivate let _parent: Parent
     
     var _lock = RecursiveLock()
     fileprivate var _latest: SecondType?
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         
         super.init(observer: observer, cancel: cancel)
     }
@@ -58,77 +58,77 @@ final fileprivate class WithLatestFromSink) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case let .next(value):
-            guard let latest = _latest else { return }
+            guard let latest = self._latest else { return }
             do {
-                let res = try _parent._resultSelector(value, latest)
+                let res = try self._parent._resultSelector(value, latest)
                 
-                forwardOn(.next(res))
+                self.forwardOn(.next(res))
             } catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
             }
         case .completed:
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         case let .error(error):
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         }
     }
 }
 
-final fileprivate class WithLatestFromSecond
+final private class WithLatestFromSecond
     : ObserverType
     , LockOwnerType
     , SynchronizedOnType {
     
-    typealias ResultType = O.E
-    typealias Parent = WithLatestFromSink
-    typealias E = SecondType
+    typealias ResultType = Observer.Element
+    typealias Parent = WithLatestFromSink
+    typealias Element = SecondType
     
     private let _parent: Parent
     private let _disposable: Disposable
 
     var _lock: RecursiveLock {
-        return _parent._lock
+        return self._parent._lock
     }
 
     init(parent: Parent, disposable: Disposable) {
-        _parent = parent
-        _disposable = disposable
+        self._parent = parent
+        self._disposable = disposable
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case let .next(value):
-            _parent._latest = value
+            self._parent._latest = value
         case .completed:
-            _disposable.dispose()
+            self._disposable.dispose()
         case let .error(error):
-            _parent.forwardOn(.error(error))
-            _parent.dispose()
+            self._parent.forwardOn(.error(error))
+            self._parent.dispose()
         }
     }
 }
 
-final fileprivate class WithLatestFrom: Producer {
+final private class WithLatestFrom: Producer {
     typealias ResultSelector = (FirstType, SecondType) throws -> ResultType
     
     fileprivate let _first: Observable
@@ -136,12 +136,12 @@ final fileprivate class WithLatestFrom: Produ
     fileprivate let _resultSelector: ResultSelector
 
     init(first: Observable, second: Observable, resultSelector: @escaping ResultSelector) {
-        _first = first
-        _second = second
-        _resultSelector = resultSelector
+        self._first = first
+        self._second = second
+        self._resultSelector = resultSelector
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == ResultType {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == ResultType {
         let sink = WithLatestFromSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift
index 11f25fc..cc232ab 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift
@@ -15,8 +15,8 @@ extension ObservableType {
      - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
      - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
      */
-    public static func zip(_ collection: C, _ resultSelector: @escaping ([C.Iterator.Element.E]) throws -> E) -> Observable
-        where C.Iterator.Element: ObservableType {
+    public static func zip(_ collection: Collection, resultSelector: @escaping ([Collection.Element.Element]) throws -> Element) -> Observable
+        where Collection.Element: ObservableType {
         return ZipCollectionType(sources: collection, resultSelector: resultSelector)
     }
 
@@ -27,18 +27,18 @@ extension ObservableType {
 
      - returns: An observable sequence containing the result of combining elements of the sources.
      */
-    public static func zip(_ collection: C) -> Observable<[E]>
-        where C.Iterator.Element: ObservableType, C.Iterator.Element.E == E {
+    public static func zip(_ collection: Collection) -> Observable<[Element]>
+        where Collection.Element: ObservableType, Collection.Element.Element == Element {
         return ZipCollectionType(sources: collection, resultSelector: { $0 })
     }
     
 }
 
-final fileprivate class ZipCollectionTypeSink
-    : Sink where C.Iterator.Element : ObservableConvertibleType {
-    typealias R = O.E
-    typealias Parent = ZipCollectionType
-    typealias SourceElement = C.Iterator.Element.E
+final private class ZipCollectionTypeSink
+    : Sink where Collection.Element: ObservableConvertibleType {
+    typealias Result = Observer.Element 
+    typealias Parent = ZipCollectionType
+    typealias SourceElement = Collection.Element.Element
     
     private let _parent: Parent
     
@@ -51,32 +51,32 @@ final fileprivate class ZipCollectionTypeSink
     private var _numberOfDone = 0
     private var _subscriptions: [SingleAssignmentDisposable]
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _values = [Queue](repeating: Queue(capacity: 4), count: parent.count)
-        _isDone = [Bool](repeating: false, count: parent.count)
-        _subscriptions = Array()
-        _subscriptions.reserveCapacity(parent.count)
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._values = [Queue](repeating: Queue(capacity: 4), count: parent.count)
+        self._isDone = [Bool](repeating: false, count: parent.count)
+        self._subscriptions = [SingleAssignmentDisposable]()
+        self._subscriptions.reserveCapacity(parent.count)
         
         for _ in 0 ..< parent.count {
-            _subscriptions.append(SingleAssignmentDisposable())
+            self._subscriptions.append(SingleAssignmentDisposable())
         }
         
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event, atIndex: Int) {
-        _lock.lock(); defer { _lock.unlock() } // {
+        self._lock.lock(); defer { self._lock.unlock() } // {
             switch event {
             case .next(let element):
-                _values[atIndex].enqueue(element)
+                self._values[atIndex].enqueue(element)
                 
-                if _values[atIndex].count == 1 {
-                    _numberOfValues += 1
+                if self._values[atIndex].count == 1 {
+                    self._numberOfValues += 1
                 }
                 
-                if _numberOfValues < _parent.count {
-                    if _numberOfDone == _parent.count - 1 {
+                if self._numberOfValues < self._parent.count {
+                    if self._numberOfDone == self._parent.count - 1 {
                         self.forwardOn(.completed)
                         self.dispose()
                     }
@@ -85,19 +85,19 @@ final fileprivate class ZipCollectionTypeSink
                 
                 do {
                     var arguments = [SourceElement]()
-                    arguments.reserveCapacity(_parent.count)
+                    arguments.reserveCapacity(self._parent.count)
                     
                     // recalculate number of values
-                    _numberOfValues = 0
+                    self._numberOfValues = 0
                     
-                    for i in 0 ..< _values.count {
-                        arguments.append(_values[i].dequeue()!)
-                        if _values[i].count > 0 {
-                            _numberOfValues += 1
+                    for i in 0 ..< self._values.count {
+                        arguments.append(self._values[i].dequeue()!)
+                        if !self._values[i].isEmpty {
+                            self._numberOfValues += 1
                         }
                     }
                     
-                    let result = try _parent.resultSelector(arguments)
+                    let result = try self._parent.resultSelector(arguments)
                     self.forwardOn(.next(result))
                 }
                 catch let error {
@@ -109,19 +109,19 @@ final fileprivate class ZipCollectionTypeSink
                 self.forwardOn(.error(error))
                 self.dispose()
             case .completed:
-                if _isDone[atIndex] {
+                if self._isDone[atIndex] {
                     return
                 }
                 
-                _isDone[atIndex] = true
-                _numberOfDone += 1
+                self._isDone[atIndex] = true
+                self._numberOfDone += 1
                 
-                if _numberOfDone == _parent.count {
+                if self._numberOfDone == self._parent.count {
                     self.forwardOn(.completed)
                     self.dispose()
                 }
                 else {
-                    _subscriptions[atIndex].dispose()
+                    self._subscriptions[atIndex].dispose()
                 }
             }
         // }
@@ -129,18 +129,18 @@ final fileprivate class ZipCollectionTypeSink
     
     func run() -> Disposable {
         var j = 0
-        for i in _parent.sources {
+        for i in self._parent.sources {
             let index = j
             let source = i.asObservable()
 
             let disposable = source.subscribe(AnyObserver { event in
                 self.on(event, atIndex: index)
                 })
-            _subscriptions[j].setDisposable(disposable)
+            self._subscriptions[j].setDisposable(disposable)
             j += 1
         }
 
-        if _parent.sources.isEmpty {
+        if self._parent.sources.isEmpty {
             self.forwardOn(.completed)
         }
         
@@ -148,20 +148,20 @@ final fileprivate class ZipCollectionTypeSink
     }
 }
 
-final fileprivate class ZipCollectionType : Producer where C.Iterator.Element : ObservableConvertibleType {
-    typealias ResultSelector = ([C.Iterator.Element.E]) throws -> R
+final private class ZipCollectionType: Producer where Collection.Element: ObservableConvertibleType {
+    typealias ResultSelector = ([Collection.Element.Element]) throws -> Result
     
-    let sources: C
+    let sources: Collection
     let resultSelector: ResultSelector
     let count: Int
     
-    init(sources: C, resultSelector: @escaping ResultSelector) {
+    init(sources: Collection, resultSelector: @escaping ResultSelector) {
         self.sources = sources
         self.resultSelector = resultSelector
-        self.count = Int(Int64(self.sources.count))
+        self.count = self.sources.count
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipCollectionTypeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift
index 04bf68f..d2a28d4 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift
@@ -21,8 +21,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func zip
-        (_ source1: O1, _ source2: O2, resultSelector: @escaping (O1.E, O2.E) throws -> E)
-        -> Observable {
+        (_ source1: O1, _ source2: O2, resultSelector: @escaping (O1.Element, O2.Element) throws -> Element)
+        -> Observable {
         return Zip2(
             source1: source1.asObservable(), source2: source2.asObservable(),
             resultSelector: resultSelector
@@ -30,7 +30,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
 
@@ -40,7 +40,7 @@ extension ObservableType where E == Any {
     */
     public static func zip
         (_ source1: O1, _ source2: O2)
-        -> Observable<(O1.E, O2.E)> {
+        -> Observable<(O1.Element, O2.Element)> {
         return Zip2(
             source1: source1.asObservable(), source2: source2.asObservable(),
             resultSelector: { ($0, $1) }
@@ -48,41 +48,39 @@ extension ObservableType where E == Any {
     }
 }
 
-final class ZipSink2_ : ZipSink {
-    typealias R = O.E
-    typealias Parent = Zip2
+final class ZipSink2_ : ZipSink {
+    typealias Result = Observer.Element 
+    typealias Parent = Zip2
 
     let _parent: Parent
 
     var _values1: Queue = Queue(capacity: 2)
     var _values2: Queue = Queue(capacity: 2)
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 2, observer: observer, cancel: cancel)
     }
 
     override func hasElements(_ index: Int) -> Bool {
-        switch (index) {
-        case 0: return _values1.count > 0
-        case 1: return _values2.count > 0
+        switch index {
+        case 0: return !self._values1.isEmpty
+        case 1: return !self._values2.isEmpty
 
         default:
             rxFatalError("Unhandled case (Function)")
         }
-
-        return false
     }
 
     func run() -> Disposable {
         let subscription1 = SingleAssignmentDisposable()
         let subscription2 = SingleAssignmentDisposable()
 
-        let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
+        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
+        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
 
-        subscription1.setDisposable(_parent.source1.subscribe(observer1))
-        subscription2.setDisposable(_parent.source2.subscribe(observer2))
+        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
+        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
 
         return Disposables.create([
            subscription1,
@@ -90,13 +88,13 @@ final class ZipSink2_ : ZipSink {
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_values1.dequeue()!, _values2.dequeue()!)
+    override func getResult() throws -> Result {
+        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!)
     }
 }
 
-final class Zip2 : Producer {
-    typealias ResultSelector = (E1, E2) throws -> R
+final class Zip2 : Producer {
+    typealias ResultSelector = (E1, E2) throws -> Result
 
     let source1: Observable
     let source2: Observable
@@ -107,10 +105,10 @@ final class Zip2 : Producer {
         self.source1 = source1
         self.source2 = source2
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipSink2_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -131,8 +129,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, resultSelector: @escaping (O1.E, O2.E, O3.E) throws -> E)
-        -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, resultSelector: @escaping (O1.Element, O2.Element, O3.Element) throws -> Element)
+        -> Observable {
         return Zip3(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(),
             resultSelector: resultSelector
@@ -140,7 +138,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
 
@@ -150,7 +148,7 @@ extension ObservableType where E == Any {
     */
     public static func zip
         (_ source1: O1, _ source2: O2, _ source3: O3)
-        -> Observable<(O1.E, O2.E, O3.E)> {
+        -> Observable<(O1.Element, O2.Element, O3.Element)> {
         return Zip3(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(),
             resultSelector: { ($0, $1, $2) }
@@ -158,9 +156,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class ZipSink3_ : ZipSink {
-    typealias R = O.E
-    typealias Parent = Zip3
+final class ZipSink3_ : ZipSink {
+    typealias Result = Observer.Element 
+    typealias Parent = Zip3
 
     let _parent: Parent
 
@@ -168,22 +166,20 @@ final class ZipSink3_ : ZipSink {
     var _values2: Queue = Queue(capacity: 2)
     var _values3: Queue = Queue(capacity: 2)
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 3, observer: observer, cancel: cancel)
     }
 
     override func hasElements(_ index: Int) -> Bool {
-        switch (index) {
-        case 0: return _values1.count > 0
-        case 1: return _values2.count > 0
-        case 2: return _values3.count > 0
+        switch index {
+        case 0: return !self._values1.isEmpty
+        case 1: return !self._values2.isEmpty
+        case 2: return !self._values3.isEmpty
 
         default:
             rxFatalError("Unhandled case (Function)")
         }
-
-        return false
     }
 
     func run() -> Disposable {
@@ -191,13 +187,13 @@ final class ZipSink3_ : ZipSink {
         let subscription2 = SingleAssignmentDisposable()
         let subscription3 = SingleAssignmentDisposable()
 
-        let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
+        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
+        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
+        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
 
-        subscription1.setDisposable(_parent.source1.subscribe(observer1))
-        subscription2.setDisposable(_parent.source2.subscribe(observer2))
-        subscription3.setDisposable(_parent.source3.subscribe(observer3))
+        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
+        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
+        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
 
         return Disposables.create([
            subscription1,
@@ -206,13 +202,13 @@ final class ZipSink3_ : ZipSink {
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_values1.dequeue()!, _values2.dequeue()!, _values3.dequeue()!)
+    override func getResult() throws -> Result {
+        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!)
     }
 }
 
-final class Zip3 : Producer {
-    typealias ResultSelector = (E1, E2, E3) throws -> R
+final class Zip3 : Producer {
+    typealias ResultSelector = (E1, E2, E3) throws -> Result
 
     let source1: Observable
     let source2: Observable
@@ -225,10 +221,10 @@ final class Zip3 : Producer {
         self.source2 = source2
         self.source3 = source3
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipSink3_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -249,8 +245,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E) throws -> E)
-        -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element) throws -> Element)
+        -> Observable {
         return Zip4(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(),
             resultSelector: resultSelector
@@ -258,7 +254,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
 
@@ -268,7 +264,7 @@ extension ObservableType where E == Any {
     */
     public static func zip
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4)
-        -> Observable<(O1.E, O2.E, O3.E, O4.E)> {
+        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element)> {
         return Zip4(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(),
             resultSelector: { ($0, $1, $2, $3) }
@@ -276,9 +272,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class ZipSink4_ : ZipSink {
-    typealias R = O.E
-    typealias Parent = Zip4
+final class ZipSink4_ : ZipSink {
+    typealias Result = Observer.Element 
+    typealias Parent = Zip4
 
     let _parent: Parent
 
@@ -287,23 +283,21 @@ final class ZipSink4_ : ZipSink {
     var _values3: Queue = Queue(capacity: 2)
     var _values4: Queue = Queue(capacity: 2)
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 4, observer: observer, cancel: cancel)
     }
 
     override func hasElements(_ index: Int) -> Bool {
-        switch (index) {
-        case 0: return _values1.count > 0
-        case 1: return _values2.count > 0
-        case 2: return _values3.count > 0
-        case 3: return _values4.count > 0
+        switch index {
+        case 0: return !self._values1.isEmpty
+        case 1: return !self._values2.isEmpty
+        case 2: return !self._values3.isEmpty
+        case 3: return !self._values4.isEmpty
 
         default:
             rxFatalError("Unhandled case (Function)")
         }
-
-        return false
     }
 
     func run() -> Disposable {
@@ -312,15 +306,15 @@ final class ZipSink4_ : ZipSink {
         let subscription3 = SingleAssignmentDisposable()
         let subscription4 = SingleAssignmentDisposable()
 
-        let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
+        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
+        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
+        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
+        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
 
-        subscription1.setDisposable(_parent.source1.subscribe(observer1))
-        subscription2.setDisposable(_parent.source2.subscribe(observer2))
-        subscription3.setDisposable(_parent.source3.subscribe(observer3))
-        subscription4.setDisposable(_parent.source4.subscribe(observer4))
+        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
+        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
+        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
+        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
 
         return Disposables.create([
            subscription1,
@@ -330,13 +324,13 @@ final class ZipSink4_ : ZipSink {
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_values1.dequeue()!, _values2.dequeue()!, _values3.dequeue()!, _values4.dequeue()!)
+    override func getResult() throws -> Result {
+        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!)
     }
 }
 
-final class Zip4 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4) throws -> R
+final class Zip4 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4) throws -> Result
 
     let source1: Observable
     let source2: Observable
@@ -351,10 +345,10 @@ final class Zip4 : Producer {
         self.source3 = source3
         self.source4 = source4
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipSink4_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -375,8 +369,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E) throws -> E)
-        -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element) throws -> Element)
+        -> Observable {
         return Zip5(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(),
             resultSelector: resultSelector
@@ -384,7 +378,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
 
@@ -394,7 +388,7 @@ extension ObservableType where E == Any {
     */
     public static func zip
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5)
-        -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E)> {
+        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element)> {
         return Zip5(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4) }
@@ -402,9 +396,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class ZipSink5_ : ZipSink {
-    typealias R = O.E
-    typealias Parent = Zip5
+final class ZipSink5_ : ZipSink {
+    typealias Result = Observer.Element 
+    typealias Parent = Zip5
 
     let _parent: Parent
 
@@ -414,24 +408,22 @@ final class ZipSink5_ : ZipSink {
     var _values4: Queue = Queue(capacity: 2)
     var _values5: Queue = Queue(capacity: 2)
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 5, observer: observer, cancel: cancel)
     }
 
     override func hasElements(_ index: Int) -> Bool {
-        switch (index) {
-        case 0: return _values1.count > 0
-        case 1: return _values2.count > 0
-        case 2: return _values3.count > 0
-        case 3: return _values4.count > 0
-        case 4: return _values5.count > 0
+        switch index {
+        case 0: return !self._values1.isEmpty
+        case 1: return !self._values2.isEmpty
+        case 2: return !self._values3.isEmpty
+        case 3: return !self._values4.isEmpty
+        case 4: return !self._values5.isEmpty
 
         default:
             rxFatalError("Unhandled case (Function)")
         }
-
-        return false
     }
 
     func run() -> Disposable {
@@ -441,17 +433,17 @@ final class ZipSink5_ : ZipSink {
         let subscription4 = SingleAssignmentDisposable()
         let subscription5 = SingleAssignmentDisposable()
 
-        let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
+        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
+        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
+        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
+        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
+        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
 
-        subscription1.setDisposable(_parent.source1.subscribe(observer1))
-        subscription2.setDisposable(_parent.source2.subscribe(observer2))
-        subscription3.setDisposable(_parent.source3.subscribe(observer3))
-        subscription4.setDisposable(_parent.source4.subscribe(observer4))
-        subscription5.setDisposable(_parent.source5.subscribe(observer5))
+        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
+        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
+        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
+        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
+        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
 
         return Disposables.create([
            subscription1,
@@ -462,13 +454,13 @@ final class ZipSink5_ : ZipSink {
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_values1.dequeue()!, _values2.dequeue()!, _values3.dequeue()!, _values4.dequeue()!, _values5.dequeue()!)
+    override func getResult() throws -> Result {
+        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!)
     }
 }
 
-final class Zip5 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5) throws -> R
+final class Zip5 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5) throws -> Result
 
     let source1: Observable
     let source2: Observable
@@ -485,10 +477,10 @@ final class Zip5 : Producer {
         self.source4 = source4
         self.source5 = source5
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipSink5_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -509,8 +501,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E) throws -> E)
-        -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element) throws -> Element)
+        -> Observable {
         return Zip6(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(),
             resultSelector: resultSelector
@@ -518,7 +510,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
 
@@ -528,7 +520,7 @@ extension ObservableType where E == Any {
     */
     public static func zip
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6)
-        -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E, O6.E)> {
+        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element)> {
         return Zip6(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4, $5) }
@@ -536,9 +528,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class ZipSink6_ : ZipSink {
-    typealias R = O.E
-    typealias Parent = Zip6
+final class ZipSink6_ : ZipSink {
+    typealias Result = Observer.Element 
+    typealias Parent = Zip6
 
     let _parent: Parent
 
@@ -549,25 +541,23 @@ final class ZipSink6_ : ZipSink {
     var _values5: Queue = Queue(capacity: 2)
     var _values6: Queue = Queue(capacity: 2)
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 6, observer: observer, cancel: cancel)
     }
 
     override func hasElements(_ index: Int) -> Bool {
-        switch (index) {
-        case 0: return _values1.count > 0
-        case 1: return _values2.count > 0
-        case 2: return _values3.count > 0
-        case 3: return _values4.count > 0
-        case 4: return _values5.count > 0
-        case 5: return _values6.count > 0
+        switch index {
+        case 0: return !self._values1.isEmpty
+        case 1: return !self._values2.isEmpty
+        case 2: return !self._values3.isEmpty
+        case 3: return !self._values4.isEmpty
+        case 4: return !self._values5.isEmpty
+        case 5: return !self._values6.isEmpty
 
         default:
             rxFatalError("Unhandled case (Function)")
         }
-
-        return false
     }
 
     func run() -> Disposable {
@@ -578,19 +568,19 @@ final class ZipSink6_ : ZipSink {
         let subscription5 = SingleAssignmentDisposable()
         let subscription6 = SingleAssignmentDisposable()
 
-        let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
-        let observer6 = ZipObserver(lock: _lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
+        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
+        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
+        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
+        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
+        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
+        let observer6 = ZipObserver(lock: self._lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
 
-        subscription1.setDisposable(_parent.source1.subscribe(observer1))
-        subscription2.setDisposable(_parent.source2.subscribe(observer2))
-        subscription3.setDisposable(_parent.source3.subscribe(observer3))
-        subscription4.setDisposable(_parent.source4.subscribe(observer4))
-        subscription5.setDisposable(_parent.source5.subscribe(observer5))
-        subscription6.setDisposable(_parent.source6.subscribe(observer6))
+        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
+        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
+        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
+        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
+        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
+        subscription6.setDisposable(self._parent.source6.subscribe(observer6))
 
         return Disposables.create([
            subscription1,
@@ -602,13 +592,13 @@ final class ZipSink6_ : ZipSink {
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_values1.dequeue()!, _values2.dequeue()!, _values3.dequeue()!, _values4.dequeue()!, _values5.dequeue()!, _values6.dequeue()!)
+    override func getResult() throws -> Result {
+        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!, self._values6.dequeue()!)
     }
 }
 
-final class Zip6 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6) throws -> R
+final class Zip6 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5, E6) throws -> Result
 
     let source1: Observable
     let source2: Observable
@@ -627,10 +617,10 @@ final class Zip6 : Producer {
         self.source5 = source5
         self.source6 = source6
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipSink6_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -651,8 +641,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E) throws -> E)
-        -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element) throws -> Element)
+        -> Observable {
         return Zip7(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(),
             resultSelector: resultSelector
@@ -660,7 +650,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
 
@@ -670,7 +660,7 @@ extension ObservableType where E == Any {
     */
     public static func zip
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7)
-        -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E)> {
+        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element)> {
         return Zip7(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4, $5, $6) }
@@ -678,9 +668,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class ZipSink7_ : ZipSink {
-    typealias R = O.E
-    typealias Parent = Zip7
+final class ZipSink7_ : ZipSink {
+    typealias Result = Observer.Element 
+    typealias Parent = Zip7
 
     let _parent: Parent
 
@@ -692,26 +682,24 @@ final class ZipSink7_ : ZipSink
     var _values6: Queue = Queue(capacity: 2)
     var _values7: Queue = Queue(capacity: 2)
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 7, observer: observer, cancel: cancel)
     }
 
     override func hasElements(_ index: Int) -> Bool {
-        switch (index) {
-        case 0: return _values1.count > 0
-        case 1: return _values2.count > 0
-        case 2: return _values3.count > 0
-        case 3: return _values4.count > 0
-        case 4: return _values5.count > 0
-        case 5: return _values6.count > 0
-        case 6: return _values7.count > 0
+        switch index {
+        case 0: return !self._values1.isEmpty
+        case 1: return !self._values2.isEmpty
+        case 2: return !self._values3.isEmpty
+        case 3: return !self._values4.isEmpty
+        case 4: return !self._values5.isEmpty
+        case 5: return !self._values6.isEmpty
+        case 6: return !self._values7.isEmpty
 
         default:
             rxFatalError("Unhandled case (Function)")
         }
-
-        return false
     }
 
     func run() -> Disposable {
@@ -723,21 +711,21 @@ final class ZipSink7_ : ZipSink
         let subscription6 = SingleAssignmentDisposable()
         let subscription7 = SingleAssignmentDisposable()
 
-        let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
-        let observer6 = ZipObserver(lock: _lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
-        let observer7 = ZipObserver(lock: _lock, parent: self, index: 6, setNextValue: { self._values7.enqueue($0) }, this: subscription7)
-
-        subscription1.setDisposable(_parent.source1.subscribe(observer1))
-        subscription2.setDisposable(_parent.source2.subscribe(observer2))
-        subscription3.setDisposable(_parent.source3.subscribe(observer3))
-        subscription4.setDisposable(_parent.source4.subscribe(observer4))
-        subscription5.setDisposable(_parent.source5.subscribe(observer5))
-        subscription6.setDisposable(_parent.source6.subscribe(observer6))
-        subscription7.setDisposable(_parent.source7.subscribe(observer7))
+        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
+        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
+        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
+        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
+        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
+        let observer6 = ZipObserver(lock: self._lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
+        let observer7 = ZipObserver(lock: self._lock, parent: self, index: 6, setNextValue: { self._values7.enqueue($0) }, this: subscription7)
+
+        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
+        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
+        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
+        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
+        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
+        subscription6.setDisposable(self._parent.source6.subscribe(observer6))
+        subscription7.setDisposable(self._parent.source7.subscribe(observer7))
 
         return Disposables.create([
            subscription1,
@@ -750,13 +738,13 @@ final class ZipSink7_ : ZipSink
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_values1.dequeue()!, _values2.dequeue()!, _values3.dequeue()!, _values4.dequeue()!, _values5.dequeue()!, _values6.dequeue()!, _values7.dequeue()!)
+    override func getResult() throws -> Result {
+        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!, self._values6.dequeue()!, self._values7.dequeue()!)
     }
 }
 
-final class Zip7 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7) throws -> R
+final class Zip7 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7) throws -> Result
 
     let source1: Observable
     let source2: Observable
@@ -777,10 +765,10 @@ final class Zip7 : Producer {
         self.source6 = source6
         self.source7 = source7
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipSink7_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -801,8 +789,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E, O8.E) throws -> E)
-        -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element, O8.Element) throws -> Element)
+        -> Observable {
         return Zip8(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(), source8: source8.asObservable(),
             resultSelector: resultSelector
@@ -810,7 +798,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
 
@@ -820,7 +808,7 @@ extension ObservableType where E == Any {
     */
     public static func zip
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8)
-        -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E, O8.E)> {
+        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element, O8.Element)> {
         return Zip8(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(), source8: source8.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4, $5, $6, $7) }
@@ -828,9 +816,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class ZipSink8_ : ZipSink {
-    typealias R = O.E
-    typealias Parent = Zip8
+final class ZipSink8_ : ZipSink {
+    typealias Result = Observer.Element 
+    typealias Parent = Zip8
 
     let _parent: Parent
 
@@ -843,27 +831,25 @@ final class ZipSink8_ : ZipSink
     var _values7: Queue = Queue(capacity: 2)
     var _values8: Queue = Queue(capacity: 2)
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 8, observer: observer, cancel: cancel)
     }
 
     override func hasElements(_ index: Int) -> Bool {
-        switch (index) {
-        case 0: return _values1.count > 0
-        case 1: return _values2.count > 0
-        case 2: return _values3.count > 0
-        case 3: return _values4.count > 0
-        case 4: return _values5.count > 0
-        case 5: return _values6.count > 0
-        case 6: return _values7.count > 0
-        case 7: return _values8.count > 0
+        switch index {
+        case 0: return !self._values1.isEmpty
+        case 1: return !self._values2.isEmpty
+        case 2: return !self._values3.isEmpty
+        case 3: return !self._values4.isEmpty
+        case 4: return !self._values5.isEmpty
+        case 5: return !self._values6.isEmpty
+        case 6: return !self._values7.isEmpty
+        case 7: return !self._values8.isEmpty
 
         default:
             rxFatalError("Unhandled case (Function)")
         }
-
-        return false
     }
 
     func run() -> Disposable {
@@ -876,23 +862,23 @@ final class ZipSink8_ : ZipSink
         let subscription7 = SingleAssignmentDisposable()
         let subscription8 = SingleAssignmentDisposable()
 
-        let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
-        let observer6 = ZipObserver(lock: _lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
-        let observer7 = ZipObserver(lock: _lock, parent: self, index: 6, setNextValue: { self._values7.enqueue($0) }, this: subscription7)
-        let observer8 = ZipObserver(lock: _lock, parent: self, index: 7, setNextValue: { self._values8.enqueue($0) }, this: subscription8)
-
-        subscription1.setDisposable(_parent.source1.subscribe(observer1))
-        subscription2.setDisposable(_parent.source2.subscribe(observer2))
-        subscription3.setDisposable(_parent.source3.subscribe(observer3))
-        subscription4.setDisposable(_parent.source4.subscribe(observer4))
-        subscription5.setDisposable(_parent.source5.subscribe(observer5))
-        subscription6.setDisposable(_parent.source6.subscribe(observer6))
-        subscription7.setDisposable(_parent.source7.subscribe(observer7))
-        subscription8.setDisposable(_parent.source8.subscribe(observer8))
+        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
+        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
+        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
+        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
+        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
+        let observer6 = ZipObserver(lock: self._lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
+        let observer7 = ZipObserver(lock: self._lock, parent: self, index: 6, setNextValue: { self._values7.enqueue($0) }, this: subscription7)
+        let observer8 = ZipObserver(lock: self._lock, parent: self, index: 7, setNextValue: { self._values8.enqueue($0) }, this: subscription8)
+
+        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
+        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
+        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
+        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
+        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
+        subscription6.setDisposable(self._parent.source6.subscribe(observer6))
+        subscription7.setDisposable(self._parent.source7.subscribe(observer7))
+        subscription8.setDisposable(self._parent.source8.subscribe(observer8))
 
         return Disposables.create([
            subscription1,
@@ -906,13 +892,13 @@ final class ZipSink8_ : ZipSink
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_values1.dequeue()!, _values2.dequeue()!, _values3.dequeue()!, _values4.dequeue()!, _values5.dequeue()!, _values6.dequeue()!, _values7.dequeue()!, _values8.dequeue()!)
+    override func getResult() throws -> Result {
+        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!, self._values6.dequeue()!, self._values7.dequeue()!, self._values8.dequeue()!)
     }
 }
 
-final class Zip8 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7, E8) throws -> R
+final class Zip8 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7, E8) throws -> Result
 
     let source1: Observable
     let source2: Observable
@@ -935,10 +921,10 @@ final class Zip8 : Producer {
         self.source7 = source7
         self.source8 = source8
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipSink8_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Zip.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Zip.swift
index a283bf2..911eb57 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Zip.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Zip.swift
@@ -13,8 +13,8 @@ protocol ZipSinkProtocol : class
     func done(_ index: Int)
 }
 
-class ZipSink : Sink, ZipSinkProtocol {
-    typealias Element = O.E
+class ZipSink : Sink, ZipSinkProtocol {
+    typealias Element = Observer.Element
     
     let _arity: Int
 
@@ -23,9 +23,9 @@ class ZipSink : Sink, ZipSinkProtocol {
     // state
     private var _isDone: [Bool]
     
-    init(arity: Int, observer: O, cancel: Cancelable) {
-        _isDone = [Bool](repeating: false, count: arity)
-        _arity = arity
+    init(arity: Int, observer: Observer, cancel: Cancelable) {
+        self._isDone = [Bool](repeating: false, count: arity)
+        self._arity = arity
         
         super.init(observer: observer, cancel: cancel)
     }
@@ -41,8 +41,8 @@ class ZipSink : Sink, ZipSinkProtocol {
     func next(_ index: Int) {
         var hasValueAll = true
         
-        for i in 0 ..< _arity {
-            if !hasElements(i) {
+        for i in 0 ..< self._arity {
+            if !self.hasElements(i) {
                 hasValueAll = false
                 break
             }
@@ -50,62 +50,43 @@ class ZipSink : Sink, ZipSinkProtocol {
         
         if hasValueAll {
             do {
-                let result = try getResult()
+                let result = try self.getResult()
                 self.forwardOn(.next(result))
             }
             catch let e {
                 self.forwardOn(.error(e))
-                dispose()
-            }
-        }
-        else {
-            var allOthersDone = true
-            
-            let arity = _isDone.count
-            for i in 0 ..< arity {
-                if i != index && !_isDone[i] {
-                    allOthersDone = false
-                    break
-                }
-            }
-            
-            if allOthersDone {
-                forwardOn(.completed)
                 self.dispose()
             }
         }
     }
     
     func fail(_ error: Swift.Error) {
-        forwardOn(.error(error))
-        dispose()
+        self.forwardOn(.error(error))
+        self.dispose()
     }
     
     func done(_ index: Int) {
-        _isDone[index] = true
+        self._isDone[index] = true
         
         var allDone = true
         
-        for done in _isDone {
-            if !done {
-                allDone = false
-                break
-            }
+        for done in self._isDone where !done {
+            allDone = false
+            break
         }
         
         if allDone {
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
 
-final class ZipObserver
+final class ZipObserver
     : ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias E = ElementType
-    typealias ValueSetter = (ElementType) -> ()
+    typealias ValueSetter = (Element) -> Void
 
     private var _parent: ZipSinkProtocol?
     
@@ -117,38 +98,38 @@ final class ZipObserver
     private let _setNextValue: ValueSetter
     
     init(lock: RecursiveLock, parent: ZipSinkProtocol, index: Int, setNextValue: @escaping ValueSetter, this: Disposable) {
-        _lock = lock
-        _parent = parent
-        _index = index
-        _this = this
-        _setNextValue = setNextValue
+        self._lock = lock
+        self._parent = parent
+        self._index = index
+        self._this = this
+        self._setNextValue = setNextValue
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
-        if let _ = _parent {
+    func _synchronized_on(_ event: Event) {
+        if self._parent != nil {
             switch event {
-            case .next(_):
+            case .next:
                 break
-            case .error(_):
-                _this.dispose()
+            case .error:
+                self._this.dispose()
             case .completed:
-                _this.dispose()
+                self._this.dispose()
             }
         }
         
-        if let parent = _parent {
+        if let parent = self._parent {
             switch event {
             case .next(let value):
-                _setNextValue(value)
-                parent.next(_index)
+                self._setNextValue(value)
+                parent.next(self._index)
             case .error(let error):
                 parent.fail(error)
             case .completed:
-                parent.done(_index)
+                parent.done(self._index)
             }
         }
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/ObserverType.swift b/Demo/Pods/RxSwift/RxSwift/ObserverType.swift
index e3ed7aa..e3db94a 100644
--- a/Demo/Pods/RxSwift/RxSwift/ObserverType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/ObserverType.swift
@@ -9,32 +9,35 @@
 /// Supports push-style iteration over an observable sequence.
 public protocol ObserverType {
     /// The type of elements in sequence that observer can observe.
-    associatedtype E
+    associatedtype Element
+
+    @available(*, deprecated, message: "Use `Element` instead.")
+    typealias E = Element
 
     /// Notify observer about sequence event.
     ///
     /// - parameter event: Event that occurred.
-    func on(_ event: Event)
+    func on(_ event: Event)
 }
 
 /// Convenience API extensions to provide alternate next, error, completed events
 extension ObserverType {
     
-    /// Convenience method equivalent to `on(.next(element: E))`
+    /// Convenience method equivalent to `on(.next(element: Element))`
     ///
     /// - parameter element: Next element to send to observer(s)
-    public func onNext(_ element: E) {
-        on(.next(element))
+    public func onNext(_ element: Element) {
+        self.on(.next(element))
     }
     
     /// Convenience method equivalent to `on(.completed)`
     public func onCompleted() {
-        on(.completed)
+        self.on(.completed)
     }
     
     /// Convenience method equivalent to `on(.error(Swift.Error))`
     /// - parameter error: Swift.Error to send to observer(s)
     public func onError(_ error: Swift.Error) {
-        on(.error(error))
+        self.on(.error(error))
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift b/Demo/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift
index 54e83f5..804e289 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift
@@ -6,27 +6,25 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-final class AnonymousObserver : ObserverBase {
-    typealias Element = ElementType
-    
+final class AnonymousObserver: ObserverBase {
     typealias EventHandler = (Event) -> Void
     
     private let _eventHandler : EventHandler
     
     init(_ eventHandler: @escaping EventHandler) {
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
-        _eventHandler = eventHandler
+        self._eventHandler = eventHandler
     }
 
     override func onCore(_ event: Event) {
-        return _eventHandler(event)
+        return self._eventHandler(event)
     }
     
 #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
     }
 #endif
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observers/ObserverBase.swift b/Demo/Pods/RxSwift/RxSwift/Observers/ObserverBase.swift
index 3811565..57be8e2 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observers/ObserverBase.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observers/ObserverBase.swift
@@ -6,29 +6,27 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-class ObserverBase : Disposable, ObserverType {
-    typealias E = ElementType
+class ObserverBase : Disposable, ObserverType {
+    private let _isStopped = AtomicInt(0)
 
-    private var _isStopped: AtomicInt = 0
-
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            if _isStopped == 0 {
-                onCore(event)
+            if load(self._isStopped) == 0 {
+                self.onCore(event)
             }
         case .error, .completed:
-            if AtomicCompareAndSwap(0, 1, &_isStopped) {
-                onCore(event)
+            if fetchOr(self._isStopped, 1) == 0 {
+                self.onCore(event)
             }
         }
     }
 
-    func onCore(_ event: Event) {
+    func onCore(_ event: Event) {
         rxAbstractMethod()
     }
 
     func dispose() {
-        _ = AtomicCompareAndSwap(0, 1, &_isStopped)
+        fetchOr(self._isStopped, 1)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift b/Demo/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift
index 48a599d..41363a9 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift
@@ -16,70 +16,70 @@ enum TailRecursiveSinkCommand {
 #endif
 
 /// This class is usually used with `Generator` version of the operators.
-class TailRecursiveSink
-    : Sink
-    , InvocableWithValueType where S.Iterator.Element: ObservableConvertibleType, S.Iterator.Element.E == O.E {
+class TailRecursiveSink
+    : Sink
+    , InvocableWithValueType where Sequence.Element: ObservableConvertibleType, Sequence.Element.Element == Observer.Element {
     typealias Value = TailRecursiveSinkCommand
-    typealias E = O.E
-    typealias SequenceGenerator = (generator: S.Iterator, remaining: IntMax?)
+    typealias Element = Observer.Element 
+    typealias SequenceGenerator = (generator: Sequence.Iterator, remaining: IntMax?)
 
     var _generators: [SequenceGenerator] = []
     var _isDisposed = false
     var _subscription = SerialDisposable()
 
     // this is thread safe object
-    var _gate = AsyncLock>>()
+    var _gate = AsyncLock>>()
 
-    override init(observer: O, cancel: Cancelable) {
+    override init(observer: Observer, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
 
     func run(_ sources: SequenceGenerator) -> Disposable {
-        _generators.append(sources)
+        self._generators.append(sources)
 
-        schedule(.moveNext)
+        self.schedule(.moveNext)
 
-        return _subscription
+        return self._subscription
     }
 
     func invoke(_ command: TailRecursiveSinkCommand) {
         switch command {
         case .dispose:
-            disposeCommand()
+            self.disposeCommand()
         case .moveNext:
-            moveNextCommand()
+            self.moveNextCommand()
         }
     }
 
     // simple implementation for now
     func schedule(_ command: TailRecursiveSinkCommand) {
-        _gate.invoke(InvocableScheduledItem(invocable: self, state: command))
+        self._gate.invoke(InvocableScheduledItem(invocable: self, state: command))
     }
 
     func done() {
-        forwardOn(.completed)
-        dispose()
+        self.forwardOn(.completed)
+        self.dispose()
     }
 
-    func extract(_ observable: Observable) -> SequenceGenerator? {
+    func extract(_ observable: Observable) -> SequenceGenerator? {
         rxAbstractMethod()
     }
 
     // should be done on gate locked
 
     private func moveNextCommand() {
-        var next: Observable? = nil
+        var next: Observable?
 
         repeat {
-            guard let (g, left) = _generators.last else {
+            guard let (g, left) = self._generators.last else {
                 break
             }
             
-            if _isDisposed {
+            if self._isDisposed {
                 return
             }
 
-            _generators.removeLast()
+            self._generators.removeLast()
             
             var e = g
 
@@ -98,20 +98,20 @@ class TailRecursiveSink
             if let knownOriginalLeft = left {
                 // `- 1` because generator.next() has just been called
                 if knownOriginalLeft - 1 >= 1 {
-                    _generators.append((e, knownOriginalLeft - 1))
+                    self._generators.append((e, knownOriginalLeft - 1))
                 }
             }
             else {
-                _generators.append((e, nil))
+                self._generators.append((e, nil))
             }
 
-            let nextGenerator = extract(nextCandidate)
+            let nextGenerator = self.extract(nextCandidate)
 
             if let nextGenerator = nextGenerator {
-                _generators.append(nextGenerator)
+                self._generators.append(nextGenerator)
                 #if DEBUG || TRACE_RESOURCES
-                    if maxTailRecursiveSinkStackSize < _generators.count {
-                        maxTailRecursiveSinkStackSize = _generators.count
+                    if maxTailRecursiveSinkStackSize < self._generators.count {
+                        maxTailRecursiveSinkStackSize = self._generators.count
                     }
                 #endif
             }
@@ -120,32 +120,32 @@ class TailRecursiveSink
             }
         } while next == nil
 
-        guard let existingNext = next else  {
-            done()
+        guard let existingNext = next else {
+            self.done()
             return
         }
 
         let disposable = SingleAssignmentDisposable()
-        _subscription.disposable = disposable
-        disposable.setDisposable(subscribeToNext(existingNext))
+        self._subscription.disposable = disposable
+        disposable.setDisposable(self.subscribeToNext(existingNext))
     }
 
-    func subscribeToNext(_ source: Observable) -> Disposable {
+    func subscribeToNext(_ source: Observable) -> Disposable {
         rxAbstractMethod()
     }
 
     func disposeCommand() {
-        _isDisposed = true
-        _generators.removeAll(keepingCapacity: false)
+        self._isDisposed = true
+        self._generators.removeAll(keepingCapacity: false)
     }
 
     override func dispose() {
         super.dispose()
         
-        _subscription.dispose()
-        _gate.dispose()
+        self._subscription.dispose()
+        self._gate.dispose()
         
-        schedule(.dispose)
+        self.schedule(.dispose)
     }
 }
 
diff --git a/Demo/Pods/RxSwift/RxSwift/Reactive.swift b/Demo/Pods/RxSwift/RxSwift/Reactive.swift
index b873996..8fdfa18 100644
--- a/Demo/Pods/RxSwift/RxSwift/Reactive.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Reactive.swift
@@ -37,13 +37,16 @@ public struct Reactive {
 /// A type that has reactive extensions.
 public protocol ReactiveCompatible {
     /// Extended type
-    associatedtype CompatibleType
+    associatedtype ReactiveBase
+
+    @available(*, deprecated, message: "Use `ReactiveBase` instead.")
+    typealias CompatibleType = ReactiveBase
 
     /// Reactive extensions.
-    static var rx: Reactive.Type { get set }
+    static var rx: Reactive.Type { get set }
 
     /// Reactive extensions.
-    var rx: Reactive { get set }
+    var rx: Reactive { get set }
 }
 
 extension ReactiveCompatible {
diff --git a/Demo/Pods/RxSwift/RxSwift/Rx.swift b/Demo/Pods/RxSwift/RxSwift/Rx.swift
index 99292ca..a547a8f 100644
--- a/Demo/Pods/RxSwift/RxSwift/Rx.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Rx.swift
@@ -7,27 +7,27 @@
 //
 
 #if TRACE_RESOURCES
-    fileprivate var resourceCount: AtomicInt = 0
+    fileprivate let resourceCount = AtomicInt(0)
 
     /// Resource utilization information
     public struct Resources {
         /// Counts internal Rx resource allocations (Observables, Observers, Disposables, etc.). This provides a simple way to detect leaks during development.
         public static var total: Int32 {
-            return resourceCount.valueSnapshot()
+            return load(resourceCount)
         }
 
         /// Increments `Resources.total` resource count.
         ///
         /// - returns: New resource count
         public static func incrementTotal() -> Int32 {
-            return AtomicIncrement(&resourceCount)
+            return increment(resourceCount)
         }
 
         /// Decrements `Resources.total` resource count
         ///
         /// - returns: New resource count
         public static func decrementTotal() -> Int32 {
-            return AtomicDecrement(&resourceCount)
+            return decrement(resourceCount)
         }
     }
 #endif
@@ -38,7 +38,6 @@ func rxAbstractMethod(file: StaticString = #file, line: UInt = #line) -> Swift.N
 }
 
 func rxFatalError(_ lastMessage: @autoclosure () -> String, file: StaticString = #file, line: UInt = #line) -> Swift.Never  {
-    // The temptation to comment this line is great, but please don't, it's for your own good. The choice is yours.
     fatalError(lastMessage(), file: file, line: line)
 }
 
@@ -76,7 +75,7 @@ func decrementChecked(_ i: inout Int) throws -> Int {
             case `default` = "Two different unsynchronized threads are trying to send some event simultaneously.\n    This is undefined behavior because the ordering of the effects caused by these events is nondeterministic and depends on the \n    operating system thread scheduler. This will result in a random behavior of your program.\n"
         }
 
-        private var _threads = Dictionary()
+        private var _threads = [UnsafeMutableRawPointer: Int]()
 
         private func synchronizationError(_ message: String) {
             #if FATAL_SYNCHRONIZATION
@@ -87,12 +86,12 @@ func decrementChecked(_ i: inout Int) throws -> Int {
         }
         
         func register(synchronizationErrorMessage: SynchronizationErrorMessages) {
-            _lock.lock(); defer { _lock.unlock() }
+            self._lock.lock(); defer { self._lock.unlock() }
             let pointer = Unmanaged.passUnretained(Thread.current).toOpaque()
-            let count = (_threads[pointer] ?? 0) + 1
+            let count = (self._threads[pointer] ?? 0) + 1
 
             if count > 1 {
-                synchronizationError(
+                self.synchronizationError(
                     "⚠️ Reentrancy anomaly was detected.\n" +
                     "  > Debugging: To debug this issue you can set a breakpoint in \(#file):\(#line) and observe the call stack.\n" +
                     "  > Problem: This behavior is breaking the observable sequence grammar. `next (error | completed)?`\n" +
@@ -101,14 +100,14 @@ func decrementChecked(_ i: inout Int) throws -> Int {
                     "  > Interpretation: This could mean that there is some kind of unexpected cyclic dependency in your code,\n" +
                     "    or that the system is not behaving in the expected way.\n" +
                     "  > Remedy: If this is the expected behavior this message can be suppressed by adding `.observeOn(MainScheduler.asyncInstance)`\n" +
-                    "    or by enqueing sequence events in some other way.\n"
+                    "    or by enqueuing sequence events in some other way.\n"
                 )
             }
             
-            _threads[pointer] = count
+            self._threads[pointer] = count
 
-            if _threads.count > 1 {
-                synchronizationError(
+            if self._threads.count > 1 {
+                self.synchronizationError(
                     "⚠️ Synchronization anomaly was detected.\n" +
                     "  > Debugging: To debug this issue you can set a breakpoint in \(#file):\(#line) and observe the call stack.\n" +
                     "  > Problem: This behavior is breaking the observable sequence grammar. `next (error | completed)?`\n" +
@@ -122,11 +121,11 @@ func decrementChecked(_ i: inout Int) throws -> Int {
         }
 
         func unregister() {
-            _lock.lock(); defer { _lock.unlock() }
+            self._lock.lock(); defer { self._lock.unlock() }
             let pointer = Unmanaged.passUnretained(Thread.current).toOpaque()
-            _threads[pointer] = (_threads[pointer] ?? 1) - 1
-            if _threads[pointer] == 0 {
-                _threads[pointer] = nil
+            self._threads[pointer] = (self._threads[pointer] ?? 1) - 1
+            if self._threads[pointer] == 0 {
+                self._threads[pointer] = nil
             }
         }
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift b/Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift
index 7f3c333..fd6fc98 100644
--- a/Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift
+++ b/Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift
@@ -6,10 +6,35 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+#if os(Linux)
+/// As Swift 5 was released, A patch to `Thread` for Linux
+/// changed `threadDictionary` to a `NSMutableDictionary` instead of
+/// a `Dictionary`: https://github.com/apple/swift-corelibs-foundation/pull/1762/files
+///
+/// This means that on Linux specifically, `RxMutableBox` must be a `NSObject`
+/// or it won't be possible to store it in `Thread.threadDictionary`.
+///
+/// For more information, read the discussion at:
+/// https://github.com/ReactiveX/RxSwift/issues/1911#issuecomment-479723298
+import class Foundation.NSObject
+
+/// Creates mutable reference wrapper for any type.
+final class RxMutableBox: NSObject {
+    /// Wrapped value
+    var value: T
+
+    /// Creates reference wrapper for `value`.
+    ///
+    /// - parameter value: Value to wrap.
+    init (_ value: T) {
+        self.value = value
+    }
+}
+#else
 /// Creates mutable reference wrapper for any type.
-final class RxMutableBox : CustomDebugStringConvertible {
+final class RxMutableBox: CustomDebugStringConvertible {
     /// Wrapped value
-    var value : T
+    var value: T
     
     /// Creates reference wrapper for `value`.
     ///
@@ -25,3 +50,4 @@ extension RxMutableBox {
         return "MutatingBox(\(self.value))"
     }
 }
+#endif
diff --git a/Demo/Pods/RxSwift/RxSwift/SchedulerType.swift b/Demo/Pods/RxSwift/RxSwift/SchedulerType.swift
index bdfcf8b..96664b4 100644
--- a/Demo/Pods/RxSwift/RxSwift/SchedulerType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/SchedulerType.swift
@@ -6,11 +6,11 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-import struct Foundation.TimeInterval
+import enum Dispatch.DispatchTimeInterval
 import struct Foundation.Date
 
 // Type that represents time interval in the context of RxSwift.
-public typealias RxTimeInterval = TimeInterval
+public typealias RxTimeInterval = DispatchTimeInterval
 
 /// Type that represents absolute time in the context of RxSwift.
 public typealias RxTime = Date
@@ -61,7 +61,7 @@ extension SchedulerType {
         return schedule.start()
     }
 
-    func scheduleRecursive(_ state: State, dueTime: RxTimeInterval, action: @escaping (State, AnyRecursiveScheduler) -> ()) -> Disposable {
+    func scheduleRecursive(_ state: State, dueTime: RxTimeInterval, action: @escaping (State, AnyRecursiveScheduler) -> Void) -> Disposable {
         let scheduler = AnyRecursiveScheduler(scheduler: self, action: action)
          
         scheduler.schedule(state, dueTime: dueTime)
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
index aa1f480..ac51324 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
@@ -28,7 +28,7 @@ public class ConcurrentDispatchQueueScheduler: SchedulerType {
     /// - parameter queue: Target dispatch queue.
     /// - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
     public init(queue: DispatchQueue, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        configuration = DispatchQueueConfiguration(queue: queue, leeway: leeway)
+        self.configuration = DispatchQueueConfiguration(queue: queue, leeway: leeway)
     }
     
     /// Convenience init for scheduler that wraps one of the global concurrent dispatch queues.
@@ -65,7 +65,7 @@ public class ConcurrentDispatchQueueScheduler: SchedulerType {
     - parameter action: Action to be executed.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public final func scheduleRelative(_ state: StateType, dueTime: Foundation.TimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
+    public final func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
         return self.configuration.scheduleRelative(state, dueTime: dueTime, action: action)
     }
     
@@ -78,7 +78,7 @@ public class ConcurrentDispatchQueueScheduler: SchedulerType {
     - parameter action: Action to be executed.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public func schedulePeriodic(_ state: StateType, startAfter: TimeInterval, period: TimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
+    public func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
         return self.configuration.schedulePeriodic(state, startAfter: startAfter, period: period, action: action)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
index a98ad21..f535a22 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
@@ -24,13 +24,13 @@ public final class ConcurrentMainScheduler : SchedulerType {
     private let _mainQueue: DispatchQueue
 
     /// - returns: Current time.
-    public var now : Date {
-        return _mainScheduler.now as Date
+    public var now: Date {
+        return self._mainScheduler.now as Date
     }
 
     private init(mainScheduler: MainScheduler) {
-        _mainQueue = DispatchQueue.main
-        _mainScheduler = mainScheduler
+        self._mainQueue = DispatchQueue.main
+        self._mainScheduler = mainScheduler
     }
 
     /// Singleton instance of `ConcurrentMainScheduler`
@@ -50,7 +50,7 @@ public final class ConcurrentMainScheduler : SchedulerType {
 
         let cancel = SingleAssignmentDisposable()
 
-        _mainQueue.async {
+        self._mainQueue.async {
             if cancel.isDisposed {
                 return
             }
@@ -69,8 +69,8 @@ public final class ConcurrentMainScheduler : SchedulerType {
     - parameter action: Action to be executed.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public final func scheduleRelative(_ state: StateType, dueTime: Foundation.TimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return _mainScheduler.scheduleRelative(state, dueTime: dueTime, action: action)
+    public final func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
+        return self._mainScheduler.scheduleRelative(state, dueTime: dueTime, action: action)
     }
 
     /**
@@ -82,7 +82,7 @@ public final class ConcurrentMainScheduler : SchedulerType {
     - parameter action: Action to be executed.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public func schedulePeriodic(_ state: StateType, startAfter: TimeInterval, period: TimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
-        return _mainScheduler.schedulePeriodic(state, startAfter: startAfter, period: period, action: action)
+    public func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
+        return self._mainScheduler.schedulePeriodic(state, startAfter: startAfter, period: period, action: action)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift
index 0676444..8f9939a 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift
@@ -21,7 +21,7 @@ import Dispatch
         fileprivate static let instance = "RxSwift.CurrentThreadScheduler.Queue"
     }
 #else
-    fileprivate class CurrentThreadSchedulerQueueKey: NSObject, NSCopying {
+    private class CurrentThreadSchedulerQueueKey: NSObject, NSCopying {
         static let instance = CurrentThreadSchedulerQueueKey()
         private override init() {
             super.init()
@@ -50,13 +50,7 @@ public class CurrentThreadScheduler : ImmediateSchedulerType {
 
     private static var isScheduleRequiredKey: pthread_key_t = { () -> pthread_key_t in
         let key = UnsafeMutablePointer.allocate(capacity: 1)
-        defer {
-#if swift(>=4.1)
-            key.deallocate()
-#else
-            key.deallocate(capacity: 1)
-#endif
-        }
+        defer { key.deallocate() }
                                                                
         guard pthread_key_create(key, nil) == 0 else {
             rxFatalError("isScheduleRequired key creation failed")
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift
index 930ca37..12eeb5c 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-import struct Foundation.Date
+import Foundation
 
 /// Converts historical virtual time into real time.
 ///
@@ -16,7 +16,7 @@ public struct HistoricalSchedulerTimeConverter : VirtualTimeConverterType {
     public typealias VirtualTimeUnit = RxTime
 
     /// Virtual time unit used to represent differences of virtual times.
-    public typealias VirtualTimeIntervalUnit = RxTimeInterval
+    public typealias VirtualTimeIntervalUnit = TimeInterval
 
     /// Returns identical value of argument passed because historical virtual time is equal to real time, just
     /// decoupled from local machine clock.
@@ -32,13 +32,13 @@ public struct HistoricalSchedulerTimeConverter : VirtualTimeConverterType {
 
     /// Returns identical value of argument passed because historical virtual time is equal to real time, just
     /// decoupled from local machine clock.
-    public func convertFromVirtualTimeInterval(_ virtualTimeInterval: VirtualTimeIntervalUnit) -> RxTimeInterval {
+    public func convertFromVirtualTimeInterval(_ virtualTimeInterval: VirtualTimeIntervalUnit) -> TimeInterval {
         return virtualTimeInterval
     }
 
     /// Returns identical value of argument passed because historical virtual time is equal to real time, just
     /// decoupled from local machine clock.
-    public func convertToVirtualTimeInterval(_ timeInterval: RxTimeInterval) -> VirtualTimeIntervalUnit {
+    public func convertToVirtualTimeInterval(_ timeInterval: TimeInterval) -> VirtualTimeIntervalUnit {
         return timeInterval
     }
 
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
index b82f011..bac5e9a 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
@@ -14,18 +14,11 @@ struct DispatchQueueConfiguration {
     let leeway: DispatchTimeInterval
 }
 
-private func dispatchInterval(_ interval: Foundation.TimeInterval) -> DispatchTimeInterval {
-    precondition(interval >= 0.0)
-    // TODO: Replace 1000 with something that actually works 
-    // NSEC_PER_MSEC returns 1000000
-    return DispatchTimeInterval.milliseconds(Int(interval * 1000.0))
-}
-
 extension DispatchQueueConfiguration {
     func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
         let cancel = SingleAssignmentDisposable()
 
-        queue.async {
+        self.queue.async {
             if cancel.isDisposed {
                 return
             }
@@ -37,17 +30,13 @@ extension DispatchQueueConfiguration {
         return cancel
     }
 
-    func scheduleRelative(_ state: StateType, dueTime: Foundation.TimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let deadline = DispatchTime.now() + dispatchInterval(dueTime)
+    func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
+        let deadline = DispatchTime.now() + dueTime
 
         let compositeDisposable = CompositeDisposable()
 
-        let timer = DispatchSource.makeTimerSource(queue: queue)
-        #if swift(>=4.0)
-            timer.schedule(deadline: deadline, leeway: leeway)
-        #else
-            timer.scheduleOneshot(deadline: deadline, leeway: leeway)
-        #endif
+        let timer = DispatchSource.makeTimerSource(queue: self.queue)
+        timer.schedule(deadline: deadline, leeway: self.leeway)
 
         // TODO:
         // This looks horrible, and yes, it is.
@@ -75,17 +64,13 @@ extension DispatchQueueConfiguration {
         return compositeDisposable
     }
 
-    func schedulePeriodic(_ state: StateType, startAfter: TimeInterval, period: TimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
-        let initial = DispatchTime.now() + dispatchInterval(startAfter)
+    func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
+        let initial = DispatchTime.now() + startAfter
 
         var timerState = state
 
-        let timer = DispatchSource.makeTimerSource(queue: queue)
-        #if swift(>=4.0)
-            timer.schedule(deadline: initial, repeating: dispatchInterval(period), leeway: leeway)
-        #else
-            timer.scheduleRepeating(deadline: initial, interval: dispatchInterval(period), leeway: leeway)
-        #endif
+        let timer = DispatchSource.makeTimerSource(queue: self.queue)
+        timer.schedule(deadline: initial, repeating: period, leeway: self.leeway)
         
         // TODO:
         // This looks horrible, and yes, it is.
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift
index 90445f8..f31469e 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift
@@ -12,11 +12,11 @@ struct InvocableScheduledItem : InvocableType {
     let _state: I.Value
 
     init(invocable: I, state: I.Value) {
-        _invocable = invocable
-        _state = state
+        self._invocable = invocable
+        self._state = state
     }
 
     func invoke() {
-        _invocable.invoke(_state)
+        self._invocable.invoke(self._state)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift
index 454fb34..6e7a0c1 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift
@@ -17,19 +17,19 @@ struct ScheduledItem
     private let _disposable = SingleAssignmentDisposable()
 
     var isDisposed: Bool {
-        return _disposable.isDisposed
+        return self._disposable.isDisposed
     }
     
     init(action: @escaping Action, state: T) {
-        _action = action
-        _state = state
+        self._action = action
+        self._state = state
     }
     
     func invoke() {
-         _disposable.setDisposable(_action(_state))
+         self._disposable.setDisposable(self._action(self._state))
     }
     
     func dispose() {
-        _disposable.dispose()
+        self._disposable.dispose()
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift
index e219e4e..8fb0907 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift
@@ -7,6 +7,9 @@
 //
 
 import Dispatch
+#if !os(Linux)
+    import Foundation
+#endif
 
 /**
 Abstracts work that needs to be performed on `DispatchQueue.main`. In case `schedule` methods are called from `DispatchQueue.main`, it will perform action immediately without scheduling.
@@ -22,12 +25,12 @@ public final class MainScheduler : SerialDispatchQueueScheduler {
 
     private let _mainQueue: DispatchQueue
 
-    var numberEnqueued: AtomicInt = 0
+    let numberEnqueued = AtomicInt(0)
 
     /// Initializes new instance of `MainScheduler`.
     public init() {
-        _mainQueue = DispatchQueue.main
-        super.init(serialQueue: _mainQueue)
+        self._mainQueue = DispatchQueue.main
+        super.init(serialQueue: self._mainQueue)
     }
 
     /// Singleton instance of `MainScheduler`
@@ -44,23 +47,32 @@ public final class MainScheduler : SerialDispatchQueueScheduler {
         }
     }
 
+    /// In case this method is running on a background thread it will throw an exception.
+    public class func ensureRunningOnMainThread(errorMessage: String? = nil) {
+        #if !os(Linux) // isMainThread is not implemented in Linux Foundation
+            guard Thread.isMainThread else {
+                rxFatalError(errorMessage ?? "Running on background thread.")
+            }
+        #endif
+    }
+
     override func scheduleInternal(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let currentNumberEnqueued = AtomicIncrement(&numberEnqueued)
+        let previousNumberEnqueued = increment(self.numberEnqueued)
 
-        if DispatchQueue.isMain && currentNumberEnqueued == 1 {
+        if DispatchQueue.isMain && previousNumberEnqueued == 0 {
             let disposable = action(state)
-            _ = AtomicDecrement(&numberEnqueued)
+            decrement(self.numberEnqueued)
             return disposable
         }
 
         let cancel = SingleAssignmentDisposable()
 
-        _mainQueue.async {
+        self._mainQueue.async {
             if !cancel.isDisposed {
                 _ = action(state)
             }
 
-            _ = AtomicDecrement(&self.numberEnqueued)
+            decrement(self.numberEnqueued)
         }
 
         return cancel
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift
index 24d19cc..9e9b4ff 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-fileprivate enum ScheduleState {
+private enum ScheduleState {
     case initial
     case added(CompositeDisposable.DisposeKey)
     case done
@@ -26,8 +26,8 @@ final class AnyRecursiveScheduler {
     private var _action: Action?
     
     init(scheduler: SchedulerType, action: @escaping Action) {
-        _action = action
-        _scheduler = scheduler
+        self._action = action
+        self._scheduler = scheduler
     }
 
     /**
@@ -39,7 +39,7 @@ final class AnyRecursiveScheduler {
     func schedule(_ state: State, dueTime: RxTimeInterval) {
         var scheduleState: ScheduleState = .initial
 
-        let d = _scheduler.scheduleRelative(state, dueTime: dueTime) { (state) -> Disposable in
+        let d = self._scheduler.scheduleRelative(state, dueTime: dueTime) { state -> Disposable in
             // best effort
             if self._group.isDisposed {
                 return Disposables.create()
@@ -67,19 +67,17 @@ final class AnyRecursiveScheduler {
             return Disposables.create()
         }
             
-        _lock.performLocked {
+        self._lock.performLocked {
             switch scheduleState {
             case .added:
                 rxFatalError("Invalid state")
-                break
             case .initial:
-                if let removeKey = _group.insert(d) {
+                if let removeKey = self._group.insert(d) {
                     scheduleState = .added(removeKey)
                 }
                 else {
                     scheduleState = .done
                 }
-                break
             case .done:
                 break
             }
@@ -92,7 +90,7 @@ final class AnyRecursiveScheduler {
     func schedule(_ state: State) {
         var scheduleState: ScheduleState = .initial
 
-        let d = _scheduler.schedule(state) { (state) -> Disposable in
+        let d = self._scheduler.schedule(state) { state -> Disposable in
             // best effort
             if self._group.isDisposed {
                 return Disposables.create()
@@ -120,19 +118,17 @@ final class AnyRecursiveScheduler {
             return Disposables.create()
         }
         
-        _lock.performLocked {
+        self._lock.performLocked {
             switch scheduleState {
             case .added:
                 rxFatalError("Invalid state")
-                break
             case .initial:
-                if let removeKey = _group.insert(d) {
+                if let removeKey = self._group.insert(d) {
                     scheduleState = .added(removeKey)
                 }
                 else {
                     scheduleState = .done
                 }
-                break
             case .done:
                 break
             }
@@ -140,10 +136,10 @@ final class AnyRecursiveScheduler {
     }
     
     func dispose() {
-        _lock.performLocked {
-            _action = nil
+        self._lock.performLocked {
+            self._action = nil
         }
-        _group.dispose()
+        self._group.dispose()
     }
 }
 
@@ -158,8 +154,8 @@ final class RecursiveImmediateScheduler {
     private let _scheduler: ImmediateSchedulerType
     
     init(action: @escaping Action, scheduler: ImmediateSchedulerType) {
-        _action = action
-        _scheduler = scheduler
+        self._action = action
+        self._scheduler = scheduler
     }
     
     // immediate scheduling
@@ -170,7 +166,7 @@ final class RecursiveImmediateScheduler {
     func schedule(_ state: State) {
         var scheduleState: ScheduleState = .initial
 
-        let d = _scheduler.schedule(state) { (state) -> Disposable in
+        let d = self._scheduler.schedule(state) { state -> Disposable in
             // best effort
             if self._group.isDisposed {
                 return Disposables.create()
@@ -198,19 +194,17 @@ final class RecursiveImmediateScheduler {
             return Disposables.create()
         }
         
-        _lock.performLocked {
+        self._lock.performLocked {
             switch scheduleState {
             case .added:
                 rxFatalError("Invalid state")
-                break
             case .initial:
-                if let removeKey = _group.insert(d) {
+                if let removeKey = self._group.insert(d) {
                     scheduleState = .added(removeKey)
                 }
                 else {
                     scheduleState = .done
                 }
-                break
             case .done:
                 break
             }
@@ -218,9 +212,9 @@ final class RecursiveImmediateScheduler {
     }
     
     func dispose() {
-        _lock.performLocked {
-            _action = nil
+        self._lock.performLocked {
+            self._action = nil
         }
-        _group.dispose()
+        self._group.dispose()
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
index 41f2947..5b7b840 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
@@ -21,38 +21,38 @@ final class SchedulePeriodicRecursive {
     private let _action: RecursiveAction
 
     private var _state: State
-    private var _pendingTickCount: AtomicInt = 0
+    private let _pendingTickCount = AtomicInt(0)
 
     init(scheduler: SchedulerType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping RecursiveAction, state: State) {
-        _scheduler = scheduler
-        _startAfter = startAfter
-        _period = period
-        _action = action
-        _state = state
+        self._scheduler = scheduler
+        self._startAfter = startAfter
+        self._period = period
+        self._action = action
+        self._state = state
     }
 
     func start() -> Disposable {
-        return _scheduler.scheduleRecursive(SchedulePeriodicRecursiveCommand.tick, dueTime: _startAfter, action: self.tick)
+        return self._scheduler.scheduleRecursive(SchedulePeriodicRecursiveCommand.tick, dueTime: self._startAfter, action: self.tick)
     }
 
-    func tick(_ command: SchedulePeriodicRecursiveCommand, scheduler: RecursiveScheduler) -> Void {
+    func tick(_ command: SchedulePeriodicRecursiveCommand, scheduler: RecursiveScheduler) {
         // Tries to emulate periodic scheduling as best as possible.
         // The problem that could arise is if handling periodic ticks take too long, or
         // tick interval is short.
         switch command {
         case .tick:
-            scheduler.schedule(.tick, dueTime: _period)
+            scheduler.schedule(.tick, dueTime: self._period)
 
             // The idea is that if on tick there wasn't any item enqueued, schedule to perform work immediately.
             // Else work will be scheduled after previous enqueued work completes.
-            if AtomicIncrement(&_pendingTickCount) == 1 {
+            if increment(self._pendingTickCount) == 0 {
                 self.tick(.dispatchStart, scheduler: scheduler)
             }
 
         case .dispatchStart:
-            _state = _action(_state)
+            self._state = self._action(self._state)
             // Start work and schedule check is this last batch of work
-            if AtomicDecrement(&_pendingTickCount) > 0 {
+            if decrement(self._pendingTickCount) > 1 {
                 // This gives priority to scheduler emulation, it's not perfect, but helps
                 scheduler.schedule(SchedulePeriodicRecursiveCommand.dispatchStart)
             }
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
index 1a38a73..57ae8bd 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
@@ -45,7 +45,7 @@ public class SerialDispatchQueueScheduler : SchedulerType {
     - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
     */
     init(serialQueue: DispatchQueue, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        configuration = DispatchQueueConfiguration(queue: serialQueue, leeway: leeway)
+        self.configuration = DispatchQueueConfiguration(queue: serialQueue, leeway: leeway)
     }
 
     /**
@@ -113,7 +113,7 @@ public class SerialDispatchQueueScheduler : SchedulerType {
     - parameter action: Action to be executed.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public final func scheduleRelative(_ state: StateType, dueTime: Foundation.TimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
+    public final func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
         return self.configuration.scheduleRelative(state, dueTime: dueTime, action: action)
     }
     
@@ -126,7 +126,7 @@ public class SerialDispatchQueueScheduler : SchedulerType {
     - parameter action: Action to be executed.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public func schedulePeriodic(_ state: StateType, startAfter: TimeInterval, period: TimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
+    public func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
         return self.configuration.schedulePeriodic(state, startAfter: startAfter, period: period, action: action)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeConverterType.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeConverterType.swift
index a17475a..7069b00 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeConverterType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeConverterType.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+import Foundation
+
 /// Parametrization for virtual time used by `VirtualTimeScheduler`s.
 public protocol VirtualTimeConverterType {
     /// Virtual time unit used that represents ticks of virtual clock.
@@ -36,7 +38,7 @@ public protocol VirtualTimeConverterType {
      - parameter virtualTimeInterval: Virtual time interval to convert to `NSTimeInterval`.
      - returns: `NSTimeInterval` corresponding to virtual time interval.
     */
-    func convertFromVirtualTimeInterval(_ virtualTimeInterval: VirtualTimeIntervalUnit) -> RxTimeInterval
+    func convertFromVirtualTimeInterval(_ virtualTimeInterval: VirtualTimeIntervalUnit) -> TimeInterval
 
     /**
      Converts from `NSTimeInterval` to virtual time interval.
@@ -44,7 +46,7 @@ public protocol VirtualTimeConverterType {
      - parameter timeInterval: `NSTimeInterval` to convert to virtual time interval.
      - returns: Virtual time interval corresponding to time interval.
     */
-    func convertToVirtualTimeInterval(_ timeInterval: RxTimeInterval) -> VirtualTimeIntervalUnit
+    func convertToVirtualTimeInterval(_ timeInterval: TimeInterval) -> VirtualTimeIntervalUnit
 
     /**
      Offsets virtual time by virtual time interval.
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
index c0e1aa5..e63cece 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
@@ -24,22 +24,22 @@ open class VirtualTimeScheduler
 
     /// - returns: Current time.
     public var now: RxTime {
-        return _converter.convertFromVirtualTime(clock)
+        return self._converter.convertFromVirtualTime(self.clock)
     }
 
     /// - returns: Scheduler's absolute time clock value.
     public var clock: VirtualTime {
-        return _clock
+        return self._clock
     }
 
     /// Creates a new virtual time scheduler.
     ///
     /// - parameter initialClock: Initial value for the clock.
     public init(initialClock: VirtualTime, converter: Converter) {
-        _clock = initialClock
-        _running = false
-        _converter = converter
-        _schedulerQueue = PriorityQueue(hasHigherPriority: {
+        self._clock = initialClock
+        self._running = false
+        self._converter = converter
+        self._schedulerQueue = PriorityQueue(hasHigherPriority: {
             switch converter.compareVirtualTime($0.time, $1.time) {
             case .lessThan:
                 return true
@@ -50,7 +50,7 @@ open class VirtualTimeScheduler
             }
         }, isEqual: { $0 === $1 })
         #if TRACE_RESOURCES
-            let _ = Resources.incrementTotal()
+            _ = Resources.incrementTotal()
         #endif
     }
 
@@ -62,7 +62,7 @@ open class VirtualTimeScheduler
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
     public func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self.scheduleRelative(state, dueTime: 0.0) { a in
+        return self.scheduleRelative(state, dueTime: .microseconds(0)) { a in
             return action(a)
         }
     }
@@ -76,10 +76,10 @@ open class VirtualTimeScheduler
      - returns: The disposable object used to cancel the scheduled action (best effort).
      */
     public func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let time = self.now.addingTimeInterval(dueTime)
-        let absoluteTime = _converter.convertToVirtualTime(time)
+        let time = self.now.addingDispatchInterval(dueTime)
+        let absoluteTime = self._converter.convertToVirtualTime(time)
         let adjustedTime = self.adjustScheduledTime(absoluteTime)
-        return scheduleAbsoluteVirtual(state, time: adjustedTime, action: action)
+        return self.scheduleAbsoluteVirtual(state, time: adjustedTime, action: action)
     }
 
     /**
@@ -91,8 +91,8 @@ open class VirtualTimeScheduler
      - returns: The disposable object used to cancel the scheduled action (best effort).
      */
     public func scheduleRelativeVirtual(_ state: StateType, dueTime: VirtualTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let time = _converter.offsetVirtualTime(self.clock, offset: dueTime)
-        return scheduleAbsoluteVirtual(state, time: time, action: action)
+        let time = self._converter.offsetVirtualTime(self.clock, offset: dueTime)
+        return self.scheduleAbsoluteVirtual(state, time: time, action: action)
     }
 
     /**
@@ -111,11 +111,11 @@ open class VirtualTimeScheduler
         let item = VirtualSchedulerItem(action: {
             let dispose = action(state)
             return dispose
-        }, time: time, id: _nextId)
+        }, time: time, id: self._nextId)
 
-        _nextId += 1
+        self._nextId += 1
 
-        _schedulerQueue.enqueue(item)
+        self._schedulerQueue.enqueue(item)
         
         _ = compositeDisposable.insert(item)
         
@@ -131,31 +131,31 @@ open class VirtualTimeScheduler
     public func start() {
         MainScheduler.ensureExecutingOnScheduler()
 
-        if _running {
+        if self._running {
             return
         }
 
-        _running = true
+        self._running = true
         repeat {
-            guard let next = findNext() else {
+            guard let next = self.findNext() else {
                 break
             }
 
-            if _converter.compareVirtualTime(next.time, self.clock).greaterThan  {
-                _clock = next.time
+            if self._converter.compareVirtualTime(next.time, self.clock).greaterThan {
+                self._clock = next.time
             }
 
             next.invoke()
-            _schedulerQueue.remove(next)
-        } while _running
+            self._schedulerQueue.remove(next)
+        } while self._running
 
-        _running = false
+        self._running = false
     }
 
     func findNext() -> VirtualSchedulerItem? {
-        while let front = _schedulerQueue.peek() {
+        while let front = self._schedulerQueue.peek() {
             if front.isDisposed {
-                _schedulerQueue.remove(front)
+                self._schedulerQueue.remove(front)
                 continue
             }
 
@@ -171,49 +171,49 @@ open class VirtualTimeScheduler
     public func advanceTo(_ virtualTime: VirtualTime) {
         MainScheduler.ensureExecutingOnScheduler()
 
-        if _running {
+        if self._running {
             fatalError("Scheduler is already running")
         }
 
-        _running = true
+        self._running = true
         repeat {
-            guard let next = findNext() else {
+            guard let next = self.findNext() else {
                 break
             }
 
-            if _converter.compareVirtualTime(next.time, virtualTime).greaterThan {
+            if self._converter.compareVirtualTime(next.time, virtualTime).greaterThan {
                 break
             }
 
-            if _converter.compareVirtualTime(next.time, self.clock).greaterThan  {
-                _clock = next.time
+            if self._converter.compareVirtualTime(next.time, self.clock).greaterThan {
+                self._clock = next.time
             }
 
             next.invoke()
-            _schedulerQueue.remove(next)
-        } while _running
+            self._schedulerQueue.remove(next)
+        } while self._running
 
-        _clock = virtualTime
-        _running = false
+        self._clock = virtualTime
+        self._running = false
     }
 
     /// Advances the scheduler's clock by the specified relative time.
     public func sleep(_ virtualInterval: VirtualTimeInterval) {
         MainScheduler.ensureExecutingOnScheduler()
 
-        let sleepTo = _converter.offsetVirtualTime(clock, offset: virtualInterval)
-        if _converter.compareVirtualTime(sleepTo, clock).lessThen {
+        let sleepTo = self._converter.offsetVirtualTime(self.clock, offset: virtualInterval)
+        if self._converter.compareVirtualTime(sleepTo, self.clock).lessThen {
             fatalError("Can't sleep to past.")
         }
 
-        _clock = sleepTo
+        self._clock = sleepTo
     }
 
     /// Stops the virtual time scheduler.
     public func stop() {
         MainScheduler.ensureExecutingOnScheduler()
 
-        _running = false
+        self._running = false
     }
 
     #if TRACE_RESOURCES
@@ -241,7 +241,7 @@ final class VirtualSchedulerItem(_ seed: A, accumulator: @escaping (A, Element) throws -> A)
-        -> Observable {
-        return Reduce(source: self.asObservable(), seed: seed, accumulator: accumulator, mapResult: { $0 })
-    }
-}
-
-final private class ReduceSink: Sink, ObserverType {
-    typealias ResultType = Observer.Element 
-    typealias Parent = Reduce
-    
-    private let _parent: Parent
-    private var _accumulation: AccumulateType
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        self._accumulation = parent._seed
-        
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            do {
-                self._accumulation = try self._parent._accumulator(self._accumulation, value)
-            }
-            catch let e {
-                self.forwardOn(.error(e))
-                self.dispose()
-            }
-        case .error(let e):
-            self.forwardOn(.error(e))
-            self.dispose()
-        case .completed:
-            do {
-                let result = try self._parent._mapResult(self._accumulation)
-                self.forwardOn(.next(result))
-                self.forwardOn(.completed)
-                self.dispose()
-            }
-            catch let e {
-                self.forwardOn(.error(e))
-                self.dispose()
-            }
-        }
-    }
-}
-
-final private class Reduce: Producer {
-    typealias AccumulatorType = (AccumulateType, SourceType) throws -> AccumulateType
-    typealias ResultSelectorType = (AccumulateType) throws -> ResultType
-    
-    fileprivate let _source: Observable
-    fileprivate let _seed: AccumulateType
-    fileprivate let _accumulator: AccumulatorType
-    fileprivate let _mapResult: ResultSelectorType
-    
-    init(source: Observable, seed: AccumulateType, accumulator: @escaping AccumulatorType, mapResult: @escaping ResultSelectorType) {
-        self._source = source
-        self._seed = seed
-        self._accumulator = accumulator
-        self._mapResult = mapResult
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == ResultType {
-        let sink = ReduceSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
-
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Repeat.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Repeat.swift
deleted file mode 100644
index 4fed45c..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Repeat.swift
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-//  Repeat.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 9/13/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-    /**
-     Generates an observable sequence that repeats the given element infinitely, using the specified scheduler to send out observer messages.
-
-     - seealso: [repeat operator on reactivex.io](http://reactivex.io/documentation/operators/repeat.html)
-
-     - parameter element: Element to repeat.
-     - parameter scheduler: Scheduler to run the producer loop on.
-     - returns: An observable sequence that repeats the given element infinitely.
-     */
-    public static func repeatElement(_ element: Element, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
-        return RepeatElement(element: element, scheduler: scheduler)
-    }
-}
-
-final private class RepeatElement: Producer {
-    fileprivate let _element: Element
-    fileprivate let _scheduler: ImmediateSchedulerType
-    
-    init(element: Element, scheduler: ImmediateSchedulerType) {
-        self._element = element
-        self._scheduler = scheduler
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = RepeatElementSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-final private class RepeatElementSink: Sink {
-    typealias Parent = RepeatElement
-    
-    private let _parent: Parent
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run() -> Disposable {
-        return self._parent._scheduler.scheduleRecursive(self._parent._element) { e, recurse in
-            self.forwardOn(.next(e))
-            recurse(e)
-        }
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift b/Demo/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift
deleted file mode 100644
index decd309..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift
+++ /dev/null
@@ -1,182 +0,0 @@
-//
-//  RetryWhen.swift
-//  RxSwift
-//
-//  Created by Junior B. on 06/10/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Repeats the source observable sequence on error when the notifier emits a next value.
-     If the source observable errors and the notifier completes, it will complete the source sequence.
-
-     - seealso: [retry operator on reactivex.io](http://reactivex.io/documentation/operators/retry.html)
-
-     - parameter notificationHandler: A handler that is passed an observable sequence of errors raised by the source observable and returns and observable that either continues, completes or errors. This behavior is then applied to the source observable.
-     - returns: An observable sequence producing the elements of the given sequence repeatedly until it terminates successfully or is notified to error or complete.
-     */
-    public func retryWhen(_ notificationHandler: @escaping (Observable) -> TriggerObservable)
-        -> Observable {
-        return RetryWhenSequence(sources: InfiniteSequence(repeatedValue: self.asObservable()), notificationHandler: notificationHandler)
-    }
-
-    /**
-     Repeats the source observable sequence on error when the notifier emits a next value.
-     If the source observable errors and the notifier completes, it will complete the source sequence.
-
-     - seealso: [retry operator on reactivex.io](http://reactivex.io/documentation/operators/retry.html)
-
-     - parameter notificationHandler: A handler that is passed an observable sequence of errors raised by the source observable and returns and observable that either continues, completes or errors. This behavior is then applied to the source observable.
-     - returns: An observable sequence producing the elements of the given sequence repeatedly until it terminates successfully or is notified to error or complete.
-     */
-    public func retryWhen(_ notificationHandler: @escaping (Observable) -> TriggerObservable)
-        -> Observable {
-        return RetryWhenSequence(sources: InfiniteSequence(repeatedValue: self.asObservable()), notificationHandler: notificationHandler)
-    }
-}
-
-final private class RetryTriggerSink
-    : ObserverType where Sequence.Element: ObservableType, Sequence.Element.Element == Observer.Element {
-    typealias Element = TriggerObservable.Element
-    
-    typealias Parent = RetryWhenSequenceSinkIter
-    
-    fileprivate let _parent: Parent
-
-    init(parent: Parent) {
-        self._parent = parent
-    }
-
-    func on(_ event: Event) {
-        switch event {
-        case .next:
-            self._parent._parent._lastError = nil
-            self._parent._parent.schedule(.moveNext)
-        case .error(let e):
-            self._parent._parent.forwardOn(.error(e))
-            self._parent._parent.dispose()
-        case .completed:
-            self._parent._parent.forwardOn(.completed)
-            self._parent._parent.dispose()
-        }
-    }
-}
-
-final private class RetryWhenSequenceSinkIter
-    : ObserverType
-    , Disposable where Sequence.Element: ObservableType, Sequence.Element.Element == Observer.Element {
-    typealias Element = Observer.Element 
-    typealias Parent = RetryWhenSequenceSink
-
-    fileprivate let _parent: Parent
-    fileprivate let _errorHandlerSubscription = SingleAssignmentDisposable()
-    fileprivate let _subscription: Disposable
-
-    init(parent: Parent, subscription: Disposable) {
-        self._parent = parent
-        self._subscription = subscription
-    }
-
-    func on(_ event: Event) {
-        switch event {
-        case .next:
-            self._parent.forwardOn(event)
-        case .error(let error):
-            self._parent._lastError = error
-
-            if let failedWith = error as? Error {
-                // dispose current subscription
-                self._subscription.dispose()
-
-                let errorHandlerSubscription = self._parent._notifier.subscribe(RetryTriggerSink(parent: self))
-                self._errorHandlerSubscription.setDisposable(errorHandlerSubscription)
-                self._parent._errorSubject.on(.next(failedWith))
-            }
-            else {
-                self._parent.forwardOn(.error(error))
-                self._parent.dispose()
-            }
-        case .completed:
-            self._parent.forwardOn(event)
-            self._parent.dispose()
-        }
-    }
-
-    final func dispose() {
-        self._subscription.dispose()
-        self._errorHandlerSubscription.dispose()
-    }
-}
-
-final private class RetryWhenSequenceSink
-    : TailRecursiveSink where Sequence.Element: ObservableType, Sequence.Element.Element == Observer.Element {
-    typealias Element = Observer.Element 
-    typealias Parent = RetryWhenSequence
-    
-    let _lock = RecursiveLock()
-    
-    fileprivate let _parent: Parent
-    
-    fileprivate var _lastError: Swift.Error?
-    fileprivate let _errorSubject = PublishSubject()
-    fileprivate let _handler: Observable
-    fileprivate let _notifier = PublishSubject()
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        self._handler = parent._notificationHandler(self._errorSubject).asObservable()
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    override func done() {
-        if let lastError = self._lastError {
-            self.forwardOn(.error(lastError))
-            self._lastError = nil
-        }
-        else {
-            self.forwardOn(.completed)
-        }
-
-        self.dispose()
-    }
-    
-    override func extract(_ observable: Observable) -> SequenceGenerator? {
-        // It is important to always return `nil` here because there are sideffects in the `run` method
-        // that are dependant on particular `retryWhen` operator so single operator stack can't be reused in this
-        // case.
-        return nil
-    }
-
-    override func subscribeToNext(_ source: Observable) -> Disposable {
-        let subscription = SingleAssignmentDisposable()
-        let iter = RetryWhenSequenceSinkIter(parent: self, subscription: subscription)
-        subscription.setDisposable(source.subscribe(iter))
-        return iter
-    }
-
-    override func run(_ sources: SequenceGenerator) -> Disposable {
-        let triggerSubscription = self._handler.subscribe(self._notifier.asObserver())
-        let superSubscription = super.run(sources)
-        return Disposables.create(superSubscription, triggerSubscription)
-    }
-}
-
-final private class RetryWhenSequence: Producer where Sequence.Element: ObservableType {
-    typealias Element = Sequence.Element.Element
-    
-    fileprivate let _sources: Sequence
-    fileprivate let _notificationHandler: (Observable) -> TriggerObservable
-    
-    init(sources: Sequence, notificationHandler: @escaping (Observable) -> TriggerObservable) {
-        self._sources = sources
-        self._notificationHandler = notificationHandler
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = RetryWhenSequenceSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run((self._sources.makeIterator(), nil))
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Sample.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Sample.swift
deleted file mode 100644
index 4fab683..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Sample.swift
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-//  Sample.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 5/1/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Samples the source observable sequence using a sampler observable sequence producing sampling ticks.
-
-     Upon each sampling tick, the latest element (if any) in the source sequence during the last sampling interval is sent to the resulting sequence.
-
-     **In case there were no new elements between sampler ticks, no element is sent to the resulting sequence.**
-
-     - seealso: [sample operator on reactivex.io](http://reactivex.io/documentation/operators/sample.html)
-
-     - parameter sampler: Sampling tick sequence.
-     - returns: Sampled observable sequence.
-     */
-    public func sample(_ sampler: Source)
-        -> Observable {
-            return Sample(source: self.asObservable(), sampler: sampler.asObservable())
-    }
-}
-
-final private class SamplerSink
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias Element = SampleType
-    
-    typealias Parent = SampleSequenceSink
-    
-    fileprivate let _parent: Parent
-
-    var _lock: RecursiveLock {
-        return self._parent._lock
-    }
-    
-    init(parent: Parent) {
-        self._parent = parent
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next, .completed:
-            if let element = _parent._element {
-                self._parent._element = nil
-                self._parent.forwardOn(.next(element))
-            }
-
-            if self._parent._atEnd {
-                self._parent.forwardOn(.completed)
-                self._parent.dispose()
-            }
-        case .error(let e):
-            self._parent.forwardOn(.error(e))
-            self._parent.dispose()
-        }
-    }
-}
-
-final private class SampleSequenceSink
-    : Sink
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias Element = Observer.Element 
-    typealias Parent = Sample
-    
-    fileprivate let _parent: Parent
-
-    let _lock = RecursiveLock()
-    
-    // state
-    fileprivate var _element = nil as Element?
-    fileprivate var _atEnd = false
-    
-    fileprivate let _sourceSubscription = SingleAssignmentDisposable()
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run() -> Disposable {
-        self._sourceSubscription.setDisposable(self._parent._source.subscribe(self))
-        let samplerSubscription = self._parent._sampler.subscribe(SamplerSink(parent: self))
-        
-        return Disposables.create(_sourceSubscription, samplerSubscription)
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next(let element):
-            self._element = element
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            self._atEnd = true
-            self._sourceSubscription.dispose()
-        }
-    }
-    
-}
-
-final private class Sample: Producer {
-    fileprivate let _source: Observable
-    fileprivate let _sampler: Observable
-
-    init(source: Observable, sampler: Observable) {
-        self._source = source
-        self._sampler = sampler
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = SampleSequenceSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Scan.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Scan.swift
deleted file mode 100644
index 7920ae9..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Scan.swift
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-//  Scan.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/14/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Applies an accumulator function over an observable sequence and returns each intermediate result. The specified seed value is used as the initial accumulator value.
-
-     For aggregation behavior with no intermediate results, see `reduce`.
-
-     - seealso: [scan operator on reactivex.io](http://reactivex.io/documentation/operators/scan.html)
-
-     - parameter seed: The initial accumulator value.
-     - parameter accumulator: An accumulator function to be invoked on each element.
-     - returns: An observable sequence containing the accumulated values.
-     */
-    public func scan(into seed: A, accumulator: @escaping (inout A, Element) throws -> Void)
-        -> Observable {
-        return Scan(source: self.asObservable(), seed: seed, accumulator: accumulator)
-    }
-
-    /**
-     Applies an accumulator function over an observable sequence and returns each intermediate result. The specified seed value is used as the initial accumulator value.
-
-     For aggregation behavior with no intermediate results, see `reduce`.
-
-     - seealso: [scan operator on reactivex.io](http://reactivex.io/documentation/operators/scan.html)
-
-     - parameter seed: The initial accumulator value.
-     - parameter accumulator: An accumulator function to be invoked on each element.
-     - returns: An observable sequence containing the accumulated values.
-     */
-    public func scan(_ seed: A, accumulator: @escaping (A, Element) throws -> A)
-        -> Observable {
-        return Scan(source: self.asObservable(), seed: seed) { acc, element in
-            let currentAcc = acc
-            acc = try accumulator(currentAcc, element)
-        }
-    }
-}
-
-final private class ScanSink: Sink, ObserverType {
-    typealias Accumulate = Observer.Element 
-    typealias Parent = Scan
-
-    fileprivate let _parent: Parent
-    fileprivate var _accumulate: Accumulate
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        self._accumulate = parent._seed
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let element):
-            do {
-                try self._parent._accumulator(&self._accumulate, element)
-                self.forwardOn(.next(self._accumulate))
-            }
-            catch let error {
-                self.forwardOn(.error(error))
-                self.dispose()
-            }
-        case .error(let error):
-            self.forwardOn(.error(error))
-            self.dispose()
-        case .completed:
-            self.forwardOn(.completed)
-            self.dispose()
-        }
-    }
-    
-}
-
-final private class Scan: Producer {
-    typealias Accumulator = (inout Accumulate, Element) throws -> Void
-    
-    fileprivate let _source: Observable
-    fileprivate let _seed: Accumulate
-    fileprivate let _accumulator: Accumulator
-    
-    init(source: Observable, seed: Accumulate, accumulator: @escaping Accumulator) {
-        self._source = source
-        self._seed = seed
-        self._accumulator = accumulator
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Accumulate {
-        let sink = ScanSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Sequence.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Sequence.swift
deleted file mode 100644
index f158565..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Sequence.swift
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-//  Sequence.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 11/14/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-    // MARK: of
-
-    /**
-     This method creates a new Observable instance with a variable number of elements.
-
-     - seealso: [from operator on reactivex.io](http://reactivex.io/documentation/operators/from.html)
-
-     - parameter elements: Elements to generate.
-     - parameter scheduler: Scheduler to send elements on. If `nil`, elements are sent immediately on subscription.
-     - returns: The observable sequence whose elements are pulled from the given arguments.
-     */
-    public static func of(_ elements: Element ..., scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
-        return ObservableSequence(elements: elements, scheduler: scheduler)
-    }
-}
-
-extension ObservableType {
-    /**
-     Converts an array to an observable sequence.
-
-     - seealso: [from operator on reactivex.io](http://reactivex.io/documentation/operators/from.html)
-
-     - returns: The observable sequence whose elements are pulled from the given enumerable sequence.
-     */
-    public static func from(_ array: [Element], scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
-        return ObservableSequence(elements: array, scheduler: scheduler)
-    }
-
-    /**
-     Converts a sequence to an observable sequence.
-
-     - seealso: [from operator on reactivex.io](http://reactivex.io/documentation/operators/from.html)
-
-     - returns: The observable sequence whose elements are pulled from the given enumerable sequence.
-     */
-    public static func from(_ sequence: Sequence, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable where Sequence.Element == Element {
-        return ObservableSequence(elements: sequence, scheduler: scheduler)
-    }
-}
-
-final private class ObservableSequenceSink: Sink where Sequence.Element == Observer.Element {
-    typealias Parent = ObservableSequence
-
-    private let _parent: Parent
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    func run() -> Disposable {
-        return self._parent._scheduler.scheduleRecursive(self._parent._elements.makeIterator()) { iterator, recurse in
-            var mutableIterator = iterator
-            if let next = mutableIterator.next() {
-                self.forwardOn(.next(next))
-                recurse(mutableIterator)
-            }
-            else {
-                self.forwardOn(.completed)
-                self.dispose()
-            }
-        }
-    }
-}
-
-final private class ObservableSequence: Producer {
-    fileprivate let _elements: Sequence
-    fileprivate let _scheduler: ImmediateSchedulerType
-
-    init(elements: Sequence, scheduler: ImmediateSchedulerType) {
-        self._elements = elements
-        self._scheduler = scheduler
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = ObservableSequenceSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift b/Demo/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
deleted file mode 100644
index 9565a49..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
+++ /dev/null
@@ -1,456 +0,0 @@
-//
-//  ShareReplayScope.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 5/28/17.
-//  Copyright © 2017 Krunoslav Zaher. All rights reserved.
-//
-
-/// Subject lifetime scope
-public enum SubjectLifetimeScope {
-    /**
-     **Each connection will have it's own subject instance to store replay events.**
-     **Connections will be isolated from each another.**
-
-     Configures the underlying implementation to behave equivalent to.
-     
-     ```
-     source.multicast(makeSubject: { MySubject() }).refCount()
-     ```
-
-     **This is the recommended default.**
-
-     This has the following consequences:
-     * `retry` or `concat` operators will function as expected because terminating the sequence will clear internal state.
-     * Each connection to source observable sequence will use it's own subject.
-     * When the number of subscribers drops from 1 to 0 and connection to source sequence is disposed, subject will be cleared.
-
-     
-     ```
-     let xs = Observable.deferred { () -> Observable in
-             print("Performing work ...")
-             return Observable.just(Date().timeIntervalSince1970)
-         }
-         .share(replay: 1, scope: .whileConnected)
-
-     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
-     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
-     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
-
-     ```
-
-     Notice how time interval is different and `Performing work ...` is printed each time)
-     
-     ```
-     Performing work ...
-     next 1495998900.82141
-     completed
-
-     Performing work ...
-     next 1495998900.82359
-     completed
-
-     Performing work ...
-     next 1495998900.82444
-     completed
-
-
-     ```
-     
-     */
-    case whileConnected
-
-    /**
-     **One subject will store replay events for all connections to source.**
-     **Connections won't be isolated from each another.**
-
-     Configures the underlying implementation behave equivalent to.
-
-     ```
-     source.multicast(MySubject()).refCount()
-     ```
-     
-     This has the following consequences:
-     * Using `retry` or `concat` operators after this operator usually isn't advised.
-     * Each connection to source observable sequence will share the same subject.
-     * After number of subscribers drops from 1 to 0 and connection to source observable sequence is dispose, this operator will 
-       continue holding a reference to the same subject.
-       If at some later moment a new observer initiates a new connection to source it can potentially receive
-       some of the stale events received during previous connection.
-     * After source sequence terminates any new observer will always immediately receive replayed elements and terminal event.
-       No new subscriptions to source observable sequence will be attempted.
-
-     ```
-     let xs = Observable.deferred { () -> Observable in
-             print("Performing work ...")
-             return Observable.just(Date().timeIntervalSince1970)
-         }
-         .share(replay: 1, scope: .forever)
-
-     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
-     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
-     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
-     ```
-     
-     Notice how time interval is the same, replayed, and `Performing work ...` is printed only once
-     
-     ```
-     Performing work ...
-     next 1495999013.76356
-     completed
-
-     next 1495999013.76356
-     completed
-
-     next 1495999013.76356
-     completed
-     ```
-     
-    */
-    case forever
-}
-
-extension ObservableType {
-
-    /**
-     Returns an observable sequence that **shares a single subscription to the underlying sequence**, and immediately upon subscription replays  elements in buffer.
-     
-     This operator is equivalent to:
-     * `.whileConnected`
-     ```
-     // Each connection will have it's own subject instance to store replay events.
-     // Connections will be isolated from each another.
-     source.multicast(makeSubject: { Replay.create(bufferSize: replay) }).refCount()
-     ```
-     * `.forever`
-     ```
-     // One subject will store replay events for all connections to source.
-     // Connections won't be isolated from each another.
-     source.multicast(Replay.create(bufferSize: replay)).refCount()
-     ```
-     
-     It uses optimized versions of the operators for most common operations.
-
-     - parameter replay: Maximum element count of the replay buffer.
-     - parameter scope: Lifetime scope of sharing subject. For more information see `SubjectLifetimeScope` enum.
-
-     - seealso: [shareReplay operator on reactivex.io](http://reactivex.io/documentation/operators/replay.html)
-
-     - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
-     */
-    public func share(replay: Int = 0, scope: SubjectLifetimeScope = .whileConnected)
-        -> Observable {
-        switch scope {
-        case .forever:
-            switch replay {
-            case 0: return self.multicast(PublishSubject()).refCount()
-            default: return self.multicast(ReplaySubject.create(bufferSize: replay)).refCount()
-            }
-        case .whileConnected:
-            switch replay {
-            case 0: return ShareWhileConnected(source: self.asObservable())
-            case 1: return ShareReplay1WhileConnected(source: self.asObservable())
-            default: return self.multicast(makeSubject: { ReplaySubject.create(bufferSize: replay) }).refCount()
-            }
-        }
-    }
-}
-
-fileprivate final class ShareReplay1WhileConnectedConnection
-    : ObserverType
-    , SynchronizedUnsubscribeType {
-    typealias Observers = AnyObserver.s
-    typealias DisposeKey = Observers.KeyType
-
-    typealias Parent = ShareReplay1WhileConnected
-    private let _parent: Parent
-    private let _subscription = SingleAssignmentDisposable()
-
-    private let _lock: RecursiveLock
-    private var _disposed: Bool = false
-    fileprivate var _observers = Observers()
-    fileprivate var _element: Element?
-
-    init(parent: Parent, lock: RecursiveLock) {
-        self._parent = parent
-        self._lock = lock
-
-        #if TRACE_RESOURCES
-            _ = Resources.incrementTotal()
-        #endif
-    }
-
-    final func on(_ event: Event) {
-        self._lock.lock()
-        let observers = self._synchronized_on(event)
-        self._lock.unlock()
-        dispatch(observers, event)
-    }
-
-    final private func _synchronized_on(_ event: Event) -> Observers {
-        if self._disposed {
-            return Observers()
-        }
-
-        switch event {
-        case .next(let element):
-            self._element = element
-            return self._observers
-        case .error, .completed:
-            let observers = self._observers
-            self._synchronized_dispose()
-            return observers
-        }
-    }
-
-    final func connect() {
-        self._subscription.setDisposable(self._parent._source.subscribe(self))
-    }
-
-    final func _synchronized_subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
-        self._lock.lock(); defer { self._lock.unlock() }
-        if let element = self._element {
-            observer.on(.next(element))
-        }
-
-        let disposeKey = self._observers.insert(observer.on)
-
-        return SubscriptionDisposable(owner: self, key: disposeKey)
-    }
-
-    final private func _synchronized_dispose() {
-        self._disposed = true
-        if self._parent._connection === self {
-            self._parent._connection = nil
-        }
-        self._observers = Observers()
-    }
-
-    final func synchronizedUnsubscribe(_ disposeKey: DisposeKey) {
-        self._lock.lock()
-        let shouldDisconnect = self._synchronized_unsubscribe(disposeKey)
-        self._lock.unlock()
-        if shouldDisconnect {
-            self._subscription.dispose()
-        }
-    }
-
-    @inline(__always)
-    final private func _synchronized_unsubscribe(_ disposeKey: DisposeKey) -> Bool {
-        // if already unsubscribed, just return
-        if self._observers.removeKey(disposeKey) == nil {
-            return false
-        }
-
-        if self._observers.count == 0 {
-            self._synchronized_dispose()
-            return true
-        }
-
-        return false
-    }
-
-    #if TRACE_RESOURCES
-        deinit {
-            _ = Resources.decrementTotal()
-        }
-    #endif
-}
-
-// optimized version of share replay for most common case
-final private class ShareReplay1WhileConnected
-    : Observable {
-
-    fileprivate typealias Connection = ShareReplay1WhileConnectedConnection
-
-    fileprivate let _source: Observable
-
-    fileprivate let _lock = RecursiveLock()
-
-    fileprivate var _connection: Connection?
-
-    init(source: Observable) {
-        self._source = source
-    }
-
-    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
-        self._lock.lock()
-
-        let connection = self._synchronized_subscribe(observer)
-        let count = connection._observers.count
-
-        let disposable = connection._synchronized_subscribe(observer)
-
-        self._lock.unlock()
-        
-        if count == 0 {
-            connection.connect()
-        }
-
-        return disposable
-    }
-
-    @inline(__always)
-    private func _synchronized_subscribe(_ observer: Observer) -> Connection where Observer.Element == Element {
-        let connection: Connection
-
-        if let existingConnection = self._connection {
-            connection = existingConnection
-        }
-        else {
-            connection = ShareReplay1WhileConnectedConnection(
-                parent: self,
-                lock: self._lock)
-            self._connection = connection
-        }
-
-        return connection
-    }
-}
-
-fileprivate final class ShareWhileConnectedConnection
-    : ObserverType
-    , SynchronizedUnsubscribeType {
-    typealias Observers = AnyObserver.s
-    typealias DisposeKey = Observers.KeyType
-
-    typealias Parent = ShareWhileConnected
-    private let _parent: Parent
-    private let _subscription = SingleAssignmentDisposable()
-
-    private let _lock: RecursiveLock
-    private var _disposed: Bool = false
-    fileprivate var _observers = Observers()
-
-    init(parent: Parent, lock: RecursiveLock) {
-        self._parent = parent
-        self._lock = lock
-
-        #if TRACE_RESOURCES
-            _ = Resources.incrementTotal()
-        #endif
-    }
-
-    final func on(_ event: Event) {
-        self._lock.lock()
-        let observers = self._synchronized_on(event)
-        self._lock.unlock()
-        dispatch(observers, event)
-    }
-
-    final private func _synchronized_on(_ event: Event) -> Observers {
-        if self._disposed {
-            return Observers()
-        }
-
-        switch event {
-        case .next:
-            return self._observers
-        case .error, .completed:
-            let observers = self._observers
-            self._synchronized_dispose()
-            return observers
-        }
-    }
-
-    final func connect() {
-        self._subscription.setDisposable(self._parent._source.subscribe(self))
-    }
-
-    final func _synchronized_subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
-        self._lock.lock(); defer { self._lock.unlock() }
-
-        let disposeKey = self._observers.insert(observer.on)
-
-        return SubscriptionDisposable(owner: self, key: disposeKey)
-    }
-
-    final private func _synchronized_dispose() {
-        self._disposed = true
-        if self._parent._connection === self {
-            self._parent._connection = nil
-        }
-        self._observers = Observers()
-    }
-
-    final func synchronizedUnsubscribe(_ disposeKey: DisposeKey) {
-        self._lock.lock()
-        let shouldDisconnect = self._synchronized_unsubscribe(disposeKey)
-        self._lock.unlock()
-        if shouldDisconnect {
-            self._subscription.dispose()
-        }
-    }
-
-    @inline(__always)
-    final private func _synchronized_unsubscribe(_ disposeKey: DisposeKey) -> Bool {
-        // if already unsubscribed, just return
-        if self._observers.removeKey(disposeKey) == nil {
-            return false
-        }
-
-        if self._observers.count == 0 {
-            self._synchronized_dispose()
-            return true
-        }
-
-        return false
-    }
-
-    #if TRACE_RESOURCES
-    deinit {
-        _ = Resources.decrementTotal()
-    }
-    #endif
-}
-
-// optimized version of share replay for most common case
-final private class ShareWhileConnected
-    : Observable {
-
-    fileprivate typealias Connection = ShareWhileConnectedConnection
-
-    fileprivate let _source: Observable
-
-    fileprivate let _lock = RecursiveLock()
-
-    fileprivate var _connection: Connection?
-
-    init(source: Observable) {
-        self._source = source
-    }
-
-    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
-        self._lock.lock()
-
-        let connection = self._synchronized_subscribe(observer)
-        let count = connection._observers.count
-
-        let disposable = connection._synchronized_subscribe(observer)
-
-        self._lock.unlock()
-
-        if count == 0 {
-            connection.connect()
-        }
-
-        return disposable
-    }
-
-    @inline(__always)
-    private func _synchronized_subscribe(_ observer: Observer) -> Connection where Observer.Element == Element {
-        let connection: Connection
-
-        if let existingConnection = self._connection {
-            connection = existingConnection
-        }
-        else {
-            connection = ShareWhileConnectedConnection(
-                parent: self,
-                lock: self._lock)
-            self._connection = connection
-        }
-        
-        return connection
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift
deleted file mode 100644
index e50a9be..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-//  SingleAsync.swift
-//  RxSwift
-//
-//  Created by Junior B. on 09/11/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     The single operator is similar to first, but throws a `RxError.noElements` or `RxError.moreThanOneElement`
-     if the source Observable does not emit exactly one element before successfully completing.
-
-     - seealso: [single operator on reactivex.io](http://reactivex.io/documentation/operators/first.html)
-
-     - returns: An observable sequence that emits a single element or throws an exception if more (or none) of them are emitted.
-     */
-    public func single()
-        -> Observable {
-        return SingleAsync(source: self.asObservable())
-    }
-
-    /**
-     The single operator is similar to first, but throws a `RxError.NoElements` or `RxError.MoreThanOneElement`
-     if the source Observable does not emit exactly one element before successfully completing.
-
-     - seealso: [single operator on reactivex.io](http://reactivex.io/documentation/operators/first.html)
-
-     - parameter predicate: A function to test each source element for a condition.
-     - returns: An observable sequence that emits a single element or throws an exception if more (or none) of them are emitted.
-     */
-    public func single(_ predicate: @escaping (Element) throws -> Bool)
-        -> Observable {
-        return SingleAsync(source: self.asObservable(), predicate: predicate)
-    }
-}
-
-fileprivate final class SingleAsyncSink : Sink, ObserverType {
-    typealias Element = Observer.Element
-    typealias Parent = SingleAsync
-    
-    private let _parent: Parent
-    private var _seenValue: Bool = false
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            do {
-                let forward = try self._parent._predicate?(value) ?? true
-                if !forward {
-                    return
-                }
-            }
-            catch let error {
-                self.forwardOn(.error(error as Swift.Error))
-                self.dispose()
-                return
-            }
-
-            if self._seenValue {
-                self.forwardOn(.error(RxError.moreThanOneElement))
-                self.dispose()
-                return
-            }
-
-            self._seenValue = true
-            self.forwardOn(.next(value))
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            if self._seenValue {
-                self.forwardOn(.completed)
-            } else {
-                self.forwardOn(.error(RxError.noElements))
-            }
-            self.dispose()
-        }
-    }
-}
-
-final class SingleAsync: Producer {
-    typealias Predicate = (Element) throws -> Bool
-    
-    fileprivate let _source: Observable
-    fileprivate let _predicate: Predicate?
-    
-    init(source: Observable, predicate: Predicate? = nil) {
-        self._source = source
-        self._predicate = predicate
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = SingleAsyncSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Sink.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Sink.swift
deleted file mode 100644
index 1305d1b..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Sink.swift
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-//  Sink.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/19/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-class Sink : Disposable {
-    fileprivate let _observer: Observer
-    fileprivate let _cancel: Cancelable
-    fileprivate let _disposed = AtomicInt(0)
-
-    #if DEBUG
-        fileprivate let _synchronizationTracker = SynchronizationTracker()
-    #endif
-
-    init(observer: Observer, cancel: Cancelable) {
-#if TRACE_RESOURCES
-        _ = Resources.incrementTotal()
-#endif
-        self._observer = observer
-        self._cancel = cancel
-    }
-
-    final func forwardOn(_ event: Event) {
-        #if DEBUG
-            self._synchronizationTracker.register(synchronizationErrorMessage: .default)
-            defer { self._synchronizationTracker.unregister() }
-        #endif
-        if isFlagSet(self._disposed, 1) {
-            return
-        }
-        self._observer.on(event)
-    }
-
-    final func forwarder() -> SinkForward {
-        return SinkForward(forward: self)
-    }
-
-    final var disposed: Bool {
-        return isFlagSet(self._disposed, 1)
-    }
-
-    func dispose() {
-        fetchOr(self._disposed, 1)
-        self._cancel.dispose()
-    }
-
-    deinit {
-#if TRACE_RESOURCES
-       _ =  Resources.decrementTotal()
-#endif
-    }
-}
-
-final class SinkForward: ObserverType {
-    typealias Element = Observer.Element 
-
-    private let _forward: Sink
-
-    init(forward: Sink) {
-        self._forward = forward
-    }
-
-    final func on(_ event: Event) {
-        switch event {
-        case .next:
-            self._forward._observer.on(event)
-        case .error, .completed:
-            self._forward._observer.on(event)
-            self._forward._cancel.dispose()
-        }
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Skip.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Skip.swift
deleted file mode 100644
index 3076f9c..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Skip.swift
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-//  Skip.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/25/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Bypasses a specified number of elements in an observable sequence and then returns the remaining elements.
-
-     - seealso: [skip operator on reactivex.io](http://reactivex.io/documentation/operators/skip.html)
-
-     - parameter count: The number of elements to skip before returning the remaining elements.
-     - returns: An observable sequence that contains the elements that occur after the specified index in the input sequence.
-     */
-    public func skip(_ count: Int)
-        -> Observable {
-        return SkipCount(source: self.asObservable(), count: count)
-    }
-}
-
-extension ObservableType {
-
-    /**
-     Skips elements for the specified duration from the start of the observable source sequence, using the specified scheduler to run timers.
-
-     - seealso: [skip operator on reactivex.io](http://reactivex.io/documentation/operators/skip.html)
-
-     - parameter duration: Duration for skipping elements from the start of the sequence.
-     - parameter scheduler: Scheduler to run the timer on.
-     - returns: An observable sequence with the elements skipped during the specified duration from the start of the source sequence.
-     */
-    public func skip(_ duration: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
-        return SkipTime(source: self.asObservable(), duration: duration, scheduler: scheduler)
-    }
-}
-
-// count version
-
-final private class SkipCountSink: Sink, ObserverType {
-    typealias Element = Observer.Element 
-    typealias Parent = SkipCount
-    
-    let parent: Parent
-    
-    var remaining: Int
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self.parent = parent
-        self.remaining = parent.count
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            
-            if self.remaining <= 0 {
-                self.forwardOn(.next(value))
-            }
-            else {
-                self.remaining -= 1
-            }
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-    
-}
-
-final private class SkipCount: Producer {
-    let source: Observable
-    let count: Int
-    
-    init(source: Observable, count: Int) {
-        self.source = source
-        self.count = count
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = SkipCountSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self.source.subscribe(sink)
-
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-// time version
-
-final private class SkipTimeSink: Sink, ObserverType where Observer.Element == Element {
-    typealias Parent = SkipTime
-
-    let parent: Parent
-    
-    // state
-    var open = false
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self.parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            if self.open {
-                self.forwardOn(.next(value))
-            }
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-    
-    func tick() {
-        self.open = true
-    }
-    
-    func run() -> Disposable {
-        let disposeTimer = self.parent.scheduler.scheduleRelative((), dueTime: self.parent.duration) { _ in 
-            self.tick()
-            return Disposables.create()
-        }
-        
-        let disposeSubscription = self.parent.source.subscribe(self)
-        
-        return Disposables.create(disposeTimer, disposeSubscription)
-    }
-}
-
-final private class SkipTime: Producer {
-    let source: Observable
-    let duration: RxTimeInterval
-    let scheduler: SchedulerType
-    
-    init(source: Observable, duration: RxTimeInterval, scheduler: SchedulerType) {
-        self.source = source
-        self.scheduler = scheduler
-        self.duration = duration
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = SkipTimeSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift
deleted file mode 100644
index 056d795..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-//  SkipUntil.swift
-//  RxSwift
-//
-//  Created by Yury Korolev on 10/3/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Returns the elements from the source observable sequence that are emitted after the other observable sequence produces an element.
-
-     - seealso: [skipUntil operator on reactivex.io](http://reactivex.io/documentation/operators/skipuntil.html)
-
-     - parameter other: Observable sequence that starts propagation of elements of the source sequence.
-     - returns: An observable sequence containing the elements of the source sequence that are emitted after the other sequence emits an item.
-     */
-    public func skipUntil(_ other: Source)
-        -> Observable {
-        return SkipUntil(source: self.asObservable(), other: other.asObservable())
-    }
-}
-
-final private class SkipUntilSinkOther
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias Parent = SkipUntilSink
-    typealias Element = Other
-    
-    fileprivate let _parent: Parent
-
-    var _lock: RecursiveLock {
-        return self._parent._lock
-    }
-    
-    let _subscription = SingleAssignmentDisposable()
-
-    init(parent: Parent) {
-        self._parent = parent
-        #if TRACE_RESOURCES
-            _ = Resources.incrementTotal()
-        #endif
-    }
-
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next:
-            self._parent._forwardElements = true
-            self._subscription.dispose()
-        case .error(let e):
-            self._parent.forwardOn(.error(e))
-            self._parent.dispose()
-        case .completed:
-            self._subscription.dispose()
-        }
-    }
-    
-    #if TRACE_RESOURCES
-    deinit {
-        _ = Resources.decrementTotal()
-    }
-    #endif
-
-}
-
-
-final private class SkipUntilSink
-    : Sink
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias Element = Observer.Element 
-    typealias Parent = SkipUntil
-    
-    let _lock = RecursiveLock()
-    fileprivate let _parent: Parent
-    fileprivate var _forwardElements = false
-    
-    fileprivate let _sourceSubscription = SingleAssignmentDisposable()
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next:
-            if self._forwardElements {
-                self.forwardOn(event)
-            }
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            if self._forwardElements {
-                self.forwardOn(event)
-            }
-            self.dispose()
-        }
-    }
-    
-    func run() -> Disposable {
-        let sourceSubscription = self._parent._source.subscribe(self)
-        let otherObserver = SkipUntilSinkOther(parent: self)
-        let otherSubscription = self._parent._other.subscribe(otherObserver)
-        self._sourceSubscription.setDisposable(sourceSubscription)
-        otherObserver._subscription.setDisposable(otherSubscription)
-        
-        return Disposables.create(_sourceSubscription, otherObserver._subscription)
-    }
-}
-
-final private class SkipUntil: Producer {
-    
-    fileprivate let _source: Observable
-    fileprivate let _other: Observable
-    
-    init(source: Observable, other: Observable) {
-        self._source = source
-        self._other = other
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = SkipUntilSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift
deleted file mode 100644
index db9f5a6..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-//  SkipWhile.swift
-//  RxSwift
-//
-//  Created by Yury Korolev on 10/9/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Bypasses elements in an observable sequence as long as a specified condition is true and then returns the remaining elements.
-
-     - seealso: [skipWhile operator on reactivex.io](http://reactivex.io/documentation/operators/skipwhile.html)
-
-     - parameter predicate: A function to test each element for a condition.
-     - returns: An observable sequence that contains the elements from the input sequence starting at the first element in the linear series that does not pass the test specified by predicate.
-     */
-    public func skipWhile(_ predicate: @escaping (Element) throws -> Bool) -> Observable {
-        return SkipWhile(source: self.asObservable(), predicate: predicate)
-    }
-}
-
-final private class SkipWhileSink: Sink, ObserverType {
-    typealias Element = Observer.Element 
-    typealias Parent = SkipWhile
-
-    fileprivate let _parent: Parent
-    fileprivate var _running = false
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            if !self._running {
-                do {
-                    self._running = try !self._parent._predicate(value)
-                } catch let e {
-                    self.forwardOn(.error(e))
-                    self.dispose()
-                    return
-                }
-            }
-
-            if self._running {
-                self.forwardOn(.next(value))
-            }
-        case .error, .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-}
-
-final private class SkipWhile: Producer {
-    typealias Predicate = (Element) throws -> Bool
-
-    fileprivate let _source: Observable
-    fileprivate let _predicate: Predicate
-
-    init(source: Observable, predicate: @escaping Predicate) {
-        self._source = source
-        self._predicate = predicate
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = SkipWhileSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/StartWith.swift b/Demo/Pods/RxSwift/RxSwift/Observables/StartWith.swift
deleted file mode 100644
index 13fb31d..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/StartWith.swift
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-//  StartWith.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 4/6/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Prepends a sequence of values to an observable sequence.
-
-     - seealso: [startWith operator on reactivex.io](http://reactivex.io/documentation/operators/startwith.html)
-
-     - parameter elements: Elements to prepend to the specified sequence.
-     - returns: The source sequence prepended with the specified values.
-     */
-    public func startWith(_ elements: Element ...)
-        -> Observable {
-            return StartWith(source: self.asObservable(), elements: elements)
-    }
-}
-
-final private class StartWith: Producer {
-    let elements: [Element]
-    let source: Observable
-
-    init(source: Observable, elements: [Element]) {
-        self.source = source
-        self.elements = elements
-        super.init()
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        for e in self.elements {
-            observer.on(.next(e))
-        }
-
-        return (sink: Disposables.create(), subscription: self.source.subscribe(observer))
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift
deleted file mode 100644
index 5f7be0b..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-//  SubscribeOn.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/14/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Wraps the source sequence in order to run its subscription and unsubscription logic on the specified
-     scheduler.
-
-     This operation is not commonly used.
-
-     This only performs the side-effects of subscription and unsubscription on the specified scheduler.
-
-     In order to invoke observer callbacks on a `scheduler`, use `observeOn`.
-
-     - seealso: [subscribeOn operator on reactivex.io](http://reactivex.io/documentation/operators/subscribeon.html)
-
-     - parameter scheduler: Scheduler to perform subscription and unsubscription actions on.
-     - returns: The source sequence whose subscriptions and unsubscriptions happen on the specified scheduler.
-     */
-    public func subscribeOn(_ scheduler: ImmediateSchedulerType)
-        -> Observable {
-        return SubscribeOn(source: self, scheduler: scheduler)
-    }
-}
-
-final private class SubscribeOnSink: Sink, ObserverType where Ob.Element == Observer.Element {
-    typealias Element = Observer.Element 
-    typealias Parent = SubscribeOn
-    
-    let parent: Parent
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self.parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        self.forwardOn(event)
-        
-        if event.isStopEvent {
-            self.dispose()
-        }
-    }
-    
-    func run() -> Disposable {
-        let disposeEverything = SerialDisposable()
-        let cancelSchedule = SingleAssignmentDisposable()
-        
-        disposeEverything.disposable = cancelSchedule
-        
-        let disposeSchedule = self.parent.scheduler.schedule(()) { _ -> Disposable in
-            let subscription = self.parent.source.subscribe(self)
-            disposeEverything.disposable = ScheduledDisposable(scheduler: self.parent.scheduler, disposable: subscription)
-            return Disposables.create()
-        }
-
-        cancelSchedule.setDisposable(disposeSchedule)
-    
-        return disposeEverything
-    }
-}
-
-final private class SubscribeOn: Producer {
-    let source: Ob
-    let scheduler: ImmediateSchedulerType
-    
-    init(source: Ob, scheduler: ImmediateSchedulerType) {
-        self.source = source
-        self.scheduler = scheduler
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Ob.Element {
-        let sink = SubscribeOnSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Switch.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Switch.swift
deleted file mode 100644
index ac12f2f..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Switch.swift
+++ /dev/null
@@ -1,234 +0,0 @@
-//
-//  Switch.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 3/12/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-    /**
-     Projects each element of an observable sequence into a new sequence of observable sequences and then
-     transforms an observable sequence of observable sequences into an observable sequence producing values only from the most recent observable sequence.
-
-     It is a combination of `map` + `switchLatest` operator
-
-     - seealso: [flatMapLatest operator on reactivex.io](http://reactivex.io/documentation/operators/flatmap.html)
-
-     - parameter selector: A transform function to apply to each element.
-     - returns: An observable sequence whose elements are the result of invoking the transform function on each element of source producing an
-     Observable of Observable sequences and that at any point in time produces the elements of the most recent inner observable sequence that has been received.
-     */
-    public func flatMapLatest(_ selector: @escaping (Element) throws -> Source)
-        -> Observable {
-            return FlatMapLatest(source: self.asObservable(), selector: selector)
-    }
-}
-
-extension ObservableType where Element : ObservableConvertibleType {
-
-    /**
-     Transforms an observable sequence of observable sequences into an observable sequence
-     producing values only from the most recent observable sequence.
-
-     Each time a new inner observable sequence is received, unsubscribe from the
-     previous inner observable sequence.
-
-     - seealso: [switch operator on reactivex.io](http://reactivex.io/documentation/operators/switch.html)
-
-     - returns: The observable sequence that at any point in time produces the elements of the most recent inner observable sequence that has been received.
-     */
-    public func switchLatest() -> Observable {
-        return Switch(source: self.asObservable())
-    }
-}
-
-private class SwitchSink
-    : Sink
-    , ObserverType where Source.Element == Observer.Element {
-    typealias Element = SourceType
-
-    fileprivate let _subscriptions: SingleAssignmentDisposable = SingleAssignmentDisposable()
-    fileprivate let _innerSubscription: SerialDisposable = SerialDisposable()
-
-    let _lock = RecursiveLock()
-    
-    // state
-    fileprivate var _stopped = false
-    fileprivate var _latest = 0
-    fileprivate var _hasLatest = false
-    
-    override init(observer: Observer, cancel: Cancelable) {
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run(_ source: Observable) -> Disposable {
-        let subscription = source.subscribe(self)
-        self._subscriptions.setDisposable(subscription)
-        return Disposables.create(_subscriptions, _innerSubscription)
-    }
-
-    func performMap(_ element: SourceType) throws -> Source {
-        rxAbstractMethod()
-    }
-
-    @inline(__always)
-    final private func nextElementArrived(element: Element) -> (Int, Observable)? {
-        self._lock.lock(); defer { self._lock.unlock() } // {
-            do {
-                let observable = try self.performMap(element).asObservable()
-                self._hasLatest = true
-                self._latest = self._latest &+ 1
-                return (self._latest, observable)
-            }
-            catch let error {
-                self.forwardOn(.error(error))
-                self.dispose()
-            }
-
-            return nil
-        // }
-    }
-
-    func on(_ event: Event) {
-        switch event {
-        case .next(let element):
-            if let (latest, observable) = self.nextElementArrived(element: element) {
-                let d = SingleAssignmentDisposable()
-                self._innerSubscription.disposable = d
-                   
-                let observer = SwitchSinkIter(parent: self, id: latest, _self: d)
-                let disposable = observable.subscribe(observer)
-                d.setDisposable(disposable)
-            }
-        case .error(let error):
-            self._lock.lock(); defer { self._lock.unlock() }
-            self.forwardOn(.error(error))
-            self.dispose()
-        case .completed:
-            self._lock.lock(); defer { self._lock.unlock() }
-            self._stopped = true
-            
-            self._subscriptions.dispose()
-            
-            if !self._hasLatest {
-                self.forwardOn(.completed)
-                self.dispose()
-            }
-        }
-    }
-}
-
-final private class SwitchSinkIter
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType where Source.Element == Observer.Element {
-    typealias Element = Source.Element
-    typealias Parent = SwitchSink
-    
-    fileprivate let _parent: Parent
-    fileprivate let _id: Int
-    fileprivate let _self: Disposable
-
-    var _lock: RecursiveLock {
-        return self._parent._lock
-    }
-
-    init(parent: Parent, id: Int, _self: Disposable) {
-        self._parent = parent
-        self._id = id
-        self._self = _self
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next: break
-        case .error, .completed:
-            self._self.dispose()
-        }
-        
-        if self._parent._latest != self._id {
-            return
-        }
-       
-        switch event {
-        case .next:
-            self._parent.forwardOn(event)
-        case .error:
-            self._parent.forwardOn(event)
-            self._parent.dispose()
-        case .completed:
-            self._parent._hasLatest = false
-            if self._parent._stopped {
-                self._parent.forwardOn(event)
-                self._parent.dispose()
-            }
-        }
-    }
-}
-
-// MARK: Specializations
-
-final private class SwitchIdentitySink: SwitchSink
-    where Observer.Element == Source.Element {
-    override init(observer: Observer, cancel: Cancelable) {
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    override func performMap(_ element: Source) throws -> Source {
-        return element
-    }
-}
-
-final private class MapSwitchSink: SwitchSink where Observer.Element == Source.Element {
-    typealias Selector = (SourceType) throws -> Source
-
-    fileprivate let _selector: Selector
-
-    init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
-        self._selector = selector
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    override func performMap(_ element: SourceType) throws -> Source {
-        return try self._selector(element)
-    }
-}
-
-// MARK: Producers
-
-final private class Switch: Producer {
-    fileprivate let _source: Observable
-    
-    init(source: Observable) {
-        self._source = source
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Source.Element {
-        let sink = SwitchIdentitySink(observer: observer, cancel: cancel)
-        let subscription = sink.run(self._source)
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-final private class FlatMapLatest: Producer {
-    typealias Selector = (SourceType) throws -> Source
-
-    fileprivate let _source: Observable
-    fileprivate let _selector: Selector
-
-    init(source: Observable, selector: @escaping Selector) {
-        self._source = source
-        self._selector = selector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Source.Element {
-        let sink = MapSwitchSink(selector: self._selector, observer: observer, cancel: cancel)
-        let subscription = sink.run(self._source)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift
deleted file mode 100644
index 5ead0f2..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-//  SwitchIfEmpty.swift
-//  RxSwift
-//
-//  Created by sergdort on 23/12/2016.
-//  Copyright © 2016 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-    /**
-     Returns the elements of the specified sequence or `switchTo` sequence if the sequence is empty.
-
-     - seealso: [DefaultIfEmpty operator on reactivex.io](http://reactivex.io/documentation/operators/defaultifempty.html)
-
-     - parameter switchTo: Observable sequence being returned when source sequence is empty.
-     - returns: Observable sequence that contains elements from switchTo sequence if source is empty, otherwise returns source sequence elements.
-     */
-    public func ifEmpty(switchTo other: Observable) -> Observable {
-        return SwitchIfEmpty(source: self.asObservable(), ifEmpty: other)
-    }
-}
-
-final private class SwitchIfEmpty: Producer {
-    
-    private let _source: Observable
-    private let _ifEmpty: Observable
-    
-    init(source: Observable, ifEmpty: Observable) {
-        self._source = source
-        self._ifEmpty = ifEmpty
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = SwitchIfEmptySink(ifEmpty: self._ifEmpty,
-                                     observer: observer,
-                                     cancel: cancel)
-        let subscription = sink.run(self._source.asObservable())
-        
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-final private class SwitchIfEmptySink: Sink
-    , ObserverType {
-    typealias Element = Observer.Element
-    
-    private let _ifEmpty: Observable
-    private var _isEmpty = true
-    private let _ifEmptySubscription = SingleAssignmentDisposable()
-    
-    init(ifEmpty: Observable, observer: Observer, cancel: Cancelable) {
-        self._ifEmpty = ifEmpty
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run(_ source: Observable) -> Disposable {
-        let subscription = source.subscribe(self)
-        return Disposables.create(subscription, _ifEmptySubscription)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next:
-            self._isEmpty = false
-            self.forwardOn(event)
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            guard self._isEmpty else {
-                self.forwardOn(.completed)
-                self.dispose()
-                return
-            }
-            let ifEmptySink = SwitchIfEmptySinkIter(parent: self)
-            self._ifEmptySubscription.setDisposable(self._ifEmpty.subscribe(ifEmptySink))
-        }
-    }
-}
-
-final private class SwitchIfEmptySinkIter
-    : ObserverType {
-    typealias Element = Observer.Element
-    typealias Parent = SwitchIfEmptySink
-    
-    private let _parent: Parent
-
-    init(parent: Parent) {
-        self._parent = parent
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next:
-            self._parent.forwardOn(event)
-        case .error:
-            self._parent.forwardOn(event)
-            self._parent.dispose()
-        case .completed:
-            self._parent.forwardOn(event)
-            self._parent.dispose()
-        }
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Take.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Take.swift
deleted file mode 100644
index 95b0b60..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Take.swift
+++ /dev/null
@@ -1,179 +0,0 @@
-//
-//  Take.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/12/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Returns a specified number of contiguous elements from the start of an observable sequence.
-
-     - seealso: [take operator on reactivex.io](http://reactivex.io/documentation/operators/take.html)
-
-     - parameter count: The number of elements to return.
-     - returns: An observable sequence that contains the specified number of elements from the start of the input sequence.
-     */
-    public func take(_ count: Int)
-        -> Observable {
-        if count == 0 {
-            return Observable.empty()
-        }
-        else {
-            return TakeCount(source: self.asObservable(), count: count)
-        }
-    }
-}
-
-extension ObservableType {
-
-    /**
-     Takes elements for the specified duration from the start of the observable source sequence, using the specified scheduler to run timers.
-
-     - seealso: [take operator on reactivex.io](http://reactivex.io/documentation/operators/take.html)
-
-     - parameter duration: Duration for taking elements from the start of the sequence.
-     - parameter scheduler: Scheduler to run the timer on.
-     - returns: An observable sequence with the elements taken during the specified duration from the start of the source sequence.
-     */
-    public func take(_ duration: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
-        return TakeTime(source: self.asObservable(), duration: duration, scheduler: scheduler)
-    }
-}
-
-// count version
-
-final private class TakeCountSink: Sink, ObserverType {
-    typealias Element = Observer.Element 
-    typealias Parent = TakeCount
-    
-    private let _parent: Parent
-    
-    private var _remaining: Int
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        self._remaining = parent._count
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            
-            if self._remaining > 0 {
-                self._remaining -= 1
-                
-                self.forwardOn(.next(value))
-            
-                if self._remaining == 0 {
-                    self.forwardOn(.completed)
-                    self.dispose()
-                }
-            }
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-    
-}
-
-final private class TakeCount: Producer {
-    fileprivate let _source: Observable
-    fileprivate let _count: Int
-    
-    init(source: Observable, count: Int) {
-        if count < 0 {
-            rxFatalError("count can't be negative")
-        }
-        self._source = source
-        self._count = count
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = TakeCountSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-// time version
-
-final private class TakeTimeSink
-    : Sink
-    , LockOwnerType
-    , ObserverType
-    , SynchronizedOnType where Observer.Element == Element {
-    typealias Parent = TakeTime
-
-    fileprivate let _parent: Parent
-    
-    let _lock = RecursiveLock()
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            self.forwardOn(.next(value))
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-    
-    func tick() {
-        self._lock.lock(); defer { self._lock.unlock() }
-
-        self.forwardOn(.completed)
-        self.dispose()
-    }
-    
-    func run() -> Disposable {
-        let disposeTimer = self._parent._scheduler.scheduleRelative((), dueTime: self._parent._duration) { _ in
-            self.tick()
-            return Disposables.create()
-        }
-        
-        let disposeSubscription = self._parent._source.subscribe(self)
-        
-        return Disposables.create(disposeTimer, disposeSubscription)
-    }
-}
-
-final private class TakeTime: Producer {
-    typealias TimeInterval = RxTimeInterval
-    
-    fileprivate let _source: Observable
-    fileprivate let _duration: TimeInterval
-    fileprivate let _scheduler: SchedulerType
-    
-    init(source: Observable, duration: TimeInterval, scheduler: SchedulerType) {
-        self._source = source
-        self._scheduler = scheduler
-        self._duration = duration
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = TakeTimeSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/TakeLast.swift b/Demo/Pods/RxSwift/RxSwift/Observables/TakeLast.swift
deleted file mode 100644
index 5a5d684..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/TakeLast.swift
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-//  TakeLast.swift
-//  RxSwift
-//
-//  Created by Tomi Koskinen on 25/10/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Returns a specified number of contiguous elements from the end of an observable sequence.
-
-     This operator accumulates a buffer with a length enough to store elements count elements. Upon completion of the source sequence, this buffer is drained on the result sequence. This causes the elements to be delayed.
-
-     - seealso: [takeLast operator on reactivex.io](http://reactivex.io/documentation/operators/takelast.html)
-
-     - parameter count: Number of elements to take from the end of the source sequence.
-     - returns: An observable sequence containing the specified number of elements from the end of the source sequence.
-     */
-    public func takeLast(_ count: Int)
-        -> Observable {
-        return TakeLast(source: self.asObservable(), count: count)
-    }
-}
-
-final private class TakeLastSink: Sink, ObserverType {
-    typealias Element = Observer.Element 
-    typealias Parent = TakeLast
-    
-    private let _parent: Parent
-    
-    private var _elements: Queue
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        self._elements = Queue(capacity: parent._count + 1)
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            self._elements.enqueue(value)
-            if self._elements.count > self._parent._count {
-                _ = self._elements.dequeue()
-            }
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            for e in self._elements {
-                self.forwardOn(.next(e))
-            }
-            self.forwardOn(.completed)
-            self.dispose()
-        }
-    }
-}
-
-final private class TakeLast: Producer {
-    fileprivate let _source: Observable
-    fileprivate let _count: Int
-    
-    init(source: Observable, count: Int) {
-        if count < 0 {
-            rxFatalError("count can't be negative")
-        }
-        self._source = source
-        self._count = count
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = TakeLastSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift b/Demo/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift
deleted file mode 100644
index f6490d4..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift
+++ /dev/null
@@ -1,227 +0,0 @@
-//
-//  TakeUntil.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/7/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Returns the elements from the source observable sequence until the other observable sequence produces an element.
-
-     - seealso: [takeUntil operator on reactivex.io](http://reactivex.io/documentation/operators/takeuntil.html)
-
-     - parameter other: Observable sequence that terminates propagation of elements of the source sequence.
-     - returns: An observable sequence containing the elements of the source sequence up to the point the other sequence interrupted further propagation.
-     */
-    public func takeUntil(_ other: Source)
-        -> Observable {
-        return TakeUntil(source: self.asObservable(), other: other.asObservable())
-    }
-
-    /**
-     Returns elements from an observable sequence until the specified condition is true.
-
-     - seealso: [takeUntil operator on reactivex.io](http://reactivex.io/documentation/operators/takeuntil.html)
-
-     - parameter behavior: Whether or not to include the last element matching the predicate.
-     - parameter predicate: A function to test each element for a condition.
-     - returns: An observable sequence that contains the elements from the input sequence that occur before the element at which the test passes.
-     */
-    public func takeUntil(_ behavior: TakeUntilBehavior,
-                          predicate: @escaping (Element) throws -> Bool)
-        -> Observable {
-        return TakeUntilPredicate(source: self.asObservable(),
-                                  behavior: behavior,
-                                  predicate: predicate)
-    }
-}
-
-/// Behaviors for the `takeUntil(_ behavior:predicate:)` operator.
-public enum TakeUntilBehavior {
-    /// Include the last element matching the predicate.
-    case inclusive
-
-    /// Exclude the last element matching the predicate.
-    case exclusive
-}
-
-// MARK: - TakeUntil Observable
-final private class TakeUntilSinkOther
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias Parent = TakeUntilSink
-    typealias Element = Other
-    
-    fileprivate let _parent: Parent
-
-    var _lock: RecursiveLock {
-        return self._parent._lock
-    }
-    
-    fileprivate let _subscription = SingleAssignmentDisposable()
-    
-    init(parent: Parent) {
-        self._parent = parent
-#if TRACE_RESOURCES
-        _ = Resources.incrementTotal()
-#endif
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next:
-            self._parent.forwardOn(.completed)
-            self._parent.dispose()
-        case .error(let e):
-            self._parent.forwardOn(.error(e))
-            self._parent.dispose()
-        case .completed:
-            self._subscription.dispose()
-        }
-    }
-    
-#if TRACE_RESOURCES
-    deinit {
-        _ = Resources.decrementTotal()
-    }
-#endif
-}
-
-final private class TakeUntilSink
-    : Sink
-    , LockOwnerType
-    , ObserverType
-    , SynchronizedOnType {
-    typealias Element = Observer.Element 
-    typealias Parent = TakeUntil
-    
-    fileprivate let _parent: Parent
- 
-    let _lock = RecursiveLock()
-    
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next:
-            self.forwardOn(event)
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-    
-    func run() -> Disposable {
-        let otherObserver = TakeUntilSinkOther(parent: self)
-        let otherSubscription = self._parent._other.subscribe(otherObserver)
-        otherObserver._subscription.setDisposable(otherSubscription)
-        let sourceSubscription = self._parent._source.subscribe(self)
-        
-        return Disposables.create(sourceSubscription, otherObserver._subscription)
-    }
-}
-
-final private class TakeUntil: Producer {
-    
-    fileprivate let _source: Observable
-    fileprivate let _other: Observable
-    
-    init(source: Observable, other: Observable) {
-        self._source = source
-        self._other = other
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = TakeUntilSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-// MARK: - TakeUntil Predicate
-final private class TakeUntilPredicateSink
-    : Sink, ObserverType {
-    typealias Element = Observer.Element 
-    typealias Parent = TakeUntilPredicate
-
-    fileprivate let _parent: Parent
-    fileprivate var _running = true
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            if !self._running {
-                return
-            }
-
-            do {
-                self._running = try !self._parent._predicate(value)
-            } catch let e {
-                self.forwardOn(.error(e))
-                self.dispose()
-                return
-            }
-
-            if self._running {
-                self.forwardOn(.next(value))
-            } else {
-                if self._parent._behavior == .inclusive {
-                    self.forwardOn(.next(value))
-                }
-
-                self.forwardOn(.completed)
-                self.dispose()
-            }
-        case .error, .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-
-}
-
-final private class TakeUntilPredicate: Producer {
-    typealias Predicate = (Element) throws -> Bool
-
-    fileprivate let _source: Observable
-    fileprivate let _predicate: Predicate
-    fileprivate let _behavior: TakeUntilBehavior
-
-    init(source: Observable,
-         behavior: TakeUntilBehavior,
-         predicate: @escaping Predicate) {
-        self._source = source
-        self._behavior = behavior
-        self._predicate = predicate
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = TakeUntilPredicateSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift b/Demo/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift
deleted file mode 100644
index efd5311..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-//  TakeWhile.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/7/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Returns elements from an observable sequence as long as a specified condition is true.
-
-     - seealso: [takeWhile operator on reactivex.io](http://reactivex.io/documentation/operators/takewhile.html)
-
-     - parameter predicate: A function to test each element for a condition.
-     - returns: An observable sequence that contains the elements from the input sequence that occur before the element at which the test no longer passes.
-     */
-    public func takeWhile(_ predicate: @escaping (Element) throws -> Bool)
-        -> Observable {
-        return TakeWhile(source: self.asObservable(), predicate: predicate)
-    }
-}
-
-final private class TakeWhileSink
-    : Sink
-    , ObserverType {
-    typealias Element = Observer.Element 
-    typealias Parent = TakeWhile
-
-    fileprivate let _parent: Parent
-
-    fileprivate var _running = true
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            if !self._running {
-                return
-            }
-            
-            do {
-                self._running = try self._parent._predicate(value)
-            } catch let e {
-                self.forwardOn(.error(e))
-                self.dispose()
-                return
-            }
-            
-            if self._running {
-                self.forwardOn(.next(value))
-            } else {
-                self.forwardOn(.completed)
-                self.dispose()
-            }
-        case .error, .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-    
-}
-
-final private class TakeWhile: Producer {
-    typealias Predicate = (Element) throws -> Bool
-
-    fileprivate let _source: Observable
-    fileprivate let _predicate: Predicate
-
-    init(source: Observable, predicate: @escaping Predicate) {
-        self._source = source
-        self._predicate = predicate
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = TakeWhileSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Throttle.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Throttle.swift
deleted file mode 100644
index f682433..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Throttle.swift
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-//  Throttle.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 3/22/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import struct Foundation.Date
-
-extension ObservableType {
-
-    /**
-     Returns an Observable that emits the first and the latest item emitted by the source Observable during sequential time windows of a specified duration.
-
-     This operator makes sure that no two elements are emitted in less then dueTime.
-
-     - seealso: [debounce operator on reactivex.io](http://reactivex.io/documentation/operators/debounce.html)
-
-     - parameter dueTime: Throttling duration for each element.
-     - parameter latest: Should latest element received in a dueTime wide time window since last element emission be emitted.
-     - parameter scheduler: Scheduler to run the throttle timers on.
-     - returns: The throttled sequence.
-     */
-    public func throttle(_ dueTime: RxTimeInterval, latest: Bool = true, scheduler: SchedulerType)
-        -> Observable {
-        return Throttle(source: self.asObservable(), dueTime: dueTime, latest: latest, scheduler: scheduler)
-    }
-}
-
-final private class ThrottleSink
-    : Sink
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias Element = Observer.Element 
-    typealias ParentType = Throttle
-    
-    private let _parent: ParentType
-    
-    let _lock = RecursiveLock()
-    
-    // state
-    private var _lastUnsentElement: Element?
-    private var _lastSentTime: Date?
-    private var _completed: Bool = false
-
-    let cancellable = SerialDisposable()
-    
-    init(parent: ParentType, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run() -> Disposable {
-        let subscription = self._parent._source.subscribe(self)
-        
-        return Disposables.create(subscription, cancellable)
-    }
-
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next(let element):
-            let now = self._parent._scheduler.now
-
-            let reducedScheduledTime: RxTimeInterval
-
-            if let lastSendingTime = self._lastSentTime {
-                reducedScheduledTime = self._parent._dueTime.reduceWithSpanBetween(earlierDate: lastSendingTime, laterDate: now)
-            }
-            else {
-                reducedScheduledTime = .nanoseconds(0)
-            }
-
-            if reducedScheduledTime.isNow {
-                self.sendNow(element: element)
-                return
-            }
-
-            if !self._parent._latest {
-                return
-            }
-
-            let isThereAlreadyInFlightRequest = self._lastUnsentElement != nil
-            
-            self._lastUnsentElement = element
-
-            if isThereAlreadyInFlightRequest {
-                return
-            }
-
-            let scheduler = self._parent._scheduler
-
-            let d = SingleAssignmentDisposable()
-            self.cancellable.disposable = d
-
-            d.setDisposable(scheduler.scheduleRelative(0, dueTime: reducedScheduledTime, action: self.propagate))
-        case .error:
-            self._lastUnsentElement = nil
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            if self._lastUnsentElement != nil {
-                self._completed = true
-            }
-            else {
-                self.forwardOn(.completed)
-                self.dispose()
-            }
-        }
-    }
-
-    private func sendNow(element: Element) {
-        self._lastUnsentElement = nil
-        self.forwardOn(.next(element))
-        // in case element processing takes a while, this should give some more room
-        self._lastSentTime = self._parent._scheduler.now
-    }
-    
-    func propagate(_: Int) -> Disposable {
-        self._lock.lock(); defer { self._lock.unlock() } // {
-            if let lastUnsentElement = self._lastUnsentElement {
-                self.sendNow(element: lastUnsentElement)
-            }
-
-            if self._completed {
-                self.forwardOn(.completed)
-                self.dispose()
-            }
-        // }
-        return Disposables.create()
-    }
-}
-
-final private class Throttle: Producer {
-    fileprivate let _source: Observable
-    fileprivate let _dueTime: RxTimeInterval
-    fileprivate let _latest: Bool
-    fileprivate let _scheduler: SchedulerType
-
-    init(source: Observable, dueTime: RxTimeInterval, latest: Bool, scheduler: SchedulerType) {
-        self._source = source
-        self._dueTime = dueTime
-        self._latest = latest
-        self._scheduler = scheduler
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = ThrottleSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-    
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Timeout.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Timeout.swift
deleted file mode 100644
index 3177c42..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Timeout.swift
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-//  Timeout.swift
-//  RxSwift
-//
-//  Created by Tomi Koskinen on 13/11/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Applies a timeout policy for each element in the observable sequence. If the next element isn't received within the specified timeout duration starting from its predecessor, a TimeoutError is propagated to the observer.
-
-     - seealso: [timeout operator on reactivex.io](http://reactivex.io/documentation/operators/timeout.html)
-
-     - parameter dueTime: Maximum duration between values before a timeout occurs.
-     - parameter scheduler: Scheduler to run the timeout timer on.
-     - returns: An observable sequence with a `RxError.timeout` in case of a timeout.
-     */
-    public func timeout(_ dueTime: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
-            return Timeout(source: self.asObservable(), dueTime: dueTime, other: Observable.error(RxError.timeout), scheduler: scheduler)
-    }
-
-    /**
-     Applies a timeout policy for each element in the observable sequence, using the specified scheduler to run timeout timers. If the next element isn't received within the specified timeout duration starting from its predecessor, the other observable sequence is used to produce future messages from that point on.
-
-     - seealso: [timeout operator on reactivex.io](http://reactivex.io/documentation/operators/timeout.html)
-
-     - parameter dueTime: Maximum duration between values before a timeout occurs.
-     - parameter other: Sequence to return in case of a timeout.
-     - parameter scheduler: Scheduler to run the timeout timer on.
-     - returns: The source sequence switching to the other sequence in case of a timeout.
-     */
-    public func timeout(_ dueTime: RxTimeInterval, other: Source, scheduler: SchedulerType)
-        -> Observable where Element == Source.Element {
-            return Timeout(source: self.asObservable(), dueTime: dueTime, other: other.asObservable(), scheduler: scheduler)
-    }
-}
-
-final private class TimeoutSink: Sink, LockOwnerType, ObserverType {
-    typealias Element = Observer.Element 
-    typealias Parent = Timeout
-    
-    private let _parent: Parent
-    
-    let _lock = RecursiveLock()
-
-    private let _timerD = SerialDisposable()
-    private let _subscription = SerialDisposable()
-    
-    private var _id = 0
-    private var _switched = false
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run() -> Disposable {
-        let original = SingleAssignmentDisposable()
-        self._subscription.disposable = original
-        
-        self._createTimeoutTimer()
-        
-        original.setDisposable(self._parent._source.subscribe(self))
-        
-        return Disposables.create(_subscription, _timerD)
-    }
-
-    func on(_ event: Event) {
-        switch event {
-        case .next:
-            var onNextWins = false
-            
-            self._lock.performLocked {
-                onNextWins = !self._switched
-                if onNextWins {
-                    self._id = self._id &+ 1
-                }
-            }
-            
-            if onNextWins {
-                self.forwardOn(event)
-                self._createTimeoutTimer()
-            }
-        case .error, .completed:
-            var onEventWins = false
-            
-            self._lock.performLocked {
-                onEventWins = !self._switched
-                if onEventWins {
-                    self._id = self._id &+ 1
-                }
-            }
-            
-            if onEventWins {
-                self.forwardOn(event)
-                self.dispose()
-            }
-        }
-    }
-    
-    private func _createTimeoutTimer() {
-        if self._timerD.isDisposed {
-            return
-        }
-        
-        let nextTimer = SingleAssignmentDisposable()
-        self._timerD.disposable = nextTimer
-        
-        let disposeSchedule = self._parent._scheduler.scheduleRelative(self._id, dueTime: self._parent._dueTime) { state in
-            
-            var timerWins = false
-            
-            self._lock.performLocked {
-                self._switched = (state == self._id)
-                timerWins = self._switched
-            }
-            
-            if timerWins {
-                self._subscription.disposable = self._parent._other.subscribe(self.forwarder())
-            }
-            
-            return Disposables.create()
-        }
-
-        nextTimer.setDisposable(disposeSchedule)
-    }
-}
-
-
-final private class Timeout: Producer {
-    fileprivate let _source: Observable
-    fileprivate let _dueTime: RxTimeInterval
-    fileprivate let _other: Observable
-    fileprivate let _scheduler: SchedulerType
-    
-    init(source: Observable, dueTime: RxTimeInterval, other: Observable, scheduler: SchedulerType) {
-        self._source = source
-        self._dueTime = dueTime
-        self._other = other
-        self._scheduler = scheduler
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = TimeoutSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Timer.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Timer.swift
deleted file mode 100644
index 7b29bca..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Timer.swift
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-//  Timer.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/7/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType where Element : RxAbstractInteger {
-    /**
-     Returns an observable sequence that produces a value after each period, using the specified scheduler to run timers and to send out observer messages.
-
-     - seealso: [interval operator on reactivex.io](http://reactivex.io/documentation/operators/interval.html)
-
-     - parameter period: Period for producing the values in the resulting sequence.
-     - parameter scheduler: Scheduler to run the timer on.
-     - returns: An observable sequence that produces a value after each period.
-     */
-    public static func interval(_ period: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
-        return Timer(
-            dueTime: period,
-            period: period,
-            scheduler: scheduler
-        )
-    }
-}
-
-extension ObservableType where Element: RxAbstractInteger {
-    /**
-     Returns an observable sequence that periodically produces a value after the specified initial relative due time has elapsed, using the specified scheduler to run timers.
-
-     - seealso: [timer operator on reactivex.io](http://reactivex.io/documentation/operators/timer.html)
-
-     - parameter dueTime: Relative time at which to produce the first value.
-     - parameter period: Period to produce subsequent values.
-     - parameter scheduler: Scheduler to run timers on.
-     - returns: An observable sequence that produces a value after due time has elapsed and then each period.
-     */
-    public static func timer(_ dueTime: RxTimeInterval, period: RxTimeInterval? = nil, scheduler: SchedulerType)
-        -> Observable {
-        return Timer(
-            dueTime: dueTime,
-            period: period,
-            scheduler: scheduler
-        )
-    }
-}
-
-import Foundation
-
-final private class TimerSink : Sink where Observer.Element : RxAbstractInteger  {
-    typealias Parent = Timer
-
-    private let _parent: Parent
-    private let _lock = RecursiveLock()
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    func run() -> Disposable {
-        return self._parent._scheduler.schedulePeriodic(0 as Observer.Element, startAfter: self._parent._dueTime, period: self._parent._period!) { state in
-            self._lock.lock(); defer { self._lock.unlock() }
-            self.forwardOn(.next(state))
-            return state &+ 1
-        }
-    }
-}
-
-final private class TimerOneOffSink: Sink where Observer.Element: RxAbstractInteger {
-    typealias Parent = Timer
-
-    private let _parent: Parent
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    func run() -> Disposable {
-        return self._parent._scheduler.scheduleRelative(self, dueTime: self._parent._dueTime) { [unowned self] _ -> Disposable in
-            self.forwardOn(.next(0))
-            self.forwardOn(.completed)
-            self.dispose()
-
-            return Disposables.create()
-        }
-    }
-}
-
-final private class Timer: Producer {
-    fileprivate let _scheduler: SchedulerType
-    fileprivate let _dueTime: RxTimeInterval
-    fileprivate let _period: RxTimeInterval?
-
-    init(dueTime: RxTimeInterval, period: RxTimeInterval?, scheduler: SchedulerType) {
-        self._scheduler = scheduler
-        self._dueTime = dueTime
-        self._period = period
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        if self._period != nil {
-            let sink = TimerSink(parent: self, observer: observer, cancel: cancel)
-            let subscription = sink.run()
-            return (sink: sink, subscription: subscription)
-        }
-        else {
-            let sink = TimerOneOffSink(parent: self, observer: observer, cancel: cancel)
-            let subscription = sink.run()
-            return (sink: sink, subscription: subscription)
-        }
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/ToArray.swift b/Demo/Pods/RxSwift/RxSwift/Observables/ToArray.swift
deleted file mode 100644
index 2821a60..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/ToArray.swift
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-//  ToArray.swift
-//  RxSwift
-//
-//  Created by Junior B. on 20/10/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-
-extension ObservableType {
-
-    /**
-    Converts an Observable into a Single that emits the whole sequence as a single array and then terminates.
-    
-    For aggregation behavior see `reduce`.
-
-    - seealso: [toArray operator on reactivex.io](http://reactivex.io/documentation/operators/to.html)
-    
-    - returns: A Single sequence containing all the emitted elements as array.
-    */
-    public func toArray()
-        -> Single<[Element]> {
-        return PrimitiveSequence(raw: ToArray(source: self.asObservable()))
-    }
-}
-
-final private class ToArraySink: Sink, ObserverType where Observer.Element == [SourceType] {
-    typealias Parent = ToArray
-    
-    let _parent: Parent
-    var _list = [SourceType]()
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            self._list.append(value)
-        case .error(let e):
-            self.forwardOn(.error(e))
-            self.dispose()
-        case .completed:
-            self.forwardOn(.next(self._list))
-            self.forwardOn(.completed)
-            self.dispose()
-        }
-    }
-}
-
-final private class ToArray: Producer<[SourceType]> {
-    let _source: Observable
-
-    init(source: Observable) {
-        self._source = source
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == [SourceType] {
-        let sink = ToArraySink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Using.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Using.swift
deleted file mode 100644
index 14c5698..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Using.swift
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-//  Using.swift
-//  RxSwift
-//
-//  Created by Yury Korolev on 10/15/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-    /**
-     Constructs an observable sequence that depends on a resource object, whose lifetime is tied to the resulting observable sequence's lifetime.
-
-     - seealso: [using operator on reactivex.io](http://reactivex.io/documentation/operators/using.html)
-
-     - parameter resourceFactory: Factory function to obtain a resource object.
-     - parameter observableFactory: Factory function to obtain an observable sequence that depends on the obtained resource.
-     - returns: An observable sequence whose lifetime controls the lifetime of the dependent resource object.
-     */
-    public static func using(_ resourceFactory: @escaping () throws -> Resource, observableFactory: @escaping (Resource) throws -> Observable) -> Observable {
-        return Using(resourceFactory: resourceFactory, observableFactory: observableFactory)
-    }
-}
-
-final private class UsingSink: Sink, ObserverType {
-    typealias SourceType = Observer.Element 
-    typealias Parent = Using
-
-    private let _parent: Parent
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run() -> Disposable {
-        var disposable = Disposables.create()
-        
-        do {
-            let resource = try self._parent._resourceFactory()
-            disposable = resource
-            let source = try self._parent._observableFactory(resource)
-            
-            return Disposables.create(
-                source.subscribe(self),
-                disposable
-            )
-        } catch let error {
-            return Disposables.create(
-                Observable.error(error).subscribe(self),
-                disposable
-            )
-        }
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case let .next(value):
-            self.forwardOn(.next(value))
-        case let .error(error):
-            self.forwardOn(.error(error))
-            self.dispose()
-        case .completed:
-            self.forwardOn(.completed)
-            self.dispose()
-        }
-    }
-}
-
-final private class Using: Producer {
-    
-    typealias Element = SourceType
-    
-    typealias ResourceFactory = () throws -> ResourceType
-    typealias ObservableFactory = (ResourceType) throws -> Observable
-    
-    fileprivate let _resourceFactory: ResourceFactory
-    fileprivate let _observableFactory: ObservableFactory
-    
-    
-    init(resourceFactory: @escaping ResourceFactory, observableFactory: @escaping ObservableFactory) {
-        self._resourceFactory = resourceFactory
-        self._observableFactory = observableFactory
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = UsingSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Window.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Window.swift
deleted file mode 100644
index b93cfa6..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Window.swift
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-//  Window.swift
-//  RxSwift
-//
-//  Created by Junior B. on 29/10/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Projects each element of an observable sequence into a window that is completed when either it’s full or a given amount of time has elapsed.
-
-     - seealso: [window operator on reactivex.io](http://reactivex.io/documentation/operators/window.html)
-
-     - parameter timeSpan: Maximum time length of a window.
-     - parameter count: Maximum element count of a window.
-     - parameter scheduler: Scheduler to run windowing timers on.
-     - returns: An observable sequence of windows (instances of `Observable`).
-     */
-    public func window(timeSpan: RxTimeInterval, count: Int, scheduler: SchedulerType)
-        -> Observable> {
-            return WindowTimeCount(source: self.asObservable(), timeSpan: timeSpan, count: count, scheduler: scheduler)
-    }
-}
-
-final private class WindowTimeCountSink
-    : Sink
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType where Observer.Element == Observable {
-    typealias Parent = WindowTimeCount
-    
-    private let _parent: Parent
-    
-    let _lock = RecursiveLock()
-    
-    private var _subject = PublishSubject()
-    private var _count = 0
-    private var _windowId = 0
-    
-    private let _timerD = SerialDisposable()
-    private let _refCountDisposable: RefCountDisposable
-    private let _groupDisposable = CompositeDisposable()
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        
-        _ = self._groupDisposable.insert(self._timerD)
-        
-        self._refCountDisposable = RefCountDisposable(disposable: self._groupDisposable)
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run() -> Disposable {
-        
-        self.forwardOn(.next(AddRef(source: self._subject, refCount: self._refCountDisposable).asObservable()))
-        self.createTimer(self._windowId)
-        
-        _ = self._groupDisposable.insert(self._parent._source.subscribe(self))
-        return self._refCountDisposable
-    }
-    
-    func startNewWindowAndCompleteCurrentOne() {
-        self._subject.on(.completed)
-        self._subject = PublishSubject()
-        
-        self.forwardOn(.next(AddRef(source: self._subject, refCount: self._refCountDisposable).asObservable()))
-    }
-
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        var newWindow = false
-        var newId = 0
-        
-        switch event {
-        case .next(let element):
-            self._subject.on(.next(element))
-            
-            do {
-                _ = try incrementChecked(&self._count)
-            } catch let e {
-                self._subject.on(.error(e as Swift.Error))
-                self.dispose()
-            }
-            
-            if self._count == self._parent._count {
-                newWindow = true
-                self._count = 0
-                self._windowId += 1
-                newId = self._windowId
-                self.startNewWindowAndCompleteCurrentOne()
-            }
-            
-        case .error(let error):
-            self._subject.on(.error(error))
-            self.forwardOn(.error(error))
-            self.dispose()
-        case .completed:
-            self._subject.on(.completed)
-            self.forwardOn(.completed)
-            self.dispose()
-        }
-
-        if newWindow {
-            self.createTimer(newId)
-        }
-    }
-    
-    func createTimer(_ windowId: Int) {
-        if self._timerD.isDisposed {
-            return
-        }
-        
-        if self._windowId != windowId {
-            return
-        }
-
-        let nextTimer = SingleAssignmentDisposable()
-
-        self._timerD.disposable = nextTimer
-
-        let scheduledRelative = self._parent._scheduler.scheduleRelative(windowId, dueTime: self._parent._timeSpan) { previousWindowId in
-            
-            var newId = 0
-            
-            self._lock.performLocked {
-                if previousWindowId != self._windowId {
-                    return
-                }
-                
-                self._count = 0
-                self._windowId = self._windowId &+ 1
-                newId = self._windowId
-                self.startNewWindowAndCompleteCurrentOne()
-            }
-            
-            self.createTimer(newId)
-            
-            return Disposables.create()
-        }
-
-        nextTimer.setDisposable(scheduledRelative)
-    }
-}
-
-final private class WindowTimeCount: Producer> {
-    fileprivate let _timeSpan: RxTimeInterval
-    fileprivate let _count: Int
-    fileprivate let _scheduler: SchedulerType
-    fileprivate let _source: Observable
-    
-    init(source: Observable, timeSpan: RxTimeInterval, count: Int, scheduler: SchedulerType) {
-        self._source = source
-        self._timeSpan = timeSpan
-        self._count = count
-        self._scheduler = scheduler
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Observable {
-        let sink = WindowTimeCountSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift b/Demo/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift
deleted file mode 100644
index b471f29..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-//  WithLatestFrom.swift
-//  RxSwift
-//
-//  Created by Yury Korolev on 10/19/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Merges two observable sequences into one observable sequence by combining each element from self with the latest element from the second source, if any.
-
-     - seealso: [combineLatest operator on reactivex.io](http://reactivex.io/documentation/operators/combinelatest.html)
-
-     - parameter second: Second observable source.
-     - parameter resultSelector: Function to invoke for each element from the self combined with the latest element from the second source, if any.
-     - returns: An observable sequence containing the result of combining each element of the self  with the latest element from the second source, if any, using the specified result selector function.
-     */
-    public func withLatestFrom(_ second: Source, resultSelector: @escaping (Element, Source.Element) throws -> ResultType) -> Observable {
-        return WithLatestFrom(first: self.asObservable(), second: second.asObservable(), resultSelector: resultSelector)
-    }
-
-    /**
-     Merges two observable sequences into one observable sequence by using latest element from the second sequence every time when `self` emits an element.
-
-     - seealso: [combineLatest operator on reactivex.io](http://reactivex.io/documentation/operators/combinelatest.html)
-
-     - parameter second: Second observable source.
-     - returns: An observable sequence containing the result of combining each element of the self  with the latest element from the second source, if any, using the specified result selector function.
-     */
-    public func withLatestFrom(_ second: Source) -> Observable {
-        return WithLatestFrom(first: self.asObservable(), second: second.asObservable(), resultSelector: { $1 })
-    }
-}
-
-final private class WithLatestFromSink
-    : Sink
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias ResultType = Observer.Element
-    typealias Parent = WithLatestFrom
-    typealias Element = FirstType
-    
-    fileprivate let _parent: Parent
-    
-    var _lock = RecursiveLock()
-    fileprivate var _latest: SecondType?
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run() -> Disposable {
-        let sndSubscription = SingleAssignmentDisposable()
-        let sndO = WithLatestFromSecond(parent: self, disposable: sndSubscription)
-        
-        sndSubscription.setDisposable(self._parent._second.subscribe(sndO))
-        let fstSubscription = self._parent._first.subscribe(self)
-
-        return Disposables.create(fstSubscription, sndSubscription)
-    }
-
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case let .next(value):
-            guard let latest = self._latest else { return }
-            do {
-                let res = try self._parent._resultSelector(value, latest)
-                
-                self.forwardOn(.next(res))
-            } catch let e {
-                self.forwardOn(.error(e))
-                self.dispose()
-            }
-        case .completed:
-            self.forwardOn(.completed)
-            self.dispose()
-        case let .error(error):
-            self.forwardOn(.error(error))
-            self.dispose()
-        }
-    }
-}
-
-final private class WithLatestFromSecond
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    
-    typealias ResultType = Observer.Element
-    typealias Parent = WithLatestFromSink
-    typealias Element = SecondType
-    
-    private let _parent: Parent
-    private let _disposable: Disposable
-
-    var _lock: RecursiveLock {
-        return self._parent._lock
-    }
-
-    init(parent: Parent, disposable: Disposable) {
-        self._parent = parent
-        self._disposable = disposable
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case let .next(value):
-            self._parent._latest = value
-        case .completed:
-            self._disposable.dispose()
-        case let .error(error):
-            self._parent.forwardOn(.error(error))
-            self._parent.dispose()
-        }
-    }
-}
-
-final private class WithLatestFrom: Producer {
-    typealias ResultSelector = (FirstType, SecondType) throws -> ResultType
-    
-    fileprivate let _first: Observable
-    fileprivate let _second: Observable
-    fileprivate let _resultSelector: ResultSelector
-
-    init(first: Observable, second: Observable, resultSelector: @escaping ResultSelector) {
-        self._first = first
-        self._second = second
-        self._resultSelector = resultSelector
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == ResultType {
-        let sink = WithLatestFromSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift
deleted file mode 100644
index cc232ab..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift
+++ /dev/null
@@ -1,169 +0,0 @@
-//
-//  Zip+Collection.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 8/30/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-    /**
-     Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-     - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-     - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-     */
-    public static func zip(_ collection: Collection, resultSelector: @escaping ([Collection.Element.Element]) throws -> Element) -> Observable
-        where Collection.Element: ObservableType {
-        return ZipCollectionType(sources: collection, resultSelector: resultSelector)
-    }
-
-    /**
-     Merges the specified observable sequences into one observable sequence whenever all of the observable sequences have produced an element at a corresponding index.
-
-     - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-     - returns: An observable sequence containing the result of combining elements of the sources.
-     */
-    public static func zip(_ collection: Collection) -> Observable<[Element]>
-        where Collection.Element: ObservableType, Collection.Element.Element == Element {
-        return ZipCollectionType(sources: collection, resultSelector: { $0 })
-    }
-    
-}
-
-final private class ZipCollectionTypeSink
-    : Sink where Collection.Element: ObservableConvertibleType {
-    typealias Result = Observer.Element 
-    typealias Parent = ZipCollectionType
-    typealias SourceElement = Collection.Element.Element
-    
-    private let _parent: Parent
-    
-    private let _lock = RecursiveLock()
-    
-    // state
-    private var _numberOfValues = 0
-    private var _values: [Queue]
-    private var _isDone: [Bool]
-    private var _numberOfDone = 0
-    private var _subscriptions: [SingleAssignmentDisposable]
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        self._values = [Queue](repeating: Queue(capacity: 4), count: parent.count)
-        self._isDone = [Bool](repeating: false, count: parent.count)
-        self._subscriptions = [SingleAssignmentDisposable]()
-        self._subscriptions.reserveCapacity(parent.count)
-        
-        for _ in 0 ..< parent.count {
-            self._subscriptions.append(SingleAssignmentDisposable())
-        }
-        
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event, atIndex: Int) {
-        self._lock.lock(); defer { self._lock.unlock() } // {
-            switch event {
-            case .next(let element):
-                self._values[atIndex].enqueue(element)
-                
-                if self._values[atIndex].count == 1 {
-                    self._numberOfValues += 1
-                }
-                
-                if self._numberOfValues < self._parent.count {
-                    if self._numberOfDone == self._parent.count - 1 {
-                        self.forwardOn(.completed)
-                        self.dispose()
-                    }
-                    return
-                }
-                
-                do {
-                    var arguments = [SourceElement]()
-                    arguments.reserveCapacity(self._parent.count)
-                    
-                    // recalculate number of values
-                    self._numberOfValues = 0
-                    
-                    for i in 0 ..< self._values.count {
-                        arguments.append(self._values[i].dequeue()!)
-                        if !self._values[i].isEmpty {
-                            self._numberOfValues += 1
-                        }
-                    }
-                    
-                    let result = try self._parent.resultSelector(arguments)
-                    self.forwardOn(.next(result))
-                }
-                catch let error {
-                    self.forwardOn(.error(error))
-                    self.dispose()
-                }
-                
-            case .error(let error):
-                self.forwardOn(.error(error))
-                self.dispose()
-            case .completed:
-                if self._isDone[atIndex] {
-                    return
-                }
-                
-                self._isDone[atIndex] = true
-                self._numberOfDone += 1
-                
-                if self._numberOfDone == self._parent.count {
-                    self.forwardOn(.completed)
-                    self.dispose()
-                }
-                else {
-                    self._subscriptions[atIndex].dispose()
-                }
-            }
-        // }
-    }
-    
-    func run() -> Disposable {
-        var j = 0
-        for i in self._parent.sources {
-            let index = j
-            let source = i.asObservable()
-
-            let disposable = source.subscribe(AnyObserver { event in
-                self.on(event, atIndex: index)
-                })
-            self._subscriptions[j].setDisposable(disposable)
-            j += 1
-        }
-
-        if self._parent.sources.isEmpty {
-            self.forwardOn(.completed)
-        }
-        
-        return Disposables.create(_subscriptions)
-    }
-}
-
-final private class ZipCollectionType: Producer where Collection.Element: ObservableConvertibleType {
-    typealias ResultSelector = ([Collection.Element.Element]) throws -> Result
-    
-    let sources: Collection
-    let resultSelector: ResultSelector
-    let count: Int
-    
-    init(sources: Collection, resultSelector: @escaping ResultSelector) {
-        self.sources = sources
-        self.resultSelector = resultSelector
-        self.count = self.sources.count
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipCollectionTypeSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift
deleted file mode 100644
index d2a28d4..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift
+++ /dev/null
@@ -1,934 +0,0 @@
-// This file is autogenerated. Take a look at `Preprocessor` target in RxSwift project 
-//
-//  Zip+arity.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 5/23/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-
-
-// 2
-
-extension ObservableType {
-    /**
-    Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-    - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, resultSelector: @escaping (O1.Element, O2.Element) throws -> Element)
-        -> Observable {
-        return Zip2(
-            source1: source1.asObservable(), source2: source2.asObservable(),
-            resultSelector: resultSelector
-        )
-    }
-}
-
-extension ObservableType where Element == Any {
-    /**
-    Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - returns: An observable sequence containing the result of combining elements of the sources.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2)
-        -> Observable<(O1.Element, O2.Element)> {
-        return Zip2(
-            source1: source1.asObservable(), source2: source2.asObservable(),
-            resultSelector: { ($0, $1) }
-        )
-    }
-}
-
-final class ZipSink2_ : ZipSink {
-    typealias Result = Observer.Element 
-    typealias Parent = Zip2
-
-    let _parent: Parent
-
-    var _values1: Queue = Queue(capacity: 2)
-    var _values2: Queue = Queue(capacity: 2)
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(arity: 2, observer: observer, cancel: cancel)
-    }
-
-    override func hasElements(_ index: Int) -> Bool {
-        switch index {
-        case 0: return !self._values1.isEmpty
-        case 1: return !self._values2.isEmpty
-
-        default:
-            rxFatalError("Unhandled case (Function)")
-        }
-    }
-
-    func run() -> Disposable {
-        let subscription1 = SingleAssignmentDisposable()
-        let subscription2 = SingleAssignmentDisposable()
-
-        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-
-        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
-        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
-
-        return Disposables.create([
-           subscription1,
-           subscription2
-        ])
-    }
-
-    override func getResult() throws -> Result {
-        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!)
-    }
-}
-
-final class Zip2 : Producer {
-    typealias ResultSelector = (E1, E2) throws -> Result
-
-    let source1: Observable
-    let source2: Observable
-
-    let _resultSelector: ResultSelector
-
-    init(source1: Observable, source2: Observable, resultSelector: @escaping ResultSelector) {
-        self.source1 = source1
-        self.source2 = source2
-
-        self._resultSelector = resultSelector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipSink2_(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-
-
-// 3
-
-extension ObservableType {
-    /**
-    Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-    - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, resultSelector: @escaping (O1.Element, O2.Element, O3.Element) throws -> Element)
-        -> Observable {
-        return Zip3(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(),
-            resultSelector: resultSelector
-        )
-    }
-}
-
-extension ObservableType where Element == Any {
-    /**
-    Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - returns: An observable sequence containing the result of combining elements of the sources.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3)
-        -> Observable<(O1.Element, O2.Element, O3.Element)> {
-        return Zip3(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(),
-            resultSelector: { ($0, $1, $2) }
-        )
-    }
-}
-
-final class ZipSink3_ : ZipSink {
-    typealias Result = Observer.Element 
-    typealias Parent = Zip3
-
-    let _parent: Parent
-
-    var _values1: Queue = Queue(capacity: 2)
-    var _values2: Queue = Queue(capacity: 2)
-    var _values3: Queue = Queue(capacity: 2)
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(arity: 3, observer: observer, cancel: cancel)
-    }
-
-    override func hasElements(_ index: Int) -> Bool {
-        switch index {
-        case 0: return !self._values1.isEmpty
-        case 1: return !self._values2.isEmpty
-        case 2: return !self._values3.isEmpty
-
-        default:
-            rxFatalError("Unhandled case (Function)")
-        }
-    }
-
-    func run() -> Disposable {
-        let subscription1 = SingleAssignmentDisposable()
-        let subscription2 = SingleAssignmentDisposable()
-        let subscription3 = SingleAssignmentDisposable()
-
-        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-
-        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
-        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
-        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
-
-        return Disposables.create([
-           subscription1,
-           subscription2,
-           subscription3
-        ])
-    }
-
-    override func getResult() throws -> Result {
-        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!)
-    }
-}
-
-final class Zip3 : Producer {
-    typealias ResultSelector = (E1, E2, E3) throws -> Result
-
-    let source1: Observable
-    let source2: Observable
-    let source3: Observable
-
-    let _resultSelector: ResultSelector
-
-    init(source1: Observable, source2: Observable, source3: Observable, resultSelector: @escaping ResultSelector) {
-        self.source1 = source1
-        self.source2 = source2
-        self.source3 = source3
-
-        self._resultSelector = resultSelector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipSink3_(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-
-
-// 4
-
-extension ObservableType {
-    /**
-    Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-    - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element) throws -> Element)
-        -> Observable {
-        return Zip4(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(),
-            resultSelector: resultSelector
-        )
-    }
-}
-
-extension ObservableType where Element == Any {
-    /**
-    Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - returns: An observable sequence containing the result of combining elements of the sources.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4)
-        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element)> {
-        return Zip4(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(),
-            resultSelector: { ($0, $1, $2, $3) }
-        )
-    }
-}
-
-final class ZipSink4_ : ZipSink {
-    typealias Result = Observer.Element 
-    typealias Parent = Zip4
-
-    let _parent: Parent
-
-    var _values1: Queue = Queue(capacity: 2)
-    var _values2: Queue = Queue(capacity: 2)
-    var _values3: Queue = Queue(capacity: 2)
-    var _values4: Queue = Queue(capacity: 2)
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(arity: 4, observer: observer, cancel: cancel)
-    }
-
-    override func hasElements(_ index: Int) -> Bool {
-        switch index {
-        case 0: return !self._values1.isEmpty
-        case 1: return !self._values2.isEmpty
-        case 2: return !self._values3.isEmpty
-        case 3: return !self._values4.isEmpty
-
-        default:
-            rxFatalError("Unhandled case (Function)")
-        }
-    }
-
-    func run() -> Disposable {
-        let subscription1 = SingleAssignmentDisposable()
-        let subscription2 = SingleAssignmentDisposable()
-        let subscription3 = SingleAssignmentDisposable()
-        let subscription4 = SingleAssignmentDisposable()
-
-        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-
-        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
-        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
-        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
-        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
-
-        return Disposables.create([
-           subscription1,
-           subscription2,
-           subscription3,
-           subscription4
-        ])
-    }
-
-    override func getResult() throws -> Result {
-        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!)
-    }
-}
-
-final class Zip4 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4) throws -> Result
-
-    let source1: Observable
-    let source2: Observable
-    let source3: Observable
-    let source4: Observable
-
-    let _resultSelector: ResultSelector
-
-    init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, resultSelector: @escaping ResultSelector) {
-        self.source1 = source1
-        self.source2 = source2
-        self.source3 = source3
-        self.source4 = source4
-
-        self._resultSelector = resultSelector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipSink4_(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-
-
-// 5
-
-extension ObservableType {
-    /**
-    Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-    - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element) throws -> Element)
-        -> Observable {
-        return Zip5(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(),
-            resultSelector: resultSelector
-        )
-    }
-}
-
-extension ObservableType where Element == Any {
-    /**
-    Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - returns: An observable sequence containing the result of combining elements of the sources.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5)
-        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element)> {
-        return Zip5(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(),
-            resultSelector: { ($0, $1, $2, $3, $4) }
-        )
-    }
-}
-
-final class ZipSink5_ : ZipSink {
-    typealias Result = Observer.Element 
-    typealias Parent = Zip5
-
-    let _parent: Parent
-
-    var _values1: Queue = Queue(capacity: 2)
-    var _values2: Queue = Queue(capacity: 2)
-    var _values3: Queue = Queue(capacity: 2)
-    var _values4: Queue = Queue(capacity: 2)
-    var _values5: Queue = Queue(capacity: 2)
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(arity: 5, observer: observer, cancel: cancel)
-    }
-
-    override func hasElements(_ index: Int) -> Bool {
-        switch index {
-        case 0: return !self._values1.isEmpty
-        case 1: return !self._values2.isEmpty
-        case 2: return !self._values3.isEmpty
-        case 3: return !self._values4.isEmpty
-        case 4: return !self._values5.isEmpty
-
-        default:
-            rxFatalError("Unhandled case (Function)")
-        }
-    }
-
-    func run() -> Disposable {
-        let subscription1 = SingleAssignmentDisposable()
-        let subscription2 = SingleAssignmentDisposable()
-        let subscription3 = SingleAssignmentDisposable()
-        let subscription4 = SingleAssignmentDisposable()
-        let subscription5 = SingleAssignmentDisposable()
-
-        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
-
-        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
-        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
-        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
-        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
-        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
-
-        return Disposables.create([
-           subscription1,
-           subscription2,
-           subscription3,
-           subscription4,
-           subscription5
-        ])
-    }
-
-    override func getResult() throws -> Result {
-        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!)
-    }
-}
-
-final class Zip5 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5) throws -> Result
-
-    let source1: Observable
-    let source2: Observable
-    let source3: Observable
-    let source4: Observable
-    let source5: Observable
-
-    let _resultSelector: ResultSelector
-
-    init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, resultSelector: @escaping ResultSelector) {
-        self.source1 = source1
-        self.source2 = source2
-        self.source3 = source3
-        self.source4 = source4
-        self.source5 = source5
-
-        self._resultSelector = resultSelector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipSink5_(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-
-
-// 6
-
-extension ObservableType {
-    /**
-    Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-    - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element) throws -> Element)
-        -> Observable {
-        return Zip6(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(),
-            resultSelector: resultSelector
-        )
-    }
-}
-
-extension ObservableType where Element == Any {
-    /**
-    Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - returns: An observable sequence containing the result of combining elements of the sources.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6)
-        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element)> {
-        return Zip6(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(),
-            resultSelector: { ($0, $1, $2, $3, $4, $5) }
-        )
-    }
-}
-
-final class ZipSink6_ : ZipSink {
-    typealias Result = Observer.Element 
-    typealias Parent = Zip6
-
-    let _parent: Parent
-
-    var _values1: Queue = Queue(capacity: 2)
-    var _values2: Queue = Queue(capacity: 2)
-    var _values3: Queue = Queue(capacity: 2)
-    var _values4: Queue = Queue(capacity: 2)
-    var _values5: Queue = Queue(capacity: 2)
-    var _values6: Queue = Queue(capacity: 2)
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(arity: 6, observer: observer, cancel: cancel)
-    }
-
-    override func hasElements(_ index: Int) -> Bool {
-        switch index {
-        case 0: return !self._values1.isEmpty
-        case 1: return !self._values2.isEmpty
-        case 2: return !self._values3.isEmpty
-        case 3: return !self._values4.isEmpty
-        case 4: return !self._values5.isEmpty
-        case 5: return !self._values6.isEmpty
-
-        default:
-            rxFatalError("Unhandled case (Function)")
-        }
-    }
-
-    func run() -> Disposable {
-        let subscription1 = SingleAssignmentDisposable()
-        let subscription2 = SingleAssignmentDisposable()
-        let subscription3 = SingleAssignmentDisposable()
-        let subscription4 = SingleAssignmentDisposable()
-        let subscription5 = SingleAssignmentDisposable()
-        let subscription6 = SingleAssignmentDisposable()
-
-        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
-        let observer6 = ZipObserver(lock: self._lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
-
-        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
-        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
-        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
-        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
-        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
-        subscription6.setDisposable(self._parent.source6.subscribe(observer6))
-
-        return Disposables.create([
-           subscription1,
-           subscription2,
-           subscription3,
-           subscription4,
-           subscription5,
-           subscription6
-        ])
-    }
-
-    override func getResult() throws -> Result {
-        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!, self._values6.dequeue()!)
-    }
-}
-
-final class Zip6 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6) throws -> Result
-
-    let source1: Observable
-    let source2: Observable
-    let source3: Observable
-    let source4: Observable
-    let source5: Observable
-    let source6: Observable
-
-    let _resultSelector: ResultSelector
-
-    init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, source6: Observable, resultSelector: @escaping ResultSelector) {
-        self.source1 = source1
-        self.source2 = source2
-        self.source3 = source3
-        self.source4 = source4
-        self.source5 = source5
-        self.source6 = source6
-
-        self._resultSelector = resultSelector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipSink6_(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-
-
-// 7
-
-extension ObservableType {
-    /**
-    Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-    - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element) throws -> Element)
-        -> Observable {
-        return Zip7(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(),
-            resultSelector: resultSelector
-        )
-    }
-}
-
-extension ObservableType where Element == Any {
-    /**
-    Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - returns: An observable sequence containing the result of combining elements of the sources.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7)
-        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element)> {
-        return Zip7(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(),
-            resultSelector: { ($0, $1, $2, $3, $4, $5, $6) }
-        )
-    }
-}
-
-final class ZipSink7_ : ZipSink {
-    typealias Result = Observer.Element 
-    typealias Parent = Zip7
-
-    let _parent: Parent
-
-    var _values1: Queue = Queue(capacity: 2)
-    var _values2: Queue = Queue(capacity: 2)
-    var _values3: Queue = Queue(capacity: 2)
-    var _values4: Queue = Queue(capacity: 2)
-    var _values5: Queue = Queue(capacity: 2)
-    var _values6: Queue = Queue(capacity: 2)
-    var _values7: Queue = Queue(capacity: 2)
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(arity: 7, observer: observer, cancel: cancel)
-    }
-
-    override func hasElements(_ index: Int) -> Bool {
-        switch index {
-        case 0: return !self._values1.isEmpty
-        case 1: return !self._values2.isEmpty
-        case 2: return !self._values3.isEmpty
-        case 3: return !self._values4.isEmpty
-        case 4: return !self._values5.isEmpty
-        case 5: return !self._values6.isEmpty
-        case 6: return !self._values7.isEmpty
-
-        default:
-            rxFatalError("Unhandled case (Function)")
-        }
-    }
-
-    func run() -> Disposable {
-        let subscription1 = SingleAssignmentDisposable()
-        let subscription2 = SingleAssignmentDisposable()
-        let subscription3 = SingleAssignmentDisposable()
-        let subscription4 = SingleAssignmentDisposable()
-        let subscription5 = SingleAssignmentDisposable()
-        let subscription6 = SingleAssignmentDisposable()
-        let subscription7 = SingleAssignmentDisposable()
-
-        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
-        let observer6 = ZipObserver(lock: self._lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
-        let observer7 = ZipObserver(lock: self._lock, parent: self, index: 6, setNextValue: { self._values7.enqueue($0) }, this: subscription7)
-
-        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
-        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
-        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
-        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
-        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
-        subscription6.setDisposable(self._parent.source6.subscribe(observer6))
-        subscription7.setDisposable(self._parent.source7.subscribe(observer7))
-
-        return Disposables.create([
-           subscription1,
-           subscription2,
-           subscription3,
-           subscription4,
-           subscription5,
-           subscription6,
-           subscription7
-        ])
-    }
-
-    override func getResult() throws -> Result {
-        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!, self._values6.dequeue()!, self._values7.dequeue()!)
-    }
-}
-
-final class Zip7 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7) throws -> Result
-
-    let source1: Observable
-    let source2: Observable
-    let source3: Observable
-    let source4: Observable
-    let source5: Observable
-    let source6: Observable
-    let source7: Observable
-
-    let _resultSelector: ResultSelector
-
-    init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, source6: Observable, source7: Observable, resultSelector: @escaping ResultSelector) {
-        self.source1 = source1
-        self.source2 = source2
-        self.source3 = source3
-        self.source4 = source4
-        self.source5 = source5
-        self.source6 = source6
-        self.source7 = source7
-
-        self._resultSelector = resultSelector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipSink7_(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-
-
-// 8
-
-extension ObservableType {
-    /**
-    Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-    - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element, O8.Element) throws -> Element)
-        -> Observable {
-        return Zip8(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(), source8: source8.asObservable(),
-            resultSelector: resultSelector
-        )
-    }
-}
-
-extension ObservableType where Element == Any {
-    /**
-    Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - returns: An observable sequence containing the result of combining elements of the sources.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8)
-        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element, O8.Element)> {
-        return Zip8(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(), source8: source8.asObservable(),
-            resultSelector: { ($0, $1, $2, $3, $4, $5, $6, $7) }
-        )
-    }
-}
-
-final class ZipSink8_ : ZipSink {
-    typealias Result = Observer.Element 
-    typealias Parent = Zip8
-
-    let _parent: Parent
-
-    var _values1: Queue = Queue(capacity: 2)
-    var _values2: Queue = Queue(capacity: 2)
-    var _values3: Queue = Queue(capacity: 2)
-    var _values4: Queue = Queue(capacity: 2)
-    var _values5: Queue = Queue(capacity: 2)
-    var _values6: Queue = Queue(capacity: 2)
-    var _values7: Queue = Queue(capacity: 2)
-    var _values8: Queue = Queue(capacity: 2)
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(arity: 8, observer: observer, cancel: cancel)
-    }
-
-    override func hasElements(_ index: Int) -> Bool {
-        switch index {
-        case 0: return !self._values1.isEmpty
-        case 1: return !self._values2.isEmpty
-        case 2: return !self._values3.isEmpty
-        case 3: return !self._values4.isEmpty
-        case 4: return !self._values5.isEmpty
-        case 5: return !self._values6.isEmpty
-        case 6: return !self._values7.isEmpty
-        case 7: return !self._values8.isEmpty
-
-        default:
-            rxFatalError("Unhandled case (Function)")
-        }
-    }
-
-    func run() -> Disposable {
-        let subscription1 = SingleAssignmentDisposable()
-        let subscription2 = SingleAssignmentDisposable()
-        let subscription3 = SingleAssignmentDisposable()
-        let subscription4 = SingleAssignmentDisposable()
-        let subscription5 = SingleAssignmentDisposable()
-        let subscription6 = SingleAssignmentDisposable()
-        let subscription7 = SingleAssignmentDisposable()
-        let subscription8 = SingleAssignmentDisposable()
-
-        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
-        let observer6 = ZipObserver(lock: self._lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
-        let observer7 = ZipObserver(lock: self._lock, parent: self, index: 6, setNextValue: { self._values7.enqueue($0) }, this: subscription7)
-        let observer8 = ZipObserver(lock: self._lock, parent: self, index: 7, setNextValue: { self._values8.enqueue($0) }, this: subscription8)
-
-        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
-        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
-        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
-        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
-        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
-        subscription6.setDisposable(self._parent.source6.subscribe(observer6))
-        subscription7.setDisposable(self._parent.source7.subscribe(observer7))
-        subscription8.setDisposable(self._parent.source8.subscribe(observer8))
-
-        return Disposables.create([
-           subscription1,
-           subscription2,
-           subscription3,
-           subscription4,
-           subscription5,
-           subscription6,
-           subscription7,
-           subscription8
-        ])
-    }
-
-    override func getResult() throws -> Result {
-        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!, self._values6.dequeue()!, self._values7.dequeue()!, self._values8.dequeue()!)
-    }
-}
-
-final class Zip8 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7, E8) throws -> Result
-
-    let source1: Observable
-    let source2: Observable
-    let source3: Observable
-    let source4: Observable
-    let source5: Observable
-    let source6: Observable
-    let source7: Observable
-    let source8: Observable
-
-    let _resultSelector: ResultSelector
-
-    init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, source6: Observable, source7: Observable, source8: Observable, resultSelector: @escaping ResultSelector) {
-        self.source1 = source1
-        self.source2 = source2
-        self.source3 = source3
-        self.source4 = source4
-        self.source5 = source5
-        self.source6 = source6
-        self.source7 = source7
-        self.source8 = source8
-
-        self._resultSelector = resultSelector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipSink8_(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Zip.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Zip.swift
deleted file mode 100644
index 911eb57..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Zip.swift
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-//  Zip.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 5/23/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-protocol ZipSinkProtocol : class
-{
-    func next(_ index: Int)
-    func fail(_ error: Swift.Error)
-    func done(_ index: Int)
-}
-
-class ZipSink : Sink, ZipSinkProtocol {
-    typealias Element = Observer.Element
-    
-    let _arity: Int
-
-    let _lock = RecursiveLock()
-
-    // state
-    private var _isDone: [Bool]
-    
-    init(arity: Int, observer: Observer, cancel: Cancelable) {
-        self._isDone = [Bool](repeating: false, count: arity)
-        self._arity = arity
-        
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    func getResult() throws -> Element {
-        rxAbstractMethod()
-    }
-    
-    func hasElements(_ index: Int) -> Bool {
-        rxAbstractMethod()
-    }
-    
-    func next(_ index: Int) {
-        var hasValueAll = true
-        
-        for i in 0 ..< self._arity {
-            if !self.hasElements(i) {
-                hasValueAll = false
-                break
-            }
-        }
-        
-        if hasValueAll {
-            do {
-                let result = try self.getResult()
-                self.forwardOn(.next(result))
-            }
-            catch let e {
-                self.forwardOn(.error(e))
-                self.dispose()
-            }
-        }
-    }
-    
-    func fail(_ error: Swift.Error) {
-        self.forwardOn(.error(error))
-        self.dispose()
-    }
-    
-    func done(_ index: Int) {
-        self._isDone[index] = true
-        
-        var allDone = true
-        
-        for done in self._isDone where !done {
-            allDone = false
-            break
-        }
-        
-        if allDone {
-            self.forwardOn(.completed)
-            self.dispose()
-        }
-    }
-}
-
-final class ZipObserver
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias ValueSetter = (Element) -> Void
-
-    private var _parent: ZipSinkProtocol?
-    
-    let _lock: RecursiveLock
-    
-    // state
-    private let _index: Int
-    private let _this: Disposable
-    private let _setNextValue: ValueSetter
-    
-    init(lock: RecursiveLock, parent: ZipSinkProtocol, index: Int, setNextValue: @escaping ValueSetter, this: Disposable) {
-        self._lock = lock
-        self._parent = parent
-        self._index = index
-        self._this = this
-        self._setNextValue = setNextValue
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        if self._parent != nil {
-            switch event {
-            case .next:
-                break
-            case .error:
-                self._this.dispose()
-            case .completed:
-                self._this.dispose()
-            }
-        }
-        
-        if let parent = self._parent {
-            switch event {
-            case .next(let value):
-                self._setNextValue(value)
-                parent.next(self._index)
-            case .error(let error):
-                parent.fail(error)
-            case .completed:
-                parent.done(self._index)
-            }
-        }
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/ObserverType.swift b/Demo/Pods/RxSwift/RxSwift/ObserverType.swift
deleted file mode 100644
index e3db94a..0000000
--- a/Demo/Pods/RxSwift/RxSwift/ObserverType.swift
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-//  ObserverType.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/8/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-/// Supports push-style iteration over an observable sequence.
-public protocol ObserverType {
-    /// The type of elements in sequence that observer can observe.
-    associatedtype Element
-
-    @available(*, deprecated, message: "Use `Element` instead.")
-    typealias E = Element
-
-    /// Notify observer about sequence event.
-    ///
-    /// - parameter event: Event that occurred.
-    func on(_ event: Event)
-}
-
-/// Convenience API extensions to provide alternate next, error, completed events
-extension ObserverType {
-    
-    /// Convenience method equivalent to `on(.next(element: Element))`
-    ///
-    /// - parameter element: Next element to send to observer(s)
-    public func onNext(_ element: Element) {
-        self.on(.next(element))
-    }
-    
-    /// Convenience method equivalent to `on(.completed)`
-    public func onCompleted() {
-        self.on(.completed)
-    }
-    
-    /// Convenience method equivalent to `on(.error(Swift.Error))`
-    /// - parameter error: Swift.Error to send to observer(s)
-    public func onError(_ error: Swift.Error) {
-        self.on(.error(error))
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift b/Demo/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift
deleted file mode 100644
index 804e289..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-//  AnonymousObserver.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/8/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-final class AnonymousObserver: ObserverBase {
-    typealias EventHandler = (Event) -> Void
-    
-    private let _eventHandler : EventHandler
-    
-    init(_ eventHandler: @escaping EventHandler) {
-#if TRACE_RESOURCES
-        _ = Resources.incrementTotal()
-#endif
-        self._eventHandler = eventHandler
-    }
-
-    override func onCore(_ event: Event) {
-        return self._eventHandler(event)
-    }
-    
-#if TRACE_RESOURCES
-    deinit {
-        _ = Resources.decrementTotal()
-    }
-#endif
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observers/ObserverBase.swift b/Demo/Pods/RxSwift/RxSwift/Observers/ObserverBase.swift
deleted file mode 100644
index 57be8e2..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observers/ObserverBase.swift
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-//  ObserverBase.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/15/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-class ObserverBase : Disposable, ObserverType {
-    private let _isStopped = AtomicInt(0)
-
-    func on(_ event: Event) {
-        switch event {
-        case .next:
-            if load(self._isStopped) == 0 {
-                self.onCore(event)
-            }
-        case .error, .completed:
-            if fetchOr(self._isStopped, 1) == 0 {
-                self.onCore(event)
-            }
-        }
-    }
-
-    func onCore(_ event: Event) {
-        rxAbstractMethod()
-    }
-
-    func dispose() {
-        fetchOr(self._isStopped, 1)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift b/Demo/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift
deleted file mode 100644
index 41363a9..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-//  TailRecursiveSink.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 3/21/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-enum TailRecursiveSinkCommand {
-    case moveNext
-    case dispose
-}
-
-#if DEBUG || TRACE_RESOURCES
-    public var maxTailRecursiveSinkStackSize = 0
-#endif
-
-/// This class is usually used with `Generator` version of the operators.
-class TailRecursiveSink
-    : Sink
-    , InvocableWithValueType where Sequence.Element: ObservableConvertibleType, Sequence.Element.Element == Observer.Element {
-    typealias Value = TailRecursiveSinkCommand
-    typealias Element = Observer.Element 
-    typealias SequenceGenerator = (generator: Sequence.Iterator, remaining: IntMax?)
-
-    var _generators: [SequenceGenerator] = []
-    var _isDisposed = false
-    var _subscription = SerialDisposable()
-
-    // this is thread safe object
-    var _gate = AsyncLock>>()
-
-    override init(observer: Observer, cancel: Cancelable) {
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    func run(_ sources: SequenceGenerator) -> Disposable {
-        self._generators.append(sources)
-
-        self.schedule(.moveNext)
-
-        return self._subscription
-    }
-
-    func invoke(_ command: TailRecursiveSinkCommand) {
-        switch command {
-        case .dispose:
-            self.disposeCommand()
-        case .moveNext:
-            self.moveNextCommand()
-        }
-    }
-
-    // simple implementation for now
-    func schedule(_ command: TailRecursiveSinkCommand) {
-        self._gate.invoke(InvocableScheduledItem(invocable: self, state: command))
-    }
-
-    func done() {
-        self.forwardOn(.completed)
-        self.dispose()
-    }
-
-    func extract(_ observable: Observable) -> SequenceGenerator? {
-        rxAbstractMethod()
-    }
-
-    // should be done on gate locked
-
-    private func moveNextCommand() {
-        var next: Observable?
-
-        repeat {
-            guard let (g, left) = self._generators.last else {
-                break
-            }
-            
-            if self._isDisposed {
-                return
-            }
-
-            self._generators.removeLast()
-            
-            var e = g
-
-            guard let nextCandidate = e.next()?.asObservable() else {
-                continue
-            }
-
-            // `left` is a hint of how many elements are left in generator.
-            // In case this is the last element, then there is no need to push
-            // that generator on stack.
-            //
-            // This is an optimization used to make sure in tail recursive case
-            // there is no memory leak in case this operator is used to generate non terminating
-            // sequence.
-
-            if let knownOriginalLeft = left {
-                // `- 1` because generator.next() has just been called
-                if knownOriginalLeft - 1 >= 1 {
-                    self._generators.append((e, knownOriginalLeft - 1))
-                }
-            }
-            else {
-                self._generators.append((e, nil))
-            }
-
-            let nextGenerator = self.extract(nextCandidate)
-
-            if let nextGenerator = nextGenerator {
-                self._generators.append(nextGenerator)
-                #if DEBUG || TRACE_RESOURCES
-                    if maxTailRecursiveSinkStackSize < self._generators.count {
-                        maxTailRecursiveSinkStackSize = self._generators.count
-                    }
-                #endif
-            }
-            else {
-                next = nextCandidate
-            }
-        } while next == nil
-
-        guard let existingNext = next else {
-            self.done()
-            return
-        }
-
-        let disposable = SingleAssignmentDisposable()
-        self._subscription.disposable = disposable
-        disposable.setDisposable(self.subscribeToNext(existingNext))
-    }
-
-    func subscribeToNext(_ source: Observable) -> Disposable {
-        rxAbstractMethod()
-    }
-
-    func disposeCommand() {
-        self._isDisposed = true
-        self._generators.removeAll(keepingCapacity: false)
-    }
-
-    override func dispose() {
-        super.dispose()
-        
-        self._subscription.dispose()
-        self._gate.dispose()
-        
-        self.schedule(.dispose)
-    }
-}
-
diff --git a/Demo/Pods/RxSwift/RxSwift/Reactive.swift b/Demo/Pods/RxSwift/RxSwift/Reactive.swift
deleted file mode 100644
index 8fdfa18..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Reactive.swift
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-//  Reactive.swift
-//  RxSwift
-//
-//  Created by Yury Korolev on 5/2/16.
-//  Copyright © 2016 Krunoslav Zaher. All rights reserved.
-//
-
-/**
- Use `Reactive` proxy as customization point for constrained protocol extensions.
-
- General pattern would be:
-
- // 1. Extend Reactive protocol with constrain on Base
- // Read as: Reactive Extension where Base is a SomeType
- extension Reactive where Base: SomeType {
- // 2. Put any specific reactive extension for SomeType here
- }
-
- With this approach we can have more specialized methods and properties using
- `Base` and not just specialized on common base type.
-
- */
-
-public struct Reactive {
-    /// Base object to extend.
-    public let base: Base
-
-    /// Creates extensions with base object.
-    ///
-    /// - parameter base: Base object.
-    public init(_ base: Base) {
-        self.base = base
-    }
-}
-
-/// A type that has reactive extensions.
-public protocol ReactiveCompatible {
-    /// Extended type
-    associatedtype ReactiveBase
-
-    @available(*, deprecated, message: "Use `ReactiveBase` instead.")
-    typealias CompatibleType = ReactiveBase
-
-    /// Reactive extensions.
-    static var rx: Reactive.Type { get set }
-
-    /// Reactive extensions.
-    var rx: Reactive { get set }
-}
-
-extension ReactiveCompatible {
-    /// Reactive extensions.
-    public static var rx: Reactive.Type {
-        get {
-            return Reactive.self
-        }
-        set {
-            // this enables using Reactive to "mutate" base type
-        }
-    }
-
-    /// Reactive extensions.
-    public var rx: Reactive {
-        get {
-            return Reactive(self)
-        }
-        set {
-            // this enables using Reactive to "mutate" base object
-        }
-    }
-}
-
-import class Foundation.NSObject
-
-/// Extend NSObject with `rx` proxy.
-extension NSObject: ReactiveCompatible { }
diff --git a/Demo/Pods/RxSwift/RxSwift/Rx.swift b/Demo/Pods/RxSwift/RxSwift/Rx.swift
deleted file mode 100644
index a547a8f..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Rx.swift
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-//  Rx.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/14/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-#if TRACE_RESOURCES
-    fileprivate let resourceCount = AtomicInt(0)
-
-    /// Resource utilization information
-    public struct Resources {
-        /// Counts internal Rx resource allocations (Observables, Observers, Disposables, etc.). This provides a simple way to detect leaks during development.
-        public static var total: Int32 {
-            return load(resourceCount)
-        }
-
-        /// Increments `Resources.total` resource count.
-        ///
-        /// - returns: New resource count
-        public static func incrementTotal() -> Int32 {
-            return increment(resourceCount)
-        }
-
-        /// Decrements `Resources.total` resource count
-        ///
-        /// - returns: New resource count
-        public static func decrementTotal() -> Int32 {
-            return decrement(resourceCount)
-        }
-    }
-#endif
-
-/// Swift does not implement abstract methods. This method is used as a runtime check to ensure that methods which intended to be abstract (i.e., they should be implemented in subclasses) are not called directly on the superclass.
-func rxAbstractMethod(file: StaticString = #file, line: UInt = #line) -> Swift.Never {
-    rxFatalError("Abstract method", file: file, line: line)
-}
-
-func rxFatalError(_ lastMessage: @autoclosure () -> String, file: StaticString = #file, line: UInt = #line) -> Swift.Never  {
-    fatalError(lastMessage(), file: file, line: line)
-}
-
-func rxFatalErrorInDebug(_ lastMessage: @autoclosure () -> String, file: StaticString = #file, line: UInt = #line) {
-    #if DEBUG
-        fatalError(lastMessage(), file: file, line: line)
-    #else
-        print("\(file):\(line): \(lastMessage())")
-    #endif
-}
-
-func incrementChecked(_ i: inout Int) throws -> Int {
-    if i == Int.max {
-        throw RxError.overflow
-    }
-    defer { i += 1 }
-    return i
-}
-
-func decrementChecked(_ i: inout Int) throws -> Int {
-    if i == Int.min {
-        throw RxError.overflow
-    }
-    defer { i -= 1 }
-    return i
-}
-
-#if DEBUG
-    import class Foundation.Thread
-    final class SynchronizationTracker {
-        private let _lock = RecursiveLock()
-
-        public enum SynchronizationErrorMessages: String {
-            case variable = "Two different threads are trying to assign the same `Variable.value` unsynchronized.\n    This is undefined behavior because the end result (variable value) is nondeterministic and depends on the \n    operating system thread scheduler. This will cause random behavior of your program.\n"
-            case `default` = "Two different unsynchronized threads are trying to send some event simultaneously.\n    This is undefined behavior because the ordering of the effects caused by these events is nondeterministic and depends on the \n    operating system thread scheduler. This will result in a random behavior of your program.\n"
-        }
-
-        private var _threads = [UnsafeMutableRawPointer: Int]()
-
-        private func synchronizationError(_ message: String) {
-            #if FATAL_SYNCHRONIZATION
-                rxFatalError(message)
-            #else
-                print(message)
-            #endif
-        }
-        
-        func register(synchronizationErrorMessage: SynchronizationErrorMessages) {
-            self._lock.lock(); defer { self._lock.unlock() }
-            let pointer = Unmanaged.passUnretained(Thread.current).toOpaque()
-            let count = (self._threads[pointer] ?? 0) + 1
-
-            if count > 1 {
-                self.synchronizationError(
-                    "⚠️ Reentrancy anomaly was detected.\n" +
-                    "  > Debugging: To debug this issue you can set a breakpoint in \(#file):\(#line) and observe the call stack.\n" +
-                    "  > Problem: This behavior is breaking the observable sequence grammar. `next (error | completed)?`\n" +
-                    "    This behavior breaks the grammar because there is overlapping between sequence events.\n" +
-                    "    Observable sequence is trying to send an event before sending of previous event has finished.\n" +
-                    "  > Interpretation: This could mean that there is some kind of unexpected cyclic dependency in your code,\n" +
-                    "    or that the system is not behaving in the expected way.\n" +
-                    "  > Remedy: If this is the expected behavior this message can be suppressed by adding `.observeOn(MainScheduler.asyncInstance)`\n" +
-                    "    or by enqueuing sequence events in some other way.\n"
-                )
-            }
-            
-            self._threads[pointer] = count
-
-            if self._threads.count > 1 {
-                self.synchronizationError(
-                    "⚠️ Synchronization anomaly was detected.\n" +
-                    "  > Debugging: To debug this issue you can set a breakpoint in \(#file):\(#line) and observe the call stack.\n" +
-                    "  > Problem: This behavior is breaking the observable sequence grammar. `next (error | completed)?`\n" +
-                    "    This behavior breaks the grammar because there is overlapping between sequence events.\n" +
-                    "    Observable sequence is trying to send an event before sending of previous event has finished.\n" +
-                    "  > Interpretation: " + synchronizationErrorMessage.rawValue +
-                    "  > Remedy: If this is the expected behavior this message can be suppressed by adding `.observeOn(MainScheduler.asyncInstance)`\n" +
-                    "    or by synchronizing sequence events in some other way.\n"
-                )
-            }
-        }
-
-        func unregister() {
-            self._lock.lock(); defer { self._lock.unlock() }
-            let pointer = Unmanaged.passUnretained(Thread.current).toOpaque()
-            self._threads[pointer] = (self._threads[pointer] ?? 1) - 1
-            if self._threads[pointer] == 0 {
-                self._threads[pointer] = nil
-            }
-        }
-    }
-
-#endif
-
-/// RxSwift global hooks
-public enum Hooks {
-    
-    // Should capture call stack
-    public static var recordCallStackOnError: Bool = false
-
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift b/Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift
deleted file mode 100644
index fd6fc98..0000000
--- a/Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-//  RxMutableBox.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 5/22/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-#if os(Linux)
-/// As Swift 5 was released, A patch to `Thread` for Linux
-/// changed `threadDictionary` to a `NSMutableDictionary` instead of
-/// a `Dictionary`: https://github.com/apple/swift-corelibs-foundation/pull/1762/files
-///
-/// This means that on Linux specifically, `RxMutableBox` must be a `NSObject`
-/// or it won't be possible to store it in `Thread.threadDictionary`.
-///
-/// For more information, read the discussion at:
-/// https://github.com/ReactiveX/RxSwift/issues/1911#issuecomment-479723298
-import class Foundation.NSObject
-
-/// Creates mutable reference wrapper for any type.
-final class RxMutableBox: NSObject {
-    /// Wrapped value
-    var value: T
-
-    /// Creates reference wrapper for `value`.
-    ///
-    /// - parameter value: Value to wrap.
-    init (_ value: T) {
-        self.value = value
-    }
-}
-#else
-/// Creates mutable reference wrapper for any type.
-final class RxMutableBox: CustomDebugStringConvertible {
-    /// Wrapped value
-    var value: T
-    
-    /// Creates reference wrapper for `value`.
-    ///
-    /// - parameter value: Value to wrap.
-    init (_ value: T) {
-        self.value = value
-    }
-}
-
-extension RxMutableBox {
-    /// - returns: Box description.
-    var debugDescription: String {
-        return "MutatingBox(\(self.value))"
-    }
-}
-#endif
diff --git a/Demo/Pods/RxSwift/RxSwift/SchedulerType.swift b/Demo/Pods/RxSwift/RxSwift/SchedulerType.swift
deleted file mode 100644
index 96664b4..0000000
--- a/Demo/Pods/RxSwift/RxSwift/SchedulerType.swift
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-//  SchedulerType.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/8/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import enum Dispatch.DispatchTimeInterval
-import struct Foundation.Date
-
-// Type that represents time interval in the context of RxSwift.
-public typealias RxTimeInterval = DispatchTimeInterval
-
-/// Type that represents absolute time in the context of RxSwift.
-public typealias RxTime = Date
-
-/// Represents an object that schedules units of work.
-public protocol SchedulerType: ImmediateSchedulerType {
-
-    /// - returns: Current time.
-    var now : RxTime {
-        get
-    }
-
-    /**
-    Schedules an action to be executed.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter dueTime: Relative time after which to execute the action.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable
- 
-    /**
-    Schedules a periodic piece of work.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter startAfter: Period after which initial work should be run.
-    - parameter period: Period for running the work periodically.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable
-}
-
-extension SchedulerType {
-
-    /**
-    Periodic task will be emulated using recursive scheduling.
-
-    - parameter state: Initial state passed to the action upon the first iteration.
-    - parameter startAfter: Period after which initial work should be run.
-    - parameter period: Period for running the work periodically.
-    - returns: The disposable object used to cancel the scheduled recurring action (best effort).
-    */
-    public func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
-        let schedule = SchedulePeriodicRecursive(scheduler: self, startAfter: startAfter, period: period, action: action, state: state)
-            
-        return schedule.start()
-    }
-
-    func scheduleRecursive(_ state: State, dueTime: RxTimeInterval, action: @escaping (State, AnyRecursiveScheduler) -> Void) -> Disposable {
-        let scheduler = AnyRecursiveScheduler(scheduler: self, action: action)
-         
-        scheduler.schedule(state, dueTime: dueTime)
-            
-        return Disposables.create(with: scheduler.dispose)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
deleted file mode 100644
index ac51324..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-//  ConcurrentDispatchQueueScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 7/5/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import struct Foundation.Date
-import struct Foundation.TimeInterval
-import Dispatch
-
-/// Abstracts the work that needs to be performed on a specific `dispatch_queue_t`. You can also pass a serial dispatch queue, it shouldn't cause any problems.
-///
-/// This scheduler is suitable when some work needs to be performed in background.
-public class ConcurrentDispatchQueueScheduler: SchedulerType {
-    public typealias TimeInterval = Foundation.TimeInterval
-    public typealias Time = Date
-    
-    public var now : Date {
-        return Date()
-    }
-
-    let configuration: DispatchQueueConfiguration
-    
-    /// Constructs new `ConcurrentDispatchQueueScheduler` that wraps `queue`.
-    ///
-    /// - parameter queue: Target dispatch queue.
-    /// - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
-    public init(queue: DispatchQueue, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        self.configuration = DispatchQueueConfiguration(queue: queue, leeway: leeway)
-    }
-    
-    /// Convenience init for scheduler that wraps one of the global concurrent dispatch queues.
-    ///
-    /// - parameter qos: Target global dispatch queue, by quality of service class.
-    /// - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
-    @available(iOS 8, OSX 10.10, *)
-    public convenience init(qos: DispatchQoS, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        self.init(queue: DispatchQueue(
-            label: "rxswift.queue.\(qos)",
-            qos: qos,
-            attributes: [DispatchQueue.Attributes.concurrent],
-            target: nil),
-            leeway: leeway
-        )
-    }
-
-    /**
-    Schedules an action to be executed immediately.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public final func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self.configuration.schedule(state, action: action)
-    }
-    
-    /**
-    Schedules an action to be executed.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter dueTime: Relative time after which to execute the action.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public final func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self.configuration.scheduleRelative(state, dueTime: dueTime, action: action)
-    }
-    
-    /**
-    Schedules a periodic piece of work.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter startAfter: Period after which initial work should be run.
-    - parameter period: Period for running the work periodically.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
-        return self.configuration.schedulePeriodic(state, startAfter: startAfter, period: period, action: action)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
deleted file mode 100644
index f535a22..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-//  ConcurrentMainScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 10/17/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import struct Foundation.Date
-import struct Foundation.TimeInterval
-import Dispatch
-
-/**
-Abstracts work that needs to be performed on `MainThread`. In case `schedule` methods are called from main thread, it will perform action immediately without scheduling.
-
-This scheduler is optimized for `subscribeOn` operator. If you want to observe observable sequence elements on main thread using `observeOn` operator,
-`MainScheduler` is more suitable for that purpose.
-*/
-public final class ConcurrentMainScheduler : SchedulerType {
-    public typealias TimeInterval = Foundation.TimeInterval
-    public typealias Time = Date
-
-    private let _mainScheduler: MainScheduler
-    private let _mainQueue: DispatchQueue
-
-    /// - returns: Current time.
-    public var now: Date {
-        return self._mainScheduler.now as Date
-    }
-
-    private init(mainScheduler: MainScheduler) {
-        self._mainQueue = DispatchQueue.main
-        self._mainScheduler = mainScheduler
-    }
-
-    /// Singleton instance of `ConcurrentMainScheduler`
-    public static let instance = ConcurrentMainScheduler(mainScheduler: MainScheduler.instance)
-
-    /**
-    Schedules an action to be executed immediately.
-
-    - parameter state: State passed to the action to be executed.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        if DispatchQueue.isMain {
-            return action(state)
-        }
-
-        let cancel = SingleAssignmentDisposable()
-
-        self._mainQueue.async {
-            if cancel.isDisposed {
-                return
-            }
-
-            cancel.setDisposable(action(state))
-        }
-
-        return cancel
-    }
-
-    /**
-    Schedules an action to be executed.
-
-    - parameter state: State passed to the action to be executed.
-    - parameter dueTime: Relative time after which to execute the action.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public final func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self._mainScheduler.scheduleRelative(state, dueTime: dueTime, action: action)
-    }
-
-    /**
-    Schedules a periodic piece of work.
-
-    - parameter state: State passed to the action to be executed.
-    - parameter startAfter: Period after which initial work should be run.
-    - parameter period: Period for running the work periodically.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
-        return self._mainScheduler.schedulePeriodic(state, startAfter: startAfter, period: period, action: action)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift
deleted file mode 100644
index 8f9939a..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-//  CurrentThreadScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 8/30/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import class Foundation.NSObject
-import protocol Foundation.NSCopying
-import class Foundation.Thread
-import Dispatch
-
-#if os(Linux)
-    import struct Foundation.pthread_key_t
-    import func Foundation.pthread_setspecific
-    import func Foundation.pthread_getspecific
-    import func Foundation.pthread_key_create
-    
-    fileprivate enum CurrentThreadSchedulerQueueKey {
-        fileprivate static let instance = "RxSwift.CurrentThreadScheduler.Queue"
-    }
-#else
-    private class CurrentThreadSchedulerQueueKey: NSObject, NSCopying {
-        static let instance = CurrentThreadSchedulerQueueKey()
-        private override init() {
-            super.init()
-        }
-
-        override var hash: Int {
-            return 0
-        }
-
-        public func copy(with zone: NSZone? = nil) -> Any {
-            return self
-        }
-    }
-#endif
-
-/// Represents an object that schedules units of work on the current thread.
-///
-/// This is the default scheduler for operators that generate elements.
-///
-/// This scheduler is also sometimes called `trampoline scheduler`.
-public class CurrentThreadScheduler : ImmediateSchedulerType {
-    typealias ScheduleQueue = RxMutableBox>
-
-    /// The singleton instance of the current thread scheduler.
-    public static let instance = CurrentThreadScheduler()
-
-    private static var isScheduleRequiredKey: pthread_key_t = { () -> pthread_key_t in
-        let key = UnsafeMutablePointer.allocate(capacity: 1)
-        defer { key.deallocate() }
-                                                               
-        guard pthread_key_create(key, nil) == 0 else {
-            rxFatalError("isScheduleRequired key creation failed")
-        }
-
-        return key.pointee
-    }()
-
-    private static var scheduleInProgressSentinel: UnsafeRawPointer = { () -> UnsafeRawPointer in
-        return UnsafeRawPointer(UnsafeMutablePointer.allocate(capacity: 1))
-    }()
-
-    static var queue : ScheduleQueue? {
-        get {
-            return Thread.getThreadLocalStorageValueForKey(CurrentThreadSchedulerQueueKey.instance)
-        }
-        set {
-            Thread.setThreadLocalStorageValue(newValue, forKey: CurrentThreadSchedulerQueueKey.instance)
-        }
-    }
-
-    /// Gets a value that indicates whether the caller must call a `schedule` method.
-    public static fileprivate(set) var isScheduleRequired: Bool {
-        get {
-            return pthread_getspecific(CurrentThreadScheduler.isScheduleRequiredKey) == nil
-        }
-        set(isScheduleRequired) {
-            if pthread_setspecific(CurrentThreadScheduler.isScheduleRequiredKey, isScheduleRequired ? nil : scheduleInProgressSentinel) != 0 {
-                rxFatalError("pthread_setspecific failed")
-            }
-        }
-    }
-
-    /**
-    Schedules an action to be executed as soon as possible on current thread.
-
-    If this method is called on some thread that doesn't have `CurrentThreadScheduler` installed, scheduler will be
-    automatically installed and uninstalled after all work is performed.
-
-    - parameter state: State passed to the action to be executed.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        if CurrentThreadScheduler.isScheduleRequired {
-            CurrentThreadScheduler.isScheduleRequired = false
-
-            let disposable = action(state)
-
-            defer {
-                CurrentThreadScheduler.isScheduleRequired = true
-                CurrentThreadScheduler.queue = nil
-            }
-
-            guard let queue = CurrentThreadScheduler.queue else {
-                return disposable
-            }
-
-            while let latest = queue.value.dequeue() {
-                if latest.isDisposed {
-                    continue
-                }
-                latest.invoke()
-            }
-
-            return disposable
-        }
-
-        let existingQueue = CurrentThreadScheduler.queue
-
-        let queue: RxMutableBox>
-        if let existingQueue = existingQueue {
-            queue = existingQueue
-        }
-        else {
-            queue = RxMutableBox(Queue(capacity: 1))
-            CurrentThreadScheduler.queue = queue
-        }
-
-        let scheduledItem = ScheduledItem(action: action, state: state)
-        queue.value.enqueue(scheduledItem)
-
-        return scheduledItem
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalScheduler.swift
deleted file mode 100644
index 11af238..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalScheduler.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  HistoricalScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 12/27/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import struct Foundation.Date
-
-/// Provides a virtual time scheduler that uses `Date` for absolute time and `NSTimeInterval` for relative time.
-public class HistoricalScheduler : VirtualTimeScheduler {
-
-    /**
-      Creates a new historical scheduler with initial clock value.
-     
-     - parameter initialClock: Initial value for virtual clock.
-    */
-    public init(initialClock: RxTime = Date(timeIntervalSince1970: 0)) {
-        super.init(initialClock: initialClock, converter: HistoricalSchedulerTimeConverter())
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift
deleted file mode 100644
index 12eeb5c..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-//  HistoricalSchedulerTimeConverter.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 12/27/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import Foundation
-
-/// Converts historical virtual time into real time.
-///
-/// Since historical virtual time is also measured in `Date`, this converter is identity function.
-public struct HistoricalSchedulerTimeConverter : VirtualTimeConverterType {
-    /// Virtual time unit used that represents ticks of virtual clock.
-    public typealias VirtualTimeUnit = RxTime
-
-    /// Virtual time unit used to represent differences of virtual times.
-    public typealias VirtualTimeIntervalUnit = TimeInterval
-
-    /// Returns identical value of argument passed because historical virtual time is equal to real time, just
-    /// decoupled from local machine clock.
-    public func convertFromVirtualTime(_ virtualTime: VirtualTimeUnit) -> RxTime {
-        return virtualTime
-    }
-
-    /// Returns identical value of argument passed because historical virtual time is equal to real time, just
-    /// decoupled from local machine clock.
-    public func convertToVirtualTime(_ time: RxTime) -> VirtualTimeUnit {
-        return time
-    }
-
-    /// Returns identical value of argument passed because historical virtual time is equal to real time, just
-    /// decoupled from local machine clock.
-    public func convertFromVirtualTimeInterval(_ virtualTimeInterval: VirtualTimeIntervalUnit) -> TimeInterval {
-        return virtualTimeInterval
-    }
-
-    /// Returns identical value of argument passed because historical virtual time is equal to real time, just
-    /// decoupled from local machine clock.
-    public func convertToVirtualTimeInterval(_ timeInterval: TimeInterval) -> VirtualTimeIntervalUnit {
-        return timeInterval
-    }
-
-    /**
-     Offsets `Date` by time interval.
-     
-     - parameter time: Time.
-     - parameter timeInterval: Time interval offset.
-     - returns: Time offsetted by time interval.
-    */
-    public func offsetVirtualTime(_ time: VirtualTimeUnit, offset: VirtualTimeIntervalUnit) -> VirtualTimeUnit {
-        return time.addingTimeInterval(offset)
-    }
-
-    /// Compares two `Date`s.
-    public func compareVirtualTime(_ lhs: VirtualTimeUnit, _ rhs: VirtualTimeUnit) -> VirtualTimeComparison {
-        switch lhs.compare(rhs as Date) {
-        case .orderedAscending:
-            return .lessThan
-        case .orderedSame:
-            return .equal
-        case .orderedDescending:
-            return .greaterThan
-        }
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
deleted file mode 100644
index bac5e9a..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-//  DispatchQueueConfiguration.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 7/23/16.
-//  Copyright © 2016 Krunoslav Zaher. All rights reserved.
-//
-
-import Dispatch
-import struct Foundation.TimeInterval
-
-struct DispatchQueueConfiguration {
-    let queue: DispatchQueue
-    let leeway: DispatchTimeInterval
-}
-
-extension DispatchQueueConfiguration {
-    func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let cancel = SingleAssignmentDisposable()
-
-        self.queue.async {
-            if cancel.isDisposed {
-                return
-            }
-
-
-            cancel.setDisposable(action(state))
-        }
-
-        return cancel
-    }
-
-    func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let deadline = DispatchTime.now() + dueTime
-
-        let compositeDisposable = CompositeDisposable()
-
-        let timer = DispatchSource.makeTimerSource(queue: self.queue)
-        timer.schedule(deadline: deadline, leeway: self.leeway)
-
-        // TODO:
-        // This looks horrible, and yes, it is.
-        // It looks like Apple has made a conceputal change here, and I'm unsure why.
-        // Need more info on this.
-        // It looks like just setting timer to fire and not holding a reference to it
-        // until deadline causes timer cancellation.
-        var timerReference: DispatchSourceTimer? = timer
-        let cancelTimer = Disposables.create {
-            timerReference?.cancel()
-            timerReference = nil
-        }
-
-        timer.setEventHandler(handler: {
-            if compositeDisposable.isDisposed {
-                return
-            }
-            _ = compositeDisposable.insert(action(state))
-            cancelTimer.dispose()
-        })
-        timer.resume()
-
-        _ = compositeDisposable.insert(cancelTimer)
-
-        return compositeDisposable
-    }
-
-    func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
-        let initial = DispatchTime.now() + startAfter
-
-        var timerState = state
-
-        let timer = DispatchSource.makeTimerSource(queue: self.queue)
-        timer.schedule(deadline: initial, repeating: period, leeway: self.leeway)
-        
-        // TODO:
-        // This looks horrible, and yes, it is.
-        // It looks like Apple has made a conceputal change here, and I'm unsure why.
-        // Need more info on this.
-        // It looks like just setting timer to fire and not holding a reference to it
-        // until deadline causes timer cancellation.
-        var timerReference: DispatchSourceTimer? = timer
-        let cancelTimer = Disposables.create {
-            timerReference?.cancel()
-            timerReference = nil
-        }
-
-        timer.setEventHandler(handler: {
-            if cancelTimer.isDisposed {
-                return
-            }
-            timerState = action(timerState)
-        })
-        timer.resume()
-        
-        return cancelTimer
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift
deleted file mode 100644
index f31469e..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  InvocableScheduledItem.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 11/7/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-struct InvocableScheduledItem : InvocableType {
-
-    let _invocable: I
-    let _state: I.Value
-
-    init(invocable: I, state: I.Value) {
-        self._invocable = invocable
-        self._state = state
-    }
-
-    func invoke() {
-        self._invocable.invoke(self._state)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableType.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableType.swift
deleted file mode 100644
index 0dba433..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableType.swift
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  InvocableType.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 11/7/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-protocol InvocableType {
-    func invoke()
-}
-
-protocol InvocableWithValueType {
-    associatedtype Value
-
-    func invoke(_ value: Value)
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift
deleted file mode 100644
index 6e7a0c1..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//  ScheduledItem.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 9/2/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-struct ScheduledItem
-    : ScheduledItemType
-    , InvocableType {
-    typealias Action = (T) -> Disposable
-    
-    private let _action: Action
-    private let _state: T
-
-    private let _disposable = SingleAssignmentDisposable()
-
-    var isDisposed: Bool {
-        return self._disposable.isDisposed
-    }
-    
-    init(action: @escaping Action, state: T) {
-        self._action = action
-        self._state = state
-    }
-    
-    func invoke() {
-         self._disposable.setDisposable(self._action(self._state))
-    }
-    
-    func dispose() {
-        self._disposable.dispose()
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItemType.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItemType.swift
deleted file mode 100644
index d2b16ca..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItemType.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  ScheduledItemType.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 11/7/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-protocol ScheduledItemType
-    : Cancelable
-    , InvocableType {
-    func invoke()
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift
deleted file mode 100644
index 8fb0907..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-//  MainScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/8/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import Dispatch
-#if !os(Linux)
-    import Foundation
-#endif
-
-/**
-Abstracts work that needs to be performed on `DispatchQueue.main`. In case `schedule` methods are called from `DispatchQueue.main`, it will perform action immediately without scheduling.
-
-This scheduler is usually used to perform UI work.
-
-Main scheduler is a specialization of `SerialDispatchQueueScheduler`.
-
-This scheduler is optimized for `observeOn` operator. To ensure observable sequence is subscribed on main thread using `subscribeOn`
-operator please use `ConcurrentMainScheduler` because it is more optimized for that purpose.
-*/
-public final class MainScheduler : SerialDispatchQueueScheduler {
-
-    private let _mainQueue: DispatchQueue
-
-    let numberEnqueued = AtomicInt(0)
-
-    /// Initializes new instance of `MainScheduler`.
-    public init() {
-        self._mainQueue = DispatchQueue.main
-        super.init(serialQueue: self._mainQueue)
-    }
-
-    /// Singleton instance of `MainScheduler`
-    public static let instance = MainScheduler()
-
-    /// Singleton instance of `MainScheduler` that always schedules work asynchronously
-    /// and doesn't perform optimizations for calls scheduled from main queue.
-    public static let asyncInstance = SerialDispatchQueueScheduler(serialQueue: DispatchQueue.main)
-
-    /// In case this method is called on a background thread it will throw an exception.
-    public class func ensureExecutingOnScheduler(errorMessage: String? = nil) {
-        if !DispatchQueue.isMain {
-            rxFatalError(errorMessage ?? "Executing on background thread. Please use `MainScheduler.instance.schedule` to schedule work on main thread.")
-        }
-    }
-
-    /// In case this method is running on a background thread it will throw an exception.
-    public class func ensureRunningOnMainThread(errorMessage: String? = nil) {
-        #if !os(Linux) // isMainThread is not implemented in Linux Foundation
-            guard Thread.isMainThread else {
-                rxFatalError(errorMessage ?? "Running on background thread.")
-            }
-        #endif
-    }
-
-    override func scheduleInternal(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let previousNumberEnqueued = increment(self.numberEnqueued)
-
-        if DispatchQueue.isMain && previousNumberEnqueued == 0 {
-            let disposable = action(state)
-            decrement(self.numberEnqueued)
-            return disposable
-        }
-
-        let cancel = SingleAssignmentDisposable()
-
-        self._mainQueue.async {
-            if !cancel.isDisposed {
-                _ = action(state)
-            }
-
-            decrement(self.numberEnqueued)
-        }
-
-        return cancel
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/OperationQueueScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/OperationQueueScheduler.swift
deleted file mode 100644
index 81ba59f..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/OperationQueueScheduler.swift
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-//  OperationQueueScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 4/4/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import class Foundation.Operation
-import class Foundation.OperationQueue
-import class Foundation.BlockOperation
-import Dispatch
-
-/// Abstracts the work that needs to be performed on a specific `NSOperationQueue`.
-///
-/// This scheduler is suitable for cases when there is some bigger chunk of work that needs to be performed in background and you want to fine tune concurrent processing using `maxConcurrentOperationCount`.
-public class OperationQueueScheduler: ImmediateSchedulerType {
-    public let operationQueue: OperationQueue
-    public let queuePriority: Operation.QueuePriority
-    
-    /// Constructs new instance of `OperationQueueScheduler` that performs work on `operationQueue`.
-    ///
-    /// - parameter operationQueue: Operation queue targeted to perform work on.
-    /// - parameter queuePriority: Queue priority which will be assigned to new operations.
-    public init(operationQueue: OperationQueue, queuePriority: Operation.QueuePriority = .normal) {
-        self.operationQueue = operationQueue
-        self.queuePriority = queuePriority
-    }
-    
-    /**
-    Schedules an action to be executed recursively.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter action: Action to execute recursively. The last parameter passed to the action is used to trigger recursive scheduling of the action, passing in recursive invocation state.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let cancel = SingleAssignmentDisposable()
-
-        let operation = BlockOperation {
-            if cancel.isDisposed {
-                return
-            }
-
-
-            cancel.setDisposable(action(state))
-        }
-
-        operation.queuePriority = self.queuePriority
-
-        self.operationQueue.addOperation(operation)
-        
-        return cancel
-    }
-
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift
deleted file mode 100644
index 9e9b4ff..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift
+++ /dev/null
@@ -1,220 +0,0 @@
-//
-//  RecursiveScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/7/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-private enum ScheduleState {
-    case initial
-    case added(CompositeDisposable.DisposeKey)
-    case done
-}
-
-/// Type erased recursive scheduler.
-final class AnyRecursiveScheduler {
-    
-    typealias Action =  (State, AnyRecursiveScheduler) -> Void
-
-    private let _lock = RecursiveLock()
-    
-    // state
-    private let _group = CompositeDisposable()
-
-    private var _scheduler: SchedulerType
-    private var _action: Action?
-    
-    init(scheduler: SchedulerType, action: @escaping Action) {
-        self._action = action
-        self._scheduler = scheduler
-    }
-
-    /**
-    Schedules an action to be executed recursively.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter dueTime: Relative time after which to execute the recursive action.
-    */
-    func schedule(_ state: State, dueTime: RxTimeInterval) {
-        var scheduleState: ScheduleState = .initial
-
-        let d = self._scheduler.scheduleRelative(state, dueTime: dueTime) { state -> Disposable in
-            // best effort
-            if self._group.isDisposed {
-                return Disposables.create()
-            }
-            
-            let action = self._lock.calculateLocked { () -> Action? in
-                switch scheduleState {
-                case let .added(removeKey):
-                    self._group.remove(for: removeKey)
-                case .initial:
-                    break
-                case .done:
-                    break
-                }
-
-                scheduleState = .done
-
-                return self._action
-            }
-            
-            if let action = action {
-                action(state, self)
-            }
-            
-            return Disposables.create()
-        }
-            
-        self._lock.performLocked {
-            switch scheduleState {
-            case .added:
-                rxFatalError("Invalid state")
-            case .initial:
-                if let removeKey = self._group.insert(d) {
-                    scheduleState = .added(removeKey)
-                }
-                else {
-                    scheduleState = .done
-                }
-            case .done:
-                break
-            }
-        }
-    }
-
-    /// Schedules an action to be executed recursively.
-    ///
-    /// - parameter state: State passed to the action to be executed.
-    func schedule(_ state: State) {
-        var scheduleState: ScheduleState = .initial
-
-        let d = self._scheduler.schedule(state) { state -> Disposable in
-            // best effort
-            if self._group.isDisposed {
-                return Disposables.create()
-            }
-            
-            let action = self._lock.calculateLocked { () -> Action? in
-                switch scheduleState {
-                case let .added(removeKey):
-                    self._group.remove(for: removeKey)
-                case .initial:
-                    break
-                case .done:
-                    break
-                }
-
-                scheduleState = .done
-                
-                return self._action
-            }
-           
-            if let action = action {
-                action(state, self)
-            }
-            
-            return Disposables.create()
-        }
-        
-        self._lock.performLocked {
-            switch scheduleState {
-            case .added:
-                rxFatalError("Invalid state")
-            case .initial:
-                if let removeKey = self._group.insert(d) {
-                    scheduleState = .added(removeKey)
-                }
-                else {
-                    scheduleState = .done
-                }
-            case .done:
-                break
-            }
-        }
-    }
-    
-    func dispose() {
-        self._lock.performLocked {
-            self._action = nil
-        }
-        self._group.dispose()
-    }
-}
-
-/// Type erased recursive scheduler.
-final class RecursiveImmediateScheduler {
-    typealias Action =  (_ state: State, _ recurse: (State) -> Void) -> Void
-    
-    private var _lock = SpinLock()
-    private let _group = CompositeDisposable()
-    
-    private var _action: Action?
-    private let _scheduler: ImmediateSchedulerType
-    
-    init(action: @escaping Action, scheduler: ImmediateSchedulerType) {
-        self._action = action
-        self._scheduler = scheduler
-    }
-    
-    // immediate scheduling
-    
-    /// Schedules an action to be executed recursively.
-    ///
-    /// - parameter state: State passed to the action to be executed.
-    func schedule(_ state: State) {
-        var scheduleState: ScheduleState = .initial
-
-        let d = self._scheduler.schedule(state) { state -> Disposable in
-            // best effort
-            if self._group.isDisposed {
-                return Disposables.create()
-            }
-            
-            let action = self._lock.calculateLocked { () -> Action? in
-                switch scheduleState {
-                case let .added(removeKey):
-                    self._group.remove(for: removeKey)
-                case .initial:
-                    break
-                case .done:
-                    break
-                }
-
-                scheduleState = .done
-
-                return self._action
-            }
-            
-            if let action = action {
-                action(state, self.schedule)
-            }
-            
-            return Disposables.create()
-        }
-        
-        self._lock.performLocked {
-            switch scheduleState {
-            case .added:
-                rxFatalError("Invalid state")
-            case .initial:
-                if let removeKey = self._group.insert(d) {
-                    scheduleState = .added(removeKey)
-                }
-                else {
-                    scheduleState = .done
-                }
-            case .done:
-                break
-            }
-        }
-    }
-    
-    func dispose() {
-        self._lock.performLocked {
-            self._action = nil
-        }
-        self._group.dispose()
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
deleted file mode 100644
index 5b7b840..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-//  SchedulerServices+Emulation.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/6/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-enum SchedulePeriodicRecursiveCommand {
-    case tick
-    case dispatchStart
-}
-
-final class SchedulePeriodicRecursive {
-    typealias RecursiveAction = (State) -> State
-    typealias RecursiveScheduler = AnyRecursiveScheduler
-
-    private let _scheduler: SchedulerType
-    private let _startAfter: RxTimeInterval
-    private let _period: RxTimeInterval
-    private let _action: RecursiveAction
-
-    private var _state: State
-    private let _pendingTickCount = AtomicInt(0)
-
-    init(scheduler: SchedulerType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping RecursiveAction, state: State) {
-        self._scheduler = scheduler
-        self._startAfter = startAfter
-        self._period = period
-        self._action = action
-        self._state = state
-    }
-
-    func start() -> Disposable {
-        return self._scheduler.scheduleRecursive(SchedulePeriodicRecursiveCommand.tick, dueTime: self._startAfter, action: self.tick)
-    }
-
-    func tick(_ command: SchedulePeriodicRecursiveCommand, scheduler: RecursiveScheduler) {
-        // Tries to emulate periodic scheduling as best as possible.
-        // The problem that could arise is if handling periodic ticks take too long, or
-        // tick interval is short.
-        switch command {
-        case .tick:
-            scheduler.schedule(.tick, dueTime: self._period)
-
-            // The idea is that if on tick there wasn't any item enqueued, schedule to perform work immediately.
-            // Else work will be scheduled after previous enqueued work completes.
-            if increment(self._pendingTickCount) == 0 {
-                self.tick(.dispatchStart, scheduler: scheduler)
-            }
-
-        case .dispatchStart:
-            self._state = self._action(self._state)
-            // Start work and schedule check is this last batch of work
-            if decrement(self._pendingTickCount) > 1 {
-                // This gives priority to scheduler emulation, it's not perfect, but helps
-                scheduler.schedule(SchedulePeriodicRecursiveCommand.dispatchStart)
-            }
-        }
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
deleted file mode 100644
index 57ae8bd..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-//  SerialDispatchQueueScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/8/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import struct Foundation.TimeInterval
-import struct Foundation.Date
-import Dispatch
-
-/**
-Abstracts the work that needs to be performed on a specific `dispatch_queue_t`. It will make sure 
-that even if concurrent dispatch queue is passed, it's transformed into a serial one.
-
-It is extremely important that this scheduler is serial, because
-certain operator perform optimizations that rely on that property.
-
-Because there is no way of detecting is passed dispatch queue serial or
-concurrent, for every queue that is being passed, worst case (concurrent)
-will be assumed, and internal serial proxy dispatch queue will be created.
-
-This scheduler can also be used with internal serial queue alone.
-
-In case some customization need to be made on it before usage,
-internal serial queue can be customized using `serialQueueConfiguration`
-callback.
-*/
-public class SerialDispatchQueueScheduler : SchedulerType {
-    public typealias TimeInterval = Foundation.TimeInterval
-    public typealias Time = Date
-    
-    /// - returns: Current time.
-    public var now : Date {
-        return Date()
-    }
-
-    let configuration: DispatchQueueConfiguration
-    
-    /**
-    Constructs new `SerialDispatchQueueScheduler` that wraps `serialQueue`.
-
-    - parameter serialQueue: Target dispatch queue.
-    - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
-    */
-    init(serialQueue: DispatchQueue, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        self.configuration = DispatchQueueConfiguration(queue: serialQueue, leeway: leeway)
-    }
-
-    /**
-    Constructs new `SerialDispatchQueueScheduler` with internal serial queue named `internalSerialQueueName`.
-    
-    Additional dispatch queue properties can be set after dispatch queue is created using `serialQueueConfiguration`.
-    
-    - parameter internalSerialQueueName: Name of internal serial dispatch queue.
-    - parameter serialQueueConfiguration: Additional configuration of internal serial dispatch queue.
-    - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
-    */
-    public convenience init(internalSerialQueueName: String, serialQueueConfiguration: ((DispatchQueue) -> Void)? = nil, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        let queue = DispatchQueue(label: internalSerialQueueName, attributes: [])
-        serialQueueConfiguration?(queue)
-        self.init(serialQueue: queue, leeway: leeway)
-    }
-    
-    /**
-    Constructs new `SerialDispatchQueueScheduler` named `internalSerialQueueName` that wraps `queue`.
-    
-    - parameter queue: Possibly concurrent dispatch queue used to perform work.
-    - parameter internalSerialQueueName: Name of internal serial dispatch queue proxy.
-    - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
-    */
-    public convenience init(queue: DispatchQueue, internalSerialQueueName: String, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        // Swift 3.0 IUO
-        let serialQueue = DispatchQueue(label: internalSerialQueueName,
-                                        attributes: [],
-                                        target: queue)
-        self.init(serialQueue: serialQueue, leeway: leeway)
-    }
-
-    /**
-     Constructs new `SerialDispatchQueueScheduler` that wraps on of the global concurrent dispatch queues.
-     
-     - parameter qos: Identifier for global dispatch queue with specified quality of service class.
-     - parameter internalSerialQueueName: Custom name for internal serial dispatch queue proxy.
-     - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
-     */
-    @available(iOS 8, OSX 10.10, *)
-    public convenience init(qos: DispatchQoS, internalSerialQueueName: String = "rx.global_dispatch_queue.serial", leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        self.init(queue: DispatchQueue.global(qos: qos.qosClass), internalSerialQueueName: internalSerialQueueName, leeway: leeway)
-    }
-    
-    /**
-    Schedules an action to be executed immediately.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public final func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self.scheduleInternal(state, action: action)
-    }
-
-    func scheduleInternal(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self.configuration.schedule(state, action: action)
-    }
-
-    /**
-    Schedules an action to be executed.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter dueTime: Relative time after which to execute the action.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public final func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self.configuration.scheduleRelative(state, dueTime: dueTime, action: action)
-    }
-    
-    /**
-    Schedules a periodic piece of work.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter startAfter: Period after which initial work should be run.
-    - parameter period: Period for running the work periodically.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
-        return self.configuration.schedulePeriodic(state, startAfter: startAfter, period: period, action: action)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeConverterType.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeConverterType.swift
deleted file mode 100644
index 7069b00..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeConverterType.swift
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-//  VirtualTimeConverterType.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 12/23/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import Foundation
-
-/// Parametrization for virtual time used by `VirtualTimeScheduler`s.
-public protocol VirtualTimeConverterType {
-    /// Virtual time unit used that represents ticks of virtual clock.
-    associatedtype VirtualTimeUnit
-
-    /// Virtual time unit used to represent differences of virtual times.
-    associatedtype VirtualTimeIntervalUnit
-
-    /**
-     Converts virtual time to real time.
-     
-     - parameter virtualTime: Virtual time to convert to `Date`.
-     - returns: `Date` corresponding to virtual time.
-    */
-    func convertFromVirtualTime(_ virtualTime: VirtualTimeUnit) -> RxTime
-
-    /**
-     Converts real time to virtual time.
-     
-     - parameter time: `Date` to convert to virtual time.
-     - returns: Virtual time corresponding to `Date`.
-    */
-    func convertToVirtualTime(_ time: RxTime) -> VirtualTimeUnit
-
-    /**
-     Converts from virtual time interval to `NSTimeInterval`.
-     
-     - parameter virtualTimeInterval: Virtual time interval to convert to `NSTimeInterval`.
-     - returns: `NSTimeInterval` corresponding to virtual time interval.
-    */
-    func convertFromVirtualTimeInterval(_ virtualTimeInterval: VirtualTimeIntervalUnit) -> TimeInterval
-
-    /**
-     Converts from `NSTimeInterval` to virtual time interval.
-     
-     - parameter timeInterval: `NSTimeInterval` to convert to virtual time interval.
-     - returns: Virtual time interval corresponding to time interval.
-    */
-    func convertToVirtualTimeInterval(_ timeInterval: TimeInterval) -> VirtualTimeIntervalUnit
-
-    /**
-     Offsets virtual time by virtual time interval.
-     
-     - parameter time: Virtual time.
-     - parameter offset: Virtual time interval.
-     - returns: Time corresponding to time offsetted by virtual time interval.
-    */
-    func offsetVirtualTime(_ time: VirtualTimeUnit, offset: VirtualTimeIntervalUnit) -> VirtualTimeUnit
-
-    /**
-     This is additional abstraction because `Date` is unfortunately not comparable.
-     Extending `Date` with `Comparable` would be too risky because of possible collisions with other libraries.
-    */
-    func compareVirtualTime(_ lhs: VirtualTimeUnit, _ rhs: VirtualTimeUnit) -> VirtualTimeComparison
-}
-
-/**
- Virtual time comparison result.
-
- This is additional abstraction because `Date` is unfortunately not comparable.
- Extending `Date` with `Comparable` would be too risky because of possible collisions with other libraries.
-*/
-public enum VirtualTimeComparison {
-    /// lhs < rhs.
-    case lessThan
-    /// lhs == rhs.
-    case equal
-    /// lhs > rhs.
-    case greaterThan
-}
-
-extension VirtualTimeComparison {
-    /// lhs < rhs.
-    var lessThen: Bool {
-        return self == .lessThan
-    }
-
-    /// lhs > rhs
-    var greaterThan: Bool {
-        return self == .greaterThan
-    }
-
-    /// lhs == rhs
-    var equal: Bool {
-        return self == .equal
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
deleted file mode 100644
index e63cece..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
+++ /dev/null
@@ -1,269 +0,0 @@
-//
-//  VirtualTimeScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/14/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-/// Base class for virtual time schedulers using a priority queue for scheduled items.
-open class VirtualTimeScheduler
-    : SchedulerType {
-
-    public typealias VirtualTime = Converter.VirtualTimeUnit
-    public typealias VirtualTimeInterval = Converter.VirtualTimeIntervalUnit
-
-    private var _running : Bool
-
-    private var _clock: VirtualTime
-
-    fileprivate var _schedulerQueue : PriorityQueue>
-    private var _converter: Converter
-
-    private var _nextId = 0
-
-    /// - returns: Current time.
-    public var now: RxTime {
-        return self._converter.convertFromVirtualTime(self.clock)
-    }
-
-    /// - returns: Scheduler's absolute time clock value.
-    public var clock: VirtualTime {
-        return self._clock
-    }
-
-    /// Creates a new virtual time scheduler.
-    ///
-    /// - parameter initialClock: Initial value for the clock.
-    public init(initialClock: VirtualTime, converter: Converter) {
-        self._clock = initialClock
-        self._running = false
-        self._converter = converter
-        self._schedulerQueue = PriorityQueue(hasHigherPriority: {
-            switch converter.compareVirtualTime($0.time, $1.time) {
-            case .lessThan:
-                return true
-            case .equal:
-                return $0.id < $1.id
-            case .greaterThan:
-                return false
-            }
-        }, isEqual: { $0 === $1 })
-        #if TRACE_RESOURCES
-            _ = Resources.incrementTotal()
-        #endif
-    }
-
-    /**
-    Schedules an action to be executed immediately.
-
-    - parameter state: State passed to the action to be executed.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self.scheduleRelative(state, dueTime: .microseconds(0)) { a in
-            return action(a)
-        }
-    }
-
-    /**
-     Schedules an action to be executed.
-
-     - parameter state: State passed to the action to be executed.
-     - parameter dueTime: Relative time after which to execute the action.
-     - parameter action: Action to be executed.
-     - returns: The disposable object used to cancel the scheduled action (best effort).
-     */
-    public func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let time = self.now.addingDispatchInterval(dueTime)
-        let absoluteTime = self._converter.convertToVirtualTime(time)
-        let adjustedTime = self.adjustScheduledTime(absoluteTime)
-        return self.scheduleAbsoluteVirtual(state, time: adjustedTime, action: action)
-    }
-
-    /**
-     Schedules an action to be executed after relative time has passed.
-
-     - parameter state: State passed to the action to be executed.
-     - parameter time: Absolute time when to execute the action. If this is less or equal then `now`, `now + 1`  will be used.
-     - parameter action: Action to be executed.
-     - returns: The disposable object used to cancel the scheduled action (best effort).
-     */
-    public func scheduleRelativeVirtual(_ state: StateType, dueTime: VirtualTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let time = self._converter.offsetVirtualTime(self.clock, offset: dueTime)
-        return self.scheduleAbsoluteVirtual(state, time: time, action: action)
-    }
-
-    /**
-     Schedules an action to be executed at absolute virtual time.
-
-     - parameter state: State passed to the action to be executed.
-     - parameter time: Absolute time when to execute the action.
-     - parameter action: Action to be executed.
-     - returns: The disposable object used to cancel the scheduled action (best effort).
-     */
-    public func scheduleAbsoluteVirtual(_ state: StateType, time: Converter.VirtualTimeUnit, action: @escaping (StateType) -> Disposable) -> Disposable {
-        MainScheduler.ensureExecutingOnScheduler()
-
-        let compositeDisposable = CompositeDisposable()
-
-        let item = VirtualSchedulerItem(action: {
-            let dispose = action(state)
-            return dispose
-        }, time: time, id: self._nextId)
-
-        self._nextId += 1
-
-        self._schedulerQueue.enqueue(item)
-        
-        _ = compositeDisposable.insert(item)
-        
-        return compositeDisposable
-    }
-
-    /// Adjusts time of scheduling before adding item to schedule queue.
-    open func adjustScheduledTime(_ time: Converter.VirtualTimeUnit) -> Converter.VirtualTimeUnit {
-        return time
-    }
-
-    /// Starts the virtual time scheduler.
-    public func start() {
-        MainScheduler.ensureExecutingOnScheduler()
-
-        if self._running {
-            return
-        }
-
-        self._running = true
-        repeat {
-            guard let next = self.findNext() else {
-                break
-            }
-
-            if self._converter.compareVirtualTime(next.time, self.clock).greaterThan {
-                self._clock = next.time
-            }
-
-            next.invoke()
-            self._schedulerQueue.remove(next)
-        } while self._running
-
-        self._running = false
-    }
-
-    func findNext() -> VirtualSchedulerItem? {
-        while let front = self._schedulerQueue.peek() {
-            if front.isDisposed {
-                self._schedulerQueue.remove(front)
-                continue
-            }
-
-            return front
-        }
-
-        return nil
-    }
-
-    /// Advances the scheduler's clock to the specified time, running all work till that point.
-    ///
-    /// - parameter virtualTime: Absolute time to advance the scheduler's clock to.
-    public func advanceTo(_ virtualTime: VirtualTime) {
-        MainScheduler.ensureExecutingOnScheduler()
-
-        if self._running {
-            fatalError("Scheduler is already running")
-        }
-
-        self._running = true
-        repeat {
-            guard let next = self.findNext() else {
-                break
-            }
-
-            if self._converter.compareVirtualTime(next.time, virtualTime).greaterThan {
-                break
-            }
-
-            if self._converter.compareVirtualTime(next.time, self.clock).greaterThan {
-                self._clock = next.time
-            }
-
-            next.invoke()
-            self._schedulerQueue.remove(next)
-        } while self._running
-
-        self._clock = virtualTime
-        self._running = false
-    }
-
-    /// Advances the scheduler's clock by the specified relative time.
-    public func sleep(_ virtualInterval: VirtualTimeInterval) {
-        MainScheduler.ensureExecutingOnScheduler()
-
-        let sleepTo = self._converter.offsetVirtualTime(self.clock, offset: virtualInterval)
-        if self._converter.compareVirtualTime(sleepTo, self.clock).lessThen {
-            fatalError("Can't sleep to past.")
-        }
-
-        self._clock = sleepTo
-    }
-
-    /// Stops the virtual time scheduler.
-    public func stop() {
-        MainScheduler.ensureExecutingOnScheduler()
-
-        self._running = false
-    }
-
-    #if TRACE_RESOURCES
-        deinit {
-            _ = Resources.decrementTotal()
-        }
-    #endif
-}
-
-// MARK: description
-
-extension VirtualTimeScheduler: CustomDebugStringConvertible {
-    /// A textual representation of `self`, suitable for debugging.
-    public var debugDescription: String {
-        return self._schedulerQueue.debugDescription
-    }
-}
-
-final class VirtualSchedulerItem
 let searchResults = searchBar.rx.text.orEmpty
-    .throttle(0.3, scheduler: MainScheduler.instance)
+    .throttle(.milliseconds(300), scheduler: MainScheduler.instance)
     .distinctUntilChanged()
     .flatMapLatest { query -> Observable<[Repository]> in
         if query.isEmpty {
@@ -104,10 +124,10 @@ searchResults
 
 ## Requirements
 
-* Xcode 9.0
-* Swift 4.0
-* Swift 3.x ([use `rxswift-3.0` branch](https://github.com/ReactiveX/RxSwift/tree/rxswift-3.0) instead)
-* Swift 2.3 ([use `rxswift-2.0` branch](https://github.com/ReactiveX/RxSwift/tree/rxswift-2.0) instead)
+* Xcode 10.2
+* Swift 5.0
+
+For Xcode 10.1 and below, [use RxSwift 4.5](https://github.com/ReactiveX/RxSwift/releases/tag/4.5.0).
 
 ## Installation
 
@@ -121,21 +141,19 @@ Open Rx.xcworkspace, choose `RxExample` and hit run. This method will build ever
 
 ### [CocoaPods](https://guides.cocoapods.org/using/using-cocoapods.html)
 
-**Tested with `pod --version`: `1.3.1`**
-
 ```ruby
 # Podfile
 use_frameworks!
 
 target 'YOUR_TARGET_NAME' do
-    pod 'RxSwift',    '~> 4.0'
-    pod 'RxCocoa',    '~> 4.0'
+    pod 'RxSwift', '~> 5'
+    pod 'RxCocoa', '~> 5'
 end
 
 # RxTest and RxBlocking make the most sense in the context of unit/integration tests
 target 'YOUR_TESTING_TARGET' do
-    pod 'RxBlocking', '~> 4.0'
-    pod 'RxTest',     '~> 4.0'
+    pod 'RxBlocking', '~> 5'
+    pod 'RxTest', '~> 5'
 end
 ```
 
@@ -147,12 +165,12 @@ $ pod install
 
 ### [Carthage](https://github.com/Carthage/Carthage)
 
-**Tested with `carthage version`: `0.26.2`**
+Officially supported: Carthage 0.33 and up.
 
 Add this to `Cartfile`
 
 ```
-github "ReactiveX/RxSwift" ~> 4.0
+github "ReactiveX/RxSwift" ~> 5.0
 ```
 
 ```bash
@@ -161,19 +179,17 @@ $ carthage update
 
 ### [Swift Package Manager](https://github.com/apple/swift-package-manager)
 
-**Tested with `swift build --version`: `Swift 4.0.0-dev (swiftpm-13126)`**
-
 Create a `Package.swift` file.
 
 ```swift
-// swift-tools-version:4.0
+// swift-tools-version:5.0
 
 import PackageDescription
 
 let package = Package(
   name: "RxTestProject",
   dependencies: [
-    .package(url: "https://github.com/ReactiveX/RxSwift.git", "4.0.0" ..< "5.0.0")
+    .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0")
   ],
   targets: [
     .target(name: "RxTestProject", dependencies: ["RxSwift", "RxCocoa"])
@@ -185,7 +201,7 @@ let package = Package(
 $ swift build
 ```
 
-To build or test a module with RxTest dependency, set `TEST=1`. ([RxSwift >= 3.4.2](https://github.com/ReactiveX/RxSwift/releases/tag/3.4.2))
+To build or test a module with RxTest dependency, set `TEST=1`.
 
 ```bash
 $ TEST=1 swift test
@@ -202,16 +218,15 @@ $ git submodule add git@github.com:ReactiveX/RxSwift.git
 * Drag `Rx.xcodeproj` into Project Navigator
 * Go to `Project > Targets > Build Phases > Link Binary With Libraries`, click `+` and select `RxSwift-[Platform]` and `RxCocoa-[Platform]` targets
 
-
 ## References
 
 * [http://reactivex.io/](http://reactivex.io/)
 * [Reactive Extensions GitHub (GitHub)](https://github.com/Reactive-Extensions)
-* [RxSwift RayWenderlich.com Book](https://store.raywenderlich.com/products/rxswift)
+* [RxSwift RayWenderlich.com Book](https://store.raywenderlich.com/products/rxswift-reactive-programming-with-swift)
 * [Boxue.io RxSwift Online Course](https://boxueio.com/series/rxswift-101) (Chinese 🇨🇳)
 * [Erik Meijer (Wikipedia)](http://en.wikipedia.org/wiki/Erik_Meijer_%28computer_scientist%29)
 * [Expert to Expert: Brian Beckman and Erik Meijer - Inside the .NET Reactive Framework (Rx) (video)](https://youtu.be/looJcaeboBY)
 * [Reactive Programming Overview (Jafar Husain from Netflix)](https://www.youtube.com/watch?v=dwP1TNXE6fc)
 * [Subject/Observer is Dual to Iterator (paper)](http://csl.stanford.edu/~christos/pldi2010.fit/meijer.duality.pdf)
 * [Rx standard sequence operators visualized (visualization tool)](http://rxmarbles.com/)
-* [Haskell](https://www.haskell.org/)
+* [Haskell](https://www.haskell.org/)
\ No newline at end of file
diff --git a/Demo/Pods/RxSwift/RxSwift/AnyObserver.swift b/Demo/Pods/RxSwift/RxSwift/AnyObserver.swift
index dd4f9c4..42aa09e 100644
--- a/Demo/Pods/RxSwift/RxSwift/AnyObserver.swift
+++ b/Demo/Pods/RxSwift/RxSwift/AnyObserver.swift
@@ -10,9 +10,6 @@
 ///
 /// Forwards operations to an arbitrary underlying observer with the same `Element` type, hiding the specifics of the underlying observer type.
 public struct AnyObserver : ObserverType {
-    /// The type of elements in sequence that observer can observe.
-    public typealias E = Element
-    
     /// Anonymous event handler type.
     public typealias EventHandler = (Event) -> Void
 
@@ -28,7 +25,7 @@ public struct AnyObserver : ObserverType {
     /// Construct an instance whose `on(event)` calls `observer.on(event)`
     ///
     /// - parameter observer: Observer that receives sequence events.
-    public init(_ observer: O) where O.E == Element {
+    public init(_ observer: Observer) where Observer.Element == Element {
         self.observer = observer.on
     }
     
@@ -42,21 +39,21 @@ public struct AnyObserver : ObserverType {
     /// Erases type of observer and returns canonical observer.
     ///
     /// - returns: type erased observer.
-    public func asObserver() -> AnyObserver {
+    public func asObserver() -> AnyObserver {
         return self
     }
 }
 
 extension AnyObserver {
     /// Collection of `AnyObserver`s
-    typealias s = Bag<(Event) -> ()>
+    typealias s = Bag<(Event) -> Void>
 }
 
 extension ObserverType {
     /// Erases type of observer and returns canonical observer.
     ///
     /// - returns: type erased observer.
-    public func asObserver() -> AnyObserver {
+    public func asObserver() -> AnyObserver {
         return AnyObserver(self)
     }
 
@@ -64,7 +61,7 @@ extension ObserverType {
     /// Each event sent to result observer is transformed and sent to `self`.
     ///
     /// - returns: observer that transforms events.
-    public func mapObserver(_ transform: @escaping (R) throws -> E) -> AnyObserver {
+    public func mapObserver(_ transform: @escaping (Result) throws -> Element) -> AnyObserver {
         return AnyObserver { e in
             self.on(e.map(transform))
         }
diff --git a/Demo/Pods/RxSwift/RxSwift/Concurrency/AsyncLock.swift b/Demo/Pods/RxSwift/RxSwift/Concurrency/AsyncLock.swift
index 2597078..80332db 100644
--- a/Demo/Pods/RxSwift/RxSwift/Concurrency/AsyncLock.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Concurrency/AsyncLock.swift
@@ -31,45 +31,45 @@ final class AsyncLock
 
     // lock {
     func lock() {
-        _lock.lock()
+        self._lock.lock()
     }
 
     func unlock() {
-        _lock.unlock()
+        self._lock.unlock()
     }
     // }
 
     private func enqueue(_ action: I) -> I? {
-        _lock.lock(); defer { _lock.unlock() } // {
-            if _hasFaulted {
+        self._lock.lock(); defer { self._lock.unlock() } // {
+            if self._hasFaulted {
                 return nil
             }
 
-            if _isExecuting {
-                _queue.enqueue(action)
+            if self._isExecuting {
+                self._queue.enqueue(action)
                 return nil
             }
 
-            _isExecuting = true
+            self._isExecuting = true
 
             return action
         // }
     }
 
     private func dequeue() -> I? {
-        _lock.lock(); defer { _lock.unlock() } // {
-            if _queue.count > 0 {
-                return _queue.dequeue()
+        self._lock.lock(); defer { self._lock.unlock() } // {
+            if !self._queue.isEmpty {
+                return self._queue.dequeue()
             }
             else {
-                _isExecuting = false
+                self._isExecuting = false
                 return nil
             }
         // }
     }
 
     func invoke(_ action: I) {
-        let firstEnqueuedAction = enqueue(action)
+        let firstEnqueuedAction = self.enqueue(action)
         
         if let firstEnqueuedAction = firstEnqueuedAction {
             firstEnqueuedAction.invoke()
@@ -80,7 +80,7 @@ final class AsyncLock
         }
         
         while true {
-            let nextAction = dequeue()
+            let nextAction = self.dequeue()
 
             if let nextAction = nextAction {
                 nextAction.invoke()
@@ -92,11 +92,11 @@ final class AsyncLock
     }
     
     func dispose() {
-        synchronizedDispose()
+        self.synchronizedDispose()
     }
 
     func _synchronized_dispose() {
-        _queue = Queue(capacity: 0)
-        _hasFaulted = true
+        self._queue = Queue(capacity: 0)
+        self._hasFaulted = true
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Concurrency/Lock.swift b/Demo/Pods/RxSwift/RxSwift/Concurrency/Lock.swift
index 52afc1c..b26f5b7 100644
--- a/Demo/Pods/RxSwift/RxSwift/Concurrency/Lock.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Concurrency/Lock.swift
@@ -17,19 +17,19 @@ typealias SpinLock = RecursiveLock
 extension RecursiveLock : Lock {
     @inline(__always)
     final func performLocked(_ action: () -> Void) {
-        lock(); defer { unlock() }
+        self.lock(); defer { self.unlock() }
         action()
     }
 
     @inline(__always)
     final func calculateLocked(_ action: () -> T) -> T {
-        lock(); defer { unlock() }
+        self.lock(); defer { self.unlock() }
         return action()
     }
 
     @inline(__always)
     final func calculateLockedOrFail(_ action: () throws -> T) throws -> T {
-        lock(); defer { unlock() }
+        self.lock(); defer { self.unlock() }
         let result = try action()
         return result
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Concurrency/LockOwnerType.swift b/Demo/Pods/RxSwift/RxSwift/Concurrency/LockOwnerType.swift
index eca8d8e..ed6b28a 100644
--- a/Demo/Pods/RxSwift/RxSwift/Concurrency/LockOwnerType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Concurrency/LockOwnerType.swift
@@ -12,10 +12,10 @@ protocol LockOwnerType : class, Lock {
 
 extension LockOwnerType {
     func lock() {
-        _lock.lock()
+        self._lock.lock()
     }
 
     func unlock() {
-        _lock.unlock()
+        self._lock.unlock()
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedDisposeType.swift b/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedDisposeType.swift
index af9548f..0490a69 100644
--- a/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedDisposeType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedDisposeType.swift
@@ -12,7 +12,7 @@ protocol SynchronizedDisposeType : class, Disposable, Lock {
 
 extension SynchronizedDisposeType {
     func synchronizedDispose() {
-        lock(); defer { unlock() }
-        _synchronized_dispose()
+        self.lock(); defer { self.unlock() }
+        self._synchronized_dispose()
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedOnType.swift b/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedOnType.swift
index 8dfc556..bac051b 100644
--- a/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedOnType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Concurrency/SynchronizedOnType.swift
@@ -7,12 +7,12 @@
 //
 
 protocol SynchronizedOnType : class, ObserverType, Lock {
-    func _synchronized_on(_ event: Event)
+    func _synchronized_on(_ event: Event)
 }
 
 extension SynchronizedOnType {
-    func synchronizedOn(_ event: Event) {
-        lock(); defer { unlock() }
-        _synchronized_on(event)
+    func synchronizedOn(_ event: Event) {
+        self.lock(); defer { self.unlock() }
+        self._synchronized_on(event)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Date+Dispatch.swift b/Demo/Pods/RxSwift/RxSwift/Date+Dispatch.swift
new file mode 100644
index 0000000..0dc3ac3
--- /dev/null
+++ b/Demo/Pods/RxSwift/RxSwift/Date+Dispatch.swift
@@ -0,0 +1,65 @@
+//
+//  Date+Dispatch.swift
+//  RxSwift
+//
+//  Created by Krunoslav Zaher on 4/14/19.
+//  Copyright © 2019 Krunoslav Zaher. All rights reserved.
+//
+
+import struct Foundation.Date
+import struct Foundation.TimeInterval
+import enum Dispatch.DispatchTimeInterval
+
+extension DispatchTimeInterval {
+    var convertToSecondsFactor: Double {
+        switch self {
+        case .nanoseconds: return 1_000_000_000.0
+        case .microseconds: return 1_000_000.0
+        case .milliseconds: return 1_000.0
+        case .seconds: return 1.0
+        case .never: fatalError()
+        @unknown default: fatalError()
+        }
+    }
+ 
+    func map(_ transform: (Int, Double) -> Int) -> DispatchTimeInterval {
+        switch self {
+        case .nanoseconds(let value): return .nanoseconds(transform(value, 1_000_000_000.0))
+        case .microseconds(let value): return .microseconds(transform(value, 1_000_000.0))
+        case .milliseconds(let value): return .milliseconds(transform(value, 1_000.0))
+        case .seconds(let value): return .seconds(transform(value, 1.0))
+        case .never: return .never
+        @unknown default: fatalError()
+        }
+    }
+    
+    var isNow: Bool {
+        switch self {
+        case .nanoseconds(let value), .microseconds(let value), .milliseconds(let value), .seconds(let value): return value == 0
+        case .never: return false
+        @unknown default: fatalError()
+        }
+    }
+    
+    internal func reduceWithSpanBetween(earlierDate: Date, laterDate: Date) -> DispatchTimeInterval {
+        return self.map { value, factor in
+            let interval = laterDate.timeIntervalSince(earlierDate)
+            let remainder = Double(value) - interval * factor
+            guard remainder > 0 else { return 0 }
+            return Int(remainder.rounded(.toNearestOrAwayFromZero))
+        }
+    }
+}
+
+extension Date {
+
+    internal func addingDispatchInterval(_ dispatchInterval: DispatchTimeInterval) -> Date {
+        switch dispatchInterval {
+        case .nanoseconds(let value), .microseconds(let value), .milliseconds(let value), .seconds(let value):
+            return self.addingTimeInterval(TimeInterval(value) / dispatchInterval.convertToSecondsFactor)
+        case .never: return Date.distantFuture
+        @unknown default: fatalError()
+        }
+    }
+    
+}
diff --git a/Demo/Pods/RxSwift/RxSwift/Deprecated.swift b/Demo/Pods/RxSwift/RxSwift/Deprecated.swift
index 0337d82..5cfdf38 100644
--- a/Demo/Pods/RxSwift/RxSwift/Deprecated.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Deprecated.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2017 Krunoslav Zaher. All rights reserved.
 //
 
+import Foundation
+
 extension Observable {
     /**
      Converts a optional to an observable sequence.
@@ -16,7 +18,7 @@ extension Observable {
      - returns: An observable sequence containing the wrapped value or not from given optional.
      */
     @available(*, deprecated, message: "Implicit conversions from any type to optional type are allowed and that is causing issues with `from` operator overloading.", renamed: "from(optional:)")
-    public static func from(_ optional: E?) -> Observable {
+    public static func from(_ optional: Element?) -> Observable {
         return Observable.from(optional: optional)
     }
 
@@ -30,7 +32,7 @@ extension Observable {
      - returns: An observable sequence containing the wrapped value or not from given optional.
      */
     @available(*, deprecated, message: "Implicit conversions from any type to optional type are allowed and that is causing issues with `from` operator overloading.", renamed: "from(optional:scheduler:)")
-    public static func from(_ optional: E?, scheduler: ImmediateSchedulerType) -> Observable {
+    public static func from(_ optional: Element?, scheduler: ImmediateSchedulerType) -> Observable {
         return Observable.from(optional: optional, scheduler: scheduler)
     }
 }
@@ -46,9 +48,9 @@ extension ObservableType {
      - returns: An observable sequence whose elements are the result of invoking the transform function on each element of source.
      */
     @available(*, deprecated, message: "Please use enumerated().map()")
-    public func mapWithIndex(_ selector: @escaping (E, Int) throws -> R)
-        -> Observable {
-        return enumerated().map { try selector($0.element, $0.index) }
+    public func mapWithIndex(_ selector: @escaping (Element, Int) throws -> Result)
+        -> Observable {
+        return self.enumerated().map { try selector($0.element, $0.index) }
     }
 
 
@@ -62,9 +64,9 @@ extension ObservableType {
      - returns: An observable sequence whose elements are the result of invoking the one-to-many transform function on each element of the input sequence.
      */
     @available(*, deprecated, message: "Please use enumerated().flatMap()")
-    public func flatMapWithIndex(_ selector: @escaping (E, Int) throws -> O)
-        -> Observable {
-        return enumerated().flatMap { try selector($0.element, $0.index) }
+    public func flatMapWithIndex(_ selector: @escaping (Element, Int) throws -> Source)
+        -> Observable {
+        return self.enumerated().flatMap { try selector($0.element, $0.index) }
     }
 
     /**
@@ -78,8 +80,8 @@ extension ObservableType {
      - returns: An observable sequence that contains the elements from the input sequence starting at the first element in the linear series that does not pass the test specified by predicate.
      */
     @available(*, deprecated, message: "Please use enumerated().skipWhile().map()")
-    public func skipWhileWithIndex(_ predicate: @escaping (E, Int) throws -> Bool) -> Observable {
-        return enumerated().skipWhile { try predicate($0.element, $0.index) }.map { $0.element }
+    public func skipWhileWithIndex(_ predicate: @escaping (Element, Int) throws -> Bool) -> Observable {
+        return self.enumerated().skipWhile { try predicate($0.element, $0.index) }.map { $0.element }
     }
 
 
@@ -95,8 +97,8 @@ extension ObservableType {
      - returns: An observable sequence that contains the elements from the input sequence that occur before the element at which the test no longer passes.
      */
     @available(*, deprecated, message: "Please use enumerated().takeWhile().map()")
-    public func takeWhileWithIndex(_ predicate: @escaping (E, Int) throws -> Bool) -> Observable {
-        return enumerated().takeWhile { try predicate($0.element, $0.index) }.map { $0.element }
+    public func takeWhileWithIndex(_ predicate: @escaping (Element, Int) throws -> Bool) -> Observable {
+        return self.enumerated().takeWhile { try predicate($0.element, $0.index) }.map { $0.element }
     }
 }
 
@@ -109,7 +111,7 @@ extension Disposable {
     /// - parameter bag: `DisposeBag` to add `self` to.
     @available(*, deprecated, message: "use disposed(by:) instead", renamed: "disposed(by:)")
     public func addDisposableTo(_ bag: DisposeBag) {
-        disposed(by: bag)
+        self.disposed(by: bag)
     }
 }
 
@@ -127,8 +129,8 @@ extension ObservableType {
      */
     @available(*, deprecated, message: "use share(replay: 1) instead", renamed: "share(replay:)")
     public func shareReplayLatestWhileConnected()
-        -> Observable {
-        return share(replay: 1, scope: .whileConnected)
+        -> Observable {
+        return self.share(replay: 1, scope: .whileConnected)
     }
 }
 
@@ -147,7 +149,7 @@ extension ObservableType {
      */
     @available(*, deprecated, message: "Suggested replacement is `share(replay: 1)`. In case old 3.x behavior of `shareReplay` is required please use `share(replay: 1, scope: .forever)` instead.", renamed: "share(replay:)")
     public func shareReplay(_ bufferSize: Int)
-        -> Observable {
+        -> Observable {
         return self.share(replay: bufferSize, scope: .forever)
     }
 }
@@ -167,16 +169,14 @@ extension ObservableType {
 /// * It has an inconsistent memory management model compared to other parts of RxSwift (completes on `deinit`).
 ///
 /// Once plans are finalized, official availability attribute will be added in one of upcoming versions.
+@available(*, deprecated, message: "Variable is deprecated. Please use `BehaviorRelay` as a replacement.")
 public final class Variable {
-
-    public typealias E = Element
-
     private let _subject: BehaviorSubject
 
     private var _lock = SpinLock()
 
     // state
-    private var _value: E
+    private var _value: Element
 
     #if DEBUG
     fileprivate let _synchronizationTracker = SynchronizationTracker()
@@ -187,21 +187,21 @@ public final class Variable {
     /// Whenever a new value is set, all the observers are notified of the change.
     ///
     /// Even if the newly set value is same as the old value, observers are still notified for change.
-    public var value: E {
+    public var value: Element {
         get {
-            _lock.lock(); defer { _lock.unlock() }
-            return _value
+            self._lock.lock(); defer { self._lock.unlock() }
+            return self._value
         }
         set(newValue) {
             #if DEBUG
-                _synchronizationTracker.register(synchronizationErrorMessage: .variable)
-                defer { _synchronizationTracker.unregister() }
+                self._synchronizationTracker.register(synchronizationErrorMessage: .variable)
+                defer { self._synchronizationTracker.unregister() }
             #endif
-            _lock.lock()
-            _value = newValue
-            _lock.unlock()
+            self._lock.lock()
+            self._value = newValue
+            self._lock.unlock()
 
-            _subject.on(.next(newValue))
+            self._subject.on(.next(newValue))
         }
     }
 
@@ -209,20 +209,373 @@ public final class Variable {
     ///
     /// - parameter value: Initial variable value.
     public init(_ value: Element) {
-        #if DEBUG
-            DeprecationWarner.warnIfNeeded(.variable)
-        #endif
-
-        _value = value
-        _subject = BehaviorSubject(value: value)
+        self._value = value
+        self._subject = BehaviorSubject(value: value)
     }
 
     /// - returns: Canonical interface for push style sequence
-    public func asObservable() -> Observable {
-        return _subject
+    public func asObservable() -> Observable {
+        return self._subject
     }
 
     deinit {
-        _subject.on(.completed)
+        self._subject.on(.completed)
+    }
+}
+
+extension ObservableType {
+    /**
+     Returns an observable sequence by the source observable sequence shifted forward in time by a specified delay. Error events from the source observable sequence are not delayed.
+    
+     - seealso: [delay operator on reactivex.io](http://reactivex.io/documentation/operators/delay.html)
+    
+     - parameter dueTime: Relative time shift of the source by.
+     - parameter scheduler: Scheduler to run the subscription delay timer on.
+     - returns: the source Observable shifted in time by the specified delay.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "delay(_:scheduler:)")
+    public func delay(_ dueTime: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> Observable {
+        return self.delay(.milliseconds(Int(dueTime * 1000.0)), scheduler: scheduler)
+    }
+}
+
+extension ObservableType {
+    
+    /**
+     Applies a timeout policy for each element in the observable sequence. If the next element isn't received within the specified timeout duration starting from its predecessor, a TimeoutError is propagated to the observer.
+     
+     - seealso: [timeout operator on reactivex.io](http://reactivex.io/documentation/operators/timeout.html)
+     
+     - parameter dueTime: Maximum duration between values before a timeout occurs.
+     - parameter scheduler: Scheduler to run the timeout timer on.
+     - returns: An observable sequence with a `RxError.timeout` in case of a timeout.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "timeout(_:scheduler:)")
+    public func timeout(_ dueTime: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> Observable {
+        return timeout(.milliseconds(Int(dueTime * 1000.0)), scheduler: scheduler)
+    }
+    
+    /**
+     Applies a timeout policy for each element in the observable sequence, using the specified scheduler to run timeout timers. If the next element isn't received within the specified timeout duration starting from its predecessor, the other observable sequence is used to produce future messages from that point on.
+     
+     - seealso: [timeout operator on reactivex.io](http://reactivex.io/documentation/operators/timeout.html)
+     
+     - parameter dueTime: Maximum duration between values before a timeout occurs.
+     - parameter other: Sequence to return in case of a timeout.
+     - parameter scheduler: Scheduler to run the timeout timer on.
+     - returns: The source sequence switching to the other sequence in case of a timeout.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "timeout(_:other:scheduler:)")
+    public func timeout(_ dueTime: Foundation.TimeInterval, other: OtherSource, scheduler: SchedulerType)
+        -> Observable where Element == OtherSource.Element {
+        return timeout(.milliseconds(Int(dueTime * 1000.0)), other: other, scheduler: scheduler)
+    }
+}
+
+extension ObservableType {
+    
+    /**
+     Skips elements for the specified duration from the start of the observable source sequence, using the specified scheduler to run timers.
+     
+     - seealso: [skip operator on reactivex.io](http://reactivex.io/documentation/operators/skip.html)
+     
+     - parameter duration: Duration for skipping elements from the start of the sequence.
+     - parameter scheduler: Scheduler to run the timer on.
+     - returns: An observable sequence with the elements skipped during the specified duration from the start of the source sequence.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "skip(_:scheduler:)")
+    public func skip(_ duration: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> Observable {
+        return skip(.milliseconds(Int(duration * 1000.0)), scheduler: scheduler)
+    }
+}
+
+extension ObservableType where Element : RxAbstractInteger {
+    /**
+     Returns an observable sequence that produces a value after each period, using the specified scheduler to run timers and to send out observer messages.
+     
+     - seealso: [interval operator on reactivex.io](http://reactivex.io/documentation/operators/interval.html)
+     
+     - parameter period: Period for producing the values in the resulting sequence.
+     - parameter scheduler: Scheduler to run the timer on.
+     - returns: An observable sequence that produces a value after each period.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "interval(_:scheduler:)")
+    public static func interval(_ period: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> Observable {
+        return interval(.milliseconds(Int(period * 1000.0)), scheduler: scheduler)
+    }
+}
+
+extension ObservableType where Element: RxAbstractInteger {
+    /**
+     Returns an observable sequence that periodically produces a value after the specified initial relative due time has elapsed, using the specified scheduler to run timers.
+     
+     - seealso: [timer operator on reactivex.io](http://reactivex.io/documentation/operators/timer.html)
+     
+     - parameter dueTime: Relative time at which to produce the first value.
+     - parameter period: Period to produce subsequent values.
+     - parameter scheduler: Scheduler to run timers on.
+     - returns: An observable sequence that produces a value after due time has elapsed and then each period.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "timer(_:period:scheduler:)")
+    public static func timer(_ dueTime: Foundation.TimeInterval, period: Foundation.TimeInterval? = nil, scheduler: SchedulerType)
+        -> Observable {
+        return timer(.milliseconds(Int(dueTime * 1000.0)), period: period.map { .milliseconds(Int($0 * 1000.0)) }, scheduler: scheduler)
+    }
+}
+
+extension ObservableType {
+    
+    /**
+     Returns an Observable that emits the first and the latest item emitted by the source Observable during sequential time windows of a specified duration.
+     
+     This operator makes sure that no two elements are emitted in less then dueTime.
+     
+     - seealso: [debounce operator on reactivex.io](http://reactivex.io/documentation/operators/debounce.html)
+     
+     - parameter dueTime: Throttling duration for each element.
+     - parameter latest: Should latest element received in a dueTime wide time window since last element emission be emitted.
+     - parameter scheduler: Scheduler to run the throttle timers on.
+     - returns: The throttled sequence.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "throttle(_:latest:scheduler:)")
+    public func throttle(_ dueTime: Foundation.TimeInterval, latest: Bool = true, scheduler: SchedulerType)
+        -> Observable {
+        return throttle(.milliseconds(Int(dueTime * 1000.0)), latest: latest, scheduler: scheduler)
+    }
+}
+
+extension ObservableType {
+    
+    /**
+     Takes elements for the specified duration from the start of the observable source sequence, using the specified scheduler to run timers.
+     
+     - seealso: [take operator on reactivex.io](http://reactivex.io/documentation/operators/take.html)
+     
+     - parameter duration: Duration for taking elements from the start of the sequence.
+     - parameter scheduler: Scheduler to run the timer on.
+     - returns: An observable sequence with the elements taken during the specified duration from the start of the source sequence.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "take(_:scheduler:)")
+    public func take(_ duration: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> Observable {
+        return take(.milliseconds(Int(duration * 1000.0)), scheduler: scheduler)
+    }
+}
+
+
+extension ObservableType {
+    
+    /**
+     Time shifts the observable sequence by delaying the subscription with the specified relative time duration, using the specified scheduler to run timers.
+     
+     - seealso: [delay operator on reactivex.io](http://reactivex.io/documentation/operators/delay.html)
+     
+     - parameter dueTime: Relative time shift of the subscription.
+     - parameter scheduler: Scheduler to run the subscription delay timer on.
+     - returns: Time-shifted sequence.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "delaySubscription(_:scheduler:)")
+    public func delaySubscription(_ dueTime: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> Observable {
+        return delaySubscription(.milliseconds(Int(dueTime * 1000.0)), scheduler: scheduler)
+    }
+}
+
+extension ObservableType {
+    
+    /**
+     Projects each element of an observable sequence into a window that is completed when either it’s full or a given amount of time has elapsed.
+     
+     - seealso: [window operator on reactivex.io](http://reactivex.io/documentation/operators/window.html)
+     
+     - parameter timeSpan: Maximum time length of a window.
+     - parameter count: Maximum element count of a window.
+     - parameter scheduler: Scheduler to run windowing timers on.
+     - returns: An observable sequence of windows (instances of `Observable`).
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "window(_:)")
+    public func window(timeSpan: Foundation.TimeInterval, count: Int, scheduler: SchedulerType)
+        -> Observable> {
+            return window(timeSpan: .milliseconds(Int(timeSpan * 1000.0)), count: count, scheduler: scheduler)
+    }
+}
+
+
+extension PrimitiveSequence {
+    /**
+     Returns an observable sequence by the source observable sequence shifted forward in time by a specified delay. Error events from the source observable sequence are not delayed.
+     
+     - seealso: [delay operator on reactivex.io](http://reactivex.io/documentation/operators/delay.html)
+     
+     - parameter dueTime: Relative time shift of the source by.
+     - parameter scheduler: Scheduler to run the subscription delay timer on.
+     - returns: the source Observable shifted in time by the specified delay.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "delay(_:scheduler:)")
+    public func delay(_ dueTime: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> PrimitiveSequence {
+        return delay(.milliseconds(Int(dueTime * 1000.0)), scheduler: scheduler)
+    }
+            
+    /**
+     Time shifts the observable sequence by delaying the subscription with the specified relative time duration, using the specified scheduler to run timers.
+     
+     - seealso: [delay operator on reactivex.io](http://reactivex.io/documentation/operators/delay.html)
+     
+     - parameter dueTime: Relative time shift of the subscription.
+     - parameter scheduler: Scheduler to run the subscription delay timer on.
+     - returns: Time-shifted sequence.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "delaySubscription(_:scheduler:)")
+    public func delaySubscription(_ dueTime: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> PrimitiveSequence {
+        return delaySubscription(.milliseconds(Int(dueTime * 1000.0)), scheduler: scheduler)
+    }
+    
+    /**
+     Applies a timeout policy for each element in the observable sequence. If the next element isn't received within the specified timeout duration starting from its predecessor, a TimeoutError is propagated to the observer.
+     
+     - seealso: [timeout operator on reactivex.io](http://reactivex.io/documentation/operators/timeout.html)
+     
+     - parameter dueTime: Maximum duration between values before a timeout occurs.
+     - parameter scheduler: Scheduler to run the timeout timer on.
+     - returns: An observable sequence with a `RxError.timeout` in case of a timeout.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "timeout(_:scheduler:)")
+    public func timeout(_ dueTime: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> PrimitiveSequence {
+        return timeout(.milliseconds(Int(dueTime * 1000.0)), scheduler: scheduler)
+    }
+    
+    /**
+     Applies a timeout policy for each element in the observable sequence, using the specified scheduler to run timeout timers. If the next element isn't received within the specified timeout duration starting from its predecessor, the other observable sequence is used to produce future messages from that point on.
+     
+     - seealso: [timeout operator on reactivex.io](http://reactivex.io/documentation/operators/timeout.html)
+     
+     - parameter dueTime: Maximum duration between values before a timeout occurs.
+     - parameter other: Sequence to return in case of a timeout.
+     - parameter scheduler: Scheduler to run the timeout timer on.
+     - returns: The source sequence switching to the other sequence in case of a timeout.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "timeout(_:other:scheduler:)")
+    public func timeout(_ dueTime: Foundation.TimeInterval,
+                        other: PrimitiveSequence,
+                        scheduler: SchedulerType) -> PrimitiveSequence {
+        return timeout(.milliseconds(Int(dueTime * 1000.0)), other: other, scheduler: scheduler)
+    }
+}
+
+extension PrimitiveSequenceType where Trait == SingleTrait {
+
+    /**
+     Invokes an action for each event in the observable sequence, and propagates all observer messages through the result sequence.
+     
+     - seealso: [do operator on reactivex.io](http://reactivex.io/documentation/operators/do.html)
+     
+     - parameter onNext: Action to invoke for each element in the observable sequence.
+     - parameter onError: Action to invoke upon errored termination of the observable sequence.
+     - parameter onSubscribe: Action to invoke before subscribing to source observable sequence.
+     - parameter onSubscribed: Action to invoke after subscribing to source observable sequence.
+     - parameter onDispose: Action to invoke after subscription to source observable has been disposed for any reason. It can be either because sequence terminates for some reason or observer subscription being disposed.
+     - returns: The source sequence with the side-effecting behavior applied.
+     */
+    @available(*, deprecated, renamed: "do(onSuccess:onError:onSubscribe:onSubscribed:onDispose:)")
+    public func `do`(onNext: ((Element) throws -> Void)?,
+                     onError: ((Swift.Error) throws -> Void)? = nil,
+                     onSubscribe: (() -> Void)? = nil,
+                     onSubscribed: (() -> Void)? = nil,
+                     onDispose: (() -> Void)? = nil)
+        -> Single {
+        return self.`do`(
+            onSuccess: onNext,
+            onError: onError,
+            onSubscribe: onSubscribe,
+            onSubscribed: onSubscribed,
+            onDispose: onDispose
+        )
+    }
+}
+
+extension ObservableType {
+    /**
+     Projects each element of an observable sequence into a buffer that's sent out when either it's full or a given amount of time has elapsed, using the specified scheduler to run timers.
+     
+     A useful real-world analogy of this overload is the behavior of a ferry leaving the dock when all seats are taken, or at the scheduled time of departure, whichever event occurs first.
+     
+     - seealso: [buffer operator on reactivex.io](http://reactivex.io/documentation/operators/buffer.html)
+     
+     - parameter timeSpan: Maximum time length of a buffer.
+     - parameter count: Maximum element count of a buffer.
+     - parameter scheduler: Scheduler to run buffering timers on.
+     - returns: An observable sequence of buffers.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "buffer(timeSpan:count:scheduler:)")
+    public func buffer(timeSpan: Foundation.TimeInterval, count: Int, scheduler: SchedulerType)
+        -> Observable<[Element]> {
+        return buffer(timeSpan: .milliseconds(Int(timeSpan * 1000.0)), count: count, scheduler: scheduler)
+    }
+}
+
+extension PrimitiveSequenceType where Element: RxAbstractInteger
+{
+    /**
+     Returns an observable sequence that periodically produces a value after the specified initial relative due time has elapsed, using the specified scheduler to run timers.
+     
+     - seealso: [timer operator on reactivex.io](http://reactivex.io/documentation/operators/timer.html)
+     
+     - parameter dueTime: Relative time at which to produce the first value.
+     - parameter scheduler: Scheduler to run timers on.
+     - returns: An observable sequence that produces a value after due time has elapsed and then each period.
+     */
+    @available(*, deprecated, message: "Use DispatchTimeInterval overload instead.", renamed: "timer(_:scheduler:)")
+    public static func timer(_ dueTime: Foundation.TimeInterval, scheduler: SchedulerType)
+        -> PrimitiveSequence  {
+        return timer(.milliseconds(Int(dueTime * 1000.0)), scheduler: scheduler)
+    }
+}
+
+extension Completable {
+    /**
+     Merges the completion of all Completables from a collection into a single Completable.
+
+     - seealso: [merge operator on reactivex.io](http://reactivex.io/documentation/operators/merge.html)
+
+     - parameter sources: Collection of Completables to merge.
+     - returns: A Completable that merges the completion of all Completables.
+     */
+    @available(*, deprecated, message: "Use Completable.zip instead.", renamed: "zip")
+    public static func merge(_ sources: Collection) -> Completable
+           where Collection.Element == Completable {
+        return zip(sources)
+    }
+
+    /**
+     Merges the completion of all Completables from an array into a single Completable.
+
+     - seealso: [merge operator on reactivex.io](http://reactivex.io/documentation/operators/merge.html)
+
+     - parameter sources: Array of observable sequences to merge.
+     - returns: A Completable that merges the completion of all Completables.
+     */
+    @available(*, deprecated, message: "Use Completable.zip instead.", renamed: "zip")
+    public static func merge(_ sources: [Completable]) -> Completable {
+        return zip(sources)
+    }
+
+    /**
+     Merges the completion of all Completables into a single Completable.
+
+     - seealso: [merge operator on reactivex.io](http://reactivex.io/documentation/operators/merge.html)
+
+     - parameter sources: Collection of observable sequences to merge.
+     - returns: The observable sequence that merges the elements of the observable sequences.
+     */
+    @available(*, deprecated, message: "Use Completable.zip instead.", renamed: "zip")
+    public static func merge(_ sources: Completable...) -> Completable {
+        return zip(sources)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/AnonymousDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/AnonymousDisposable.swift
index e54532b..6fbd635 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/AnonymousDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/AnonymousDisposable.swift
@@ -12,37 +12,35 @@
 fileprivate final class AnonymousDisposable : DisposeBase, Cancelable {
     public typealias DisposeAction = () -> Void
 
-    private var _isDisposed: AtomicInt = 0
+    private let _isDisposed = AtomicInt(0)
     private var _disposeAction: DisposeAction?
 
     /// - returns: Was resource disposed.
     public var isDisposed: Bool {
-        return _isDisposed == 1
+        return isFlagSet(self._isDisposed, 1)
     }
 
     /// Constructs a new disposable with the given action used for disposal.
     ///
     /// - parameter disposeAction: Disposal action which will be run upon calling `dispose`.
     fileprivate init(_ disposeAction: @escaping DisposeAction) {
-        _disposeAction = disposeAction
+        self._disposeAction = disposeAction
         super.init()
     }
-    
+
     // Non-deprecated version of the constructor, used by `Disposables.create(with:)`
     fileprivate init(disposeAction: @escaping DisposeAction) {
-        _disposeAction = disposeAction
+        self._disposeAction = disposeAction
         super.init()
     }
-    
+
     /// Calls the disposal action if and only if the current instance hasn't been disposed yet.
     ///
     /// After invoking disposal action, disposal action will be dereferenced.
     fileprivate func dispose() {
-        if AtomicCompareAndSwap(0, 1, &_isDisposed) {
-            assert(_isDisposed == 1)
-
-            if let action = _disposeAction {
-                _disposeAction = nil
+        if fetchOr(self._isDisposed, 1) == 0 {
+            if let action = self._disposeAction {
+                self._disposeAction = nil
                 action()
             }
         }
@@ -50,12 +48,12 @@ fileprivate final class AnonymousDisposable : DisposeBase, Cancelable {
 }
 
 extension Disposables {
-    
+
     /// Constructs a new disposable with the given action used for disposal.
     ///
     /// - parameter dispose: Disposal action which will be run upon calling `dispose`.
-    public static func create(with dispose: @escaping () -> ()) -> Cancelable {
+    public static func create(with dispose: @escaping () -> Void) -> Cancelable {
         return AnonymousDisposable(disposeAction: dispose)
     }
-    
+
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/BinaryDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/BinaryDisposable.swift
index 8a518f0..5693268 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/BinaryDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/BinaryDisposable.swift
@@ -9,7 +9,7 @@
 /// Represents two disposable resources that are disposed together.
 private final class BinaryDisposable : DisposeBase, Cancelable {
 
-    private var _isDisposed: AtomicInt = 0
+    private let _isDisposed = AtomicInt(0)
 
     // state
     private var _disposable1: Disposable?
@@ -17,7 +17,7 @@ private final class BinaryDisposable : DisposeBase, Cancelable {
 
     /// - returns: Was resource disposed.
     var isDisposed: Bool {
-        return _isDisposed > 0
+        return isFlagSet(self._isDisposed, 1)
     }
 
     /// Constructs new binary disposable from two disposables.
@@ -25,8 +25,8 @@ private final class BinaryDisposable : DisposeBase, Cancelable {
     /// - parameter disposable1: First disposable
     /// - parameter disposable2: Second disposable
     init(_ disposable1: Disposable, _ disposable2: Disposable) {
-        _disposable1 = disposable1
-        _disposable2 = disposable2
+        self._disposable1 = disposable1
+        self._disposable2 = disposable2
         super.init()
     }
 
@@ -34,20 +34,20 @@ private final class BinaryDisposable : DisposeBase, Cancelable {
     ///
     /// After invoking disposal action, disposal action will be dereferenced.
     func dispose() {
-        if AtomicCompareAndSwap(0, 1, &_isDisposed) {
-            _disposable1?.dispose()
-            _disposable2?.dispose()
-            _disposable1 = nil
-            _disposable2 = nil
+        if fetchOr(self._isDisposed, 1) == 0 {
+            self._disposable1?.dispose()
+            self._disposable2?.dispose()
+            self._disposable1 = nil
+            self._disposable2 = nil
         }
     }
 }
 
 extension Disposables {
-    
+
     /// Creates a disposable with the given disposables.
     public static func create(_ disposable1: Disposable, _ disposable2: Disposable) -> Cancelable {
         return BinaryDisposable(disposable1, disposable2)
     }
-    
+
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/BooleanDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/BooleanDisposable.swift
index efae55e..a0f5c2f 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/BooleanDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/BooleanDisposable.swift
@@ -23,11 +23,11 @@ public final class BooleanDisposable : Cancelable {
     
     /// - returns: Was resource disposed.
     public var isDisposed: Bool {
-        return _isDisposed
+        return self._isDisposed
     }
     
     /// Sets the status to disposed, which can be observer through the `isDisposed` property.
     public func dispose() {
-        _isDisposed = true
+        self._isDisposed = true
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/CompositeDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/CompositeDisposable.swift
index b057817..ce0da6a 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/CompositeDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/CompositeDisposable.swift
@@ -22,8 +22,8 @@ public final class CompositeDisposable : DisposeBase, Cancelable {
     private var _disposables: Bag? = Bag()
 
     public var isDisposed: Bool {
-        _lock.lock(); defer { _lock.unlock() }
-        return _disposables == nil
+        self._lock.lock(); defer { self._lock.unlock() }
+        return self._disposables == nil
     }
     
     public override init() {
@@ -32,35 +32,35 @@ public final class CompositeDisposable : DisposeBase, Cancelable {
     /// Initializes a new instance of composite disposable with the specified number of disposables.
     public init(_ disposable1: Disposable, _ disposable2: Disposable) {
         // This overload is here to make sure we are using optimized version up to 4 arguments.
-        let _ = _disposables!.insert(disposable1)
-        let _ = _disposables!.insert(disposable2)
+        _ = self._disposables!.insert(disposable1)
+        _ = self._disposables!.insert(disposable2)
     }
     
     /// Initializes a new instance of composite disposable with the specified number of disposables.
     public init(_ disposable1: Disposable, _ disposable2: Disposable, _ disposable3: Disposable) {
         // This overload is here to make sure we are using optimized version up to 4 arguments.
-        let _ = _disposables!.insert(disposable1)
-        let _ = _disposables!.insert(disposable2)
-        let _ = _disposables!.insert(disposable3)
+        _ = self._disposables!.insert(disposable1)
+        _ = self._disposables!.insert(disposable2)
+        _ = self._disposables!.insert(disposable3)
     }
     
     /// Initializes a new instance of composite disposable with the specified number of disposables.
     public init(_ disposable1: Disposable, _ disposable2: Disposable, _ disposable3: Disposable, _ disposable4: Disposable, _ disposables: Disposable...) {
         // This overload is here to make sure we are using optimized version up to 4 arguments.
-        let _ = _disposables!.insert(disposable1)
-        let _ = _disposables!.insert(disposable2)
-        let _ = _disposables!.insert(disposable3)
-        let _ = _disposables!.insert(disposable4)
+        _ = self._disposables!.insert(disposable1)
+        _ = self._disposables!.insert(disposable2)
+        _ = self._disposables!.insert(disposable3)
+        _ = self._disposables!.insert(disposable4)
         
         for disposable in disposables {
-            let _ = _disposables!.insert(disposable)
+            _ = self._disposables!.insert(disposable)
         }
     }
     
     /// Initializes a new instance of composite disposable with the specified number of disposables.
     public init(disposables: [Disposable]) {
         for disposable in disposables {
-            let _ = _disposables!.insert(disposable)
+            _ = self._disposables!.insert(disposable)
         }
     }
 
@@ -72,7 +72,7 @@ public final class CompositeDisposable : DisposeBase, Cancelable {
      disposed `nil` will be returned.
      */
     public func insert(_ disposable: Disposable) -> DisposeKey? {
-        let key = _insert(disposable)
+        let key = self._insert(disposable)
         
         if key == nil {
             disposable.dispose()
@@ -82,42 +82,42 @@ public final class CompositeDisposable : DisposeBase, Cancelable {
     }
     
     private func _insert(_ disposable: Disposable) -> DisposeKey? {
-        _lock.lock(); defer { _lock.unlock() }
+        self._lock.lock(); defer { self._lock.unlock() }
 
-        let bagKey = _disposables?.insert(disposable)
+        let bagKey = self._disposables?.insert(disposable)
         return bagKey.map(DisposeKey.init)
     }
     
     /// - returns: Gets the number of disposables contained in the `CompositeDisposable`.
     public var count: Int {
-        _lock.lock(); defer { _lock.unlock() }
-        return _disposables?.count ?? 0
+        self._lock.lock(); defer { self._lock.unlock() }
+        return self._disposables?.count ?? 0
     }
     
     /// Removes and disposes the disposable identified by `disposeKey` from the CompositeDisposable.
     ///
     /// - parameter disposeKey: Key used to identify disposable to be removed.
     public func remove(for disposeKey: DisposeKey) {
-        _remove(for: disposeKey)?.dispose()
+        self._remove(for: disposeKey)?.dispose()
     }
     
     private func _remove(for disposeKey: DisposeKey) -> Disposable? {
-        _lock.lock(); defer { _lock.unlock() }
-        return _disposables?.removeKey(disposeKey.key)
+        self._lock.lock(); defer { self._lock.unlock() }
+        return self._disposables?.removeKey(disposeKey.key)
     }
     
     /// Disposes all disposables in the group and removes them from the group.
     public func dispose() {
-        if let disposables = _dispose() {
+        if let disposables = self._dispose() {
             disposeAll(in: disposables)
         }
     }
 
     private func _dispose() -> Bag? {
-        _lock.lock(); defer { _lock.unlock() }
+        self._lock.lock(); defer { self._lock.unlock() }
 
-        let disposeBag = _disposables
-        _disposables = nil
+        let disposeBag = self._disposables
+        self._disposables = nil
 
         return disposeBag
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBag.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBag.swift
index 9a2386d..22e5cb0 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBag.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBag.swift
@@ -44,23 +44,23 @@ public final class DisposeBag: DisposeBase {
     ///
     /// - parameter disposable: Disposable to add.
     public func insert(_ disposable: Disposable) {
-        _insert(disposable)?.dispose()
+        self._insert(disposable)?.dispose()
     }
     
     private func _insert(_ disposable: Disposable) -> Disposable? {
-        _lock.lock(); defer { _lock.unlock() }
-        if _isDisposed {
+        self._lock.lock(); defer { self._lock.unlock() }
+        if self._isDisposed {
             return disposable
         }
 
-        _disposables.append(disposable)
+        self._disposables.append(disposable)
 
         return nil
     }
 
     /// This is internal on purpose, take a look at `CompositeDisposable` instead.
     private func dispose() {
-        let oldDisposables = _dispose()
+        let oldDisposables = self._dispose()
 
         for disposable in oldDisposables {
             disposable.dispose()
@@ -68,18 +68,18 @@ public final class DisposeBag: DisposeBase {
     }
 
     private func _dispose() -> [Disposable] {
-        _lock.lock(); defer { _lock.unlock() }
+        self._lock.lock(); defer { self._lock.unlock() }
 
-        let disposables = _disposables
+        let disposables = self._disposables
         
-        _disposables.removeAll(keepingCapacity: false)
-        _isDisposed = true
+        self._disposables.removeAll(keepingCapacity: false)
+        self._isDisposed = true
         
         return disposables
     }
     
     deinit {
-        dispose()
+        self.dispose()
     }
 }
 
@@ -88,27 +88,27 @@ extension DisposeBag {
     /// Convenience init allows a list of disposables to be gathered for disposal.
     public convenience init(disposing disposables: Disposable...) {
         self.init()
-        _disposables += disposables
+        self._disposables += disposables
     }
 
     /// Convenience init allows an array of disposables to be gathered for disposal.
     public convenience init(disposing disposables: [Disposable]) {
         self.init()
-        _disposables += disposables
+        self._disposables += disposables
     }
 
     /// Convenience function allows a list of disposables to be gathered for disposal.
     public func insert(_ disposables: Disposable...) {
-        insert(disposables)
+        self.insert(disposables)
     }
 
     /// Convenience function allows an array of disposables to be gathered for disposal.
     public func insert(_ disposables: [Disposable]) {
-        _lock.lock(); defer { _lock.unlock() }
-        if _isDisposed {
+        self._lock.lock(); defer { self._lock.unlock() }
+        if self._isDisposed {
             disposables.forEach { $0.dispose() }
         } else {
-            _disposables += disposables
+            self._disposables += disposables
         }
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBase.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBase.swift
index 8c6a44f..0d4b2fb 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBase.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/DisposeBase.swift
@@ -10,13 +10,13 @@
 public class DisposeBase {
     init() {
 #if TRACE_RESOURCES
-    let _ = Resources.incrementTotal()
+    _ = Resources.incrementTotal()
 #endif
     }
     
     deinit {
 #if TRACE_RESOURCES
-    let _ = Resources.decrementTotal()
+    _ = Resources.decrementTotal()
 #endif
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/RefCountDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/RefCountDisposable.swift
index a21662a..922f20a 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/RefCountDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/RefCountDisposable.swift
@@ -15,13 +15,13 @@ public final class RefCountDisposable : DisposeBase, Cancelable {
 
     /// - returns: Was resource disposed.
     public var isDisposed: Bool {
-        _lock.lock(); defer { _lock.unlock() }
-        return _disposable == nil
+        self._lock.lock(); defer { self._lock.unlock() }
+        return self._disposable == nil
     }
 
     /// Initializes a new instance of the `RefCountDisposable`.
     public init(disposable: Disposable) {
-        _disposable = disposable
+        self._disposable = disposable
         super.init()
     }
 
@@ -31,12 +31,11 @@ public final class RefCountDisposable : DisposeBase, Cancelable {
      When getter is called, a dependent disposable contributing to the reference count that manages the underlying disposable's lifetime is returned.
      */
     public func retain() -> Disposable {
-        return _lock.calculateLocked {
-            if let _ = _disposable {
-
+        return self._lock.calculateLocked {
+            if self._disposable != nil {
                 do {
-                    let _ = try incrementChecked(&_count)
-                } catch (_) {
+                    _ = try incrementChecked(&self._count)
+                } catch {
                     rxFatalError("RefCountDisposable increment failed")
                 }
 
@@ -49,14 +48,12 @@ public final class RefCountDisposable : DisposeBase, Cancelable {
 
     /// Disposes the underlying disposable only when all dependent disposables have been disposed.
     public func dispose() {
-        let oldDisposable: Disposable? = _lock.calculateLocked {
-            if let oldDisposable = _disposable, !_primaryDisposed
-            {
-                _primaryDisposed = true
-
-                if (_count == 0)
-                {
-                    _disposable = nil
+        let oldDisposable: Disposable? = self._lock.calculateLocked {
+            if let oldDisposable = self._disposable, !self._primaryDisposed {
+                self._primaryDisposed = true
+
+                if self._count == 0 {
+                    self._disposable = nil
                     return oldDisposable
                 }
             }
@@ -70,20 +67,20 @@ public final class RefCountDisposable : DisposeBase, Cancelable {
     }
 
     fileprivate func release() {
-        let oldDisposable: Disposable? = _lock.calculateLocked {
-            if let oldDisposable = _disposable {
+        let oldDisposable: Disposable? = self._lock.calculateLocked {
+            if let oldDisposable = self._disposable {
                 do {
-                    let _ = try decrementChecked(&_count)
-                } catch (_) {
+                    _ = try decrementChecked(&self._count)
+                } catch {
                     rxFatalError("RefCountDisposable decrement on release failed")
                 }
 
-                guard _count >= 0 else {
+                guard self._count >= 0 else {
                     rxFatalError("RefCountDisposable counter is lower than 0")
                 }
 
-                if _primaryDisposed && _count == 0 {
-                    _disposable = nil
+                if self._primaryDisposed && self._count == 0 {
+                    self._disposable = nil
                     return oldDisposable
                 }
             }
@@ -100,18 +97,17 @@ public final class RefCountDisposable : DisposeBase, Cancelable {
 internal final class RefCountInnerDisposable: DisposeBase, Disposable
 {
     private let _parent: RefCountDisposable
-    private var _isDisposed: AtomicInt = 0
+    private let _isDisposed = AtomicInt(0)
 
-    init(_ parent: RefCountDisposable)
-    {
-        _parent = parent
+    init(_ parent: RefCountDisposable) {
+        self._parent = parent
         super.init()
     }
 
     internal func dispose()
     {
-        if AtomicCompareAndSwap(0, 1, &_isDisposed) {
-            _parent.release()
+        if fetchOr(self._isDisposed, 1) == 0 {
+            self._parent.release()
         }
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/ScheduledDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/ScheduledDisposable.swift
index 92c220d..c834f5b 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/ScheduledDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/ScheduledDisposable.swift
@@ -15,14 +15,14 @@ private let disposeScheduledDisposable: (ScheduledDisposable) -> Disposable = {
 public final class ScheduledDisposable : Cancelable {
     public let scheduler: ImmediateSchedulerType
 
-    private var _isDisposed: AtomicInt = 0
+    private let _isDisposed = AtomicInt(0)
 
     // state
     private var _disposable: Disposable?
 
     /// - returns: Was resource disposed.
     public var isDisposed: Bool {
-        return _isDisposed == 1
+        return isFlagSet(self._isDisposed, 1)
     }
 
     /**
@@ -33,18 +33,18 @@ public final class ScheduledDisposable : Cancelable {
     */
     public init(scheduler: ImmediateSchedulerType, disposable: Disposable) {
         self.scheduler = scheduler
-        _disposable = disposable
+        self._disposable = disposable
     }
 
     /// Disposes the wrapped disposable on the provided scheduler.
     public func dispose() {
-        let _ = scheduler.schedule(self, action: disposeScheduledDisposable)
+        _ = self.scheduler.schedule(self, action: disposeScheduledDisposable)
     }
 
     func disposeInner() {
-        if AtomicCompareAndSwap(0, 1, &_isDisposed) {
-            _disposable!.dispose()
-            _disposable = nil
+        if fetchOr(self._isDisposed, 1) == 0 {
+            self._disposable!.dispose()
+            self._disposable = nil
         }
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/SerialDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/SerialDisposable.swift
index 6373d2b..22dce36 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/SerialDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/SerialDisposable.swift
@@ -16,7 +16,7 @@ public final class SerialDisposable : DisposeBase, Cancelable {
     
     /// - returns: Was resource disposed.
     public var isDisposed: Bool {
-        return _isDisposed
+        return self._isDisposed
     }
     
     /// Initializes a new instance of the `SerialDisposable`.
@@ -33,18 +33,18 @@ public final class SerialDisposable : DisposeBase, Cancelable {
     */
     public var disposable: Disposable {
         get {
-            return _lock.calculateLocked {
-                return _current ?? Disposables.create()
+            return self._lock.calculateLocked {
+                return self._current ?? Disposables.create()
             }
         }
         set (newDisposable) {
-            let disposable: Disposable? = _lock.calculateLocked {
-                if _isDisposed {
+            let disposable: Disposable? = self._lock.calculateLocked {
+                if self._isDisposed {
                     return newDisposable
                 }
                 else {
-                    let toDispose = _current
-                    _current = newDisposable
+                    let toDispose = self._current
+                    self._current = newDisposable
                     return toDispose
                 }
             }
@@ -57,18 +57,18 @@ public final class SerialDisposable : DisposeBase, Cancelable {
     
     /// Disposes the underlying disposable as well as all future replacements.
     public func dispose() {
-        _dispose()?.dispose()
+        self._dispose()?.dispose()
     }
 
     private func _dispose() -> Disposable? {
-        _lock.lock(); defer { _lock.unlock() }
-        if _isDisposed {
+        self._lock.lock(); defer { self._lock.unlock() }
+        if self._isDisposed {
             return nil
         }
         else {
-            _isDisposed = true
-            let current = _current
-            _current = nil
+            self._isDisposed = true
+            let current = self._current
+            self._current = nil
             return current
         }
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/SingleAssignmentDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/SingleAssignmentDisposable.swift
index e8ef67d..88d59db 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/SingleAssignmentDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/SingleAssignmentDisposable.swift
@@ -13,24 +13,18 @@ If an underlying disposable resource has already been set, future attempts to se
 */
 public final class SingleAssignmentDisposable : DisposeBase, Cancelable {
 
-    fileprivate enum DisposeState: UInt32 {
-        case disposed = 1
-        case disposableSet = 2
-    }
-
-    // Jeej, swift API consistency rules
-    fileprivate enum DisposeStateInt32: Int32 {
+    fileprivate enum DisposeState: Int32 {
         case disposed = 1
         case disposableSet = 2
     }
 
     // state
-    private var _state: AtomicInt = 0
+    private let _state = AtomicInt(0)
     private var _disposable = nil as Disposable?
 
     /// - returns: A value that indicates whether the object is disposed.
     public var isDisposed: Bool {
-        return AtomicFlagSet(DisposeState.disposed.rawValue, &_state)
+        return isFlagSet(self._state, DisposeState.disposed.rawValue)
     }
 
     /// Initializes a new instance of the `SingleAssignmentDisposable`.
@@ -42,34 +36,34 @@ public final class SingleAssignmentDisposable : DisposeBase, Cancelable {
     ///
     /// **Throws exception if the `SingleAssignmentDisposable` has already been assigned to.**
     public func setDisposable(_ disposable: Disposable) {
-        _disposable = disposable
+        self._disposable = disposable
+
+        let previousState = fetchOr(self._state, DisposeState.disposableSet.rawValue)
 
-        let previousState = AtomicOr(DisposeState.disposableSet.rawValue, &_state)
-        
-        if (previousState & DisposeStateInt32.disposableSet.rawValue) != 0 {
+        if (previousState & DisposeState.disposableSet.rawValue) != 0 {
             rxFatalError("oldState.disposable != nil")
         }
 
-        if (previousState & DisposeStateInt32.disposed.rawValue) != 0 {
+        if (previousState & DisposeState.disposed.rawValue) != 0 {
             disposable.dispose()
-            _disposable = nil
+            self._disposable = nil
         }
     }
 
     /// Disposes the underlying disposable.
     public func dispose() {
-        let previousState = AtomicOr(DisposeState.disposed.rawValue, &_state)
+        let previousState = fetchOr(self._state, DisposeState.disposed.rawValue)
 
-        if (previousState & DisposeStateInt32.disposed.rawValue) != 0 {
+        if (previousState & DisposeState.disposed.rawValue) != 0 {
             return
         }
 
-        if (previousState & DisposeStateInt32.disposableSet.rawValue) != 0 {
-            guard let disposable = _disposable else {
+        if (previousState & DisposeState.disposableSet.rawValue) != 0 {
+            guard let disposable = self._disposable else {
                 rxFatalError("Disposable not set")
             }
             disposable.dispose()
-            _disposable = nil
+            self._disposable = nil
         }
     }
 
diff --git a/Demo/Pods/RxSwift/RxSwift/Disposables/SubscriptionDisposable.swift b/Demo/Pods/RxSwift/RxSwift/Disposables/SubscriptionDisposable.swift
index 3ae138a..430e4c6 100644
--- a/Demo/Pods/RxSwift/RxSwift/Disposables/SubscriptionDisposable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Disposables/SubscriptionDisposable.swift
@@ -11,11 +11,11 @@ struct SubscriptionDisposable : Disposable {
     private weak var _owner: T?
 
     init(owner: T, key: T.DisposeKey) {
-        _owner = owner
-        _key = key
+        self._owner = owner
+        self._key = key
     }
 
     func dispose() {
-        _owner?.synchronizedUnsubscribe(_key)
+        self._owner?.synchronizedUnsubscribe(self._key)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Event.swift b/Demo/Pods/RxSwift/RxSwift/Event.swift
index 9193e35..699e3d2 100644
--- a/Demo/Pods/RxSwift/RxSwift/Event.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Event.swift
@@ -21,7 +21,7 @@ public enum Event {
     case completed
 }
 
-extension Event : CustomDebugStringConvertible {
+extension Event: CustomDebugStringConvertible {
     /// Description of event.
     public var debugDescription: String {
         switch self {
@@ -92,13 +92,16 @@ extension Event {
 /// A type that can be converted to `Event`.
 public protocol EventConvertible {
     /// Type of element in event
-    associatedtype ElementType
+    associatedtype Element
+
+    @available(*, deprecated, message: "Use `Element` instead.")
+    typealias ElementType = Element
 
     /// Event representation of this instance
-    var event: Event { get }
+    var event: Event { get }
 }
 
-extension Event : EventConvertible {
+extension Event: EventConvertible {
     /// Event representation of this instance
     public var event: Event {
         return self
diff --git a/Demo/Pods/RxSwift/RxSwift/Extensions/Bag+Rx.swift b/Demo/Pods/RxSwift/RxSwift/Extensions/Bag+Rx.swift
index 748578d..9794683 100644
--- a/Demo/Pods/RxSwift/RxSwift/Extensions/Bag+Rx.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Extensions/Bag+Rx.swift
@@ -10,7 +10,7 @@
 // MARK: forEach
 
 @inline(__always)
-func dispatch(_ bag: Bag<(Event) -> ()>, _ event: Event) {
+func dispatch(_ bag: Bag<(Event) -> Void>, _ event: Event) {
     bag._value0?(event)
 
     if bag._onlyFastPath {
diff --git a/Demo/Pods/RxSwift/RxSwift/Extensions/String+Rx.swift b/Demo/Pods/RxSwift/RxSwift/Extensions/String+Rx.swift
index 42ef636..70d4786 100644
--- a/Demo/Pods/RxSwift/RxSwift/Extensions/String+Rx.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Extensions/String+Rx.swift
@@ -9,8 +9,8 @@
 extension String {
     /// This is needed because on Linux Swift doesn't have `rangeOfString(..., options: .BackwardsSearch)`
     func lastIndexOf(_ character: Character) -> Index? {
-        var index = endIndex
-        while index > startIndex {
+        var index = self.endIndex
+        while index > self.startIndex {
             index = self.index(before: index)
             if self[index] == character {
                 return index
diff --git a/Demo/Pods/RxSwift/RxSwift/GroupedObservable.swift b/Demo/Pods/RxSwift/RxSwift/GroupedObservable.swift
index d87e0ba..34a2fc2 100644
--- a/Demo/Pods/RxSwift/RxSwift/GroupedObservable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/GroupedObservable.swift
@@ -8,8 +8,6 @@
 
 /// Represents an observable sequence of elements that have a common key.
 public struct GroupedObservable : ObservableType {
-    public typealias E = Element
-
     /// Gets the common key.
     public let key: Key
 
@@ -26,12 +24,12 @@ public struct GroupedObservable : ObservableType {
     }
 
     /// Subscribes `observer` to receive events for this sequence.
-    public func subscribe(_ observer: O) -> Disposable where O.E == E {
+    public func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
         return self.source.subscribe(observer)
     }
 
     /// Converts `self` to `Observable` sequence. 
     public func asObservable() -> Observable {
-        return source
+        return self.source
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift b/Demo/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift
index 8dc2a85..954fbf0 100644
--- a/Demo/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift
@@ -26,7 +26,7 @@ extension ImmediateSchedulerType {
     - parameter action: Action to execute recursively. The last parameter passed to the action is used to trigger recursive scheduling of the action, passing in recursive invocation state.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public func scheduleRecursive(_ state: State, action: @escaping (_ state: State, _ recurse: (State) -> ()) -> ()) -> Disposable {
+    public func scheduleRecursive(_ state: State, action: @escaping (_ state: State, _ recurse: (State) -> Void) -> Void) -> Disposable {
         let recursiveScheduler = RecursiveImmediateScheduler(action: action, scheduler: self)
         
         recursiveScheduler.schedule(state)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observable.swift b/Demo/Pods/RxSwift/RxSwift/Observable.swift
index f0c55af..5120d23 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observable.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observable.swift
@@ -10,26 +10,23 @@
 ///
 /// It represents a push style sequence.
 public class Observable : ObservableType {
-    /// Type of elements in sequence.
-    public typealias E = Element
-    
     init() {
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
     }
     
-    public func subscribe(_ observer: O) -> Disposable where O.E == E {
+    public func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
         rxAbstractMethod()
     }
     
-    public func asObservable() -> Observable {
+    public func asObservable() -> Observable {
         return self
     }
     
     deinit {
 #if TRACE_RESOURCES
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
 #endif
     }
 
@@ -37,7 +34,7 @@ public class Observable : ObservableType {
     // Swift compiler reports "Not supported yet" when trying to override protocol extensions, so ¯\_(ツ)_/¯
 
     /// Optimizations for map operator
-    internal func composeMap(_ transform: @escaping (Element) throws -> R) -> Observable {
+    internal func composeMap(_ transform: @escaping (Element) throws -> Result) -> Observable {
         return _map(source: self, transform: transform)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/ObservableConvertibleType.swift b/Demo/Pods/RxSwift/RxSwift/ObservableConvertibleType.swift
index d89c5aa..8db16e6 100644
--- a/Demo/Pods/RxSwift/RxSwift/ObservableConvertibleType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/ObservableConvertibleType.swift
@@ -6,13 +6,16 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-/// Type that can be converted to observable sequence (`Observable`).
+/// Type that can be converted to observable sequence (`Observable`).
 public protocol ObservableConvertibleType {
     /// Type of elements in sequence.
-    associatedtype E
+    associatedtype Element
+
+    @available(*, deprecated, message: "Use `Element` instead.")
+    typealias E = Element
 
     /// Converts `self` to `Observable` sequence.
     ///
     /// - returns: Observable sequence that represents `self`.
-    func asObservable() -> Observable
+    func asObservable() -> Observable
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift b/Demo/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift
index 29ed8a2..e8875ea 100644
--- a/Demo/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift
+++ b/Demo/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift
@@ -17,7 +17,7 @@ extension ObservableType {
      - parameter on: Action to invoke for each event in the observable sequence.
      - returns: Subscription object used to unsubscribe from the observable sequence.
      */
-    public func subscribe(_ on: @escaping (Event) -> Void)
+    public func subscribe(_ on: @escaping (Event) -> Void)
         -> Disposable {
             let observer = AnonymousObserver { e in
                 on(e)
@@ -36,7 +36,7 @@ extension ObservableType {
      gracefully completed, errored, or if the generation is canceled by disposing subscription).
      - returns: Subscription object used to unsubscribe from the observable sequence.
      */
-    public func subscribe(onNext: ((E) -> Void)? = nil, onError: ((Swift.Error) -> Void)? = nil, onCompleted: (() -> Void)? = nil, onDisposed: (() -> Void)? = nil)
+    public func subscribe(onNext: ((Element) -> Void)? = nil, onError: ((Swift.Error) -> Void)? = nil, onCompleted: (() -> Void)? = nil, onDisposed: (() -> Void)? = nil)
         -> Disposable {
             let disposable: Disposable
             
@@ -53,7 +53,7 @@ extension ObservableType {
             
             let callStack = Hooks.recordCallStackOnError ? Hooks.customCaptureSubscriptionCallstack() : []
             
-            let observer = AnonymousObserver { event in
+            let observer = AnonymousObserver { event in
                 
                 #if DEBUG
                     synchronizationTracker.register(synchronizationErrorMessage: .default)
@@ -86,7 +86,7 @@ extension ObservableType {
 import class Foundation.NSRecursiveLock
 
 extension Hooks {
-    public typealias DefaultErrorHandler = (_ subscriptionCallStack: [String], _ error: Error) -> ()
+    public typealias DefaultErrorHandler = (_ subscriptionCallStack: [String], _ error: Error) -> Void
     public typealias CustomCaptureSubscriptionCallstack = () -> [String]
 
     fileprivate static let _lock = RecursiveLock()
diff --git a/Demo/Pods/RxSwift/RxSwift/ObservableType.swift b/Demo/Pods/RxSwift/RxSwift/ObservableType.swift
index e41a36a..dea9bfc 100644
--- a/Demo/Pods/RxSwift/RxSwift/ObservableType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/ObservableType.swift
@@ -7,7 +7,7 @@
 //
 
 /// Represents a push style sequence.
-public protocol ObservableType : ObservableConvertibleType {
+public protocol ObservableType: ObservableConvertibleType {
     /**
     Subscribes `observer` to receive events for this sequence.
     
@@ -31,13 +31,13 @@ public protocol ObservableType : ObservableConvertibleType {
     
     - returns: Subscription for `observer` that can be used to cancel production of sequence elements and free resources.
     */
-    func subscribe(_ observer: O) -> Disposable where O.E == E
+    func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element
 }
 
 extension ObservableType {
     
     /// Default implementation of converting `ObservableType` to `Observable`.
-    public func asObservable() -> Observable {
+    public func asObservable() -> Observable {
         // temporary workaround
         //return Observable.create(subscribe: self.subscribe)
         return Observable.create { o in
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/AddRef.swift b/Demo/Pods/RxSwift/RxSwift/Observables/AddRef.swift
index b782c13..2c937a4 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/AddRef.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/AddRef.swift
@@ -6,39 +6,38 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-final class AddRefSink : Sink, ObserverType {
-    typealias Element = O.E
+final class AddRefSink : Sink, ObserverType {
+    typealias Element = Observer.Element 
     
-    override init(observer: O, cancel: Cancelable) {
+    override init(observer: Observer, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event) {
         switch event {
-        case .next(_):
-            forwardOn(event)
-        case .completed, .error(_):
-            forwardOn(event)
-            dispose()
+        case .next:
+            self.forwardOn(event)
+        case .completed, .error:
+            self.forwardOn(event)
+            self.dispose()
         }
     }
 }
 
 final class AddRef : Producer {
-    typealias EventHandler = (Event) throws -> Void
     
     private let _source: Observable
     private let _refCount: RefCountDisposable
     
     init(source: Observable, refCount: RefCountDisposable) {
-        _source = source
-        _refCount = refCount
+        self._source = source
+        self._refCount = refCount
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let releaseDisposable = _refCount.retain()
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let releaseDisposable = self._refCount.retain()
         let sink = AddRefSink(observer: observer, cancel: cancel)
-        let subscription = Disposables.create(releaseDisposable, _source.subscribe(sink))
+        let subscription = Disposables.create(releaseDisposable, self._source.subscribe(sink))
 
         return (sink: sink, subscription: subscription)
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Amb.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Amb.swift
index 08ec04e..f8c1746 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Amb.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Amb.swift
@@ -14,9 +14,9 @@ extension ObservableType {
 
      - returns: An observable sequence that surfaces any of the given sequences, whichever reacted first.
      */
-    public static func amb(_ sequence: S) -> Observable
-        where S.Iterator.Element == Observable {
-            return sequence.reduce(Observable.never()) { a, o in
+    public static func amb(_ sequence: Sequence) -> Observable
+        where Sequence.Element == Observable {
+            return sequence.reduce(Observable.never()) { a, o in
                 return a.amb(o.asObservable())
             }
     }
@@ -34,8 +34,8 @@ extension ObservableType {
      */
     public func amb
         (_ right: O2)
-        -> Observable where O2.E == E {
-        return Amb(left: asObservable(), right: right.asObservable())
+        -> Observable where O2.Element == Element {
+        return Amb(left: self.asObservable(), right: right.asObservable())
     }
 }
 
@@ -45,10 +45,10 @@ fileprivate enum AmbState {
     case right
 }
 
-final fileprivate class AmbObserver : ObserverType {
-    typealias Element = O.E
-    typealias Parent = AmbSink
-    typealias This = AmbObserver
+final private class AmbObserver: ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = AmbSink
+    typealias This = AmbObserver
     typealias Sink = (This, Event) -> Void
     
     fileprivate let _parent: Parent
@@ -57,32 +57,32 @@ final fileprivate class AmbObserver : ObserverType {
     
     init(parent: Parent, cancel: Disposable, sink: @escaping Sink) {
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
         
-        _parent = parent
-        _sink = sink
-        _cancel = cancel
+        self._parent = parent
+        self._sink = sink
+        self._cancel = cancel
     }
     
     func on(_ event: Event) {
-        _sink(self, event)
+        self._sink(self, event)
         if event.isStopEvent {
-            _cancel.dispose()
+            self._cancel.dispose()
         }
     }
     
     deinit {
 #if TRACE_RESOURCES
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
 #endif
     }
 }
 
-final fileprivate class AmbSink : Sink {
-    typealias ElementType = O.E
-    typealias Parent = Amb
-    typealias AmbObserverType = AmbObserver
+final private class AmbSink: Sink {
+    typealias Element = Observer.Element
+    typealias Parent = Amb
+    typealias AmbObserverType = AmbObserver
 
     private let _parent: Parent
     
@@ -90,8 +90,8 @@ final fileprivate class AmbSink : Sink {
     // state
     private var _choice = AmbState.neither
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
@@ -100,14 +100,14 @@ final fileprivate class AmbSink : Sink {
         let subscription2 = SingleAssignmentDisposable()
         let disposeAll = Disposables.create(subscription1, subscription2)
         
-        let forwardEvent = { (o: AmbObserverType, event: Event) -> Void in
+        let forwardEvent = { (o: AmbObserverType, event: Event) -> Void in
             self.forwardOn(event)
             if event.isStopEvent {
                 self.dispose()
             }
         }
 
-        let decide = { (o: AmbObserverType, event: Event, me: AmbState, otherSubscription: Disposable) in
+        let decide = { (o: AmbObserverType, event: Event, me: AmbState, otherSubscription: Disposable) in
             self._lock.performLocked {
                 if self._choice == .neither {
                     self._choice = me
@@ -133,23 +133,23 @@ final fileprivate class AmbSink : Sink {
             decide(o, e, .right, subscription1)
         }
         
-        subscription1.setDisposable(_parent._left.subscribe(sink1))
-        subscription2.setDisposable(_parent._right.subscribe(sink2))
+        subscription1.setDisposable(self._parent._left.subscribe(sink1))
+        subscription2.setDisposable(self._parent._right.subscribe(sink2))
         
         return disposeAll
     }
 }
 
-final fileprivate class Amb: Producer {
+final private class Amb: Producer {
     fileprivate let _left: Observable
     fileprivate let _right: Observable
     
     init(left: Observable, right: Observable) {
-        _left = left
-        _right = right
+        self._left = left
+        self._right = right
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = AmbSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/AsMaybe.swift b/Demo/Pods/RxSwift/RxSwift/Observables/AsMaybe.swift
index 36fa685..d8371e5 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/AsMaybe.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/AsMaybe.swift
@@ -6,30 +6,29 @@
 //  Copyright © 2017 Krunoslav Zaher. All rights reserved.
 //
 
-fileprivate final class AsMaybeSink : Sink, ObserverType {
-    typealias ElementType = O.E
-    typealias E = ElementType
+fileprivate final class AsMaybeSink : Sink, ObserverType {
+    typealias Element = Observer.Element
 
-    private var _element: Event? = nil
+    private var _element: Event?
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            if _element != nil {
-                forwardOn(.error(RxError.moreThanOneElement))
-                dispose()
+            if self._element != nil {
+                self.forwardOn(.error(RxError.moreThanOneElement))
+                self.dispose()
             }
 
-            _element = event
+            self._element = event
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            if let element = _element {
-                forwardOn(element)
+            if let element = self._element {
+                self.forwardOn(element)
             }
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
@@ -38,12 +37,12 @@ final class AsMaybe: Producer {
     fileprivate let _source: Observable
 
     init(source: Observable) {
-        _source = source
+        self._source = source
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = AsMaybeSink(observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/AsSingle.swift b/Demo/Pods/RxSwift/RxSwift/Observables/AsSingle.swift
index 080aa8e..00a2686 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/AsSingle.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/AsSingle.swift
@@ -6,33 +6,32 @@
 //  Copyright © 2017 Krunoslav Zaher. All rights reserved.
 //
 
-fileprivate final class AsSingleSink : Sink, ObserverType {
-    typealias ElementType = O.E
-    typealias E = ElementType
+fileprivate final class AsSingleSink : Sink, ObserverType { 
+    typealias Element = Observer.Element
 
-    private var _element: Event? = nil
+    private var _element: Event?
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            if _element != nil {
-                forwardOn(.error(RxError.moreThanOneElement))
-                dispose()
+            if self._element != nil {
+                self.forwardOn(.error(RxError.moreThanOneElement))
+                self.dispose()
             }
 
-            _element = event
+            self._element = event
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            if let element = _element {
-                forwardOn(element)
-                forwardOn(.completed)
+            if let element = self._element {
+                self.forwardOn(element)
+                self.forwardOn(.completed)
             }
             else {
-                forwardOn(.error(RxError.noElements))
+                self.forwardOn(.error(RxError.noElements))
             }
-            dispose()
+            self.dispose()
         }
     }
 }
@@ -41,12 +40,12 @@ final class AsSingle: Producer {
     fileprivate let _source: Observable
 
     init(source: Observable) {
-        _source = source
+        self._source = source
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = AsSingleSink(observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Buffer.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Buffer.swift
index b8c33ae..0eb65f3 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Buffer.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Buffer.swift
@@ -21,12 +21,12 @@ extension ObservableType {
      - returns: An observable sequence of buffers.
      */
     public func buffer(timeSpan: RxTimeInterval, count: Int, scheduler: SchedulerType)
-        -> Observable<[E]> {
+        -> Observable<[Element]> {
         return BufferTimeCount(source: self.asObservable(), timeSpan: timeSpan, count: count, scheduler: scheduler)
     }
 }
 
-final fileprivate class BufferTimeCount : Producer<[Element]> {
+final private class BufferTimeCount: Producer<[Element]> {
     
     fileprivate let _timeSpan: RxTimeInterval
     fileprivate let _count: Int
@@ -34,26 +34,25 @@ final fileprivate class BufferTimeCount : Producer<[Element]> {
     fileprivate let _source: Observable
     
     init(source: Observable, timeSpan: RxTimeInterval, count: Int, scheduler: SchedulerType) {
-        _source = source
-        _timeSpan = timeSpan
-        _count = count
-        _scheduler = scheduler
+        self._source = source
+        self._timeSpan = timeSpan
+        self._count = count
+        self._scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == [Element] {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == [Element] {
         let sink = BufferTimeCountSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class BufferTimeCountSink
-    : Sink
+final private class BufferTimeCountSink
+    : Sink
     , LockOwnerType
     , ObserverType
-    , SynchronizedOnType where O.E == [Element] {
+    , SynchronizedOnType where Observer.Element == [Element] {
     typealias Parent = BufferTimeCount
-    typealias E = Element
     
     private let _parent: Parent
     
@@ -64,65 +63,65 @@ final fileprivate class BufferTimeCountSink
     private var _buffer = [Element]()
     private var _windowID = 0
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
  
     func run() -> Disposable {
-        createTimer(_windowID)
+        self.createTimer(self._windowID)
         return Disposables.create(_timerD, _parent._source.subscribe(self))
     }
     
     func startNewWindowAndSendCurrentOne() {
-        _windowID = _windowID &+ 1
-        let windowID = _windowID
+        self._windowID = self._windowID &+ 1
+        let windowID = self._windowID
         
-        let buffer = _buffer
-        _buffer = []
-        forwardOn(.next(buffer))
+        let buffer = self._buffer
+        self._buffer = []
+        self.forwardOn(.next(buffer))
         
-        createTimer(windowID)
+        self.createTimer(windowID)
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next(let element):
-            _buffer.append(element)
+            self._buffer.append(element)
             
-            if _buffer.count == _parent._count {
-                startNewWindowAndSendCurrentOne()
+            if self._buffer.count == self._parent._count {
+                self.startNewWindowAndSendCurrentOne()
             }
             
         case .error(let error):
-            _buffer = []
-            forwardOn(.error(error))
-            dispose()
+            self._buffer = []
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            forwardOn(.next(_buffer))
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.next(self._buffer))
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
     
     func createTimer(_ windowID: Int) {
-        if _timerD.isDisposed {
+        if self._timerD.isDisposed {
             return
         }
         
-        if _windowID != windowID {
+        if self._windowID != windowID {
             return
         }
 
         let nextTimer = SingleAssignmentDisposable()
         
-        _timerD.disposable = nextTimer
+        self._timerD.disposable = nextTimer
 
-        let disposable = _parent._scheduler.scheduleRelative(windowID, dueTime: _parent._timeSpan) { previousWindowID in
+        let disposable = self._parent._scheduler.scheduleRelative(windowID, dueTime: self._parent._timeSpan) { previousWindowID in
             self._lock.performLocked {
                 if previousWindowID != self._windowID {
                     return
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Catch.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Catch.swift
index 187eb8a..84569ec 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Catch.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Catch.swift
@@ -16,9 +16,9 @@ extension ObservableType {
      - parameter handler: Error handler function, producing another observable sequence.
      - returns: An observable sequence containing the source sequence's elements, followed by the elements produced by the handler's resulting observable sequence in case an error occurred.
      */
-    public func catchError(_ handler: @escaping (Swift.Error) throws -> Observable)
-        -> Observable {
-        return Catch(source: asObservable(), handler: handler)
+    public func catchError(_ handler: @escaping (Swift.Error) throws -> Observable)
+        -> Observable {
+        return Catch(source: self.asObservable(), handler: handler)
     }
 
     /**
@@ -29,9 +29,9 @@ extension ObservableType {
      - parameter element: Last element in an observable sequence in case error occurs.
      - returns: An observable sequence containing the source sequence's elements, followed by the `element` in case an error occurred.
      */
-    public func catchErrorJustReturn(_ element: E)
-        -> Observable {
-        return Catch(source: asObservable(), handler: { _ in Observable.just(element) })
+    public func catchErrorJustReturn(_ element: Element)
+        -> Observable {
+        return Catch(source: self.asObservable(), handler: { _ in Observable.just(element) })
     }
     
 }
@@ -44,8 +44,8 @@ extension ObservableType {
 
      - returns: An observable sequence containing elements from consecutive source sequences until a source sequence terminates successfully.
      */
-    public static func catchError(_ sequence: S) -> Observable
-        where S.Iterator.Element == Observable {
+    public static func catchError(_ sequence: Sequence) -> Observable
+        where Sequence.Element == Observable {
         return CatchSequence(sources: sequence)
     }
 }
@@ -61,7 +61,7 @@ extension ObservableType {
 
      - returns: Observable sequence to repeat until it successfully terminates.
      */
-    public func retry() -> Observable {
+    public func retry() -> Observable {
         return CatchSequence(sources: InfiniteSequence(repeatedValue: self.asObservable()))
     }
 
@@ -76,90 +76,90 @@ extension ObservableType {
      - returns: An observable sequence producing the elements of the given sequence repeatedly until it terminates successfully.
      */
     public func retry(_ maxAttemptCount: Int)
-        -> Observable {
+        -> Observable {
         return CatchSequence(sources: Swift.repeatElement(self.asObservable(), count: maxAttemptCount))
     }
 }
 
 // catch with callback
 
-final fileprivate class CatchSinkProxy : ObserverType {
-    typealias E = O.E
-    typealias Parent = CatchSink
+final private class CatchSinkProxy: ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = CatchSink
     
     private let _parent: Parent
     
     init(parent: Parent) {
-        _parent = parent
+        self._parent = parent
     }
     
-    func on(_ event: Event) {
-        _parent.forwardOn(event)
+    func on(_ event: Event) {
+        self._parent.forwardOn(event)
         
         switch event {
         case .next:
             break
         case .error, .completed:
-            _parent.dispose()
+            self._parent.dispose()
         }
     }
 }
 
-final fileprivate class CatchSink : Sink, ObserverType {
-    typealias E = O.E
-    typealias Parent = Catch
+final private class CatchSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = Catch
     
     private let _parent: Parent
     private let _subscription = SerialDisposable()
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
         let d1 = SingleAssignmentDisposable()
-        _subscription.disposable = d1
-        d1.setDisposable(_parent._source.subscribe(self))
+        self._subscription.disposable = d1
+        d1.setDisposable(self._parent._source.subscribe(self))
 
-        return _subscription
+        return self._subscription
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            forwardOn(event)
+            self.forwardOn(event)
         case .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .error(let error):
             do {
-                let catchSequence = try _parent._handler(error)
+                let catchSequence = try self._parent._handler(error)
 
                 let observer = CatchSinkProxy(parent: self)
                 
-                _subscription.disposable = catchSequence.subscribe(observer)
+                self._subscription.disposable = catchSequence.subscribe(observer)
             }
             catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
             }
         }
     }
 }
 
-final fileprivate class Catch : Producer {
+final private class Catch: Producer {
     typealias Handler = (Swift.Error) throws -> Observable
     
     fileprivate let _source: Observable
     fileprivate let _handler: Handler
     
     init(source: Observable, handler: @escaping Handler) {
-        _source = source
-        _handler = handler
+        self._source = source
+        self._handler = handler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = CatchSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -168,48 +168,48 @@ final fileprivate class Catch : Producer {
 
 // catch enumerable
 
-final fileprivate class CatchSequenceSink
-    : TailRecursiveSink
-    , ObserverType where S.Iterator.Element : ObservableConvertibleType, S.Iterator.Element.E == O.E {
-    typealias Element = O.E
-    typealias Parent = CatchSequence
-    
+final private class CatchSequenceSink
+    : TailRecursiveSink
+    , ObserverType where Sequence.Element: ObservableConvertibleType, Sequence.Element.Element == Observer.Element {
+    typealias Element = Observer.Element
+    typealias Parent = CatchSequence
+
     private var _lastError: Swift.Error?
     
-    override init(observer: O, cancel: Cancelable) {
+    override init(observer: Observer, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event) {
         switch event {
         case .next:
-            forwardOn(event)
+            self.forwardOn(event)
         case .error(let error):
-            _lastError = error
-            schedule(.moveNext)
+            self._lastError = error
+            self.schedule(.moveNext)
         case .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
 
-    override func subscribeToNext(_ source: Observable) -> Disposable {
+    override func subscribeToNext(_ source: Observable) -> Disposable {
         return source.subscribe(self)
     }
     
     override func done() {
-        if let lastError = _lastError {
-            forwardOn(.error(lastError))
+        if let lastError = self._lastError {
+            self.forwardOn(.error(lastError))
         }
         else {
-            forwardOn(.completed)
+            self.forwardOn(.completed)
         }
         
         self.dispose()
     }
     
     override func extract(_ observable: Observable) -> SequenceGenerator? {
-        if let onError = observable as? CatchSequence {
+        if let onError = observable as? CatchSequence {
             return (onError.sources.makeIterator(), nil)
         }
         else {
@@ -218,17 +218,17 @@ final fileprivate class CatchSequenceSink
     }
 }
 
-final fileprivate class CatchSequence : Producer where S.Iterator.Element : ObservableConvertibleType {
-    typealias Element = S.Iterator.Element.E
+final private class CatchSequence: Producer where Sequence.Element: ObservableConvertibleType {
+    typealias Element = Sequence.Element.Element
     
-    let sources: S
+    let sources: Sequence
     
-    init(sources: S) {
+    init(sources: Sequence) {
         self.sources = sources
     }
-    
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let sink = CatchSequenceSink(observer: observer, cancel: cancel)
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = CatchSequenceSink(observer: observer, cancel: cancel)
         let subscription = sink.run((self.sources.makeIterator(), nil))
         return (sink: sink, subscription: subscription)
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+Collection.swift b/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+Collection.swift
index 45e0173..f81c704 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+Collection.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+Collection.swift
@@ -15,8 +15,8 @@ extension ObservableType {
      - parameter resultSelector: Function to invoke whenever any of the sources produces an element.
      - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
      */
-    public static func combineLatest(_ collection: C, _ resultSelector: @escaping ([C.Iterator.Element.E]) throws -> E) -> Observable
-        where C.Iterator.Element: ObservableType {
+    public static func combineLatest(_ collection: Collection, resultSelector: @escaping ([Collection.Element.Element]) throws -> Element) -> Observable
+        where Collection.Element: ObservableType {
         return CombineLatestCollectionType(sources: collection, resultSelector: resultSelector)
     }
 
@@ -27,17 +27,17 @@ extension ObservableType {
 
      - returns: An observable sequence containing the result of combining elements of the sources.
      */
-    public static func combineLatest(_ collection: C) -> Observable<[E]>
-        where C.Iterator.Element: ObservableType, C.Iterator.Element.E == E {
+    public static func combineLatest(_ collection: Collection) -> Observable<[Element]>
+        where Collection.Element: ObservableType, Collection.Element.Element == Element {
         return CombineLatestCollectionType(sources: collection, resultSelector: { $0 })
     }
 }
 
-final fileprivate class CombineLatestCollectionTypeSink
-    : Sink where C.Iterator.Element : ObservableConvertibleType {
-    typealias R = O.E
-    typealias Parent = CombineLatestCollectionType
-    typealias SourceElement = C.Iterator.Element.E
+final private class CombineLatestCollectionTypeSink
+    : Sink where Collection.Element: ObservableConvertibleType {
+    typealias Result = Observer.Element 
+    typealias Parent = CombineLatestCollectionType
+    typealias SourceElement = Collection.Element.Element
     
     let _parent: Parent
     
@@ -50,65 +50,65 @@ final fileprivate class CombineLatestCollectionTypeSink()
-        _subscriptions.reserveCapacity(parent._count)
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._values = [SourceElement?](repeating: nil, count: parent._count)
+        self._isDone = [Bool](repeating: false, count: parent._count)
+        self._subscriptions = [SingleAssignmentDisposable]()
+        self._subscriptions.reserveCapacity(parent._count)
         
         for _ in 0 ..< parent._count {
-            _subscriptions.append(SingleAssignmentDisposable())
+            self._subscriptions.append(SingleAssignmentDisposable())
         }
         
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event, atIndex: Int) {
-        _lock.lock(); defer { _lock.unlock() } // {
+        self._lock.lock(); defer { self._lock.unlock() } // {
             switch event {
             case .next(let element):
-                if _values[atIndex] == nil {
-                   _numberOfValues += 1
+                if self._values[atIndex] == nil {
+                   self._numberOfValues += 1
                 }
                 
-                _values[atIndex] = element
+                self._values[atIndex] = element
                 
-                if _numberOfValues < _parent._count {
-                    let numberOfOthersThatAreDone = self._numberOfDone - (_isDone[atIndex] ? 1 : 0)
+                if self._numberOfValues < self._parent._count {
+                    let numberOfOthersThatAreDone = self._numberOfDone - (self._isDone[atIndex] ? 1 : 0)
                     if numberOfOthersThatAreDone == self._parent._count - 1 {
-                        forwardOn(.completed)
-                        dispose()
+                        self.forwardOn(.completed)
+                        self.dispose()
                     }
                     return
                 }
                 
                 do {
-                    let result = try _parent._resultSelector(_values.map { $0! })
-                    forwardOn(.next(result))
+                    let result = try self._parent._resultSelector(self._values.map { $0! })
+                    self.forwardOn(.next(result))
                 }
                 catch let error {
-                    forwardOn(.error(error))
-                    dispose()
+                    self.forwardOn(.error(error))
+                    self.dispose()
                 }
                 
             case .error(let error):
-                forwardOn(.error(error))
-                dispose()
+                self.forwardOn(.error(error))
+                self.dispose()
             case .completed:
-                if _isDone[atIndex] {
+                if self._isDone[atIndex] {
                     return
                 }
                 
-                _isDone[atIndex] = true
-                _numberOfDone += 1
+                self._isDone[atIndex] = true
+                self._numberOfDone += 1
                 
-                if _numberOfDone == self._parent._count {
-                    forwardOn(.completed)
-                    dispose()
+                if self._numberOfDone == self._parent._count {
+                    self.forwardOn(.completed)
+                    self.dispose()
                 }
                 else {
-                    _subscriptions[atIndex].dispose()
+                    self._subscriptions[atIndex].dispose()
                 }
             }
         // }
@@ -116,40 +116,49 @@ final fileprivate class CombineLatestCollectionTypeSink Disposable {
         var j = 0
-        for i in _parent._sources {
+        for i in self._parent._sources {
             let index = j
             let source = i.asObservable()
             let disposable = source.subscribe(AnyObserver { event in
                 self.on(event, atIndex: index)
             })
 
-            _subscriptions[j].setDisposable(disposable)
+            self._subscriptions[j].setDisposable(disposable)
             
             j += 1
         }
 
-        if _parent._sources.isEmpty {
-            self.forwardOn(.completed)
+        if self._parent._sources.isEmpty {
+            do {
+                let result = try self._parent._resultSelector([])
+                self.forwardOn(.next(result))
+                self.forwardOn(.completed)
+                self.dispose()
+            }
+            catch let error {
+                self.forwardOn(.error(error))
+                self.dispose()
+            }
         }
         
         return Disposables.create(_subscriptions)
     }
 }
 
-final fileprivate class CombineLatestCollectionType : Producer where C.Iterator.Element : ObservableConvertibleType {
-    typealias ResultSelector = ([C.Iterator.Element.E]) throws -> R
+final private class CombineLatestCollectionType: Producer where Collection.Element: ObservableConvertibleType {
+    typealias ResultSelector = ([Collection.Element.Element]) throws -> Result
     
-    let _sources: C
+    let _sources: Collection
     let _resultSelector: ResultSelector
     let _count: Int
 
-    init(sources: C, resultSelector: @escaping ResultSelector) {
-        _sources = sources
-        _resultSelector = resultSelector
-        _count = Int(Int64(self._sources.count))
+    init(sources: Collection, resultSelector: @escaping ResultSelector) {
+        self._sources = sources
+        self._resultSelector = resultSelector
+        self._count = self._sources.count
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestCollectionTypeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+arity.swift b/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+arity.swift
index aad2255..ece5802 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+arity.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest+arity.swift
@@ -21,8 +21,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func combineLatest
-        (_ source1: O1, _ source2: O2, resultSelector: @escaping (O1.E, O2.E) throws -> E)
-            -> Observable {
+        (_ source1: O1, _ source2: O2, resultSelector: @escaping (O1.Element, O2.Element) throws -> Element)
+            -> Observable {
         return CombineLatest2(
             source1: source1.asObservable(), source2: source2.asObservable(),
             resultSelector: resultSelector
@@ -30,7 +30,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever any of the observable sequences produces an element.
 
@@ -40,7 +40,7 @@ extension ObservableType where E == Any {
     */
     public static func combineLatest
         (_ source1: O1, _ source2: O2)
-            -> Observable<(O1.E, O2.E)> {
+            -> Observable<(O1.Element, O2.Element)> {
         return CombineLatest2(
             source1: source1.asObservable(), source2: source2.asObservable(),
             resultSelector: { ($0, $1) }
@@ -48,17 +48,17 @@ extension ObservableType where E == Any {
     }
 }
 
-final class CombineLatestSink2_ : CombineLatestSink {
-    typealias R = O.E
-    typealias Parent = CombineLatest2
+final class CombineLatestSink2_ : CombineLatestSink {
+    typealias Result = Observer.Element
+    typealias Parent = CombineLatest2
 
     let _parent: Parent
 
     var _latestElement1: E1! = nil
     var _latestElement2: E2! = nil
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 2, observer: observer, cancel: cancel)
     }
 
@@ -66,11 +66,11 @@ final class CombineLatestSink2_ : CombineLatestSink
         let subscription1 = SingleAssignmentDisposable()
         let subscription2 = SingleAssignmentDisposable()
 
-        let observer1 = CombineLatestObserver(lock: _lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
-        let observer2 = CombineLatestObserver(lock: _lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
+        let observer1 = CombineLatestObserver(lock: self._lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
+        let observer2 = CombineLatestObserver(lock: self._lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
 
-         subscription1.setDisposable(_parent._source1.subscribe(observer1))
-         subscription2.setDisposable(_parent._source2.subscribe(observer2))
+         subscription1.setDisposable(self._parent._source1.subscribe(observer1))
+         subscription2.setDisposable(self._parent._source2.subscribe(observer2))
 
         return Disposables.create([
                 subscription1,
@@ -78,13 +78,13 @@ final class CombineLatestSink2_ : CombineLatestSink
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_latestElement1, _latestElement2)
+    override func getResult() throws-> Result {
+        return try self._parent._resultSelector(self._latestElement1, self._latestElement2)
     }
 }
 
-final class CombineLatest2 : Producer {
-    typealias ResultSelector = (E1, E2) throws -> R
+final class CombineLatest2 : Producer {
+    typealias ResultSelector = (E1, E2) throws -> Result
 
     let _source1: Observable
     let _source2: Observable
@@ -92,13 +92,13 @@ final class CombineLatest2 : Producer {
     let _resultSelector: ResultSelector
 
     init(source1: Observable, source2: Observable, resultSelector: @escaping ResultSelector) {
-        _source1 = source1
-        _source2 = source2
+        self._source1 = source1
+        self._source2 = source2
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestSink2_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -119,8 +119,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func combineLatest
-        (_ source1: O1, _ source2: O2, _ source3: O3, resultSelector: @escaping (O1.E, O2.E, O3.E) throws -> E)
-            -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, resultSelector: @escaping (O1.Element, O2.Element, O3.Element) throws -> Element)
+            -> Observable {
         return CombineLatest3(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(),
             resultSelector: resultSelector
@@ -128,7 +128,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever any of the observable sequences produces an element.
 
@@ -138,7 +138,7 @@ extension ObservableType where E == Any {
     */
     public static func combineLatest
         (_ source1: O1, _ source2: O2, _ source3: O3)
-            -> Observable<(O1.E, O2.E, O3.E)> {
+            -> Observable<(O1.Element, O2.Element, O3.Element)> {
         return CombineLatest3(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(),
             resultSelector: { ($0, $1, $2) }
@@ -146,9 +146,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class CombineLatestSink3_ : CombineLatestSink {
-    typealias R = O.E
-    typealias Parent = CombineLatest3
+final class CombineLatestSink3_ : CombineLatestSink {
+    typealias Result = Observer.Element
+    typealias Parent = CombineLatest3
 
     let _parent: Parent
 
@@ -156,8 +156,8 @@ final class CombineLatestSink3_ : CombineLatestSink
     var _latestElement2: E2! = nil
     var _latestElement3: E3! = nil
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 3, observer: observer, cancel: cancel)
     }
 
@@ -166,13 +166,13 @@ final class CombineLatestSink3_ : CombineLatestSink
         let subscription2 = SingleAssignmentDisposable()
         let subscription3 = SingleAssignmentDisposable()
 
-        let observer1 = CombineLatestObserver(lock: _lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
-        let observer2 = CombineLatestObserver(lock: _lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
-        let observer3 = CombineLatestObserver(lock: _lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
+        let observer1 = CombineLatestObserver(lock: self._lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
+        let observer2 = CombineLatestObserver(lock: self._lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
+        let observer3 = CombineLatestObserver(lock: self._lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
 
-         subscription1.setDisposable(_parent._source1.subscribe(observer1))
-         subscription2.setDisposable(_parent._source2.subscribe(observer2))
-         subscription3.setDisposable(_parent._source3.subscribe(observer3))
+         subscription1.setDisposable(self._parent._source1.subscribe(observer1))
+         subscription2.setDisposable(self._parent._source2.subscribe(observer2))
+         subscription3.setDisposable(self._parent._source3.subscribe(observer3))
 
         return Disposables.create([
                 subscription1,
@@ -181,13 +181,13 @@ final class CombineLatestSink3_ : CombineLatestSink
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_latestElement1, _latestElement2, _latestElement3)
+    override func getResult() throws-> Result {
+        return try self._parent._resultSelector(self._latestElement1, self._latestElement2, self._latestElement3)
     }
 }
 
-final class CombineLatest3 : Producer {
-    typealias ResultSelector = (E1, E2, E3) throws -> R
+final class CombineLatest3 : Producer {
+    typealias ResultSelector = (E1, E2, E3) throws-> Result
 
     let _source1: Observable
     let _source2: Observable
@@ -196,14 +196,14 @@ final class CombineLatest3 : Producer {
     let _resultSelector: ResultSelector
 
     init(source1: Observable, source2: Observable, source3: Observable, resultSelector: @escaping ResultSelector) {
-        _source1 = source1
-        _source2 = source2
-        _source3 = source3
+        self._source1 = source1
+        self._source2 = source2
+        self._source3 = source3
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestSink3_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -224,8 +224,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func combineLatest
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E) throws -> E)
-            -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element) throws -> Element)
+            -> Observable {
         return CombineLatest4(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(),
             resultSelector: resultSelector
@@ -233,7 +233,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever any of the observable sequences produces an element.
 
@@ -243,7 +243,7 @@ extension ObservableType where E == Any {
     */
     public static func combineLatest
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4)
-            -> Observable<(O1.E, O2.E, O3.E, O4.E)> {
+            -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element)> {
         return CombineLatest4(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(),
             resultSelector: { ($0, $1, $2, $3) }
@@ -251,9 +251,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class CombineLatestSink4_ : CombineLatestSink {
-    typealias R = O.E
-    typealias Parent = CombineLatest4
+final class CombineLatestSink4_ : CombineLatestSink {
+    typealias Result = Observer.Element
+    typealias Parent = CombineLatest4
 
     let _parent: Parent
 
@@ -262,8 +262,8 @@ final class CombineLatestSink4_ : CombineLatest
     var _latestElement3: E3! = nil
     var _latestElement4: E4! = nil
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 4, observer: observer, cancel: cancel)
     }
 
@@ -273,15 +273,15 @@ final class CombineLatestSink4_ : CombineLatest
         let subscription3 = SingleAssignmentDisposable()
         let subscription4 = SingleAssignmentDisposable()
 
-        let observer1 = CombineLatestObserver(lock: _lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
-        let observer2 = CombineLatestObserver(lock: _lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
-        let observer3 = CombineLatestObserver(lock: _lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
-        let observer4 = CombineLatestObserver(lock: _lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
+        let observer1 = CombineLatestObserver(lock: self._lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
+        let observer2 = CombineLatestObserver(lock: self._lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
+        let observer3 = CombineLatestObserver(lock: self._lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
+        let observer4 = CombineLatestObserver(lock: self._lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
 
-         subscription1.setDisposable(_parent._source1.subscribe(observer1))
-         subscription2.setDisposable(_parent._source2.subscribe(observer2))
-         subscription3.setDisposable(_parent._source3.subscribe(observer3))
-         subscription4.setDisposable(_parent._source4.subscribe(observer4))
+         subscription1.setDisposable(self._parent._source1.subscribe(observer1))
+         subscription2.setDisposable(self._parent._source2.subscribe(observer2))
+         subscription3.setDisposable(self._parent._source3.subscribe(observer3))
+         subscription4.setDisposable(self._parent._source4.subscribe(observer4))
 
         return Disposables.create([
                 subscription1,
@@ -291,13 +291,13 @@ final class CombineLatestSink4_ : CombineLatest
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_latestElement1, _latestElement2, _latestElement3, _latestElement4)
+    override func getResult() throws-> Result {
+        return try self._parent._resultSelector(self._latestElement1, self._latestElement2, self._latestElement3, self._latestElement4)
     }
 }
 
-final class CombineLatest4 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4) throws -> R
+final class CombineLatest4 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4) throws-> Result
 
     let _source1: Observable
     let _source2: Observable
@@ -307,15 +307,15 @@ final class CombineLatest4 : Producer {
     let _resultSelector: ResultSelector
 
     init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, resultSelector: @escaping ResultSelector) {
-        _source1 = source1
-        _source2 = source2
-        _source3 = source3
-        _source4 = source4
+        self._source1 = source1
+        self._source2 = source2
+        self._source3 = source3
+        self._source4 = source4
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestSink4_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -336,8 +336,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func combineLatest
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E) throws -> E)
-            -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element) throws -> Element)
+            -> Observable {
         return CombineLatest5(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(),
             resultSelector: resultSelector
@@ -345,7 +345,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever any of the observable sequences produces an element.
 
@@ -355,7 +355,7 @@ extension ObservableType where E == Any {
     */
     public static func combineLatest
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5)
-            -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E)> {
+            -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element)> {
         return CombineLatest5(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4) }
@@ -363,9 +363,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class CombineLatestSink5_ : CombineLatestSink {
-    typealias R = O.E
-    typealias Parent = CombineLatest5
+final class CombineLatestSink5_ : CombineLatestSink {
+    typealias Result = Observer.Element
+    typealias Parent = CombineLatest5
 
     let _parent: Parent
 
@@ -375,8 +375,8 @@ final class CombineLatestSink5_ : CombineLa
     var _latestElement4: E4! = nil
     var _latestElement5: E5! = nil
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 5, observer: observer, cancel: cancel)
     }
 
@@ -387,17 +387,17 @@ final class CombineLatestSink5_ : CombineLa
         let subscription4 = SingleAssignmentDisposable()
         let subscription5 = SingleAssignmentDisposable()
 
-        let observer1 = CombineLatestObserver(lock: _lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
-        let observer2 = CombineLatestObserver(lock: _lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
-        let observer3 = CombineLatestObserver(lock: _lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
-        let observer4 = CombineLatestObserver(lock: _lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
-        let observer5 = CombineLatestObserver(lock: _lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
+        let observer1 = CombineLatestObserver(lock: self._lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
+        let observer2 = CombineLatestObserver(lock: self._lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
+        let observer3 = CombineLatestObserver(lock: self._lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
+        let observer4 = CombineLatestObserver(lock: self._lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
+        let observer5 = CombineLatestObserver(lock: self._lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
 
-         subscription1.setDisposable(_parent._source1.subscribe(observer1))
-         subscription2.setDisposable(_parent._source2.subscribe(observer2))
-         subscription3.setDisposable(_parent._source3.subscribe(observer3))
-         subscription4.setDisposable(_parent._source4.subscribe(observer4))
-         subscription5.setDisposable(_parent._source5.subscribe(observer5))
+         subscription1.setDisposable(self._parent._source1.subscribe(observer1))
+         subscription2.setDisposable(self._parent._source2.subscribe(observer2))
+         subscription3.setDisposable(self._parent._source3.subscribe(observer3))
+         subscription4.setDisposable(self._parent._source4.subscribe(observer4))
+         subscription5.setDisposable(self._parent._source5.subscribe(observer5))
 
         return Disposables.create([
                 subscription1,
@@ -408,13 +408,13 @@ final class CombineLatestSink5_ : CombineLa
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_latestElement1, _latestElement2, _latestElement3, _latestElement4, _latestElement5)
+    override func getResult() throws-> Result {
+        return try self._parent._resultSelector(self._latestElement1, self._latestElement2, self._latestElement3, self._latestElement4, self._latestElement5)
     }
 }
 
-final class CombineLatest5 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5) throws -> R
+final class CombineLatest5 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5) throws-> Result
 
     let _source1: Observable
     let _source2: Observable
@@ -425,16 +425,16 @@ final class CombineLatest5 : Producer {
     let _resultSelector: ResultSelector
 
     init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, resultSelector: @escaping ResultSelector) {
-        _source1 = source1
-        _source2 = source2
-        _source3 = source3
-        _source4 = source4
-        _source5 = source5
+        self._source1 = source1
+        self._source2 = source2
+        self._source3 = source3
+        self._source4 = source4
+        self._source5 = source5
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestSink5_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -455,8 +455,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func combineLatest
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E) throws -> E)
-            -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element) throws -> Element)
+            -> Observable {
         return CombineLatest6(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(),
             resultSelector: resultSelector
@@ -464,7 +464,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever any of the observable sequences produces an element.
 
@@ -474,7 +474,7 @@ extension ObservableType where E == Any {
     */
     public static func combineLatest
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6)
-            -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E, O6.E)> {
+            -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element)> {
         return CombineLatest6(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4, $5) }
@@ -482,9 +482,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class CombineLatestSink6_ : CombineLatestSink {
-    typealias R = O.E
-    typealias Parent = CombineLatest6
+final class CombineLatestSink6_ : CombineLatestSink {
+    typealias Result = Observer.Element
+    typealias Parent = CombineLatest6
 
     let _parent: Parent
 
@@ -495,8 +495,8 @@ final class CombineLatestSink6_ : Combi
     var _latestElement5: E5! = nil
     var _latestElement6: E6! = nil
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 6, observer: observer, cancel: cancel)
     }
 
@@ -508,19 +508,19 @@ final class CombineLatestSink6_ : Combi
         let subscription5 = SingleAssignmentDisposable()
         let subscription6 = SingleAssignmentDisposable()
 
-        let observer1 = CombineLatestObserver(lock: _lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
-        let observer2 = CombineLatestObserver(lock: _lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
-        let observer3 = CombineLatestObserver(lock: _lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
-        let observer4 = CombineLatestObserver(lock: _lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
-        let observer5 = CombineLatestObserver(lock: _lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
-        let observer6 = CombineLatestObserver(lock: _lock, parent: self, index: 5, setLatestValue: { (e: E6) -> Void in self._latestElement6 = e }, this: subscription6)
+        let observer1 = CombineLatestObserver(lock: self._lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
+        let observer2 = CombineLatestObserver(lock: self._lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
+        let observer3 = CombineLatestObserver(lock: self._lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
+        let observer4 = CombineLatestObserver(lock: self._lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
+        let observer5 = CombineLatestObserver(lock: self._lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
+        let observer6 = CombineLatestObserver(lock: self._lock, parent: self, index: 5, setLatestValue: { (e: E6) -> Void in self._latestElement6 = e }, this: subscription6)
 
-         subscription1.setDisposable(_parent._source1.subscribe(observer1))
-         subscription2.setDisposable(_parent._source2.subscribe(observer2))
-         subscription3.setDisposable(_parent._source3.subscribe(observer3))
-         subscription4.setDisposable(_parent._source4.subscribe(observer4))
-         subscription5.setDisposable(_parent._source5.subscribe(observer5))
-         subscription6.setDisposable(_parent._source6.subscribe(observer6))
+         subscription1.setDisposable(self._parent._source1.subscribe(observer1))
+         subscription2.setDisposable(self._parent._source2.subscribe(observer2))
+         subscription3.setDisposable(self._parent._source3.subscribe(observer3))
+         subscription4.setDisposable(self._parent._source4.subscribe(observer4))
+         subscription5.setDisposable(self._parent._source5.subscribe(observer5))
+         subscription6.setDisposable(self._parent._source6.subscribe(observer6))
 
         return Disposables.create([
                 subscription1,
@@ -532,13 +532,13 @@ final class CombineLatestSink6_ : Combi
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_latestElement1, _latestElement2, _latestElement3, _latestElement4, _latestElement5, _latestElement6)
+    override func getResult() throws-> Result {
+        return try self._parent._resultSelector(self._latestElement1, self._latestElement2, self._latestElement3, self._latestElement4, self._latestElement5, self._latestElement6)
     }
 }
 
-final class CombineLatest6 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6) throws -> R
+final class CombineLatest6 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5, E6) throws-> Result
 
     let _source1: Observable
     let _source2: Observable
@@ -550,17 +550,17 @@ final class CombineLatest6 : Producer {
     let _resultSelector: ResultSelector
 
     init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, source6: Observable, resultSelector: @escaping ResultSelector) {
-        _source1 = source1
-        _source2 = source2
-        _source3 = source3
-        _source4 = source4
-        _source5 = source5
-        _source6 = source6
+        self._source1 = source1
+        self._source2 = source2
+        self._source3 = source3
+        self._source4 = source4
+        self._source5 = source5
+        self._source6 = source6
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestSink6_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -581,8 +581,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func combineLatest
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E) throws -> E)
-            -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element) throws -> Element)
+            -> Observable {
         return CombineLatest7(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(),
             resultSelector: resultSelector
@@ -590,7 +590,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever any of the observable sequences produces an element.
 
@@ -600,7 +600,7 @@ extension ObservableType where E == Any {
     */
     public static func combineLatest
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7)
-            -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E)> {
+            -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element)> {
         return CombineLatest7(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4, $5, $6) }
@@ -608,9 +608,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class CombineLatestSink7_ : CombineLatestSink {
-    typealias R = O.E
-    typealias Parent = CombineLatest7
+final class CombineLatestSink7_ : CombineLatestSink {
+    typealias Result = Observer.Element
+    typealias Parent = CombineLatest7
 
     let _parent: Parent
 
@@ -622,8 +622,8 @@ final class CombineLatestSink7_ : C
     var _latestElement6: E6! = nil
     var _latestElement7: E7! = nil
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 7, observer: observer, cancel: cancel)
     }
 
@@ -636,21 +636,21 @@ final class CombineLatestSink7_ : C
         let subscription6 = SingleAssignmentDisposable()
         let subscription7 = SingleAssignmentDisposable()
 
-        let observer1 = CombineLatestObserver(lock: _lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
-        let observer2 = CombineLatestObserver(lock: _lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
-        let observer3 = CombineLatestObserver(lock: _lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
-        let observer4 = CombineLatestObserver(lock: _lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
-        let observer5 = CombineLatestObserver(lock: _lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
-        let observer6 = CombineLatestObserver(lock: _lock, parent: self, index: 5, setLatestValue: { (e: E6) -> Void in self._latestElement6 = e }, this: subscription6)
-        let observer7 = CombineLatestObserver(lock: _lock, parent: self, index: 6, setLatestValue: { (e: E7) -> Void in self._latestElement7 = e }, this: subscription7)
-
-         subscription1.setDisposable(_parent._source1.subscribe(observer1))
-         subscription2.setDisposable(_parent._source2.subscribe(observer2))
-         subscription3.setDisposable(_parent._source3.subscribe(observer3))
-         subscription4.setDisposable(_parent._source4.subscribe(observer4))
-         subscription5.setDisposable(_parent._source5.subscribe(observer5))
-         subscription6.setDisposable(_parent._source6.subscribe(observer6))
-         subscription7.setDisposable(_parent._source7.subscribe(observer7))
+        let observer1 = CombineLatestObserver(lock: self._lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
+        let observer2 = CombineLatestObserver(lock: self._lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
+        let observer3 = CombineLatestObserver(lock: self._lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
+        let observer4 = CombineLatestObserver(lock: self._lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
+        let observer5 = CombineLatestObserver(lock: self._lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
+        let observer6 = CombineLatestObserver(lock: self._lock, parent: self, index: 5, setLatestValue: { (e: E6) -> Void in self._latestElement6 = e }, this: subscription6)
+        let observer7 = CombineLatestObserver(lock: self._lock, parent: self, index: 6, setLatestValue: { (e: E7) -> Void in self._latestElement7 = e }, this: subscription7)
+
+         subscription1.setDisposable(self._parent._source1.subscribe(observer1))
+         subscription2.setDisposable(self._parent._source2.subscribe(observer2))
+         subscription3.setDisposable(self._parent._source3.subscribe(observer3))
+         subscription4.setDisposable(self._parent._source4.subscribe(observer4))
+         subscription5.setDisposable(self._parent._source5.subscribe(observer5))
+         subscription6.setDisposable(self._parent._source6.subscribe(observer6))
+         subscription7.setDisposable(self._parent._source7.subscribe(observer7))
 
         return Disposables.create([
                 subscription1,
@@ -663,13 +663,13 @@ final class CombineLatestSink7_ : C
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_latestElement1, _latestElement2, _latestElement3, _latestElement4, _latestElement5, _latestElement6, _latestElement7)
+    override func getResult() throws-> Result {
+        return try self._parent._resultSelector(self._latestElement1, self._latestElement2, self._latestElement3, self._latestElement4, self._latestElement5, self._latestElement6, self._latestElement7)
     }
 }
 
-final class CombineLatest7 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7) throws -> R
+final class CombineLatest7 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7) throws-> Result
 
     let _source1: Observable
     let _source2: Observable
@@ -682,18 +682,18 @@ final class CombineLatest7 : Producer {
     let _resultSelector: ResultSelector
 
     init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, source6: Observable, source7: Observable, resultSelector: @escaping ResultSelector) {
-        _source1 = source1
-        _source2 = source2
-        _source3 = source3
-        _source4 = source4
-        _source5 = source5
-        _source6 = source6
-        _source7 = source7
+        self._source1 = source1
+        self._source2 = source2
+        self._source3 = source3
+        self._source4 = source4
+        self._source5 = source5
+        self._source6 = source6
+        self._source7 = source7
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestSink7_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -714,8 +714,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func combineLatest
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E, O8.E) throws -> E)
-            -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element, O8.Element) throws -> Element)
+            -> Observable {
         return CombineLatest8(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(), source8: source8.asObservable(),
             resultSelector: resultSelector
@@ -723,7 +723,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever any of the observable sequences produces an element.
 
@@ -733,7 +733,7 @@ extension ObservableType where E == Any {
     */
     public static func combineLatest
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8)
-            -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E, O8.E)> {
+            -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element, O8.Element)> {
         return CombineLatest8(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(), source8: source8.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4, $5, $6, $7) }
@@ -741,9 +741,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class CombineLatestSink8_ : CombineLatestSink {
-    typealias R = O.E
-    typealias Parent = CombineLatest8
+final class CombineLatestSink8_ : CombineLatestSink {
+    typealias Result = Observer.Element
+    typealias Parent = CombineLatest8
 
     let _parent: Parent
 
@@ -756,8 +756,8 @@ final class CombineLatestSink8_
     var _latestElement7: E7! = nil
     var _latestElement8: E8! = nil
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 8, observer: observer, cancel: cancel)
     }
 
@@ -771,23 +771,23 @@ final class CombineLatestSink8_
         let subscription7 = SingleAssignmentDisposable()
         let subscription8 = SingleAssignmentDisposable()
 
-        let observer1 = CombineLatestObserver(lock: _lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
-        let observer2 = CombineLatestObserver(lock: _lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
-        let observer3 = CombineLatestObserver(lock: _lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
-        let observer4 = CombineLatestObserver(lock: _lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
-        let observer5 = CombineLatestObserver(lock: _lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
-        let observer6 = CombineLatestObserver(lock: _lock, parent: self, index: 5, setLatestValue: { (e: E6) -> Void in self._latestElement6 = e }, this: subscription6)
-        let observer7 = CombineLatestObserver(lock: _lock, parent: self, index: 6, setLatestValue: { (e: E7) -> Void in self._latestElement7 = e }, this: subscription7)
-        let observer8 = CombineLatestObserver(lock: _lock, parent: self, index: 7, setLatestValue: { (e: E8) -> Void in self._latestElement8 = e }, this: subscription8)
-
-         subscription1.setDisposable(_parent._source1.subscribe(observer1))
-         subscription2.setDisposable(_parent._source2.subscribe(observer2))
-         subscription3.setDisposable(_parent._source3.subscribe(observer3))
-         subscription4.setDisposable(_parent._source4.subscribe(observer4))
-         subscription5.setDisposable(_parent._source5.subscribe(observer5))
-         subscription6.setDisposable(_parent._source6.subscribe(observer6))
-         subscription7.setDisposable(_parent._source7.subscribe(observer7))
-         subscription8.setDisposable(_parent._source8.subscribe(observer8))
+        let observer1 = CombineLatestObserver(lock: self._lock, parent: self, index: 0, setLatestValue: { (e: E1) -> Void in self._latestElement1 = e }, this: subscription1)
+        let observer2 = CombineLatestObserver(lock: self._lock, parent: self, index: 1, setLatestValue: { (e: E2) -> Void in self._latestElement2 = e }, this: subscription2)
+        let observer3 = CombineLatestObserver(lock: self._lock, parent: self, index: 2, setLatestValue: { (e: E3) -> Void in self._latestElement3 = e }, this: subscription3)
+        let observer4 = CombineLatestObserver(lock: self._lock, parent: self, index: 3, setLatestValue: { (e: E4) -> Void in self._latestElement4 = e }, this: subscription4)
+        let observer5 = CombineLatestObserver(lock: self._lock, parent: self, index: 4, setLatestValue: { (e: E5) -> Void in self._latestElement5 = e }, this: subscription5)
+        let observer6 = CombineLatestObserver(lock: self._lock, parent: self, index: 5, setLatestValue: { (e: E6) -> Void in self._latestElement6 = e }, this: subscription6)
+        let observer7 = CombineLatestObserver(lock: self._lock, parent: self, index: 6, setLatestValue: { (e: E7) -> Void in self._latestElement7 = e }, this: subscription7)
+        let observer8 = CombineLatestObserver(lock: self._lock, parent: self, index: 7, setLatestValue: { (e: E8) -> Void in self._latestElement8 = e }, this: subscription8)
+
+         subscription1.setDisposable(self._parent._source1.subscribe(observer1))
+         subscription2.setDisposable(self._parent._source2.subscribe(observer2))
+         subscription3.setDisposable(self._parent._source3.subscribe(observer3))
+         subscription4.setDisposable(self._parent._source4.subscribe(observer4))
+         subscription5.setDisposable(self._parent._source5.subscribe(observer5))
+         subscription6.setDisposable(self._parent._source6.subscribe(observer6))
+         subscription7.setDisposable(self._parent._source7.subscribe(observer7))
+         subscription8.setDisposable(self._parent._source8.subscribe(observer8))
 
         return Disposables.create([
                 subscription1,
@@ -801,13 +801,13 @@ final class CombineLatestSink8_
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_latestElement1, _latestElement2, _latestElement3, _latestElement4, _latestElement5, _latestElement6, _latestElement7, _latestElement8)
+    override func getResult() throws-> Result {
+        return try self._parent._resultSelector(self._latestElement1, self._latestElement2, self._latestElement3, self._latestElement4, self._latestElement5, self._latestElement6, self._latestElement7, self._latestElement8)
     }
 }
 
-final class CombineLatest8 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7, E8) throws -> R
+final class CombineLatest8 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7, E8) throws-> Result
 
     let _source1: Observable
     let _source2: Observable
@@ -821,19 +821,19 @@ final class CombineLatest8 : Producer {
     let _resultSelector: ResultSelector
 
     init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, source6: Observable, source7: Observable, source8: Observable, resultSelector: @escaping ResultSelector) {
-        _source1 = source1
-        _source2 = source2
-        _source3 = source3
-        _source4 = source4
-        _source5 = source5
-        _source6 = source6
-        _source7 = source7
-        _source8 = source8
+        self._source1 = source1
+        self._source2 = source2
+        self._source3 = source3
+        self._source4 = source4
+        self._source5 = source5
+        self._source6 = source6
+        self._source7 = source7
+        self._source8 = source8
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = CombineLatestSink8_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest.swift b/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest.swift
index 8c03e8c..7d6fa7f 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/CombineLatest.swift
@@ -12,10 +12,10 @@ protocol CombineLatestProtocol : class {
     func done(_ index: Int)
 }
 
-class CombineLatestSink
-    : Sink
+class CombineLatestSink
+    : Sink
     , CombineLatestProtocol {
-    typealias Element = O.E
+    typealias Element = Observer.Element 
    
     let _lock = RecursiveLock()
 
@@ -25,10 +25,10 @@ class CombineLatestSink
     private var _hasValue: [Bool]
     private var _isDone: [Bool]
    
-    init(arity: Int, observer: O, cancel: Cancelable) {
-        _arity = arity
-        _hasValue = [Bool](repeating: false, count: arity)
-        _isDone = [Bool](repeating: false, count: arity)
+    init(arity: Int, observer: Observer, cancel: Cancelable) {
+        self._arity = arity
+        self._hasValue = [Bool](repeating: false, count: arity)
+        self._isDone = [Bool](repeating: false, count: arity)
         
         super.init(observer: observer, cancel: cancel)
     }
@@ -38,63 +38,62 @@ class CombineLatestSink
     }
     
     func next(_ index: Int) {
-        if !_hasValue[index] {
-            _hasValue[index] = true
-            _numberOfValues += 1
+        if !self._hasValue[index] {
+            self._hasValue[index] = true
+            self._numberOfValues += 1
         }
 
-        if _numberOfValues == _arity {
+        if self._numberOfValues == self._arity {
             do {
-                let result = try getResult()
-                forwardOn(.next(result))
+                let result = try self.getResult()
+                self.forwardOn(.next(result))
             }
             catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
             }
         }
         else {
             var allOthersDone = true
 
-            for i in 0 ..< _arity {
-                if i != index && !_isDone[i] {
+            for i in 0 ..< self._arity {
+                if i != index && !self._isDone[i] {
                     allOthersDone = false
                     break
                 }
             }
             
             if allOthersDone {
-                forwardOn(.completed)
-                dispose()
+                self.forwardOn(.completed)
+                self.dispose()
             }
         }
     }
     
     func fail(_ error: Swift.Error) {
-        forwardOn(.error(error))
-        dispose()
+        self.forwardOn(.error(error))
+        self.dispose()
     }
     
     func done(_ index: Int) {
-        if _isDone[index] {
+        if self._isDone[index] {
             return
         }
 
-        _isDone[index] = true
-        _numberOfDone += 1
+        self._isDone[index] = true
+        self._numberOfDone += 1
 
-        if _numberOfDone == _arity {
-            forwardOn(.completed)
-            dispose()
+        if self._numberOfDone == self._arity {
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
 
-final class CombineLatestObserver
+final class CombineLatestObserver
     : ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias Element = ElementType
     typealias ValueSetter = (Element) -> Void
     
     private let _parent: CombineLatestProtocol
@@ -105,28 +104,28 @@ final class CombineLatestObserver
     private let _setLatestValue: ValueSetter
     
     init(lock: RecursiveLock, parent: CombineLatestProtocol, index: Int, setLatestValue: @escaping ValueSetter, this: Disposable) {
-        _lock = lock
-        _parent = parent
-        _index = index
-        _this = this
-        _setLatestValue = setLatestValue
+        self._lock = lock
+        self._parent = parent
+        self._index = index
+        self._this = this
+        self._setLatestValue = setLatestValue
     }
     
     func on(_ event: Event) {
-        synchronizedOn(event)
+        self.synchronizedOn(event)
     }
 
     func _synchronized_on(_ event: Event) {
         switch event {
         case .next(let value):
-            _setLatestValue(value)
-            _parent.next(_index)
+            self._setLatestValue(value)
+            self._parent.next(self._index)
         case .error(let error):
-            _this.dispose()
-            _parent.fail(error)
+            self._this.dispose()
+            self._parent.fail(error)
         case .completed:
-            _this.dispose()
-            _parent.done(_index)
+            self._this.dispose()
+            self._parent.done(self._index)
         }
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/CompactMap.swift b/Demo/Pods/RxSwift/RxSwift/Observables/CompactMap.swift
new file mode 100644
index 0000000..09cd3a9
--- /dev/null
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/CompactMap.swift
@@ -0,0 +1,82 @@
+//
+//  CompactMap.swift
+//  RxSwift
+//
+//  Created by Michael Long on 04/09/2019.
+//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
+//
+
+extension ObservableType {
+
+    /**
+     Projects each element of an observable sequence into an optional form and filters all optional results.
+
+     Equivalent to:
+
+     func compactMap(_ transform: @escaping (Self.E) throws -> Result?) -> RxSwift.Observable {
+        return self.map { try? transform($0) }.filter { $0 != nil }.map { $0! }
+     }
+
+     - parameter transform: A transform function to apply to each source element and which returns an element or nil.
+     - returns: An observable sequence whose elements are the result of filtering the transform function for each element of the source.
+
+     */
+    public func compactMap(_ transform: @escaping (Element) throws -> Result?)
+        -> Observable {
+            return CompactMap(source: self.asObservable(), transform: transform)
+    }
+}
+
+final private class CompactMapSink: Sink, ObserverType {
+    typealias Transform = (SourceType) throws -> ResultType?
+
+    typealias ResultType = Observer.Element 
+    typealias Element = SourceType
+
+    private let _transform: Transform
+
+    init(transform: @escaping Transform, observer: Observer, cancel: Cancelable) {
+        self._transform = transform
+        super.init(observer: observer, cancel: cancel)
+    }
+
+    func on(_ event: Event) {
+        switch event {
+        case .next(let element):
+            do {
+                if let mappedElement = try self._transform(element) {
+                    self.forwardOn(.next(mappedElement))
+                }
+            }
+            catch let e {
+                self.forwardOn(.error(e))
+                self.dispose()
+            }
+        case .error(let error):
+            self.forwardOn(.error(error))
+            self.dispose()
+        case .completed:
+            self.forwardOn(.completed)
+            self.dispose()
+        }
+    }
+}
+
+final private class CompactMap: Producer {
+    typealias Transform = (SourceType) throws -> ResultType?
+
+    private let _source: Observable
+
+    private let _transform: Transform
+
+    init(source: Observable, transform: @escaping Transform) {
+        self._source = source
+        self._transform = transform
+    }
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == ResultType {
+        let sink = CompactMapSink(transform: self._transform, observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
+        return (sink: sink, subscription: subscription)
+    }
+}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Concat.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Concat.swift
index 35ef0e1..6d76a04 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Concat.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Concat.swift
@@ -16,7 +16,7 @@ extension ObservableType {
      - parameter second: Second observable sequence.
      - returns: An observable sequence that contains the elements of `self`, followed by those of the second sequence.
      */
-    public func concat(_ second: O) -> Observable where O.E == E {
+    public func concat(_ second: Source) -> Observable where Source.Element == Element {
         return Observable.concat([self.asObservable(), second.asObservable()])
     }
 }
@@ -35,8 +35,8 @@ extension ObservableType {
 
      - returns: An observable sequence that contains the elements of each given sequence, in sequential order.
      */
-    public static func concat(_ sequence: S) -> Observable
-        where S.Iterator.Element == Observable {
+    public static func concat(_ sequence: Sequence) -> Observable
+        where Sequence.Element == Observable {
             return Concat(sources: sequence, count: nil)
     }
 
@@ -53,8 +53,8 @@ extension ObservableType {
 
      - returns: An observable sequence that contains the elements of each given sequence, in sequential order.
      */
-    public static func concat(_ collection: S) -> Observable
-        where S.Iterator.Element == Observable {
+    public static func concat(_ collection: Collection) -> Observable
+        where Collection.Element == Observable {
             return Concat(sources: collection, count: Int64(collection.count))
     }
 
@@ -71,38 +71,38 @@ extension ObservableType {
 
      - returns: An observable sequence that contains the elements of each given sequence, in sequential order.
      */
-    public static func concat(_ sources: Observable ...) -> Observable {
+    public static func concat(_ sources: Observable ...) -> Observable {
         return Concat(sources: sources, count: Int64(sources.count))
     }
 }
 
-final fileprivate class ConcatSink
-    : TailRecursiveSink
-    , ObserverType where S.Iterator.Element : ObservableConvertibleType, S.Iterator.Element.E == O.E {
-    typealias Element = O.E
+final private class ConcatSink
+    : TailRecursiveSink
+    , ObserverType where Sequence.Element: ObservableConvertibleType, Sequence.Element.Element == Observer.Element {
+    typealias Element = Observer.Element 
     
-    override init(observer: O, cancel: Cancelable) {
+    override init(observer: Observer, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event){
         switch event {
         case .next:
-            forwardOn(event)
+            self.forwardOn(event)
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            schedule(.moveNext)
+            self.schedule(.moveNext)
         }
     }
 
-    override func subscribeToNext(_ source: Observable) -> Disposable {
+    override func subscribeToNext(_ source: Observable) -> Disposable {
         return source.subscribe(self)
     }
     
-    override func extract(_ observable: Observable) -> SequenceGenerator? {
-        if let source = observable as? Concat {
+    override func extract(_ observable: Observable) -> SequenceGenerator? {
+        if let source = observable as? Concat {
             return (source._sources.makeIterator(), source._count)
         }
         else {
@@ -111,20 +111,20 @@ final fileprivate class ConcatSink
     }
 }
 
-final fileprivate class Concat : Producer where S.Iterator.Element : ObservableConvertibleType {
-    typealias Element = S.Iterator.Element.E
+final private class Concat: Producer where Sequence.Element: ObservableConvertibleType {
+    typealias Element = Sequence.Element.Element
     
-    fileprivate let _sources: S
+    fileprivate let _sources: Sequence
     fileprivate let _count: IntMax?
 
-    init(sources: S, count: IntMax?) {
-        _sources = sources
-        _count = count
+    init(sources: Sequence, count: IntMax?) {
+        self._sources = sources
+        self._count = count
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let sink = ConcatSink(observer: observer, cancel: cancel)
-        let subscription = sink.run((_sources.makeIterator(), _count))
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = ConcatSink(observer: observer, cancel: cancel)
+        let subscription = sink.run((self._sources.makeIterator(), self._count))
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Create.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Create.swift
index 4a1804a..30eae4c 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Create.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Create.swift
@@ -17,41 +17,41 @@ extension ObservableType {
      - parameter subscribe: Implementation of the resulting observable sequence's `subscribe` method.
      - returns: The observable sequence with the specified implementation for the `subscribe` method.
      */
-    public static func create(_ subscribe: @escaping (AnyObserver) -> Disposable) -> Observable {
+    public static func create(_ subscribe: @escaping (AnyObserver) -> Disposable) -> Observable {
         return AnonymousObservable(subscribe)
     }
 }
 
-final fileprivate class AnonymousObservableSink : Sink, ObserverType {
-    typealias E = O.E
-    typealias Parent = AnonymousObservable
+final private class AnonymousObservableSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = AnonymousObservable
 
     // state
-    private var _isStopped: AtomicInt = 0
+    private let _isStopped = AtomicInt(0)
 
     #if DEBUG
         fileprivate let _synchronizationTracker = SynchronizationTracker()
     #endif
 
-    override init(observer: O, cancel: Cancelable) {
+    override init(observer: Observer, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         #if DEBUG
-            _synchronizationTracker.register(synchronizationErrorMessage: .default)
-            defer { _synchronizationTracker.unregister() }
+            self._synchronizationTracker.register(synchronizationErrorMessage: .default)
+            defer { self._synchronizationTracker.unregister() }
         #endif
         switch event {
         case .next:
-            if _isStopped == 1 {
+            if load(self._isStopped) == 1 {
                 return
             }
-            forwardOn(event)
+            self.forwardOn(event)
         case .error, .completed:
-            if AtomicCompareAndSwap(0, 1, &_isStopped) {
-                forwardOn(event)
-                dispose()
+            if fetchOr(self._isStopped, 1) == 0 {
+                self.forwardOn(event)
+                self.dispose()
             }
         }
     }
@@ -61,16 +61,16 @@ final fileprivate class AnonymousObservableSink : Sink, Obse
     }
 }
 
-final fileprivate class AnonymousObservable : Producer {
+final private class AnonymousObservable: Producer {
     typealias SubscribeHandler = (AnyObserver) -> Disposable
 
     let _subscribeHandler: SubscribeHandler
 
     init(_ subscribeHandler: @escaping SubscribeHandler) {
-        _subscribeHandler = subscribeHandler
+        self._subscribeHandler = subscribeHandler
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = AnonymousObservableSink(observer: observer, cancel: cancel)
         let subscription = sink.run(self)
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Debounce.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Debounce.swift
index 866427a..6f84711 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Debounce.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Debounce.swift
@@ -18,17 +18,17 @@ extension ObservableType {
      - returns: The throttled sequence.
      */
     public func debounce(_ dueTime: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
             return Debounce(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler)
     }
 }
 
-final fileprivate class DebounceSink
-    : Sink
+final private class DebounceSink
+    : Sink
     , ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias Element = O.E
+    typealias Element = Observer.Element 
     typealias ParentType = Debounce
 
     private let _parent: ParentType
@@ -37,80 +37,79 @@ final fileprivate class DebounceSink
 
     // state
     private var _id = 0 as UInt64
-    private var _value: Element? = nil
+    private var _value: Element?
 
     let cancellable = SerialDisposable()
 
-    init(parent: ParentType, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: ParentType, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
 
         super.init(observer: observer, cancel: cancel)
     }
 
     func run() -> Disposable {
-        let subscription = _parent._source.subscribe(self)
+        let subscription = self._parent._source.subscribe(self)
 
         return Disposables.create(subscription, cancellable)
     }
 
     func on(_ event: Event) {
-        synchronizedOn(event)
+        self.synchronizedOn(event)
     }
 
     func _synchronized_on(_ event: Event) {
         switch event {
         case .next(let element):
-            _id = _id &+ 1
-            let currentId = _id
-            _value = element
+            self._id = self._id &+ 1
+            let currentId = self._id
+            self._value = element
 
 
-            let scheduler = _parent._scheduler
-            let dueTime = _parent._dueTime
+            let scheduler = self._parent._scheduler
+            let dueTime = self._parent._dueTime
 
             let d = SingleAssignmentDisposable()
             self.cancellable.disposable = d
             d.setDisposable(scheduler.scheduleRelative(currentId, dueTime: dueTime, action: self.propagate))
         case .error:
-            _value = nil
-            forwardOn(event)
-            dispose()
+            self._value = nil
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            if let value = _value {
-                _value = nil
-                forwardOn(.next(value))
+            if let value = self._value {
+                self._value = nil
+                self.forwardOn(.next(value))
             }
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 
     func propagate(_ currentId: UInt64) -> Disposable {
-        _lock.lock(); defer { _lock.unlock() } // {
-        let originalValue = _value
+        self._lock.lock(); defer { self._lock.unlock() } // {
+        let originalValue = self._value
 
-        if let value = originalValue, _id == currentId {
-            _value = nil
-            forwardOn(.next(value))
+        if let value = originalValue, self._id == currentId {
+            self._value = nil
+            self.forwardOn(.next(value))
         }
         // }
         return Disposables.create()
     }
 }
 
-final fileprivate class Debounce : Producer {
-
+final private class Debounce: Producer {
     fileprivate let _source: Observable
     fileprivate let _dueTime: RxTimeInterval
     fileprivate let _scheduler: SchedulerType
 
     init(source: Observable, dueTime: RxTimeInterval, scheduler: SchedulerType) {
-        _source = source
-        _dueTime = dueTime
-        _scheduler = scheduler
+        self._source = source
+        self._dueTime = dueTime
+        self._scheduler = scheduler
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = DebounceSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Debug.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Debug.swift
index 85b8af7..103c6e8 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Debug.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Debug.swift
@@ -21,7 +21,7 @@ extension ObservableType {
      - returns: An observable sequence whose events are printed to standard output.
      */
     public func debug(_ identifier: String? = nil, trimOutput: Bool = false, file: String = #file, line: UInt = #line, function: String = #function)
-        -> Observable {
+        -> Observable {
             return Debug(source: self, identifier: identifier, trimOutput: trimOutput, file: file, line: line, function: function)
     }
 }
@@ -32,18 +32,18 @@ fileprivate func logEvent(_ identifier: String, dateFormat: DateFormatter, conte
     print("\(dateFormat.string(from: Date())): \(identifier) -> \(content)")
 }
 
-final fileprivate class DebugSink : Sink, ObserverType where O.E == Source.E {
-    typealias Element = O.E
+final private class DebugSink: Sink, ObserverType where Observer.Element == Source.Element {
+    typealias Element = Observer.Element 
     typealias Parent = Debug
     
     private let _parent: Parent
     private let _timestampFormatter = DateFormatter()
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _timestampFormatter.dateFormat = dateFormat
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._timestampFormatter.dateFormat = dateFormat
 
-        logEvent(_parent._identifier, dateFormat: _timestampFormatter, content: "subscribed")
+        logEvent(self._parent._identifier, dateFormat: self._timestampFormatter, content: "subscribed")
 
         super.init(observer: observer, cancel: cancel)
     }
@@ -52,35 +52,35 @@ final fileprivate class DebugSink : Sin
         let maxEventTextLength = 40
         let eventText = "\(event)"
 
-        let eventNormalized = (eventText.count > maxEventTextLength) && _parent._trimOutput
+        let eventNormalized = (eventText.count > maxEventTextLength) && self._parent._trimOutput
             ? String(eventText.prefix(maxEventTextLength / 2)) + "..." + String(eventText.suffix(maxEventTextLength / 2))
             : eventText
 
-        logEvent(_parent._identifier, dateFormat: _timestampFormatter, content: "Event \(eventNormalized)")
+        logEvent(self._parent._identifier, dateFormat: self._timestampFormatter, content: "Event \(eventNormalized)")
 
-        forwardOn(event)
+        self.forwardOn(event)
         if event.isStopEvent {
-            dispose()
+            self.dispose()
         }
     }
     
     override func dispose() {
         if !self.disposed {
-            logEvent(_parent._identifier, dateFormat: _timestampFormatter, content: "isDisposed")
+            logEvent(self._parent._identifier, dateFormat: self._timestampFormatter, content: "isDisposed")
         }
         super.dispose()
     }
 }
 
-final fileprivate class Debug : Producer {
+final private class Debug: Producer {
     fileprivate let _identifier: String
     fileprivate let _trimOutput: Bool
     fileprivate let _source: Source
 
     init(source: Source, identifier: String?, trimOutput: Bool, file: String, line: UInt, function: String) {
-        _trimOutput = trimOutput
+        self._trimOutput = trimOutput
         if let identifier = identifier {
-            _identifier = identifier
+            self._identifier = identifier
         }
         else {
             let trimmedFile: String
@@ -90,14 +90,14 @@ final fileprivate class Debug : Producer {
             else {
                 trimmedFile = file
             }
-            _identifier = "\(trimmedFile):\(line) (\(function))"
+            self._identifier = "\(trimmedFile):\(line) (\(function))"
         }
-        _source = source
+        self._source = source
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Source.E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Source.Element {
         let sink = DebugSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/DefaultIfEmpty.swift b/Demo/Pods/RxSwift/RxSwift/Observables/DefaultIfEmpty.swift
index 696361f..5ad1bef 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/DefaultIfEmpty.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/DefaultIfEmpty.swift
@@ -16,51 +16,51 @@ extension ObservableType {
      - parameter default: Default element to be sent if the source does not emit any elements
      - returns: An observable sequence which emits default element end completes in case the original sequence is empty
      */
-    public func ifEmpty(default: E) -> Observable {
+    public func ifEmpty(default: Element) -> Observable {
         return DefaultIfEmpty(source: self.asObservable(), default: `default`)
     }
 }
 
-final fileprivate class DefaultIfEmptySink: Sink, ObserverType {
-    typealias E = O.E
-    private let _default: E
+final private class DefaultIfEmptySink: Sink, ObserverType {
+    typealias Element = Observer.Element 
+    private let _default: Element
     private var _isEmpty = true
     
-    init(default: E, observer: O, cancel: Cancelable) {
-        _default = `default`
+    init(default: Element, observer: Observer, cancel: Cancelable) {
+        self._default = `default`
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
-        case .next(_):
-            _isEmpty = false
-            forwardOn(event)
-        case .error(_):
-            forwardOn(event)
-            dispose()
+        case .next:
+            self._isEmpty = false
+            self.forwardOn(event)
+        case .error:
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            if _isEmpty {
-                forwardOn(.next(_default))
+            if self._isEmpty {
+                self.forwardOn(.next(self._default))
             }
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class DefaultIfEmpty: Producer {
+final private class DefaultIfEmpty: Producer {
     private let _source: Observable
     private let _default: SourceType
     
     init(source: Observable, `default`: SourceType) {
-        _source = source
-        _default = `default`
+        self._source = source
+        self._default = `default`
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceType {
-        let sink = DefaultIfEmptySink(default: _default, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == SourceType {
+        let sink = DefaultIfEmptySink(default: self._default, observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Deferred.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Deferred.swift
index 947f604..8152f5c 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Deferred.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Deferred.swift
@@ -15,59 +15,60 @@ extension ObservableType {
      - parameter observableFactory: Observable factory function to invoke for each observer that subscribes to the resulting sequence.
      - returns: An observable sequence whose observers trigger an invocation of the given observable factory function.
      */
-    public static func deferred(_ observableFactory: @escaping () throws -> Observable)
-        -> Observable {
+    public static func deferred(_ observableFactory: @escaping () throws -> Observable)
+        -> Observable {
         return Deferred(observableFactory: observableFactory)
     }
 }
 
-final fileprivate class DeferredSink : Sink, ObserverType where S.E == O.E {
-    typealias E = O.E
+final private class DeferredSink: Sink, ObserverType where Source.Element == Observer.Element {
+    typealias Element = Observer.Element 
 
-    private let _observableFactory: () throws -> S
+    private let _observableFactory: () throws -> Source
 
-    init(observableFactory: @escaping () throws -> S, observer: O, cancel: Cancelable) {
-        _observableFactory = observableFactory
+    init(observableFactory: @escaping () throws -> Source, observer: Observer, cancel: Cancelable) {
+        self._observableFactory = observableFactory
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
         do {
-            let result = try _observableFactory()
+            let result = try self._observableFactory()
             return result.subscribe(self)
         }
         catch let e {
-            forwardOn(.error(e))
-            dispose()
+            self.forwardOn(.error(e))
+            self.dispose()
             return Disposables.create()
         }
     }
     
-    func on(_ event: Event) {
-        forwardOn(event)
+    func on(_ event: Event) {
+        self.forwardOn(event)
         
         switch event {
         case .next:
             break
         case .error:
-            dispose()
+            self.dispose()
         case .completed:
-            dispose()
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Deferred : Producer {
-    typealias Factory = () throws -> S
+final private class Deferred: Producer {
+    typealias Factory = () throws -> Source
     
     private let _observableFactory : Factory
     
     init(observableFactory: @escaping Factory) {
-        _observableFactory = observableFactory
+        self._observableFactory = observableFactory
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
-        let sink = DeferredSink(observableFactory: _observableFactory, observer: observer, cancel: cancel)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable)
+             where Observer.Element == Source.Element {
+        let sink = DeferredSink(observableFactory: self._observableFactory, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Delay.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Delay.swift
index 13955a3..1c00a49 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Delay.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Delay.swift
@@ -20,16 +20,16 @@ extension ObservableType {
      - returns: the source Observable shifted in time by the specified delay.
      */
     public func delay(_ dueTime: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
             return Delay(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler)
     }
 }
 
-final fileprivate class DelaySink
-    : Sink
+final private class DelaySink
+    : Sink
     , ObserverType {
-    typealias E = O.E
-    typealias Source = Observable
+    typealias Element = Observer.Element 
+    typealias Source = Observable
     typealias DisposeKey = Bag.KeyType
     
     private let _lock = RecursiveLock()
@@ -44,15 +44,15 @@ final fileprivate class DelaySink
     private var _active = false
     // is "run loop" on different scheduler running
     private var _running = false
-    private var _errorEvent: Event? = nil
+    private var _errorEvent: Event?
 
     // state
-    private var _queue = Queue<(eventTime: RxTime, event: Event)>(capacity: 0)
+    private var _queue = Queue<(eventTime: RxTime, event: Event)>(capacity: 0)
     private var _disposed = false
     
-    init(observer: O, dueTime: RxTimeInterval, scheduler: SchedulerType, cancel: Cancelable) {
-        _dueTime = dueTime
-        _scheduler = scheduler
+    init(observer: Observer, dueTime: RxTimeInterval, scheduler: SchedulerType, cancel: Cancelable) {
+        self._dueTime = dueTime
+        self._scheduler = scheduler
         super.init(observer: observer, cancel: cancel)
     }
 
@@ -63,12 +63,12 @@ final fileprivate class DelaySink
     // Another complication is that scheduler is potentially concurrent so internal queue is used.
     func drainQueue(state: (), scheduler: AnyRecursiveScheduler<()>) {
 
-        _lock.lock()    // {
-            let hasFailed = _errorEvent != nil
+        self._lock.lock()    // {
+            let hasFailed = self._errorEvent != nil
             if !hasFailed {
-                _running = true
+                self._running = true
             }
-        _lock.unlock()  // }
+        self._lock.unlock()  // }
 
         if hasFailed {
             return
@@ -77,26 +77,24 @@ final fileprivate class DelaySink
         var ranAtLeastOnce = false
 
         while true {
-            _lock.lock() // {
-                let errorEvent = _errorEvent
+            self._lock.lock() // {
+                let errorEvent = self._errorEvent
 
-                let eventToForwardImmediately = ranAtLeastOnce ? nil : _queue.dequeue()?.event
-                let nextEventToScheduleOriginalTime: Date? = ranAtLeastOnce && !_queue.isEmpty ? _queue.peek().eventTime : nil
+                let eventToForwardImmediately = ranAtLeastOnce ? nil : self._queue.dequeue()?.event
+                let nextEventToScheduleOriginalTime: Date? = ranAtLeastOnce && !self._queue.isEmpty ? self._queue.peek().eventTime : nil
 
-                if let _ = errorEvent {
-                }
-                else  {
-                    if let _ = eventToForwardImmediately {
+                if errorEvent == nil {
+                    if eventToForwardImmediately != nil {
                     }
-                    else if let _ = nextEventToScheduleOriginalTime {
-                        _running = false
+                    else if nextEventToScheduleOriginalTime != nil {
+                        self._running = false
                     }
                     else {
-                        _running = false
-                        _active = false
+                        self._running = false
+                        self._active = false
                     }
                 }
-            _lock.unlock() // {
+            self._lock.unlock() // {
 
             if let errorEvent = errorEvent {
                 self.forwardOn(errorEvent)
@@ -113,10 +111,7 @@ final fileprivate class DelaySink
                     }
                 }
                 else if let nextEventToScheduleOriginalTime = nextEventToScheduleOriginalTime {
-                    let elapsedTime = _scheduler.now.timeIntervalSince(nextEventToScheduleOriginalTime)
-                    let interval = _dueTime - elapsedTime
-                    let normalizedInterval = interval < 0.0 ? 0.0 : interval
-                    scheduler.schedule((), dueTime: normalizedInterval)
+                    scheduler.schedule((), dueTime: self._dueTime.reduceWithSpanBetween(earlierDate: nextEventToScheduleOriginalTime, laterDate: self._scheduler.now))
                     return
                 }
                 else {
@@ -126,56 +121,56 @@ final fileprivate class DelaySink
         }
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         if event.isStopEvent {
-            _sourceSubscription.dispose()
+            self._sourceSubscription.dispose()
         }
 
         switch event {
-        case .error(_):
-            _lock.lock()    // {
-                let shouldSendImmediately = !_running
-                _queue = Queue(capacity: 0)
-                _errorEvent = event
-            _lock.unlock()  // }
+        case .error:
+            self._lock.lock()    // {
+                let shouldSendImmediately = !self._running
+                self._queue = Queue(capacity: 0)
+                self._errorEvent = event
+            self._lock.unlock()  // }
 
             if shouldSendImmediately {
-                forwardOn(event)
-                dispose()
+                self.forwardOn(event)
+                self.dispose()
             }
         default:
-            _lock.lock()    // {
-                let shouldSchedule = !_active
-                _active = true
-                _queue.enqueue((_scheduler.now, event))
-            _lock.unlock()  // }
+            self._lock.lock()    // {
+                let shouldSchedule = !self._active
+                self._active = true
+                self._queue.enqueue((self._scheduler.now, event))
+            self._lock.unlock()  // }
 
             if shouldSchedule {
-                _cancelable.disposable = _scheduler.scheduleRecursive((), dueTime: _dueTime, action: self.drainQueue)
+                self._cancelable.disposable = self._scheduler.scheduleRecursive((), dueTime: self._dueTime, action: self.drainQueue)
             }
         }
     }
     
-    func run(source: Observable) -> Disposable {
-        _sourceSubscription.setDisposable(source.subscribe(self))
+    func run(source: Observable) -> Disposable {
+        self._sourceSubscription.setDisposable(source.subscribe(self))
         return Disposables.create(_sourceSubscription, _cancelable)
     }
 }
 
-final fileprivate class Delay: Producer {
+final private class Delay: Producer {
     private let _source: Observable
     private let _dueTime: RxTimeInterval
     private let _scheduler: SchedulerType
     
     init(source: Observable, dueTime: RxTimeInterval, scheduler: SchedulerType) {
-        _source = source
-        _dueTime = dueTime
-        _scheduler = scheduler
+        self._source = source
+        self._dueTime = dueTime
+        self._scheduler = scheduler
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let sink = DelaySink(observer: observer, dueTime: _dueTime, scheduler: _scheduler, cancel: cancel)
-        let subscription = sink.run(source: _source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = DelaySink(observer: observer, dueTime: self._dueTime, scheduler: self._scheduler, cancel: cancel)
+        let subscription = sink.run(source: self._source)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/DelaySubscription.swift b/Demo/Pods/RxSwift/RxSwift/Observables/DelaySubscription.swift
index 9225a19..a329d60 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/DelaySubscription.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/DelaySubscription.swift
@@ -18,46 +18,38 @@ extension ObservableType {
      - returns: Time-shifted sequence.
      */
     public func delaySubscription(_ dueTime: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
         return DelaySubscription(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler)
     }
 }
 
-final fileprivate class DelaySubscriptionSink
-    : Sink, ObserverType {
-    typealias E = O.E
-    typealias Parent = DelaySubscription
+final private class DelaySubscriptionSink
+    : Sink, ObserverType {
+    typealias Element = Observer.Element 
     
-    private let _parent: Parent
-    
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        forwardOn(event)
+    func on(_ event: Event) {
+        self.forwardOn(event)
         if event.isStopEvent {
-            dispose()
+            self.dispose()
         }
     }
     
 }
 
-final fileprivate class DelaySubscription: Producer {
+final private class DelaySubscription: Producer {
     private let _source: Observable
     private let _dueTime: RxTimeInterval
     private let _scheduler: SchedulerType
     
     init(source: Observable, dueTime: RxTimeInterval, scheduler: SchedulerType) {
-        _source = source
-        _dueTime = dueTime
-        _scheduler = scheduler
+        self._source = source
+        self._dueTime = dueTime
+        self._scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let sink = DelaySubscriptionSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _scheduler.scheduleRelative((), dueTime: _dueTime) { _ in
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = DelaySubscriptionSink(observer: observer, cancel: cancel)
+        let subscription = self._scheduler.scheduleRelative((), dueTime: self._dueTime) { _ in
             return self._source.subscribe(sink)
         }
 
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Dematerialize.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Dematerialize.swift
index d142249..8337311 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Dematerialize.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Dematerialize.swift
@@ -6,46 +6,46 @@
 //  Copyright © 2017 Krunoslav Zaher. All rights reserved.
 //
 
-extension ObservableType where E: EventConvertible {
+extension ObservableType where Element: EventConvertible {
     /**
      Convert any previously materialized Observable into it's original form.
      - seealso: [materialize operator on reactivex.io](http://reactivex.io/documentation/operators/materialize-dematerialize.html)
      - returns: The dematerialized observable sequence.
      */
-    public func dematerialize() -> Observable {
+    public func dematerialize() -> Observable {
         return Dematerialize(source: self.asObservable())
     }
 
 }
 
-fileprivate final class DematerializeSink: Sink, ObserverType where O.E == Element.ElementType {
-    fileprivate func on(_ event: Event) {
+fileprivate final class DematerializeSink: Sink, ObserverType where Observer.Element == T.Element {
+    fileprivate func on(_ event: Event) {
         switch event {
         case .next(let element):
-            forwardOn(element.event)
+            self.forwardOn(element.event)
             if element.event.isStopEvent {
-                dispose()
+                self.dispose()
             }
         case .completed:
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         case .error(let error):
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Dematerialize: Producer  {
-    private let _source: Observable
-    
-    init(source: Observable) {
-        _source = source
+final private class Dematerialize: Producer {
+    private let _source: Observable
+
+    init(source: Observable) {
+        self._source = source
     }
-    
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element.ElementType {
-        let sink = DematerializeSink(observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == T.Element {
+        let sink = DematerializeSink(observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/DistinctUntilChanged.swift b/Demo/Pods/RxSwift/RxSwift/Observables/DistinctUntilChanged.swift
index f72f520..5bf38d6 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/DistinctUntilChanged.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/DistinctUntilChanged.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-extension ObservableType where E: Equatable {
+extension ObservableType where Element: Equatable {
 
     /**
      Returns an observable sequence that contains only distinct contiguous elements according to equality operator.
@@ -16,7 +16,7 @@ extension ObservableType where E: Equatable {
      - returns: An observable sequence only containing the distinct contiguous elements, based on equality operator, from the source sequence.
      */
     public func distinctUntilChanged()
-        -> Observable {
+        -> Observable {
             return self.distinctUntilChanged({ $0 }, comparer: { ($0 == $1) })
     }
 }
@@ -30,8 +30,8 @@ extension ObservableType {
      - parameter keySelector: A function to compute the comparison key for each element.
      - returns: An observable sequence only containing the distinct contiguous elements, based on a computed key value, from the source sequence.
      */
-    public func distinctUntilChanged(_ keySelector: @escaping (E) throws -> K)
-        -> Observable {
+    public func distinctUntilChanged(_ keySelector: @escaping (Element) throws -> Key)
+        -> Observable {
             return self.distinctUntilChanged(keySelector, comparer: { $0 == $1 })
     }
 
@@ -43,8 +43,8 @@ extension ObservableType {
      - parameter comparer: Equality comparer for computed key values.
      - returns: An observable sequence only containing the distinct contiguous elements, based on `comparer`, from the source sequence.
      */
-    public func distinctUntilChanged(_ comparer: @escaping (E, E) throws -> Bool)
-        -> Observable {
+    public func distinctUntilChanged(_ comparer: @escaping (Element, Element) throws -> Bool)
+        -> Observable {
             return self.distinctUntilChanged({ $0 }, comparer: comparer)
     }
 
@@ -57,53 +57,53 @@ extension ObservableType {
      - parameter comparer: Equality comparer for computed key values.
      - returns: An observable sequence only containing the distinct contiguous elements, based on a computed key value and the comparer, from the source sequence.
      */
-    public func distinctUntilChanged(_ keySelector: @escaping (E) throws -> K, comparer: @escaping (K, K) throws -> Bool)
-        -> Observable {
+    public func distinctUntilChanged(_ keySelector: @escaping (Element) throws -> K, comparer: @escaping (K, K) throws -> Bool)
+        -> Observable {
             return DistinctUntilChanged(source: self.asObservable(), selector: keySelector, comparer: comparer)
     }
 }
 
-final fileprivate class DistinctUntilChangedSink: Sink, ObserverType {
-    typealias E = O.E
+final private class DistinctUntilChangedSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
     
-    private let _parent: DistinctUntilChanged
-    private var _currentKey: Key? = nil
+    private let _parent: DistinctUntilChanged
+    private var _currentKey: Key?
     
-    init(parent: DistinctUntilChanged, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: DistinctUntilChanged, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next(let value):
             do {
-                let key = try _parent._selector(value)
+                let key = try self._parent._selector(value)
                 var areEqual = false
-                if let currentKey = _currentKey {
-                    areEqual = try _parent._comparer(currentKey, key)
+                if let currentKey = self._currentKey {
+                    areEqual = try self._parent._comparer(currentKey, key)
                 }
                 
                 if areEqual {
                     return
                 }
                 
-                _currentKey = key
+                self._currentKey = key
                 
-                forwardOn(event)
+                self.forwardOn(event)
             }
             catch let error {
-                forwardOn(.error(error))
-                dispose()
+                self.forwardOn(.error(error))
+                self.dispose()
             }
         case .error, .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class DistinctUntilChanged: Producer {
+final private class DistinctUntilChanged: Producer {
     typealias KeySelector = (Element) throws -> Key
     typealias EqualityComparer = (Key, Key) throws -> Bool
     
@@ -112,14 +112,14 @@ final fileprivate class DistinctUntilChanged: Producer {
     fileprivate let _comparer: EqualityComparer
     
     init(source: Observable, selector: @escaping KeySelector, comparer: @escaping EqualityComparer) {
-        _source = source
-        _selector = selector
-        _comparer = comparer
+        self._source = source
+        self._selector = selector
+        self._comparer = comparer
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = DistinctUntilChangedSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Do.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Do.swift
index 2be6d58..8f0c228 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Do.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Do.swift
@@ -13,15 +13,18 @@ extension ObservableType {
      - seealso: [do operator on reactivex.io](http://reactivex.io/documentation/operators/do.html)
 
      - parameter onNext: Action to invoke for each element in the observable sequence.
+     - parameter afterNext: Action to invoke for each element after the observable has passed an onNext event along to its downstream.
      - parameter onError: Action to invoke upon errored termination of the observable sequence.
+     - parameter afterError: Action to invoke after errored termination of the observable sequence.
      - parameter onCompleted: Action to invoke upon graceful termination of the observable sequence.
+     - parameter afterCompleted: Action to invoke after graceful termination of the observable sequence.
      - parameter onSubscribe: Action to invoke before subscribing to source observable sequence.
      - parameter onSubscribed: Action to invoke after subscribing to source observable sequence.
      - parameter onDispose: Action to invoke after subscription to source observable has been disposed for any reason. It can be either because sequence terminates for some reason or observer subscription being disposed.
      - returns: The source sequence with the side-effecting behavior applied.
      */
-    public func `do`(onNext: ((E) throws -> Void)? = nil, onError: ((Swift.Error) throws -> Void)? = nil, onCompleted: (() throws -> Void)? = nil, onSubscribe: (() -> ())? = nil, onSubscribed: (() -> ())? = nil, onDispose: (() -> ())? = nil)
-        -> Observable {
+    public func `do`(onNext: ((Element) throws -> Void)? = nil, afterNext: ((Element) throws -> Void)? = nil, onError: ((Swift.Error) throws -> Void)? = nil, afterError: ((Swift.Error) throws -> Void)? = nil, onCompleted: (() throws -> Void)? = nil, afterCompleted: (() throws -> Void)? = nil, onSubscribe: (() -> Void)? = nil, onSubscribed: (() -> Void)? = nil, onDispose: (() -> Void)? = nil)
+        -> Observable {
             return Do(source: self.asObservable(), eventHandler: { e in
                 switch e {
                 case .next(let element):
@@ -31,59 +34,75 @@ extension ObservableType {
                 case .completed:
                     try onCompleted?()
                 }
+            }, afterEventHandler: { e in
+                switch e {
+                case .next(let element):
+                    try afterNext?(element)
+                case .error(let e):
+                    try afterError?(e)
+                case .completed:
+                    try afterCompleted?()
+                }
             }, onSubscribe: onSubscribe, onSubscribed: onSubscribed, onDispose: onDispose)
     }
 }
 
-final fileprivate class DoSink : Sink, ObserverType {
-    typealias Element = O.E
+final private class DoSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
     typealias EventHandler = (Event) throws -> Void
+    typealias AfterEventHandler = (Event) throws -> Void
     
     private let _eventHandler: EventHandler
+    private let _afterEventHandler: AfterEventHandler
     
-    init(eventHandler: @escaping EventHandler, observer: O, cancel: Cancelable) {
-        _eventHandler = eventHandler
+    init(eventHandler: @escaping EventHandler, afterEventHandler: @escaping AfterEventHandler, observer: Observer, cancel: Cancelable) {
+        self._eventHandler = eventHandler
+        self._afterEventHandler = afterEventHandler
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event) {
         do {
-            try _eventHandler(event)
-            forwardOn(event)
+            try self._eventHandler(event)
+            self.forwardOn(event)
+            try self._afterEventHandler(event)
             if event.isStopEvent {
-                dispose()
+                self.dispose()
             }
         }
         catch let error {
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Do : Producer {
+final private class Do: Producer {
     typealias EventHandler = (Event) throws -> Void
+    typealias AfterEventHandler = (Event) throws -> Void
     
     fileprivate let _source: Observable
     fileprivate let _eventHandler: EventHandler
-    fileprivate let _onSubscribe: (() -> ())?
-    fileprivate let _onSubscribed: (() -> ())?
-    fileprivate let _onDispose: (() -> ())?
+    fileprivate let _afterEventHandler: AfterEventHandler
+    fileprivate let _onSubscribe: (() -> Void)?
+    fileprivate let _onSubscribed: (() -> Void)?
+    fileprivate let _onDispose: (() -> Void)?
     
-    init(source: Observable, eventHandler: @escaping EventHandler, onSubscribe: (() -> ())?, onSubscribed: (() -> ())?, onDispose: (() -> ())?) {
-        _source = source
-        _eventHandler = eventHandler
-        _onSubscribe = onSubscribe
-        _onSubscribed = onSubscribed
-        _onDispose = onDispose
+    init(source: Observable, eventHandler: @escaping EventHandler, afterEventHandler: @escaping AfterEventHandler, onSubscribe: (() -> Void)?, onSubscribed: (() -> Void)?, onDispose: (() -> Void)?) {
+        self._source = source
+        self._eventHandler = eventHandler
+        self._afterEventHandler = afterEventHandler
+        self._onSubscribe = onSubscribe
+        self._onSubscribed = onSubscribed
+        self._onDispose = onDispose
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        _onSubscribe?()
-        let sink = DoSink(eventHandler: _eventHandler, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
-        _onSubscribed?()
-        let onDispose = _onDispose
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        self._onSubscribe?()
+        let sink = DoSink(eventHandler: self._eventHandler, afterEventHandler: self._afterEventHandler, observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
+        self._onSubscribed?()
+        let onDispose = self._onDispose
         let allSubscriptions = Disposables.create {
             subscription.dispose()
             onDispose?()
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/ElementAt.swift b/Demo/Pods/RxSwift/RxSwift/Observables/ElementAt.swift
index 500a044..f8750f0 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/ElementAt.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/ElementAt.swift
@@ -17,51 +17,51 @@ extension ObservableType {
      - returns: An observable sequence that emits the desired element as its own sole emission.
      */
     public func elementAt(_ index: Int)
-        -> Observable {
-        return ElementAt(source: asObservable(), index: index, throwOnEmpty: true)
+        -> Observable {
+        return ElementAt(source: self.asObservable(), index: index, throwOnEmpty: true)
     }
 }
 
-final fileprivate class ElementAtSink : Sink, ObserverType {
-    typealias SourceType = O.E
+final private class ElementAtSink: Sink, ObserverType {
+    typealias SourceType = Observer.Element
     typealias Parent = ElementAt
     
     let _parent: Parent
     var _i: Int
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _i = parent._index
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._i = parent._index
         
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event) {
         switch event {
-        case .next(_):
+        case .next:
 
-            if (_i == 0) {
-                forwardOn(event)
-                forwardOn(.completed)
+            if self._i == 0 {
+                self.forwardOn(event)
+                self.forwardOn(.completed)
                 self.dispose()
             }
             
             do {
-                let _ = try decrementChecked(&_i)
-            } catch(let e) {
-                forwardOn(.error(e))
-                dispose()
+                _ = try decrementChecked(&self._i)
+            } catch let e {
+                self.forwardOn(.error(e))
+                self.dispose()
                 return
             }
             
         case .error(let e):
-            forwardOn(.error(e))
+            self.forwardOn(.error(e))
             self.dispose()
         case .completed:
-            if (_parent._throwOnEmpty) {
-                forwardOn(.error(RxError.argumentOutOfRange))
+            if self._parent._throwOnEmpty {
+                self.forwardOn(.error(RxError.argumentOutOfRange))
             } else {
-                forwardOn(.completed)
+                self.forwardOn(.completed)
             }
             
             self.dispose()
@@ -69,8 +69,7 @@ final fileprivate class ElementAtSink : Sink, ObserverType {
     }
 }
 
-final fileprivate class ElementAt : Producer {
-    
+final private class ElementAt: Producer {
     let _source: Observable
     let _throwOnEmpty: Bool
     let _index: Int
@@ -85,9 +84,9 @@ final fileprivate class ElementAt : Producer {
         self._throwOnEmpty = throwOnEmpty
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceType {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == SourceType {
         let sink = ElementAtSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Empty.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Empty.swift
index d2dcdb0..4ea2995 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Empty.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Empty.swift
@@ -14,13 +14,13 @@ extension ObservableType {
 
      - returns: An observable sequence with no elements.
      */
-    public static func empty() -> Observable {
-        return EmptyProducer()
+    public static func empty() -> Observable {
+        return EmptyProducer()
     }
 }
 
-final fileprivate class EmptyProducer : Producer {
-    override func subscribe(_ observer: O) -> Disposable where O.E == Element {
+final private class EmptyProducer: Producer {
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
         observer.on(.completed)
         return Disposables.create()
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Enumerated.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Enumerated.swift
index 2a6cd98..bd92381 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Enumerated.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Enumerated.swift
@@ -16,47 +16,46 @@ extension ObservableType {
      - returns: An observable sequence that contains tuples of source sequence elements and their indexes.
      */
     public func enumerated()
-        -> Observable<(index: Int, element: E)> {
+        -> Observable<(index: Int, element: Element)> {
         return Enumerated(source: self.asObservable())
     }
 }
 
-final fileprivate class EnumeratedSink: Sink, ObserverType where O.E == (index: Int, element: Element) {
-    typealias E = Element
+final private class EnumeratedSink: Sink, ObserverType where Observer.Element == (index: Int, element: Element) {
     var index = 0
     
     func on(_ event: Event) {
         switch event {
         case .next(let value):
             do {
-                let nextIndex = try incrementChecked(&index)
+                let nextIndex = try incrementChecked(&self.index)
                 let next = (index: nextIndex, element: value)
-                forwardOn(.next(next))
+                self.forwardOn(.next(next))
             }
             catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
             }
         case .completed:
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         case .error(let error):
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Enumerated : Producer<(index: Int, element: Element)> {
+final private class Enumerated: Producer<(index: Int, element: Element)> {
     private let _source: Observable
 
     init(source: Observable) {
-        _source = source
+        self._source = source
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == (index: Int, element: Element) {
-        let sink = EnumeratedSink(observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == (index: Int, element: Element) {
+        let sink = EnumeratedSink(observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Error.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Error.swift
index a15942b..530fe3e 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Error.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Error.swift
@@ -14,20 +14,20 @@ extension ObservableType {
 
      - returns: The observable sequence that terminates with specified error.
      */
-    public static func error(_ error: Swift.Error) -> Observable {
+    public static func error(_ error: Swift.Error) -> Observable {
         return ErrorProducer(error: error)
     }
 }
 
-final fileprivate class ErrorProducer : Producer {
+final private class ErrorProducer: Producer {
     private let _error: Swift.Error
     
     init(error: Swift.Error) {
-        _error = error
+        self._error = error
     }
     
-    override func subscribe(_ observer: O) -> Disposable where O.E == Element {
-        observer.on(.error(_error))
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        observer.on(.error(self._error))
         return Disposables.create()
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Filter.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Filter.swift
index 05dc8a4..5f787d6 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Filter.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Filter.swift
@@ -16,9 +16,9 @@ extension ObservableType {
      - parameter predicate: A function to test each source element for a condition.
      - returns: An observable sequence that contains elements from the input sequence that satisfy the condition.
      */
-    public func filter(_ predicate: @escaping (E) throws -> Bool)
-        -> Observable {
-        return Filter(source: asObservable(), predicate: predicate)
+    public func filter(_ predicate: @escaping (Element) throws -> Bool)
+        -> Observable {
+        return Filter(source: self.asObservable(), predicate: predicate)
     }
 }
 
@@ -33,58 +33,58 @@ extension ObservableType {
      */
     public func ignoreElements()
         -> Completable {
-            return flatMap { _ in
+            return self.flatMap { _ in
                 return Observable.empty()
             }
             .asCompletable()
     }
 }
 
-final fileprivate class FilterSink: Sink, ObserverType {
+final private class FilterSink: Sink, ObserverType {
     typealias Predicate = (Element) throws -> Bool
-    typealias Element = O.E
+    typealias Element = Observer.Element
     
     private let _predicate: Predicate
     
-    init(predicate: @escaping Predicate, observer: O, cancel: Cancelable) {
-        _predicate = predicate
+    init(predicate: @escaping Predicate, observer: Observer, cancel: Cancelable) {
+        self._predicate = predicate
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event) {
         switch event {
-            case .next(let value):
-                do {
-                    let satisfies = try _predicate(value)
-                    if satisfies {
-                        forwardOn(.next(value))
-                    }
+        case .next(let value):
+            do {
+                let satisfies = try self._predicate(value)
+                if satisfies {
+                    self.forwardOn(.next(value))
                 }
-                catch let e {
-                    forwardOn(.error(e))
-                    dispose()
-                }
-            case .completed, .error:
-                forwardOn(event)
-                dispose()
+            }
+            catch let e {
+                self.forwardOn(.error(e))
+                self.dispose()
+            }
+        case .completed, .error:
+            self.forwardOn(event)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Filter : Producer {
+final private class Filter: Producer {
     typealias Predicate = (Element) throws -> Bool
     
     private let _source: Observable
     private let _predicate: Predicate
     
     init(source: Observable, predicate: @escaping Predicate) {
-        _source = source
-        _predicate = predicate
+        self._source = source
+        self._predicate = predicate
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let sink = FilterSink(predicate: _predicate, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = FilterSink(predicate: self._predicate, observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/First.swift b/Demo/Pods/RxSwift/RxSwift/Observables/First.swift
index 4a72ba0..4c56223 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/First.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/First.swift
@@ -6,23 +6,22 @@
 //  Copyright © 2017 Krunoslav Zaher. All rights reserved.
 //
 
-fileprivate final class FirstSink : Sink, ObserverType where O.E == Element? {
-    typealias E = Element
-    typealias Parent = First
+fileprivate final class FirstSink : Sink, ObserverType where Observer.Element == Element? {
+    typealias Parent = First
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next(let value):
-            forwardOn(.next(value))
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.next(value))
+            self.forwardOn(.completed)
+            self.dispose()
         case .error(let error):
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            forwardOn(.next(nil))
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.next(nil))
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
@@ -31,12 +30,12 @@ final class First: Producer {
     fileprivate let _source: Observable
 
     init(source: Observable) {
-        _source = source
+        self._source = source
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element? {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element? {
         let sink = FirstSink(observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Generate.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Generate.swift
index 6469937..5c9d0c1 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Generate.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Generate.swift
@@ -19,26 +19,26 @@ extension ObservableType {
      - parameter scheduler: Scheduler on which to run the generator loop.
      - returns: The generated sequence.
      */
-    public static func generate(initialState: E, condition: @escaping (E) throws -> Bool, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance, iterate: @escaping (E) throws -> E) -> Observable {
+    public static func generate(initialState: Element, condition: @escaping (Element) throws -> Bool, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance, iterate: @escaping (Element) throws -> Element) -> Observable {
         return Generate(initialState: initialState, condition: condition, iterate: iterate, resultSelector: { $0 }, scheduler: scheduler)
     }
 }
 
-final fileprivate class GenerateSink : Sink {
-    typealias Parent = Generate
+final private class GenerateSink: Sink {
+    typealias Parent = Generate
     
     private let _parent: Parent
     
-    private var _state: S
+    private var _state: Sequence
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _state = parent._initialState
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._state = parent._initialState
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
-        return _parent._scheduler.scheduleRecursive(true) { (isFirst, recurse) -> Void in
+        return self._parent._scheduler.scheduleRecursive(true) { isFirst, recurse -> Void in
             do {
                 if !isFirst {
                     self._state = try self._parent._iterate(self._state)
@@ -63,23 +63,23 @@ final fileprivate class GenerateSink : Sink {
     }
 }
 
-final fileprivate class Generate : Producer {
-    fileprivate let _initialState: S
-    fileprivate let _condition: (S) throws -> Bool
-    fileprivate let _iterate: (S) throws -> S
-    fileprivate let _resultSelector: (S) throws -> E
+final private class Generate: Producer {
+    fileprivate let _initialState: Sequence
+    fileprivate let _condition: (Sequence) throws -> Bool
+    fileprivate let _iterate: (Sequence) throws -> Sequence
+    fileprivate let _resultSelector: (Sequence) throws -> Element
     fileprivate let _scheduler: ImmediateSchedulerType
     
-    init(initialState: S, condition: @escaping (S) throws -> Bool, iterate: @escaping (S) throws -> S, resultSelector: @escaping (S) throws -> E, scheduler: ImmediateSchedulerType) {
-        _initialState = initialState
-        _condition = condition
-        _iterate = iterate
-        _resultSelector = resultSelector
-        _scheduler = scheduler
+    init(initialState: Sequence, condition: @escaping (Sequence) throws -> Bool, iterate: @escaping (Sequence) throws -> Sequence, resultSelector: @escaping (Sequence) throws -> Element, scheduler: ImmediateSchedulerType) {
+        self._initialState = initialState
+        self._condition = condition
+        self._iterate = iterate
+        self._resultSelector = resultSelector
+        self._scheduler = scheduler
         super.init()
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = GenerateSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/GroupBy.swift b/Demo/Pods/RxSwift/RxSwift/Observables/GroupBy.swift
index a8a0e78..6ae101c 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/GroupBy.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/GroupBy.swift
@@ -15,34 +15,33 @@ extension ObservableType {
      - parameter keySelector: A function to extract the key for each element.
      - returns: A sequence of observable groups, each of which corresponds to a unique key value, containing all elements that share that same key value.
      */
-    public func groupBy(keySelector: @escaping (E) throws -> K)
-        -> Observable> {
+    public func groupBy(keySelector: @escaping (Element) throws -> Key)
+        -> Observable> {
         return GroupBy(source: self.asObservable(), selector: keySelector)
     }
 }
 
-final fileprivate class GroupedObservableImpl : Observable {
+final private class GroupedObservableImpl: Observable {
     private var _subject: PublishSubject
     private var _refCount: RefCountDisposable
     
-    init(key: Key, subject: PublishSubject, refCount: RefCountDisposable) {
-        _subject = subject
-        _refCount = refCount
+    init(subject: PublishSubject, refCount: RefCountDisposable) {
+        self._subject = subject
+        self._refCount = refCount
     }
 
-    override public func subscribe(_ observer: O) -> Disposable where O.E == E {
-        let release = _refCount.retain()
-        let subscription = _subject.subscribe(observer)
+    override public func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        let release = self._refCount.retain()
+        let subscription = self._subject.subscribe(observer)
         return Disposables.create(release, subscription)
     }
 }
 
 
-final fileprivate class GroupBySink
-    : Sink
-    , ObserverType where O.E == GroupedObservable {
-    typealias E = Element
-    typealias ResultType = O.E
+final private class GroupBySink
+    : Sink
+    , ObserverType where Observer.Element == GroupedObservable {
+    typealias ResultType = Observer.Element 
     typealias Parent = GroupBy
 
     private let _parent: Parent
@@ -50,33 +49,33 @@ final fileprivate class GroupBySink
     private var _refCountDisposable: RefCountDisposable!
     private var _groupedSubjectTable: [Key: PublishSubject]
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _groupedSubjectTable = [Key: PublishSubject]()
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._groupedSubjectTable = [Key: PublishSubject]()
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
-        _refCountDisposable = RefCountDisposable(disposable: _subscription)
+        self._refCountDisposable = RefCountDisposable(disposable: self._subscription)
         
-        _subscription.setDisposable(_parent._source.subscribe(self))
+        self._subscription.setDisposable(self._parent._source.subscribe(self))
         
-        return _refCountDisposable
+        return self._refCountDisposable
     }
     
     private func onGroupEvent(key: Key, value: Element) {
-        if let writer = _groupedSubjectTable[key] {
+        if let writer = self._groupedSubjectTable[key] {
             writer.on(.next(value))
         } else {
             let writer = PublishSubject()
-            _groupedSubjectTable[key] = writer
+            self._groupedSubjectTable[key] = writer
             
             let group = GroupedObservable(
                 key: key,
-                source: GroupedObservableImpl(key: key, subject: writer, refCount: _refCountDisposable)
+                source: GroupedObservableImpl(subject: writer, refCount: _refCountDisposable)
             )
             
-            forwardOn(.next(group))
+            self.forwardOn(.next(group))
             writer.on(.next(value))
         }
     }
@@ -85,49 +84,49 @@ final fileprivate class GroupBySink
         switch event {
         case let .next(value):
             do {
-                let groupKey = try _parent._selector(value)
-                onGroupEvent(key: groupKey, value: value)
+                let groupKey = try self._parent._selector(value)
+                self.onGroupEvent(key: groupKey, value: value)
             }
             catch let e {
-                error(e)
+                self.error(e)
                 return
             }
         case let .error(e):
-            error(e)
+            self.error(e)
         case .completed:
-            forwardOnGroups(event: .completed)
-            forwardOn(.completed)
-            _subscription.dispose()
-            dispose()
+            self.forwardOnGroups(event: .completed)
+            self.forwardOn(.completed)
+            self._subscription.dispose()
+            self.dispose()
         }
     }
 
     final func error(_ error: Swift.Error) {
-        forwardOnGroups(event: .error(error))
-        forwardOn(.error(error))
-        _subscription.dispose()
-        dispose()
+        self.forwardOnGroups(event: .error(error))
+        self.forwardOn(.error(error))
+        self._subscription.dispose()
+        self.dispose()
     }
     
     final func forwardOnGroups(event: Event) {
-        for writer in _groupedSubjectTable.values {
+        for writer in self._groupedSubjectTable.values {
             writer.on(event)
         }
     }
 }
 
-final fileprivate class GroupBy: Producer> {
+final private class GroupBy: Producer> {
     typealias KeySelector = (Element) throws -> Key
 
     fileprivate let _source: Observable
     fileprivate let _selector: KeySelector
     
     init(source: Observable, selector: @escaping KeySelector) {
-        _source = source
-        _selector = selector
+        self._source = source
+        self._selector = selector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == GroupedObservable {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == GroupedObservable {
         let sink = GroupBySink(parent: self, observer: observer, cancel: cancel)
         return (sink: sink, subscription: sink.run())
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Just.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Just.swift
index 4e49059..df4f302 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Just.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Just.swift
@@ -15,7 +15,7 @@ extension ObservableType {
      - parameter element: Single element in the resulting observable sequence.
      - returns: An observable sequence containing the single specified element.
      */
-    public static func just(_ element: E) -> Observable {
+    public static func just(_ element: Element) -> Observable {
         return Just(element: element)
     }
 
@@ -28,24 +28,24 @@ extension ObservableType {
      - parameter scheduler: Scheduler to send the single element on.
      - returns: An observable sequence containing the single specified element.
      */
-    public static func just(_ element: E, scheduler: ImmediateSchedulerType) -> Observable {
+    public static func just(_ element: Element, scheduler: ImmediateSchedulerType) -> Observable {
         return JustScheduled(element: element, scheduler: scheduler)
     }
 }
 
-final fileprivate class JustScheduledSink : Sink {
-    typealias Parent = JustScheduled
+final private class JustScheduledSink: Sink {
+    typealias Parent = JustScheduled
 
     private let _parent: Parent
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
 
     func run() -> Disposable {
-        let scheduler = _parent._scheduler
-        return scheduler.schedule(_parent._element) { element in
+        let scheduler = self._parent._scheduler
+        return scheduler.schedule(self._parent._element) { element in
             self.forwardOn(.next(element))
             return scheduler.schedule(()) { _ in
                 self.forwardOn(.completed)
@@ -56,31 +56,31 @@ final fileprivate class JustScheduledSink : Sink {
     }
 }
 
-final fileprivate class JustScheduled : Producer {
+final private class JustScheduled: Producer {
     fileprivate let _scheduler: ImmediateSchedulerType
     fileprivate let _element: Element
 
     init(element: Element, scheduler: ImmediateSchedulerType) {
-        _scheduler = scheduler
-        _element = element
+        self._scheduler = scheduler
+        self._element = element
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = JustScheduledSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class Just : Producer {
+final private class Just: Producer {
     private let _element: Element
     
     init(element: Element) {
-        _element = element
+        self._element = element
     }
     
-    override func subscribe(_ observer: O) -> Disposable where O.E == Element {
-        observer.on(.next(_element))
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        observer.on(.next(self._element))
         observer.on(.completed)
         return Disposables.create()
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Map.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Map.swift
index df0e0d1..315f375 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Map.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Map.swift
@@ -17,22 +17,22 @@ extension ObservableType {
      - returns: An observable sequence whose elements are the result of invoking the transform function on each element of source.
 
      */
-    public func map(_ transform: @escaping (E) throws -> R)
-        -> Observable {
+    public func map(_ transform: @escaping (Element) throws -> Result)
+        -> Observable {
         return self.asObservable().composeMap(transform)
     }
 }
 
-final fileprivate class MapSink : Sink, ObserverType {
+final private class MapSink: Sink, ObserverType {
     typealias Transform = (SourceType) throws -> ResultType
 
-    typealias ResultType = O.E
+    typealias ResultType = Observer.Element 
     typealias Element = SourceType
 
     private let _transform: Transform
-    
-    init(transform: @escaping Transform, observer: O, cancel: Cancelable) {
-        _transform = transform
+
+    init(transform: @escaping Transform, observer: Observer, cancel: Cancelable) {
+        self._transform = transform
         super.init(observer: observer, cancel: cancel)
     }
 
@@ -40,37 +40,37 @@ final fileprivate class MapSink : Sink, Observe
         switch event {
         case .next(let element):
             do {
-                let mappedElement = try _transform(element)
-                forwardOn(.next(mappedElement))
+                let mappedElement = try self._transform(element)
+                self.forwardOn(.next(mappedElement))
             }
             catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
             }
         case .error(let error):
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
 
 #if TRACE_RESOURCES
-    fileprivate var _numberOfMapOperators: AtomicInt = 0
+    fileprivate let _numberOfMapOperators = AtomicInt(0)
     extension Resources {
         public static var numberOfMapOperators: Int32 {
-            return _numberOfMapOperators.valueSnapshot()
+            return load(_numberOfMapOperators)
         }
     }
 #endif
 
-internal func _map(source: Observable, transform: @escaping (Element) throws -> R) -> Observable {
+internal func _map(source: Observable, transform: @escaping (Element) throws -> Result) -> Observable {
     return Map(source: source, transform: transform)
 }
 
-final fileprivate class Map: Producer {
+final private class Map: Producer {
     typealias Transform = (SourceType) throws -> ResultType
 
     private let _source: Observable
@@ -78,31 +78,31 @@ final fileprivate class Map: Producer {
     private let _transform: Transform
 
     init(source: Observable, transform: @escaping Transform) {
-        _source = source
-        _transform = transform
+        self._source = source
+        self._transform = transform
 
 #if TRACE_RESOURCES
-        let _ = AtomicIncrement(&_numberOfMapOperators)
+        _ = increment(_numberOfMapOperators)
 #endif
     }
 
-    override func composeMap(_ selector: @escaping (ResultType) throws -> R) -> Observable {
-        let originalSelector = _transform
-        return Map(source: _source, transform: { (s: SourceType) throws -> R in
+    override func composeMap(_ selector: @escaping (ResultType) throws -> Result) -> Observable {
+        let originalSelector = self._transform
+        return Map(source: self._source, transform: { (s: SourceType) throws -> Result in
             let r: ResultType = try originalSelector(s)
             return try selector(r)
         })
     }
-    
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == ResultType {
-        let sink = MapSink(transform: _transform, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == ResultType {
+        let sink = MapSink(transform: self._transform, observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 
     #if TRACE_RESOURCES
     deinit {
-        let _ = AtomicDecrement(&_numberOfMapOperators)
+        _ = decrement(_numberOfMapOperators)
     }
     #endif
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Materialize.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Materialize.swift
index cf19b6d..e035e96 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Materialize.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Materialize.swift
@@ -12,32 +12,32 @@ extension ObservableType {
      - seealso: [materialize operator on reactivex.io](http://reactivex.io/documentation/operators/materialize-dematerialize.html)
      - returns: An observable sequence that wraps events in an Event. The returned Observable never errors, but it does complete after observing all of the events of the underlying Observable.
      */
-    public func materialize() -> Observable> {
+    public func materialize() -> Observable> {
         return Materialize(source: self.asObservable())
     }
 }
 
-fileprivate final class MaterializeSink: Sink, ObserverType where O.E == Event {
-    
+fileprivate final class MaterializeSink: Sink, ObserverType where Observer.Element == Event {
+
     func on(_ event: Event) {
-        forwardOn(.next(event))
+        self.forwardOn(.next(event))
         if event.isStopEvent {
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Materialize: Producer> {
-    private let _source: Observable
-    
-    init(source: Observable) {
-        _source = source
+final private class Materialize: Producer> {
+    private let _source: Observable
+
+    init(source: Observable) {
+        self._source = source
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = MaterializeSink(observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
 
         return (sink: sink, subscription: subscription)
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Merge.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Merge.swift
index b2f9a0d..3bc7943 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Merge.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Merge.swift
@@ -16,9 +16,9 @@ extension ObservableType {
      - parameter selector: A transform function to apply to each element.
      - returns: An observable sequence whose elements are the result of invoking the one-to-many transform function on each element of the input sequence.
      */
-    public func flatMap(_ selector: @escaping (E) throws -> O)
-        -> Observable {
-            return FlatMap(source: asObservable(), selector: selector)
+    public func flatMap(_ selector: @escaping (Element) throws -> Source)
+        -> Observable {
+            return FlatMap(source: self.asObservable(), selector: selector)
     }
 
 }
@@ -34,13 +34,13 @@ extension ObservableType {
      - parameter selector: A transform function to apply to element that was observed while no observable is executing in parallel.
      - returns: An observable sequence whose elements are the result of invoking the one-to-many transform function on each element of the input sequence that was received while no other sequence was being calculated.
      */
-    public func flatMapFirst(_ selector: @escaping (E) throws -> O)
-        -> Observable {
-            return FlatMapFirst(source: asObservable(), selector: selector)
+    public func flatMapFirst(_ selector: @escaping (Element) throws -> Source)
+        -> Observable {
+            return FlatMapFirst(source: self.asObservable(), selector: selector)
     }
 }
 
-extension ObservableType where E : ObservableConvertibleType {
+extension ObservableType where Element : ObservableConvertibleType {
 
     /**
      Merges elements from all observable sequences in the given enumerable sequence into a single observable sequence.
@@ -49,8 +49,8 @@ extension ObservableType where E : ObservableConvertibleType {
 
      - returns: The observable sequence that merges the elements of the observable sequences.
      */
-    public func merge() -> Observable {
-        return Merge(source: asObservable())
+    public func merge() -> Observable {
+        return Merge(source: self.asObservable())
     }
 
     /**
@@ -62,12 +62,12 @@ extension ObservableType where E : ObservableConvertibleType {
      - returns: The observable sequence that merges the elements of the inner sequences.
      */
     public func merge(maxConcurrent: Int)
-        -> Observable {
-        return MergeLimited(source: asObservable(), maxConcurrent: maxConcurrent)
+        -> Observable {
+        return MergeLimited(source: self.asObservable(), maxConcurrent: maxConcurrent)
     }
 }
 
-extension ObservableType where E : ObservableConvertibleType {
+extension ObservableType where Element : ObservableConvertibleType {
 
     /**
      Concatenates all inner observable sequences, as long as the previous observable sequence terminated successfully.
@@ -76,8 +76,8 @@ extension ObservableType where E : ObservableConvertibleType {
 
      - returns: An observable sequence that contains the elements of each observed inner sequence, in sequential order.
      */
-    public func concat() -> Observable {
-        return merge(maxConcurrent: 1)
+    public func concat() -> Observable {
+        return self.merge(maxConcurrent: 1)
     }
 }
 
@@ -90,7 +90,7 @@ extension ObservableType {
      - parameter sources: Collection of observable sequences to merge.
      - returns: The observable sequence that merges the elements of the observable sequences.
      */
-    public static func merge(_ sources: C) -> Observable where C.Iterator.Element == Observable {
+    public static func merge(_ sources: Collection) -> Observable where Collection.Element == Observable {
         return MergeArray(sources: Array(sources))
     }
 
@@ -102,7 +102,7 @@ extension ObservableType {
      - parameter sources: Array of observable sequences to merge.
      - returns: The observable sequence that merges the elements of the observable sequences.
      */
-    public static func merge(_ sources: [Observable]) -> Observable {
+    public static func merge(_ sources: [Observable]) -> Observable {
         return MergeArray(sources: sources)
     }
 
@@ -114,7 +114,7 @@ extension ObservableType {
      - parameter sources: Collection of observable sequences to merge.
      - returns: The observable sequence that merges the elements of the observable sequences.
      */
-    public static func merge(_ sources: Observable...) -> Observable {
+    public static func merge(_ sources: Observable...) -> Observable {
         return MergeArray(sources: sources)
     }
 }
@@ -130,17 +130,17 @@ extension ObservableType {
      - returns: An observable sequence that contains the elements of each observed inner sequence, in sequential order.
      */
     
-    public func concatMap(_ selector: @escaping (E) throws -> O)
-        -> Observable {
-            return ConcatMap(source: asObservable(), selector: selector)
+    public func concatMap(_ selector: @escaping (Element) throws -> Source)
+        -> Observable {
+            return ConcatMap(source: self.asObservable(), selector: selector)
     }
 }
 
 fileprivate final class MergeLimitedSinkIter
     : ObserverType
     , LockOwnerType
-    , SynchronizedOnType where SourceSequence.E == Observer.E {
-    typealias E = Observer.E
+    , SynchronizedOnType where SourceSequence.Element == Observer.Element {
+    typealias Element = Observer.Element
     typealias DisposeKey = CompositeDisposable.DisposeKey
     typealias Parent = MergeLimitedSink
     
@@ -148,67 +148,67 @@ fileprivate final class MergeLimitedSinkIter) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next:
-            _parent.forwardOn(event)
+            self._parent.forwardOn(event)
         case .error:
-            _parent.forwardOn(event)
-            _parent.dispose()
+            self._parent.forwardOn(event)
+            self._parent.dispose()
         case .completed:
-            _parent._group.remove(for: _disposeKey)
-            if let next = _parent._queue.dequeue() {
-                _parent.subscribe(next, group: _parent._group)
+            self._parent._group.remove(for: self._disposeKey)
+            if let next = self._parent._queue.dequeue() {
+                self._parent.subscribe(next, group: self._parent._group)
             }
             else {
-                _parent._activeCount = _parent._activeCount - 1
+                self._parent._activeCount -= 1
                 
-                if _parent._stopped && _parent._activeCount == 0 {
-                    _parent.forwardOn(.completed)
-                    _parent.dispose()
+                if self._parent._stopped && self._parent._activeCount == 0 {
+                    self._parent.forwardOn(.completed)
+                    self._parent.dispose()
                 }
             }
         }
     }
 }
 
-fileprivate final class ConcatMapSink: MergeLimitedSink where Observer.E == SourceSequence.E {
+fileprivate final class ConcatMapSink: MergeLimitedSink where Observer.Element == SourceSequence.Element {
     typealias Selector = (SourceElement) throws -> SourceSequence
     
     private let _selector: Selector
     
     init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
-        _selector = selector
+        self._selector = selector
         super.init(maxConcurrent: 1, observer: observer, cancel: cancel)
     }
     
     override func performMap(_ element: SourceElement) throws -> SourceSequence {
-        return try _selector(element)
+        return try self._selector(element)
     }
 }
 
-fileprivate final class MergeLimitedBasicSink: MergeLimitedSink where Observer.E == SourceSequence.E {
+fileprivate final class MergeLimitedBasicSink: MergeLimitedSink where Observer.Element == SourceSequence.Element {
     
     override func performMap(_ element: SourceSequence) throws -> SourceSequence {
         return element
     }
 }
 
-fileprivate class MergeLimitedSink
+private class MergeLimitedSink
     : Sink
-    , ObserverType where Observer.E == SourceSequence.E  {
+    , ObserverType where Observer.Element == SourceSequence.Element {
     typealias QueueType = Queue
 
     let _maxConcurrent: Int
@@ -224,16 +224,16 @@ fileprivate class MergeLimitedSink) -> Disposable {
-        let _ = _group.insert(_sourceSubscription)
+        _ = self._group.insert(self._sourceSubscription)
         
         let disposable = source.subscribe(self)
-        _sourceSubscription.setDisposable(disposable)
-        return _group
+        self._sourceSubscription.setDisposable(disposable)
+        return self._group
     }
     
     func subscribe(_ innerSource: SourceSequence, group: CompositeDisposable) {
@@ -255,29 +255,29 @@ fileprivate class MergeLimitedSink SourceSequence? {
-        _lock.lock(); defer { _lock.unlock() } // {
+        self._lock.lock(); defer { self._lock.unlock() } // {
             let subscribe: Bool
-            if _activeCount < _maxConcurrent {
-                _activeCount += 1
+            if self._activeCount < self._maxConcurrent {
+                self._activeCount += 1
                 subscribe = true
             }
             else {
                 do {
-                    let value = try performMap(element)
-                    _queue.enqueue(value)
+                    let value = try self.performMap(element)
+                    self._queue.enqueue(value)
                 } catch {
-                    forwardOn(.error(error))
-                    dispose()
+                    self.forwardOn(.error(error))
+                    self.dispose()
                 }
                 subscribe = false
             }
 
             if subscribe {
                 do {
-                    return try performMap(element)
+                    return try self.performMap(element)
                 } catch {
-                    forwardOn(.error(error))
-                    dispose()
+                    self.forwardOn(.error(error))
+                    self.dispose()
                 }
             }
 
@@ -289,126 +289,126 @@ fileprivate class MergeLimitedSink : Producer {
+final private class MergeLimited: Producer {
     private let _source: Observable
     private let _maxConcurrent: Int
     
     init(source: Observable, maxConcurrent: Int) {
-        _source = source
-        _maxConcurrent = maxConcurrent
+        self._source = source
+        self._maxConcurrent = maxConcurrent
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
-        let sink = MergeLimitedBasicSink(maxConcurrent: _maxConcurrent, observer: observer, cancel: cancel)
-        let subscription = sink.run(_source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == SourceSequence.Element {
+        let sink = MergeLimitedBasicSink(maxConcurrent: self._maxConcurrent, observer: observer, cancel: cancel)
+        let subscription = sink.run(self._source)
         return (sink: sink, subscription: subscription)
     }
 }
 
 // MARK: Merge
 
-fileprivate final class MergeBasicSink : MergeSink where O.E == S.E {
-    override func performMap(_ element: S) throws -> S {
+fileprivate final class MergeBasicSink : MergeSink where Observer.Element == Source.Element {
+    override func performMap(_ element: Source) throws -> Source {
         return element
     }
 }
 
 // MARK: flatMap
 
-fileprivate final class FlatMapSink : MergeSink where Observer.E == SourceSequence.E {
+fileprivate final class FlatMapSink : MergeSink where Observer.Element == SourceSequence.Element {
     typealias Selector = (SourceElement) throws -> SourceSequence
 
     private let _selector: Selector
 
     init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
-        _selector = selector
+        self._selector = selector
         super.init(observer: observer, cancel: cancel)
     }
 
     override func performMap(_ element: SourceElement) throws -> SourceSequence {
-        return try _selector(element)
+        return try self._selector(element)
     }
 }
 
 // MARK: FlatMapFirst
 
-fileprivate final class FlatMapFirstSink : MergeSink where Observer.E == SourceSequence.E {
+fileprivate final class FlatMapFirstSink : MergeSink where Observer.Element == SourceSequence.Element {
     typealias Selector = (SourceElement) throws -> SourceSequence
 
     private let _selector: Selector
 
     override var subscribeNext: Bool {
-        return _activeCount == 0
+        return self._activeCount == 0
     }
 
     init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
-        _selector = selector
+        self._selector = selector
         super.init(observer: observer, cancel: cancel)
     }
 
     override func performMap(_ element: SourceElement) throws -> SourceSequence {
-        return try _selector(element)
+        return try self._selector(element)
     }
 }
 
-fileprivate final class MergeSinkIter : ObserverType where Observer.E == SourceSequence.E {
+fileprivate final class MergeSinkIter : ObserverType where Observer.Element == SourceSequence.Element {
     typealias Parent = MergeSink
     typealias DisposeKey = CompositeDisposable.DisposeKey
-    typealias E = Observer.E
+    typealias Element = Observer.Element
     
     private let _parent: Parent
     private let _disposeKey: DisposeKey
 
     init(parent: Parent, disposeKey: DisposeKey) {
-        _parent = parent
-        _disposeKey = disposeKey
+        self._parent = parent
+        self._disposeKey = disposeKey
     }
     
-    func on(_ event: Event) {
-        _parent._lock.lock(); defer { _parent._lock.unlock() } // lock {
+    func on(_ event: Event) {
+        self._parent._lock.lock(); defer { self._parent._lock.unlock() } // lock {
             switch event {
             case .next(let value):
-                _parent.forwardOn(.next(value))
+                self._parent.forwardOn(.next(value))
             case .error(let error):
-                _parent.forwardOn(.error(error))
-                _parent.dispose()
+                self._parent.forwardOn(.error(error))
+                self._parent.dispose()
             case .completed:
-                _parent._group.remove(for: _disposeKey)
-                _parent._activeCount -= 1
-                _parent.checkCompleted()
+                self._parent._group.remove(for: self._disposeKey)
+                self._parent._activeCount -= 1
+                self._parent.checkCompleted()
             }
         // }
     }
 }
 
 
-fileprivate class MergeSink
+private class MergeSink
     : Sink
-    , ObserverType where Observer.E == SourceSequence.E {
-    typealias ResultType = Observer.E
+    , ObserverType where Observer.Element == SourceSequence.Element {
+    typealias ResultType = Observer.Element
     typealias Element = SourceElement
 
     let _lock = RecursiveLock()
@@ -434,19 +434,19 @@ fileprivate class MergeSink SourceSequence? {
-        _lock.lock(); defer { _lock.unlock() } // {
-            if !subscribeNext {
+        self._lock.lock(); defer { self._lock.unlock() } // {
+            if !self.subscribeNext {
                 return nil
             }
 
             do {
-                let value = try performMap(element)
-                _activeCount += 1
+                let value = try self.performMap(element)
+                self._activeCount += 1
                 return value
             }
             catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
                 return nil
             }
         // }
@@ -455,65 +455,65 @@ fileprivate class MergeSink) {
         switch event {
         case .next(let element):
-            if let value = nextElementArrived(element: element) {
-                subscribeInner(value.asObservable())
+            if let value = self.nextElementArrived(element: element) {
+                self.subscribeInner(value.asObservable())
             }
         case .error(let error):
-            _lock.lock(); defer { _lock.unlock() }
-            forwardOn(.error(error))
-            dispose()
+            self._lock.lock(); defer { self._lock.unlock() }
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            _lock.lock(); defer { _lock.unlock() }
-            _stopped = true
-            _sourceSubscription.dispose()
-            checkCompleted()
+            self._lock.lock(); defer { self._lock.unlock() }
+            self._stopped = true
+            self._sourceSubscription.dispose()
+            self.checkCompleted()
         }
     }
 
-    func subscribeInner(_ source: Observable) {
+    func subscribeInner(_ source: Observable) {
         let iterDisposable = SingleAssignmentDisposable()
-        if let disposeKey = _group.insert(iterDisposable) {
+        if let disposeKey = self._group.insert(iterDisposable) {
             let iter = MergeSinkIter(parent: self, disposeKey: disposeKey)
             let subscription = source.subscribe(iter)
             iterDisposable.setDisposable(subscription)
         }
     }
 
-    func run(_ sources: [Observable]) -> Disposable {
-        _activeCount += sources.count
+    func run(_ sources: [Observable]) -> Disposable {
+        self._activeCount += sources.count
 
         for source in sources {
-            subscribeInner(source)
+            self.subscribeInner(source)
         }
 
-        _stopped = true
+        self._stopped = true
 
-        checkCompleted()
+        self.checkCompleted()
 
-        return _group
+        return self._group
     }
 
     @inline(__always)
     func checkCompleted() {
-        if _stopped && _activeCount == 0 {
+        if self._stopped && self._activeCount == 0 {
             self.forwardOn(.completed)
             self.dispose()
         }
     }
     
     func run(_ source: Observable) -> Disposable {
-        let _ = _group.insert(_sourceSubscription)
+        _ = self._group.insert(self._sourceSubscription)
 
         let subscription = source.subscribe(self)
-        _sourceSubscription.setDisposable(subscription)
+        self._sourceSubscription.setDisposable(subscription)
         
-        return _group
+        return self._group
     }
 }
 
 // MARK: Producers
 
-final fileprivate class FlatMap: Producer {
+final private class FlatMap: Producer {
     typealias Selector = (SourceElement) throws -> SourceSequence
 
     private let _source: Observable
@@ -521,18 +521,18 @@ final fileprivate class FlatMap, selector: @escaping Selector) {
-        _source = source
-        _selector = selector
+        self._source = source
+        self._selector = selector
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
-        let sink = FlatMapSink(selector: _selector, observer: observer, cancel: cancel)
-        let subscription = sink.run(_source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == SourceSequence.Element {
+        let sink = FlatMapSink(selector: self._selector, observer: observer, cancel: cancel)
+        let subscription = sink.run(self._source)
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class FlatMapFirst: Producer {
+final private class FlatMapFirst: Producer {
     typealias Selector = (SourceElement) throws -> SourceSequence
 
     private let _source: Observable
@@ -540,59 +540,59 @@ final fileprivate class FlatMapFirst, selector: @escaping Selector) {
-        _source = source
-        _selector = selector
+        self._source = source
+        self._selector = selector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
-        let sink = FlatMapFirstSink(selector: _selector, observer: observer, cancel: cancel)
-        let subscription = sink.run(_source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == SourceSequence.Element {
+        let sink = FlatMapFirstSink(selector: self._selector, observer: observer, cancel: cancel)
+        let subscription = sink.run(self._source)
         return (sink: sink, subscription: subscription)
     }
 }
 
-final class ConcatMap: Producer {
+final class ConcatMap: Producer {
     typealias Selector = (SourceElement) throws -> SourceSequence
     
     private let _source: Observable
     private let _selector: Selector
     
     init(source: Observable, selector: @escaping Selector) {
-        _source = source
-        _selector = selector
+        self._source = source
+        self._selector = selector
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
-        let sink = ConcatMapSink(selector: _selector, observer: observer, cancel: cancel)
-        let subscription = sink.run(_source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == SourceSequence.Element {
+        let sink = ConcatMapSink(selector: self._selector, observer: observer, cancel: cancel)
+        let subscription = sink.run(self._source)
         return (sink: sink, subscription: subscription)
     }
 }
 
-final class Merge : Producer {
+final class Merge : Producer {
     private let _source: Observable
 
     init(source: Observable) {
-        _source = source
+        self._source = source
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
-        let sink = MergeBasicSink(observer: observer, cancel: cancel)
-        let subscription = sink.run(_source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == SourceSequence.Element {
+        let sink = MergeBasicSink(observer: observer, cancel: cancel)
+        let subscription = sink.run(self._source)
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class MergeArray : Producer {
+final private class MergeArray: Producer {
     private let _sources: [Observable]
 
     init(sources: [Observable]) {
-        _sources = sources
+        self._sources = sources
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
-        let sink = MergeBasicSink, O>(observer: observer, cancel: cancel)
-        let subscription = sink.run(_sources)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = MergeBasicSink, Observer>(observer: observer, cancel: cancel)
+        let subscription = sink.run(self._sources)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Multicast.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Multicast.swift
index a027c4f..ca90548 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Multicast.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Multicast.swift
@@ -24,22 +24,22 @@ public class ConnectableObservable
 }
 
 extension ObservableType {
-    
+
     /**
-    Multicasts the source sequence notifications through an instantiated subject into all uses of the sequence within a selector function. 
-    
+    Multicasts the source sequence notifications through an instantiated subject into all uses of the sequence within a selector function.
+
     Each subscription to the resulting sequence causes a separate multicast invocation, exposing the sequence resulting from the selector function's invocation.
 
     For specializations with fixed subject types, see `publish` and `replay`.
 
     - seealso: [multicast operator on reactivex.io](http://reactivex.io/documentation/operators/publish.html)
-    
+
     - parameter subjectSelector: Factory function to create an intermediate subject through which the source sequence's elements will be multicast to the selector function.
     - parameter selector: Selector function which can use the multicasted source sequence subject to the policies enforced by the created subject.
     - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence within a selector function.
     */
-    public func multicast(_ subjectSelector: @escaping () throws -> S, selector: @escaping (Observable) throws -> Observable)
-        -> Observable where S.SubjectObserverType.E == E {
+    public func multicast(_ subjectSelector: @escaping () throws -> Subject, selector: @escaping (Observable) throws -> Observable)
+        -> Observable where Subject.Observer.Element == Element {
         return Multicast(
             source: self.asObservable(),
             subjectSelector: subjectSelector,
@@ -49,17 +49,17 @@ extension ObservableType {
 }
 
 extension ObservableType {
-    
+
     /**
-    Returns a connectable observable sequence that shares a single subscription to the underlying sequence. 
-    
+    Returns a connectable observable sequence that shares a single subscription to the underlying sequence.
+
     This operator is a specialization of `multicast` using a `PublishSubject`.
 
     - seealso: [publish operator on reactivex.io](http://reactivex.io/documentation/operators/publish.html)
-    
+
     - returns: A connectable observable sequence that shares a single subscription to the underlying sequence.
     */
-    public func publish() -> ConnectableObservable {
+    public func publish() -> ConnectableObservable {
         return self.multicast { PublishSubject() }
     }
 }
@@ -77,7 +77,7 @@ extension ObservableType {
      - returns: A connectable observable sequence that shares a single subscription to the underlying sequence.
      */
     public func replay(_ bufferSize: Int)
-        -> ConnectableObservable {
+        -> ConnectableObservable {
         return self.multicast { ReplaySubject.create(bufferSize: bufferSize) }
     }
 
@@ -91,21 +91,21 @@ extension ObservableType {
      - returns: A connectable observable sequence that shares a single subscription to the underlying sequence.
      */
     public func replayAll()
-        -> ConnectableObservable {
+        -> ConnectableObservable {
         return self.multicast { ReplaySubject.createUnbounded() }
     }
 }
 
 extension ConnectableObservableType {
-    
+
     /**
     Returns an observable sequence that stays connected to the source as long as there is at least one subscription to the observable sequence.
 
     - seealso: [refCount operator on reactivex.io](http://reactivex.io/documentation/operators/refcount.html)
-    
+
     - returns: An observable sequence that stays connected to the source as long as there is at least one subscription to the observable sequence.
     */
-    public func refCount() -> Observable {
+    public func refCount() -> Observable {
         return RefCount(source: self)
     }
 }
@@ -124,8 +124,8 @@ extension ObservableType {
      - parameter subject: Subject to push source elements into.
      - returns: A connectable observable sequence that upon connection causes the source sequence to push results into the specified subject.
      */
-    public func multicast(_ subject: S)
-        -> ConnectableObservable where S.SubjectObserverType.E == E {
+    public func multicast(_ subject: Subject)
+        -> ConnectableObservable where Subject.Observer.Element == Element {
         return ConnectableObservableAdapter(source: self.asObservable(), makeSubject: { subject })
     }
 
@@ -133,7 +133,7 @@ extension ObservableType {
      Multicasts the source sequence notifications through an instantiated subject to the resulting connectable observable.
 
      Upon connection of the connectable observable, the subject is subscribed to the source exactly one, and messages are forwarded to the observers registered with the connectable observable.
-     
+
      Subject is cleared on connection disposal or in case source sequence produces terminal event.
 
      - seealso: [multicast operator on reactivex.io](http://reactivex.io/documentation/operators/publish.html)
@@ -141,43 +141,43 @@ extension ObservableType {
      - parameter makeSubject: Factory function used to instantiate a subject for each connection.
      - returns: A connectable observable sequence that upon connection causes the source sequence to push results into the specified subject.
      */
-    public func multicast(makeSubject: @escaping () -> S)
-        -> ConnectableObservable where S.SubjectObserverType.E == E {
+    public func multicast(makeSubject: @escaping () -> Subject)
+        -> ConnectableObservable where Subject.Observer.Element == Element {
         return ConnectableObservableAdapter(source: self.asObservable(), makeSubject: makeSubject)
     }
 }
 
-final fileprivate class Connection : ObserverType, Disposable {
-    typealias E = S.SubjectObserverType.E
+final private class Connection: ObserverType, Disposable {
+    typealias Element = Subject.Observer.Element
 
     private var _lock: RecursiveLock
     // state
-    private var _parent: ConnectableObservableAdapter?
+    private var _parent: ConnectableObservableAdapter?
     private var _subscription : Disposable?
-    private var _subjectObserver: S.SubjectObserverType
+    private var _subjectObserver: Subject.Observer
 
-    private var _disposed: Bool = false
+    private let _disposed = AtomicInt(0)
 
-    init(parent: ConnectableObservableAdapter, subjectObserver: S.SubjectObserverType, lock: RecursiveLock, subscription: Disposable) {
-        _parent = parent
-        _subscription = subscription
-        _lock = lock
-        _subjectObserver = subjectObserver
+    init(parent: ConnectableObservableAdapter, subjectObserver: Subject.Observer, lock: RecursiveLock, subscription: Disposable) {
+        self._parent = parent
+        self._subscription = subscription
+        self._lock = lock
+        self._subjectObserver = subjectObserver
     }
 
-    func on(_ event: Event) {
-        if _disposed {
+    func on(_ event: Event) {
+        if isFlagSet(self._disposed, 1) {
             return
         }
         if event.isStopEvent {
             self.dispose()
         }
-        _subjectObserver.on(event)
+        self._subjectObserver.on(event)
     }
 
     func dispose() {
         _lock.lock(); defer { _lock.unlock() } // {
-        _disposed = true
+        fetchOr(self._disposed, 1)
         guard let parent = _parent else {
             return
         }
@@ -186,95 +186,95 @@ final fileprivate class Connection : ObserverType, Disposable {
             parent._connection = nil
             parent._subject = nil
         }
-        _parent = nil
+        self._parent = nil
 
-        _subscription?.dispose()
-        _subscription = nil
+        self._subscription?.dispose()
+        self._subscription = nil
         // }
     }
 }
 
-final fileprivate class ConnectableObservableAdapter
-    : ConnectableObservable {
-    typealias ConnectionType = Connection
+final private class ConnectableObservableAdapter
+    : ConnectableObservable {
+    typealias ConnectionType = Connection
 
-    fileprivate let _source: Observable
-    fileprivate let _makeSubject: () -> S
+    fileprivate let _source: Observable
+    fileprivate let _makeSubject: () -> Subject
 
     fileprivate let _lock = RecursiveLock()
-    fileprivate var _subject: S?
+    fileprivate var _subject: Subject?
 
     // state
     fileprivate var _connection: ConnectionType?
 
-    init(source: Observable, makeSubject: @escaping () -> S) {
-        _source = source
-        _makeSubject = makeSubject
-        _subject = nil
-        _connection = nil
+    init(source: Observable, makeSubject: @escaping () -> Subject) {
+        self._source = source
+        self._makeSubject = makeSubject
+        self._subject = nil
+        self._connection = nil
     }
 
     override func connect() -> Disposable {
-        return _lock.calculateLocked {
-            if let connection = _connection {
+        return self._lock.calculateLocked {
+            if let connection = self._connection {
                 return connection
             }
 
             let singleAssignmentDisposable = SingleAssignmentDisposable()
-            let connection = Connection(parent: self, subjectObserver: self.lazySubject.asObserver(), lock: _lock, subscription: singleAssignmentDisposable)
-            _connection = connection
-            let subscription = _source.subscribe(connection)
+            let connection = Connection(parent: self, subjectObserver: self.lazySubject.asObserver(), lock: self._lock, subscription: singleAssignmentDisposable)
+            self._connection = connection
+            let subscription = self._source.subscribe(connection)
             singleAssignmentDisposable.setDisposable(subscription)
             return connection
         }
     }
 
-    fileprivate var lazySubject: S {
+    fileprivate var lazySubject: Subject {
         if let subject = self._subject {
             return subject
         }
 
-        let subject = _makeSubject()
+        let subject = self._makeSubject()
         self._subject = subject
         return subject
     }
 
-    override func subscribe(_ observer: O) -> Disposable where O.E == S.E {
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Subject.Element {
         return self.lazySubject.subscribe(observer)
     }
 }
 
-final fileprivate class RefCountSink
-    : Sink
-    , ObserverType where CO.E == O.E {
-    typealias Element = O.E
-    typealias Parent = RefCount
+final private class RefCountSink
+    : Sink
+    , ObserverType where ConnectableSource.Element == Observer.Element {
+    typealias Element = Observer.Element 
+    typealias Parent = RefCount
 
     private let _parent: Parent
 
     private var _connectionIdSnapshot: Int64 = -1
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
 
     func run() -> Disposable {
-        let subscription = _parent._source.subscribe(self)
-        _parent._lock.lock(); defer { _parent._lock.unlock() } // {
+        let subscription = self._parent._source.subscribe(self)
+        self._parent._lock.lock(); defer { self._parent._lock.unlock() } // {
 
-        _connectionIdSnapshot = _parent._connectionId
+        self._connectionIdSnapshot = self._parent._connectionId
 
         if self.disposed {
             return Disposables.create()
         }
 
-        if _parent._count == 0 {
-            _parent._count = 1
-            _parent._connectableSubscription = _parent._source.connect()
+        if self._parent._count == 0 {
+            self._parent._count = 1
+            self._parent._connectableSubscription = self._parent._source.connect()
         }
         else {
-            _parent._count = _parent._count + 1
+            self._parent._count += 1
         }
         // }
 
@@ -294,7 +294,7 @@ final fileprivate class RefCountSink 1 {
-                self._parent._count = self._parent._count - 1
+                self._parent._count -= 1
             }
             else {
                 rxFatalError("Something went wrong with RefCount disposing mechanism")
@@ -306,25 +306,25 @@ final fileprivate class RefCountSink) {
         switch event {
         case .next:
-            forwardOn(event)
+            self.forwardOn(event)
         case .error, .completed:
-            _parent._lock.lock() // {
-                if _parent._connectionId == self._connectionIdSnapshot {
-                    let connection = _parent._connectableSubscription
+            self._parent._lock.lock() // {
+                if self._parent._connectionId == self._connectionIdSnapshot {
+                    let connection = self._parent._connectableSubscription
                     defer { connection?.dispose() }
-                    _parent._count = 0
-                    _parent._connectionId = _parent._connectionId &+ 1
-                    _parent._connectableSubscription = nil
+                    self._parent._count = 0
+                    self._parent._connectionId = self._parent._connectionId &+ 1
+                    self._parent._connectableSubscription = nil
                 }
             // }
-            _parent._lock.unlock()
-            forwardOn(event)
-            dispose()
+            self._parent._lock.unlock()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class RefCount: Producer {
+final private class RefCount: Producer {
     fileprivate let _lock = RecursiveLock()
 
     // state
@@ -332,75 +332,76 @@ final fileprivate class RefCount: Producer
     fileprivate var _connectionId: Int64 = 0
     fileprivate var _connectableSubscription = nil as Disposable?
 
-    fileprivate let _source: CO
+    fileprivate let _source: ConnectableSource
 
-    init(source: CO) {
-        _source = source
+    init(source: ConnectableSource) {
+        self._source = source
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == CO.E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable)
+             where Observer.Element == ConnectableSource.Element {
         let sink = RefCountSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class MulticastSink: Sink, ObserverType {
-    typealias Element = O.E
+final private class MulticastSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
     typealias ResultType = Element
-    typealias MutlicastType = Multicast
-    
+    typealias MutlicastType = Multicast
+
     private let _parent: MutlicastType
-    
-    init(parent: MutlicastType, observer: O, cancel: Cancelable) {
-        _parent = parent
+
+    init(parent: MutlicastType, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         do {
-            let subject = try _parent._subjectSelector()
-            let connectable = ConnectableObservableAdapter(source: _parent._source, makeSubject: { subject })
-            
-            let observable = try _parent._selector(connectable)
-            
+            let subject = try self._parent._subjectSelector()
+            let connectable = ConnectableObservableAdapter(source: self._parent._source, makeSubject: { subject })
+
+            let observable = try self._parent._selector(connectable)
+
             let subscription = observable.subscribe(self)
             let connection = connectable.connect()
-                
+
             return Disposables.create(subscription, connection)
         }
         catch let e {
-            forwardOn(.error(e))
-            dispose()
+            self.forwardOn(.error(e))
+            self.dispose()
             return Disposables.create()
         }
     }
-    
+
     func on(_ event: Event) {
-        forwardOn(event)
+        self.forwardOn(event)
         switch event {
-            case .next: break
-            case .error, .completed:
-                dispose()
+        case .next: break
+        case .error, .completed:
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Multicast: Producer {
-    typealias SubjectSelectorType = () throws -> S
-    typealias SelectorType = (Observable) throws -> Observable
-    
-    fileprivate let _source: Observable
+final private class Multicast: Producer {
+    typealias SubjectSelectorType = () throws -> Subject
+    typealias SelectorType = (Observable) throws -> Observable
+
+    fileprivate let _source: Observable
     fileprivate let _subjectSelector: SubjectSelectorType
     fileprivate let _selector: SelectorType
-    
-    init(source: Observable, subjectSelector: @escaping SubjectSelectorType, selector: @escaping SelectorType) {
-        _source = source
-        _subjectSelector = subjectSelector
-        _selector = selector
+
+    init(source: Observable, subjectSelector: @escaping SubjectSelectorType, selector: @escaping SelectorType) {
+        self._source = source
+        self._subjectSelector = subjectSelector
+        self._selector = selector
     }
-    
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = MulticastSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Never.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Never.swift
index d98a7a8..c56e567 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Never.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Never.swift
@@ -15,13 +15,13 @@ extension ObservableType {
 
      - returns: An observable sequence whose observers will never get called.
      */
-    public static func never() -> Observable {
+    public static func never() -> Observable {
         return NeverProducer()
     }
 }
 
-final fileprivate class NeverProducer : Producer {
-    override func subscribe(_ observer: O) -> Disposable where O.E == Element {
+final private class NeverProducer: Producer {
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
         return Disposables.create()
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/ObserveOn.swift b/Demo/Pods/RxSwift/RxSwift/Observables/ObserveOn.swift
index ce2a0d4..5121150 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/ObserveOn.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/ObserveOn.swift
@@ -20,7 +20,7 @@ extension ObservableType {
      - returns: The source sequence whose observations happen on the specified scheduler.
      */
     public func observeOn(_ scheduler: ImmediateSchedulerType)
-        -> Observable {
+        -> Observable {
             if let scheduler = scheduler as? SerialDispatchQueueScheduler {
                 return ObserveOnSerialDispatchQueue(source: self.asObservable(), scheduler: scheduler)
             }
@@ -30,28 +30,28 @@ extension ObservableType {
     }
 }
 
-final fileprivate class ObserveOn : Producer {
+final private class ObserveOn: Producer {
     let scheduler: ImmediateSchedulerType
-    let source: Observable
-    
-    init(source: Observable, scheduler: ImmediateSchedulerType) {
+    let source: Observable
+
+    init(source: Observable, scheduler: ImmediateSchedulerType) {
         self.scheduler = scheduler
         self.source = source
-        
+
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
     }
-    
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
-        let sink = ObserveOnSink(scheduler: scheduler, observer: observer, cancel: cancel)
-        let subscription = source.subscribe(sink)
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = ObserveOnSink(scheduler: self.scheduler, observer: observer, cancel: cancel)
+        let subscription = self.source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
-    
+
 #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
     }
 #endif
 }
@@ -63,31 +63,31 @@ enum ObserveOnState : Int32 {
     case running = 1
 }
 
-final fileprivate class ObserveOnSink : ObserverBase {
-    typealias E = O.E
-    
+final private class ObserveOnSink: ObserverBase {
+    typealias Element = Observer.Element 
+
     let _scheduler: ImmediateSchedulerType
 
     var _lock = SpinLock()
-    let _observer: O
+    let _observer: Observer
 
     // state
     var _state = ObserveOnState.stopped
-    var _queue = Queue>(capacity: 10)
+    var _queue = Queue>(capacity: 10)
 
     let _scheduleDisposable = SerialDisposable()
     let _cancel: Cancelable
 
-    init(scheduler: ImmediateSchedulerType, observer: O, cancel: Cancelable) {
-        _scheduler = scheduler
-        _observer = observer
-        _cancel = cancel
+    init(scheduler: ImmediateSchedulerType, observer: Observer, cancel: Cancelable) {
+        self._scheduler = scheduler
+        self._observer = observer
+        self._cancel = cancel
     }
 
-    override func onCore(_ event: Event) {
-        let shouldStart = _lock.calculateLocked { () -> Bool in
+    override func onCore(_ event: Event) {
+        let shouldStart = self._lock.calculateLocked { () -> Bool in
             self._queue.enqueue(event)
-            
+
             switch self._state {
             case .stopped:
                 self._state = .running
@@ -96,15 +96,15 @@ final fileprivate class ObserveOnSink : ObserverBase {
                 return false
             }
         }
-        
+
         if shouldStart {
-            _scheduleDisposable.disposable = self._scheduler.scheduleRecursive((), action: self.run)
+            self._scheduleDisposable.disposable = self._scheduler.scheduleRecursive((), action: self.run)
         }
     }
-    
-    func run(_ state: (), _ recurse: (()) -> ()) {
-        let (nextEvent, observer) = self._lock.calculateLocked { () -> (Event?, O) in
-            if self._queue.count > 0 {
+
+    func run(_ state: (), _ recurse: (()) -> Void) {
+        let (nextEvent, observer) = self._lock.calculateLocked { () -> (Event?, Observer) in
+            if !self._queue.isEmpty {
                 return (self._queue.dequeue(), self._observer)
             }
             else {
@@ -113,17 +113,17 @@ final fileprivate class ObserveOnSink : ObserverBase {
             }
         }
 
-        if let nextEvent = nextEvent, !_cancel.isDisposed {
+        if let nextEvent = nextEvent, !self._cancel.isDisposed {
             observer.on(nextEvent)
             if nextEvent.isStopEvent {
-                dispose()
+                self.dispose()
             }
         }
         else {
             return
         }
 
-        let shouldContinue = _shouldContinue_synchronized()
+        let shouldContinue = self._shouldContinue_synchronized()
 
         if shouldContinue {
             recurse(())
@@ -131,8 +131,8 @@ final fileprivate class ObserveOnSink : ObserverBase {
     }
 
     func _shouldContinue_synchronized() -> Bool {
-        _lock.lock(); defer { _lock.unlock() } // {
-            if self._queue.count > 0 {
+        self._lock.lock(); defer { self._lock.unlock() } // {
+            if !self._queue.isEmpty {
                 return true
             }
             else {
@@ -141,17 +141,17 @@ final fileprivate class ObserveOnSink : ObserverBase {
             }
         // }
     }
-    
+
     override func dispose() {
         super.dispose()
 
-        _cancel.dispose()
-        _scheduleDisposable.dispose()
+        self._cancel.dispose()
+        self._scheduleDisposable.dispose()
     }
 }
 
 #if TRACE_RESOURCES
-    fileprivate var _numberOfSerialDispatchQueueObservables: AtomicInt = 0
+    fileprivate let _numberOfSerialDispatchQueueObservables = AtomicInt(0)
     extension Resources {
         /**
          Counts number of `SerialDispatchQueueObservables`.
@@ -159,26 +159,28 @@ final fileprivate class ObserveOnSink : ObserverBase {
          Purposed for unit tests.
          */
         public static var numberOfSerialDispatchQueueObservables: Int32 {
-            return _numberOfSerialDispatchQueueObservables.valueSnapshot()
+            return load(_numberOfSerialDispatchQueueObservables)
         }
     }
 #endif
 
-final fileprivate class ObserveOnSerialDispatchQueueSink : ObserverBase {
+final private class ObserveOnSerialDispatchQueueSink: ObserverBase {
     let scheduler: SerialDispatchQueueScheduler
-    let observer: O
+    let observer: Observer
 
     let cancel: Cancelable
 
-    var cachedScheduleLambda: (((sink: ObserveOnSerialDispatchQueueSink, event: Event)) -> Disposable)!
+    var cachedScheduleLambda: (((sink: ObserveOnSerialDispatchQueueSink, event: Event)) -> Disposable)!
 
-    init(scheduler: SerialDispatchQueueScheduler, observer: O, cancel: Cancelable) {
+    init(scheduler: SerialDispatchQueueScheduler, observer: Observer, cancel: Cancelable) {
         self.scheduler = scheduler
         self.observer = observer
         self.cancel = cancel
         super.init()
 
-        cachedScheduleLambda = { pair in
+        self.cachedScheduleLambda = { pair in
+            guard !cancel.isDisposed else { return Disposables.create() }
+
             pair.sink.observer.on(pair.event)
 
             if pair.event.isStopEvent {
@@ -189,41 +191,41 @@ final fileprivate class ObserveOnSerialDispatchQueueSink : Obse
         }
     }
 
-    override func onCore(_ event: Event) {
-        let _ = self.scheduler.schedule((self, event), action: cachedScheduleLambda!)
+    override func onCore(_ event: Event) {
+        _ = self.scheduler.schedule((self, event), action: self.cachedScheduleLambda!)
     }
 
     override func dispose() {
         super.dispose()
 
-        cancel.dispose()
+        self.cancel.dispose()
     }
 }
 
-final fileprivate class ObserveOnSerialDispatchQueue : Producer {
+final private class ObserveOnSerialDispatchQueue: Producer {
     let scheduler: SerialDispatchQueueScheduler
-    let source: Observable
+    let source: Observable
 
-    init(source: Observable, scheduler: SerialDispatchQueueScheduler) {
+    init(source: Observable, scheduler: SerialDispatchQueueScheduler) {
         self.scheduler = scheduler
         self.source = source
 
         #if TRACE_RESOURCES
-            let _ = Resources.incrementTotal()
-            let _ = AtomicIncrement(&_numberOfSerialDispatchQueueObservables)
+            _ = Resources.incrementTotal()
+            _ = increment(_numberOfSerialDispatchQueueObservables)
         #endif
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
-        let sink = ObserveOnSerialDispatchQueueSink(scheduler: scheduler, observer: observer, cancel: cancel)
-        let subscription = source.subscribe(sink)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = ObserveOnSerialDispatchQueueSink(scheduler: self.scheduler, observer: observer, cancel: cancel)
+        let subscription = self.source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 
     #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
-        let _ = AtomicDecrement(&_numberOfSerialDispatchQueueObservables)
+        _ = Resources.decrementTotal()
+        _ = decrement(_numberOfSerialDispatchQueueObservables)
     }
     #endif
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Optional.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Optional.swift
index 8cd6a16..9bf5b1c 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Optional.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Optional.swift
@@ -15,7 +15,7 @@ extension ObservableType {
      - parameter optional: Optional element in the resulting observable sequence.
      - returns: An observable sequence containing the wrapped value or not from given optional.
      */
-    public static func from(optional: E?) -> Observable {
+    public static func from(optional: Element?) -> Observable {
         return ObservableOptional(optional: optional)
     }
 
@@ -28,24 +28,24 @@ extension ObservableType {
      - parameter scheduler: Scheduler to send the optional element on.
      - returns: An observable sequence containing the wrapped value or not from given optional.
      */
-    public static func from(optional: E?, scheduler: ImmediateSchedulerType) -> Observable {
+    public static func from(optional: Element?, scheduler: ImmediateSchedulerType) -> Observable {
         return ObservableOptionalScheduled(optional: optional, scheduler: scheduler)
     }
 }
 
-final fileprivate class ObservableOptionalScheduledSink : Sink {
-    typealias E = O.E
-    typealias Parent = ObservableOptionalScheduled
+final private class ObservableOptionalScheduledSink: Sink {
+    typealias Element = Observer.Element 
+    typealias Parent = ObservableOptionalScheduled
 
     private let _parent: Parent
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
 
     func run() -> Disposable {
-        return _parent._scheduler.schedule(_parent._optional) { (optional: E?) -> Disposable in
+        return self._parent._scheduler.schedule(self._parent._optional) { (optional: Element?) -> Disposable in
             if let next = optional {
                 self.forwardOn(.next(next))
                 return self._parent._scheduler.schedule(()) { _ in
@@ -62,31 +62,31 @@ final fileprivate class ObservableOptionalScheduledSink : Sink<
     }
 }
 
-final fileprivate class ObservableOptionalScheduled : Producer {
-    fileprivate let _optional: E?
+final private class ObservableOptionalScheduled: Producer {
+    fileprivate let _optional: Element?
     fileprivate let _scheduler: ImmediateSchedulerType
 
-    init(optional: E?, scheduler: ImmediateSchedulerType) {
-        _optional = optional
-        _scheduler = scheduler
+    init(optional: Element?, scheduler: ImmediateSchedulerType) {
+        self._optional = optional
+        self._scheduler = scheduler
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = ObservableOptionalScheduledSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class ObservableOptional: Producer {
-    private let _optional: E?
+final private class ObservableOptional: Producer {
+    private let _optional: Element?
     
-    init(optional: E?) {
-        _optional = optional
+    init(optional: Element?) {
+        self._optional = optional
     }
     
-    override func subscribe(_ observer: O) -> Disposable where O.E == E {
-        if let element = _optional {
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        if let element = self._optional {
             observer.on(.next(element))
         }
         observer.on(.completed)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Producer.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Producer.swift
index 996b011..f78d9a6 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Producer.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Producer.swift
@@ -10,12 +10,12 @@ class Producer : Observable {
     override init() {
         super.init()
     }
-    
-    override func subscribe(_ observer: O) -> Disposable where O.E == Element {
+
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
         if !CurrentThreadScheduler.isScheduleRequired {
             // The returned disposable needs to release all references once it was disposed.
             let disposer = SinkDisposer()
-            let sinkAndSubscription = run(observer, cancel: disposer)
+            let sinkAndSubscription = self.run(observer, cancel: disposer)
             disposer.setSinkAndSubscription(sink: sinkAndSubscription.sink, subscription: sinkAndSubscription.subscription)
 
             return disposer
@@ -30,69 +30,63 @@ class Producer : Observable {
             }
         }
     }
-    
-    func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         rxAbstractMethod()
     }
 }
 
 fileprivate final class SinkDisposer: Cancelable {
-    fileprivate enum DisposeState: UInt32 {
+    fileprivate enum DisposeState: Int32 {
         case disposed = 1
         case sinkAndSubscriptionSet = 2
     }
 
-    // Jeej, swift API consistency rules
-    fileprivate enum DisposeStateInt32: Int32 {
-        case disposed = 1
-        case sinkAndSubscriptionSet = 2
-    }
-    
-    private var _state: AtomicInt = 0
-    private var _sink: Disposable? = nil
-    private var _subscription: Disposable? = nil
+    private let _state = AtomicInt(0)
+    private var _sink: Disposable?
+    private var _subscription: Disposable?
 
     var isDisposed: Bool {
-        return AtomicFlagSet(DisposeState.disposed.rawValue, &_state)
+        return isFlagSet(self._state, DisposeState.disposed.rawValue)
     }
 
     func setSinkAndSubscription(sink: Disposable, subscription: Disposable) {
-        _sink = sink
-        _subscription = subscription
+        self._sink = sink
+        self._subscription = subscription
 
-        let previousState = AtomicOr(DisposeState.sinkAndSubscriptionSet.rawValue, &_state)
-        if (previousState & DisposeStateInt32.sinkAndSubscriptionSet.rawValue) != 0 {
+        let previousState = fetchOr(self._state, DisposeState.sinkAndSubscriptionSet.rawValue)
+        if (previousState & DisposeState.sinkAndSubscriptionSet.rawValue) != 0 {
             rxFatalError("Sink and subscription were already set")
         }
 
-        if (previousState & DisposeStateInt32.disposed.rawValue) != 0 {
+        if (previousState & DisposeState.disposed.rawValue) != 0 {
             sink.dispose()
             subscription.dispose()
-            _sink = nil
-            _subscription = nil
+            self._sink = nil
+            self._subscription = nil
         }
     }
-    
+
     func dispose() {
-        let previousState = AtomicOr(DisposeState.disposed.rawValue, &_state)
+        let previousState = fetchOr(self._state, DisposeState.disposed.rawValue)
 
-        if (previousState & DisposeStateInt32.disposed.rawValue) != 0 {
+        if (previousState & DisposeState.disposed.rawValue) != 0 {
             return
         }
 
-        if (previousState & DisposeStateInt32.sinkAndSubscriptionSet.rawValue) != 0 {
-            guard let sink = _sink else {
+        if (previousState & DisposeState.sinkAndSubscriptionSet.rawValue) != 0 {
+            guard let sink = self._sink else {
                 rxFatalError("Sink not set")
             }
-            guard let subscription = _subscription else {
+            guard let subscription = self._subscription else {
                 rxFatalError("Subscription not set")
             }
 
             sink.dispose()
             subscription.dispose()
 
-            _sink = nil
-            _subscription = nil
+            self._sink = nil
+            self._subscription = nil
         }
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Range.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Range.swift
index 9b85554..f88c999 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Range.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Range.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-extension ObservableType where E : RxAbstractInteger {
+extension ObservableType where Element : RxAbstractInteger {
     /**
      Generates an observable sequence of integral numbers within a specified range, using the specified scheduler to generate and send out observer messages.
 
@@ -17,49 +17,49 @@ extension ObservableType where E : RxAbstractInteger {
      - parameter scheduler: Scheduler to run the generator loop on.
      - returns: An observable sequence that contains a range of sequential integral numbers.
      */
-    public static func range(start: E, count: E, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
-        return RangeProducer(start: start, count: count, scheduler: scheduler)
+    public static func range(start: Element, count: Element, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
+        return RangeProducer(start: start, count: count, scheduler: scheduler)
     }
 }
 
-final fileprivate class RangeProducer : Producer {
-    fileprivate let _start: E
-    fileprivate let _count: E
+final private class RangeProducer: Producer {
+    fileprivate let _start: Element
+    fileprivate let _count: Element
     fileprivate let _scheduler: ImmediateSchedulerType
 
-    init(start: E, count: E, scheduler: ImmediateSchedulerType) {
-        if count < 0 {
+    init(start: Element, count: Element, scheduler: ImmediateSchedulerType) {
+        guard count >= 0 else {
             rxFatalError("count can't be negative")
         }
 
-        if start &+ (count - 1) < start {
+        guard start &+ (count - 1) >= start || count == 0 else {
             rxFatalError("overflow of count")
         }
 
-        _start = start
-        _count = count
-        _scheduler = scheduler
+        self._start = start
+        self._count = count
+        self._scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = RangeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class RangeSink : Sink where O.E: RxAbstractInteger {
-    typealias Parent = RangeProducer
+final private class RangeSink: Sink where Observer.Element: RxAbstractInteger {
+    typealias Parent = RangeProducer
     
     private let _parent: Parent
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
-        return _parent._scheduler.scheduleRecursive(0 as O.E) { i, recurse in
+        return self._parent._scheduler.scheduleRecursive(0 as Observer.Element) { i, recurse in
             if i < self._parent._count {
                 self.forwardOn(.next(self._parent._start + i))
                 recurse(i + 1)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Reduce.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Reduce.swift
index 3e4a7b9..7814c6a 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Reduce.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Reduce.swift
@@ -20,8 +20,8 @@ extension ObservableType {
     - parameter mapResult: A function to transform the final accumulator value into the result value.
     - returns: An observable sequence containing a single element with the final accumulator value.
     */
-    public func reduce(_ seed: A, accumulator: @escaping (A, E) throws -> A, mapResult: @escaping (A) throws -> R)
-        -> Observable {
+    public func reduce(_ seed: A, accumulator: @escaping (A, Element) throws -> A, mapResult: @escaping (A) throws -> Result)
+        -> Observable {
         return Reduce(source: self.asObservable(), seed: seed, accumulator: accumulator, mapResult: mapResult)
     }
 
@@ -36,22 +36,22 @@ extension ObservableType {
     - parameter accumulator: A accumulator function to be invoked on each element.
     - returns: An observable sequence containing a single element with the final accumulator value.
     */
-    public func reduce(_ seed: A, accumulator: @escaping (A, E) throws -> A)
+    public func reduce(_ seed: A, accumulator: @escaping (A, Element) throws -> A)
         -> Observable {
         return Reduce(source: self.asObservable(), seed: seed, accumulator: accumulator, mapResult: { $0 })
     }
 }
 
-final fileprivate class ReduceSink : Sink, ObserverType {
-    typealias ResultType = O.E
+final private class ReduceSink: Sink, ObserverType {
+    typealias ResultType = Observer.Element 
     typealias Parent = Reduce
     
     private let _parent: Parent
     private var _accumulation: AccumulateType
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _accumulation = parent._seed
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._accumulation = parent._seed
         
         super.init(observer: observer, cancel: cancel)
     }
@@ -60,31 +60,31 @@ final fileprivate class ReduceSink
         switch event {
         case .next(let value):
             do {
-                _accumulation = try _parent._accumulator(_accumulation, value)
+                self._accumulation = try self._parent._accumulator(self._accumulation, value)
             }
             catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
             }
         case .error(let e):
-            forwardOn(.error(e))
-            dispose()
+            self.forwardOn(.error(e))
+            self.dispose()
         case .completed:
             do {
-                let result = try _parent._mapResult(_accumulation)
-                forwardOn(.next(result))
-                forwardOn(.completed)
-                dispose()
+                let result = try self._parent._mapResult(self._accumulation)
+                self.forwardOn(.next(result))
+                self.forwardOn(.completed)
+                self.dispose()
             }
             catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
             }
         }
     }
 }
 
-final fileprivate class Reduce : Producer {
+final private class Reduce: Producer {
     typealias AccumulatorType = (AccumulateType, SourceType) throws -> AccumulateType
     typealias ResultSelectorType = (AccumulateType) throws -> ResultType
     
@@ -94,15 +94,15 @@ final fileprivate class Reduce : Produce
     fileprivate let _mapResult: ResultSelectorType
     
     init(source: Observable, seed: AccumulateType, accumulator: @escaping AccumulatorType, mapResult: @escaping ResultSelectorType) {
-        _source = source
-        _seed = seed
-        _accumulator = accumulator
-        _mapResult = mapResult
+        self._source = source
+        self._seed = seed
+        self._accumulator = accumulator
+        self._mapResult = mapResult
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == ResultType {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == ResultType {
         let sink = ReduceSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Repeat.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Repeat.swift
index 6892ec1..4fed45c 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Repeat.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Repeat.swift
@@ -16,21 +16,21 @@ extension ObservableType {
      - parameter scheduler: Scheduler to run the producer loop on.
      - returns: An observable sequence that repeats the given element infinitely.
      */
-    public static func repeatElement(_ element: E, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
+    public static func repeatElement(_ element: Element, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
         return RepeatElement(element: element, scheduler: scheduler)
     }
 }
 
-final fileprivate class RepeatElement : Producer {
+final private class RepeatElement: Producer {
     fileprivate let _element: Element
     fileprivate let _scheduler: ImmediateSchedulerType
     
     init(element: Element, scheduler: ImmediateSchedulerType) {
-        _element = element
-        _scheduler = scheduler
+        self._element = element
+        self._scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = RepeatElementSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
 
@@ -38,18 +38,18 @@ final fileprivate class RepeatElement : Producer {
     }
 }
 
-final fileprivate class RepeatElementSink : Sink {
-    typealias Parent = RepeatElement
+final private class RepeatElementSink: Sink {
+    typealias Parent = RepeatElement
     
     private let _parent: Parent
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
-        return _parent._scheduler.scheduleRecursive(_parent._element) { e, recurse in
+        return self._parent._scheduler.scheduleRecursive(self._parent._element) { e, recurse in
             self.forwardOn(.next(e))
             recurse(e)
         }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift b/Demo/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift
index 268b399..decd309 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift
@@ -18,7 +18,7 @@ extension ObservableType {
      - returns: An observable sequence producing the elements of the given sequence repeatedly until it terminates successfully or is notified to error or complete.
      */
     public func retryWhen(_ notificationHandler: @escaping (Observable) -> TriggerObservable)
-        -> Observable {
+        -> Observable {
         return RetryWhenSequence(sources: InfiniteSequence(repeatedValue: self.asObservable()), notificationHandler: notificationHandler)
     }
 
@@ -32,88 +32,88 @@ extension ObservableType {
      - returns: An observable sequence producing the elements of the given sequence repeatedly until it terminates successfully or is notified to error or complete.
      */
     public func retryWhen(_ notificationHandler: @escaping (Observable) -> TriggerObservable)
-        -> Observable {
+        -> Observable {
         return RetryWhenSequence(sources: InfiniteSequence(repeatedValue: self.asObservable()), notificationHandler: notificationHandler)
     }
 }
 
-final fileprivate class RetryTriggerSink
-    : ObserverType where S.Iterator.Element : ObservableType, S.Iterator.Element.E == O.E {
-    typealias E = TriggerObservable.E
+final private class RetryTriggerSink
+    : ObserverType where Sequence.Element: ObservableType, Sequence.Element.Element == Observer.Element {
+    typealias Element = TriggerObservable.Element
     
-    typealias Parent = RetryWhenSequenceSinkIter
+    typealias Parent = RetryWhenSequenceSinkIter
     
     fileprivate let _parent: Parent
 
     init(parent: Parent) {
-        _parent = parent
+        self._parent = parent
     }
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            _parent._parent._lastError = nil
-            _parent._parent.schedule(.moveNext)
+            self._parent._parent._lastError = nil
+            self._parent._parent.schedule(.moveNext)
         case .error(let e):
-            _parent._parent.forwardOn(.error(e))
-            _parent._parent.dispose()
+            self._parent._parent.forwardOn(.error(e))
+            self._parent._parent.dispose()
         case .completed:
-            _parent._parent.forwardOn(.completed)
-            _parent._parent.dispose()
+            self._parent._parent.forwardOn(.completed)
+            self._parent._parent.dispose()
         }
     }
 }
 
-final fileprivate class RetryWhenSequenceSinkIter
+final private class RetryWhenSequenceSinkIter
     : ObserverType
-    , Disposable where S.Iterator.Element : ObservableType, S.Iterator.Element.E == O.E {
-    typealias E = O.E
-    typealias Parent = RetryWhenSequenceSink
+    , Disposable where Sequence.Element: ObservableType, Sequence.Element.Element == Observer.Element {
+    typealias Element = Observer.Element 
+    typealias Parent = RetryWhenSequenceSink
 
     fileprivate let _parent: Parent
     fileprivate let _errorHandlerSubscription = SingleAssignmentDisposable()
     fileprivate let _subscription: Disposable
 
     init(parent: Parent, subscription: Disposable) {
-        _parent = parent
-        _subscription = subscription
+        self._parent = parent
+        self._subscription = subscription
     }
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            _parent.forwardOn(event)
+            self._parent.forwardOn(event)
         case .error(let error):
-            _parent._lastError = error
+            self._parent._lastError = error
 
             if let failedWith = error as? Error {
                 // dispose current subscription
-                _subscription.dispose()
+                self._subscription.dispose()
 
-                let errorHandlerSubscription = _parent._notifier.subscribe(RetryTriggerSink(parent: self))
-                _errorHandlerSubscription.setDisposable(errorHandlerSubscription)
-                _parent._errorSubject.on(.next(failedWith))
+                let errorHandlerSubscription = self._parent._notifier.subscribe(RetryTriggerSink(parent: self))
+                self._errorHandlerSubscription.setDisposable(errorHandlerSubscription)
+                self._parent._errorSubject.on(.next(failedWith))
             }
             else {
-                _parent.forwardOn(.error(error))
-                _parent.dispose()
+                self._parent.forwardOn(.error(error))
+                self._parent.dispose()
             }
         case .completed:
-            _parent.forwardOn(event)
-            _parent.dispose()
+            self._parent.forwardOn(event)
+            self._parent.dispose()
         }
     }
 
     final func dispose() {
-        _subscription.dispose()
-        _errorHandlerSubscription.dispose()
+        self._subscription.dispose()
+        self._errorHandlerSubscription.dispose()
     }
 }
 
-final fileprivate class RetryWhenSequenceSink
-    : TailRecursiveSink where S.Iterator.Element : ObservableType, S.Iterator.Element.E == O.E {
-    typealias Element = O.E
-    typealias Parent = RetryWhenSequence
+final private class RetryWhenSequenceSink
+    : TailRecursiveSink where Sequence.Element: ObservableType, Sequence.Element.Element == Observer.Element {
+    typealias Element = Observer.Element 
+    typealias Parent = RetryWhenSequence
     
     let _lock = RecursiveLock()
     
@@ -121,35 +121,35 @@ final fileprivate class RetryWhenSequenceSink()
-    fileprivate let _handler: Observable
-    fileprivate let _notifier = PublishSubject()
+    fileprivate let _handler: Observable
+    fileprivate let _notifier = PublishSubject()
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _handler = parent._notificationHandler(_errorSubject).asObservable()
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._handler = parent._notificationHandler(self._errorSubject).asObservable()
         super.init(observer: observer, cancel: cancel)
     }
     
     override func done() {
-        if let lastError = _lastError {
-            forwardOn(.error(lastError))
-            _lastError = nil
+        if let lastError = self._lastError {
+            self.forwardOn(.error(lastError))
+            self._lastError = nil
         }
         else {
-            forwardOn(.completed)
+            self.forwardOn(.completed)
         }
 
-        dispose()
+        self.dispose()
     }
     
-    override func extract(_ observable: Observable) -> SequenceGenerator? {
+    override func extract(_ observable: Observable) -> SequenceGenerator? {
         // It is important to always return `nil` here because there are sideffects in the `run` method
         // that are dependant on particular `retryWhen` operator so single operator stack can't be reused in this
         // case.
         return nil
     }
 
-    override func subscribeToNext(_ source: Observable) -> Disposable {
+    override func subscribeToNext(_ source: Observable) -> Disposable {
         let subscription = SingleAssignmentDisposable()
         let iter = RetryWhenSequenceSinkIter(parent: self, subscription: subscription)
         subscription.setDisposable(source.subscribe(iter))
@@ -157,25 +157,25 @@ final fileprivate class RetryWhenSequenceSink Disposable {
-        let triggerSubscription = _handler.subscribe(_notifier.asObserver())
+        let triggerSubscription = self._handler.subscribe(self._notifier.asObserver())
         let superSubscription = super.run(sources)
         return Disposables.create(superSubscription, triggerSubscription)
     }
 }
 
-final fileprivate class RetryWhenSequence : Producer where S.Iterator.Element : ObservableType {
-    typealias Element = S.Iterator.Element.E
+final private class RetryWhenSequence: Producer where Sequence.Element: ObservableType {
+    typealias Element = Sequence.Element.Element
     
-    fileprivate let _sources: S
+    fileprivate let _sources: Sequence
     fileprivate let _notificationHandler: (Observable) -> TriggerObservable
     
-    init(sources: S, notificationHandler: @escaping (Observable) -> TriggerObservable) {
-        _sources = sources
-        _notificationHandler = notificationHandler
+    init(sources: Sequence, notificationHandler: @escaping (Observable) -> TriggerObservable) {
+        self._sources = sources
+        self._notificationHandler = notificationHandler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let sink = RetryWhenSequenceSink(parent: self, observer: observer, cancel: cancel)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = RetryWhenSequenceSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run((self._sources.makeIterator(), nil))
         return (sink: sink, subscription: subscription)
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Sample.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Sample.swift
index 31f8b62..4fab683 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Sample.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Sample.swift
@@ -20,68 +20,59 @@ extension ObservableType {
      - parameter sampler: Sampling tick sequence.
      - returns: Sampled observable sequence.
      */
-    public func sample(_ sampler: O)
-        -> Observable {
+    public func sample(_ sampler: Source)
+        -> Observable {
             return Sample(source: self.asObservable(), sampler: sampler.asObservable())
     }
 }
 
-final fileprivate class SamplerSink
+final private class SamplerSink
     : ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias E = SampleType
+    typealias Element = SampleType
     
-    typealias Parent = SampleSequenceSink
+    typealias Parent = SampleSequenceSink
     
     fileprivate let _parent: Parent
 
     var _lock: RecursiveLock {
-        return _parent._lock
+        return self._parent._lock
     }
     
     init(parent: Parent) {
-        _parent = parent
+        self._parent = parent
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
-        case .next:
+        case .next, .completed:
             if let element = _parent._element {
-                _parent._element = nil
-                _parent.forwardOn(.next(element))
+                self._parent._element = nil
+                self._parent.forwardOn(.next(element))
             }
 
-            if _parent._atEnd {
-                _parent.forwardOn(.completed)
-                _parent.dispose()
+            if self._parent._atEnd {
+                self._parent.forwardOn(.completed)
+                self._parent.dispose()
             }
         case .error(let e):
-            _parent.forwardOn(.error(e))
-            _parent.dispose()
-        case .completed:
-            if let element = _parent._element {
-                _parent._element = nil
-                _parent.forwardOn(.next(element))
-            }
-            if _parent._atEnd {
-                _parent.forwardOn(.completed)
-                _parent.dispose()
-            }
+            self._parent.forwardOn(.error(e))
+            self._parent.dispose()
         }
     }
 }
 
-final fileprivate class SampleSequenceSink
-    : Sink
+final private class SampleSequenceSink
+    : Sink
     , ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias Element = O.E
+    typealias Element = Observer.Element 
     typealias Parent = Sample
     
     fileprivate let _parent: Parent
@@ -94,47 +85,47 @@ final fileprivate class SampleSequenceSink
     
     fileprivate let _sourceSubscription = SingleAssignmentDisposable()
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
-        _sourceSubscription.setDisposable(_parent._source.subscribe(self))
-        let samplerSubscription = _parent._sampler.subscribe(SamplerSink(parent: self))
+        self._sourceSubscription.setDisposable(self._parent._source.subscribe(self))
+        let samplerSubscription = self._parent._sampler.subscribe(SamplerSink(parent: self))
         
         return Disposables.create(_sourceSubscription, samplerSubscription)
     }
     
     func on(_ event: Event) {
-        synchronizedOn(event)
+        self.synchronizedOn(event)
     }
 
     func _synchronized_on(_ event: Event) {
         switch event {
         case .next(let element):
-            _element = element
+            self._element = element
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            _atEnd = true
-            _sourceSubscription.dispose()
+            self._atEnd = true
+            self._sourceSubscription.dispose()
         }
     }
     
 }
 
-final fileprivate class Sample : Producer {
+final private class Sample: Producer {
     fileprivate let _source: Observable
     fileprivate let _sampler: Observable
 
     init(source: Observable, sampler: Observable) {
-        _source = source
-        _sampler = sampler
+        self._source = source
+        self._sampler = sampler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = SampleSequenceSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Scan.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Scan.swift
index 39d5e92..7920ae9 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Scan.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Scan.swift
@@ -19,7 +19,7 @@ extension ObservableType {
      - parameter accumulator: An accumulator function to be invoked on each element.
      - returns: An observable sequence containing the accumulated values.
      */
-    public func scan(into seed: A, accumulator: @escaping (inout A, E) throws -> ())
+    public func scan(into seed: A, accumulator: @escaping (inout A, Element) throws -> Void)
         -> Observable {
         return Scan(source: self.asObservable(), seed: seed, accumulator: accumulator)
     }
@@ -35,7 +35,7 @@ extension ObservableType {
      - parameter accumulator: An accumulator function to be invoked on each element.
      - returns: An observable sequence containing the accumulated values.
      */
-    public func scan(_ seed: A, accumulator: @escaping (A, E) throws -> A)
+    public func scan(_ seed: A, accumulator: @escaping (A, Element) throws -> A)
         -> Observable {
         return Scan(source: self.asObservable(), seed: seed) { acc, element in
             let currentAcc = acc
@@ -44,58 +44,57 @@ extension ObservableType {
     }
 }
 
-final fileprivate class ScanSink : Sink, ObserverType {
-    typealias Accumulate = O.E
-    typealias Parent = Scan
-    typealias E = ElementType
-    
+final private class ScanSink: Sink, ObserverType {
+    typealias Accumulate = Observer.Element 
+    typealias Parent = Scan
+
     fileprivate let _parent: Parent
     fileprivate var _accumulate: Accumulate
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _accumulate = parent._seed
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._accumulate = parent._seed
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next(let element):
             do {
-                try _parent._accumulator(&_accumulate, element)
-                forwardOn(.next(_accumulate))
+                try self._parent._accumulator(&self._accumulate, element)
+                self.forwardOn(.next(self._accumulate))
             }
             catch let error {
-                forwardOn(.error(error))
-                dispose()
+                self.forwardOn(.error(error))
+                self.dispose()
             }
         case .error(let error):
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
     
 }
 
-final fileprivate class Scan: Producer {
-    typealias Accumulator = (inout Accumulate, Element) throws -> ()
+final private class Scan: Producer {
+    typealias Accumulator = (inout Accumulate, Element) throws -> Void
     
     fileprivate let _source: Observable
     fileprivate let _seed: Accumulate
     fileprivate let _accumulator: Accumulator
     
     init(source: Observable, seed: Accumulate, accumulator: @escaping Accumulator) {
-        _source = source
-        _seed = seed
-        _accumulator = accumulator
+        self._source = source
+        self._seed = seed
+        self._accumulator = accumulator
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Accumulate {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Accumulate {
         let sink = ScanSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Sequence.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Sequence.swift
index e141bc7..f158565 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Sequence.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Sequence.swift
@@ -18,7 +18,7 @@ extension ObservableType {
      - parameter scheduler: Scheduler to send elements on. If `nil`, elements are sent immediately on subscription.
      - returns: The observable sequence whose elements are pulled from the given arguments.
      */
-    public static func of(_ elements: E ..., scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
+    public static func of(_ elements: Element ..., scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
         return ObservableSequence(elements: elements, scheduler: scheduler)
     }
 }
@@ -31,7 +31,7 @@ extension ObservableType {
 
      - returns: The observable sequence whose elements are pulled from the given enumerable sequence.
      */
-    public static func from(_ array: [E], scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
+    public static func from(_ array: [Element], scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
         return ObservableSequence(elements: array, scheduler: scheduler)
     }
 
@@ -42,25 +42,25 @@ extension ObservableType {
 
      - returns: The observable sequence whose elements are pulled from the given enumerable sequence.
      */
-    public static func from(_ sequence: S, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable where S.Iterator.Element == E {
+    public static func from(_ sequence: Sequence, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable where Sequence.Element == Element {
         return ObservableSequence(elements: sequence, scheduler: scheduler)
     }
 }
 
-final fileprivate class ObservableSequenceSink : Sink where S.Iterator.Element == O.E {
-    typealias Parent = ObservableSequence
+final private class ObservableSequenceSink: Sink where Sequence.Element == Observer.Element {
+    typealias Parent = ObservableSequence
 
     private let _parent: Parent
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
 
     func run() -> Disposable {
-        return _parent._scheduler.scheduleRecursive((_parent._elements.makeIterator(), _parent._elements)) { (iterator, recurse) in
+        return self._parent._scheduler.scheduleRecursive(self._parent._elements.makeIterator()) { iterator, recurse in
             var mutableIterator = iterator
-            if let next = mutableIterator.0.next() {
+            if let next = mutableIterator.next() {
                 self.forwardOn(.next(next))
                 recurse(mutableIterator)
             }
@@ -72,16 +72,16 @@ final fileprivate class ObservableSequenceSink : S
     }
 }
 
-final fileprivate class ObservableSequence : Producer {
-    fileprivate let _elements: S
+final private class ObservableSequence: Producer {
+    fileprivate let _elements: Sequence
     fileprivate let _scheduler: ImmediateSchedulerType
 
-    init(elements: S, scheduler: ImmediateSchedulerType) {
-        _elements = elements
-        _scheduler = scheduler
+    init(elements: Sequence, scheduler: ImmediateSchedulerType) {
+        self._elements = elements
+        self._scheduler = scheduler
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = ObservableSequenceSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift b/Demo/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
index 5af102f..9565a49 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
@@ -139,7 +139,7 @@ extension ObservableType {
      - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
      */
     public func share(replay: Int = 0, scope: SubjectLifetimeScope = .whileConnected)
-        -> Observable {
+        -> Observable {
         switch scope {
         case .forever:
             switch replay {
@@ -159,7 +159,6 @@ extension ObservableType {
 fileprivate final class ShareReplay1WhileConnectedConnection
     : ObserverType
     , SynchronizedUnsubscribeType {
-    typealias E = Element
     typealias Observers = AnyObserver.s
     typealias DisposeKey = Observers.KeyType
 
@@ -173,66 +172,66 @@ fileprivate final class ShareReplay1WhileConnectedConnection
     fileprivate var _element: Element?
 
     init(parent: Parent, lock: RecursiveLock) {
-        _parent = parent
-        _lock = lock
+        self._parent = parent
+        self._lock = lock
 
         #if TRACE_RESOURCES
             _ = Resources.incrementTotal()
         #endif
     }
 
-    final func on(_ event: Event) {
-        _lock.lock()
-        let observers = _synchronized_on(event)
-        _lock.unlock()
+    final func on(_ event: Event) {
+        self._lock.lock()
+        let observers = self._synchronized_on(event)
+        self._lock.unlock()
         dispatch(observers, event)
     }
 
-    final private func _synchronized_on(_ event: Event) -> Observers {
-        if _disposed {
+    final private func _synchronized_on(_ event: Event) -> Observers {
+        if self._disposed {
             return Observers()
         }
 
         switch event {
         case .next(let element):
-            _element = element
-            return _observers
+            self._element = element
+            return self._observers
         case .error, .completed:
-            let observers = _observers
+            let observers = self._observers
             self._synchronized_dispose()
             return observers
         }
     }
 
     final func connect() {
-        _subscription.setDisposable(_parent._source.subscribe(self))
+        self._subscription.setDisposable(self._parent._source.subscribe(self))
     }
 
-    final func _synchronized_subscribe(_ observer: O) -> Disposable where O.E == Element {
-        _lock.lock(); defer { _lock.unlock() }
-        if let element = _element {
+    final func _synchronized_subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        self._lock.lock(); defer { self._lock.unlock() }
+        if let element = self._element {
             observer.on(.next(element))
         }
 
-        let disposeKey = _observers.insert(observer.on)
+        let disposeKey = self._observers.insert(observer.on)
 
         return SubscriptionDisposable(owner: self, key: disposeKey)
     }
 
     final private func _synchronized_dispose() {
-        _disposed = true
-        if _parent._connection === self {
-            _parent._connection = nil
+        self._disposed = true
+        if self._parent._connection === self {
+            self._parent._connection = nil
         }
-        _observers = Observers()
+        self._observers = Observers()
     }
 
     final func synchronizedUnsubscribe(_ disposeKey: DisposeKey) {
-        _lock.lock()
-        let shouldDisconnect = _synchronized_unsubscribe(disposeKey)
-        _lock.unlock()
+        self._lock.lock()
+        let shouldDisconnect = self._synchronized_unsubscribe(disposeKey)
+        self._lock.unlock()
         if shouldDisconnect {
-            _subscription.dispose()
+            self._subscription.dispose()
         }
     }
 
@@ -243,8 +242,8 @@ fileprivate final class ShareReplay1WhileConnectedConnection
             return false
         }
 
-        if _observers.count == 0 {
-            _synchronized_dispose()
+        if self._observers.count == 0 {
+            self._synchronized_dispose()
             return true
         }
 
@@ -259,7 +258,7 @@ fileprivate final class ShareReplay1WhileConnectedConnection
 }
 
 // optimized version of share replay for most common case
-final fileprivate class ShareReplay1WhileConnected
+final private class ShareReplay1WhileConnected
     : Observable {
 
     fileprivate typealias Connection = ShareReplay1WhileConnectedConnection
@@ -274,15 +273,15 @@ final fileprivate class ShareReplay1WhileConnected
         self._source = source
     }
 
-    override func subscribe(_ observer: O) -> Disposable where O.E == E {
-        _lock.lock()
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        self._lock.lock()
 
-        let connection = _synchronized_subscribe(observer)
+        let connection = self._synchronized_subscribe(observer)
         let count = connection._observers.count
 
         let disposable = connection._synchronized_subscribe(observer)
 
-        _lock.unlock()
+        self._lock.unlock()
         
         if count == 0 {
             connection.connect()
@@ -292,17 +291,17 @@ final fileprivate class ShareReplay1WhileConnected
     }
 
     @inline(__always)
-    private func _synchronized_subscribe(_ observer: O) -> Connection where O.E == E {
+    private func _synchronized_subscribe(_ observer: Observer) -> Connection where Observer.Element == Element {
         let connection: Connection
 
-        if let existingConnection = _connection {
+        if let existingConnection = self._connection {
             connection = existingConnection
         }
         else {
             connection = ShareReplay1WhileConnectedConnection(
                 parent: self,
-                lock: _lock)
-            _connection = connection
+                lock: self._lock)
+            self._connection = connection
         }
 
         return connection
@@ -312,7 +311,6 @@ final fileprivate class ShareReplay1WhileConnected
 fileprivate final class ShareWhileConnectedConnection
     : ObserverType
     , SynchronizedUnsubscribeType {
-    typealias E = Element
     typealias Observers = AnyObserver.s
     typealias DisposeKey = Observers.KeyType
 
@@ -325,62 +323,62 @@ fileprivate final class ShareWhileConnectedConnection
     fileprivate var _observers = Observers()
 
     init(parent: Parent, lock: RecursiveLock) {
-        _parent = parent
-        _lock = lock
+        self._parent = parent
+        self._lock = lock
 
         #if TRACE_RESOURCES
             _ = Resources.incrementTotal()
         #endif
     }
 
-    final func on(_ event: Event) {
-        _lock.lock()
-        let observers = _synchronized_on(event)
-        _lock.unlock()
+    final func on(_ event: Event) {
+        self._lock.lock()
+        let observers = self._synchronized_on(event)
+        self._lock.unlock()
         dispatch(observers, event)
     }
 
-    final private func _synchronized_on(_ event: Event) -> Observers {
-        if _disposed {
+    final private func _synchronized_on(_ event: Event) -> Observers {
+        if self._disposed {
             return Observers()
         }
 
         switch event {
         case .next:
-            return _observers
+            return self._observers
         case .error, .completed:
-            let observers = _observers
+            let observers = self._observers
             self._synchronized_dispose()
             return observers
         }
     }
 
     final func connect() {
-        _subscription.setDisposable(_parent._source.subscribe(self))
+        self._subscription.setDisposable(self._parent._source.subscribe(self))
     }
 
-    final func _synchronized_subscribe(_ observer: O) -> Disposable where O.E == Element {
-        _lock.lock(); defer { _lock.unlock() }
+    final func _synchronized_subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        self._lock.lock(); defer { self._lock.unlock() }
 
-        let disposeKey = _observers.insert(observer.on)
+        let disposeKey = self._observers.insert(observer.on)
 
         return SubscriptionDisposable(owner: self, key: disposeKey)
     }
 
     final private func _synchronized_dispose() {
-        _disposed = true
-        if _parent._connection === self {
-            _parent._connection = nil
+        self._disposed = true
+        if self._parent._connection === self {
+            self._parent._connection = nil
         }
-        _observers = Observers()
+        self._observers = Observers()
     }
 
     final func synchronizedUnsubscribe(_ disposeKey: DisposeKey) {
-        _lock.lock()
-        let shouldDisconnect = _synchronized_unsubscribe(disposeKey)
-        _lock.unlock()
+        self._lock.lock()
+        let shouldDisconnect = self._synchronized_unsubscribe(disposeKey)
+        self._lock.unlock()
         if shouldDisconnect {
-            _subscription.dispose()
+            self._subscription.dispose()
         }
     }
 
@@ -391,8 +389,8 @@ fileprivate final class ShareWhileConnectedConnection
             return false
         }
 
-        if _observers.count == 0 {
-            _synchronized_dispose()
+        if self._observers.count == 0 {
+            self._synchronized_dispose()
             return true
         }
 
@@ -407,7 +405,7 @@ fileprivate final class ShareWhileConnectedConnection
 }
 
 // optimized version of share replay for most common case
-final fileprivate class ShareWhileConnected
+final private class ShareWhileConnected
     : Observable {
 
     fileprivate typealias Connection = ShareWhileConnectedConnection
@@ -422,15 +420,15 @@ final fileprivate class ShareWhileConnected
         self._source = source
     }
 
-    override func subscribe(_ observer: O) -> Disposable where O.E == E {
-        _lock.lock()
+    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
+        self._lock.lock()
 
-        let connection = _synchronized_subscribe(observer)
+        let connection = self._synchronized_subscribe(observer)
         let count = connection._observers.count
 
         let disposable = connection._synchronized_subscribe(observer)
 
-        _lock.unlock()
+        self._lock.unlock()
 
         if count == 0 {
             connection.connect()
@@ -440,17 +438,17 @@ final fileprivate class ShareWhileConnected
     }
 
     @inline(__always)
-    private func _synchronized_subscribe(_ observer: O) -> Connection where O.E == E {
+    private func _synchronized_subscribe(_ observer: Observer) -> Connection where Observer.Element == Element {
         let connection: Connection
 
-        if let existingConnection = _connection {
+        if let existingConnection = self._connection {
             connection = existingConnection
         }
         else {
             connection = ShareWhileConnectedConnection(
                 parent: self,
-                lock: _lock)
-            _connection = connection
+                lock: self._lock)
+            self._connection = connection
         }
         
         return connection
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift
index 1419a93..e50a9be 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift
@@ -17,8 +17,8 @@ extension ObservableType {
      - returns: An observable sequence that emits a single element or throws an exception if more (or none) of them are emitted.
      */
     public func single()
-        -> Observable {
-        return SingleAsync(source: asObservable())
+        -> Observable {
+        return SingleAsync(source: self.asObservable())
     }
 
     /**
@@ -30,58 +30,57 @@ extension ObservableType {
      - parameter predicate: A function to test each source element for a condition.
      - returns: An observable sequence that emits a single element or throws an exception if more (or none) of them are emitted.
      */
-    public func single(_ predicate: @escaping (E) throws -> Bool)
-        -> Observable {
-        return SingleAsync(source: asObservable(), predicate: predicate)
+    public func single(_ predicate: @escaping (Element) throws -> Bool)
+        -> Observable {
+        return SingleAsync(source: self.asObservable(), predicate: predicate)
     }
 }
 
-fileprivate final class SingleAsyncSink : Sink, ObserverType {
-    typealias ElementType = O.E
-    typealias Parent = SingleAsync
-    typealias E = ElementType
+fileprivate final class SingleAsyncSink : Sink, ObserverType {
+    typealias Element = Observer.Element
+    typealias Parent = SingleAsync
     
     private let _parent: Parent
     private var _seenValue: Bool = false
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next(let value):
             do {
-                let forward = try _parent._predicate?(value) ?? true
+                let forward = try self._parent._predicate?(value) ?? true
                 if !forward {
                     return
                 }
             }
             catch let error {
-                forwardOn(.error(error as Swift.Error))
-                dispose()
+                self.forwardOn(.error(error as Swift.Error))
+                self.dispose()
                 return
             }
 
-            if _seenValue {
-                forwardOn(.error(RxError.moreThanOneElement))
-                dispose()
+            if self._seenValue {
+                self.forwardOn(.error(RxError.moreThanOneElement))
+                self.dispose()
                 return
             }
 
-            _seenValue = true
-            forwardOn(.next(value))
+            self._seenValue = true
+            self.forwardOn(.next(value))
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            if (_seenValue) {
-                forwardOn(.completed)
+            if self._seenValue {
+                self.forwardOn(.completed)
             } else {
-                forwardOn(.error(RxError.noElements))
+                self.forwardOn(.error(RxError.noElements))
             }
-            dispose()
+            self.dispose()
         }
     }
 }
@@ -93,13 +92,13 @@ final class SingleAsync: Producer {
     fileprivate let _predicate: Predicate?
     
     init(source: Observable, predicate: Predicate? = nil) {
-        _source = source
-        _predicate = predicate
+        self._source = source
+        self._predicate = predicate
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = SingleAsyncSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Sink.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Sink.swift
index 214cfda..1305d1b 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Sink.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Sink.swift
@@ -6,71 +6,70 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-class Sink : Disposable {
-    fileprivate let _observer: O
+class Sink : Disposable {
+    fileprivate let _observer: Observer
     fileprivate let _cancel: Cancelable
-    fileprivate var _disposed: Bool
+    fileprivate let _disposed = AtomicInt(0)
 
     #if DEBUG
         fileprivate let _synchronizationTracker = SynchronizationTracker()
     #endif
 
-    init(observer: O, cancel: Cancelable) {
+    init(observer: Observer, cancel: Cancelable) {
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
-        _observer = observer
-        _cancel = cancel
-        _disposed = false
+        self._observer = observer
+        self._cancel = cancel
     }
-    
-    final func forwardOn(_ event: Event) {
+
+    final func forwardOn(_ event: Event) {
         #if DEBUG
-            _synchronizationTracker.register(synchronizationErrorMessage: .default)
-            defer { _synchronizationTracker.unregister() }
+            self._synchronizationTracker.register(synchronizationErrorMessage: .default)
+            defer { self._synchronizationTracker.unregister() }
         #endif
-        if _disposed {
+        if isFlagSet(self._disposed, 1) {
             return
         }
-        _observer.on(event)
+        self._observer.on(event)
     }
-    
-    final func forwarder() -> SinkForward {
+
+    final func forwarder() -> SinkForward {
         return SinkForward(forward: self)
     }
 
     final var disposed: Bool {
-        return _disposed
+        return isFlagSet(self._disposed, 1)
     }
 
     func dispose() {
-        _disposed = true
-        _cancel.dispose()
+        fetchOr(self._disposed, 1)
+        self._cancel.dispose()
     }
 
     deinit {
 #if TRACE_RESOURCES
-       let _ =  Resources.decrementTotal()
+       _ =  Resources.decrementTotal()
 #endif
     }
 }
 
-final class SinkForward: ObserverType {
-    typealias E = O.E
-    
-    private let _forward: Sink
-    
-    init(forward: Sink) {
-        _forward = forward
+final class SinkForward: ObserverType {
+    typealias Element = Observer.Element 
+
+    private let _forward: Sink
+
+    init(forward: Sink) {
+        self._forward = forward
     }
-    
-    final func on(_ event: Event) {
+
+    final func on(_ event: Event) {
         switch event {
         case .next:
-            _forward._observer.on(event)
+            self._forward._observer.on(event)
         case .error, .completed:
-            _forward._observer.on(event)
-            _forward._cancel.dispose()
+            self._forward._observer.on(event)
+            self._forward._cancel.dispose()
         }
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Skip.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Skip.swift
index fcac9d4..3076f9c 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Skip.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Skip.swift
@@ -17,8 +17,8 @@ extension ObservableType {
      - returns: An observable sequence that contains the elements that occur after the specified index in the input sequence.
      */
     public func skip(_ count: Int)
-        -> Observable {
-        return SkipCount(source: asObservable(), count: count)
+        -> Observable {
+        return SkipCount(source: self.asObservable(), count: count)
     }
 }
 
@@ -34,22 +34,22 @@ extension ObservableType {
      - returns: An observable sequence with the elements skipped during the specified duration from the start of the source sequence.
      */
     public func skip(_ duration: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
         return SkipTime(source: self.asObservable(), duration: duration, scheduler: scheduler)
     }
 }
 
 // count version
 
-final fileprivate class SkipCountSink : Sink, ObserverType {
-    typealias Element = O.E
+final private class SkipCountSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
     typealias Parent = SkipCount
     
     let parent: Parent
     
     var remaining: Int
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
         self.parent = parent
         self.remaining = parent.count
         super.init(observer: observer, cancel: cancel)
@@ -59,24 +59,24 @@ final fileprivate class SkipCountSink : Sink, ObserverType {
         switch event {
         case .next(let value):
             
-            if remaining <= 0 {
-                forwardOn(.next(value))
+            if self.remaining <= 0 {
+                self.forwardOn(.next(value))
             }
             else {
-                remaining -= 1
+                self.remaining -= 1
             }
         case .error:
-            forwardOn(event)
+            self.forwardOn(event)
             self.dispose()
         case .completed:
-            forwardOn(event)
+            self.forwardOn(event)
             self.dispose()
         }
     }
     
 }
 
-final fileprivate class SkipCount: Producer {
+final private class SkipCount: Producer {
     let source: Observable
     let count: Int
     
@@ -85,9 +85,9 @@ final fileprivate class SkipCount: Producer {
         self.count = count
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = SkipCountSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = source.subscribe(sink)
+        let subscription = self.source.subscribe(sink)
 
         return (sink: sink, subscription: subscription)
     }
@@ -95,16 +95,15 @@ final fileprivate class SkipCount: Producer {
 
 // time version
 
-final fileprivate class SkipTimeSink : Sink, ObserverType where O.E == ElementType {
-    typealias Parent = SkipTime
-    typealias Element = ElementType
+final private class SkipTimeSink: Sink, ObserverType where Observer.Element == Element {
+    typealias Parent = SkipTime
 
     let parent: Parent
     
     // state
     var open = false
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
         self.parent = parent
         super.init(observer: observer, cancel: cancel)
     }
@@ -112,35 +111,35 @@ final fileprivate class SkipTimeSink : Sink, Ob
     func on(_ event: Event) {
         switch event {
         case .next(let value):
-            if open {
-                forwardOn(.next(value))
+            if self.open {
+                self.forwardOn(.next(value))
             }
         case .error:
-            forwardOn(event)
+            self.forwardOn(event)
             self.dispose()
         case .completed:
-            forwardOn(event)
+            self.forwardOn(event)
             self.dispose()
         }
     }
     
     func tick() {
-        open = true
+        self.open = true
     }
     
     func run() -> Disposable {
-        let disposeTimer = parent.scheduler.scheduleRelative((), dueTime: self.parent.duration) { _ in 
+        let disposeTimer = self.parent.scheduler.scheduleRelative((), dueTime: self.parent.duration) { _ in 
             self.tick()
             return Disposables.create()
         }
         
-        let disposeSubscription = parent.source.subscribe(self)
+        let disposeSubscription = self.parent.source.subscribe(self)
         
         return Disposables.create(disposeTimer, disposeSubscription)
     }
 }
 
-final fileprivate class SkipTime: Producer {
+final private class SkipTime: Producer {
     let source: Observable
     let duration: RxTimeInterval
     let scheduler: SchedulerType
@@ -151,7 +150,7 @@ final fileprivate class SkipTime: Producer {
         self.duration = duration
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = SkipTimeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift
index f35f1fd..056d795 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift
@@ -16,67 +16,67 @@ extension ObservableType {
      - parameter other: Observable sequence that starts propagation of elements of the source sequence.
      - returns: An observable sequence containing the elements of the source sequence that are emitted after the other sequence emits an item.
      */
-    public func skipUntil(_ other: O)
-        -> Observable {
-        return SkipUntil(source: asObservable(), other: other.asObservable())
+    public func skipUntil(_ other: Source)
+        -> Observable {
+        return SkipUntil(source: self.asObservable(), other: other.asObservable())
     }
 }
 
-final fileprivate class SkipUntilSinkOther
+final private class SkipUntilSinkOther
     : ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias Parent = SkipUntilSink
-    typealias E = Other
+    typealias Parent = SkipUntilSink
+    typealias Element = Other
     
     fileprivate let _parent: Parent
 
     var _lock: RecursiveLock {
-        return _parent._lock
+        return self._parent._lock
     }
     
     let _subscription = SingleAssignmentDisposable()
 
     init(parent: Parent) {
-        _parent = parent
+        self._parent = parent
         #if TRACE_RESOURCES
-            let _ = Resources.incrementTotal()
+            _ = Resources.incrementTotal()
         #endif
     }
 
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next:
-            _parent._forwardElements = true
-            _subscription.dispose()
+            self._parent._forwardElements = true
+            self._subscription.dispose()
         case .error(let e):
-            _parent.forwardOn(.error(e))
-            _parent.dispose()
+            self._parent.forwardOn(.error(e))
+            self._parent.dispose()
         case .completed:
-            _subscription.dispose()
+            self._subscription.dispose()
         }
     }
     
     #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
     }
     #endif
 
 }
 
 
-final fileprivate class SkipUntilSink
-    : Sink
+final private class SkipUntilSink
+    : Sink
     , ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias E = O.E
-    typealias Parent = SkipUntil
+    typealias Element = Observer.Element 
+    typealias Parent = SkipUntil
     
     let _lock = RecursiveLock()
     fileprivate let _parent: Parent
@@ -84,54 +84,54 @@ final fileprivate class SkipUntilSink
     
     fileprivate let _sourceSubscription = SingleAssignmentDisposable()
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next:
-            if _forwardElements {
-                forwardOn(event)
+            if self._forwardElements {
+                self.forwardOn(event)
             }
         case .error:
-            forwardOn(event)
+            self.forwardOn(event)
             self.dispose()
         case .completed:
-            if _forwardElements {
-                forwardOn(event)
+            if self._forwardElements {
+                self.forwardOn(event)
             }
             self.dispose()
         }
     }
     
     func run() -> Disposable {
-        let sourceSubscription = _parent._source.subscribe(self)
+        let sourceSubscription = self._parent._source.subscribe(self)
         let otherObserver = SkipUntilSinkOther(parent: self)
-        let otherSubscription = _parent._other.subscribe(otherObserver)
-        _sourceSubscription.setDisposable(sourceSubscription)
+        let otherSubscription = self._parent._other.subscribe(otherObserver)
+        self._sourceSubscription.setDisposable(sourceSubscription)
         otherObserver._subscription.setDisposable(otherSubscription)
         
         return Disposables.create(_sourceSubscription, otherObserver._subscription)
     }
 }
 
-final fileprivate class SkipUntil: Producer {
+final private class SkipUntil: Producer {
     
     fileprivate let _source: Observable
     fileprivate let _other: Observable
     
     init(source: Observable, other: Observable) {
-        _source = source
-        _other = other
+        self._source = source
+        self._other = other
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = SkipUntilSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift
index 4bb394b..db9f5a6 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift
@@ -16,62 +16,60 @@ extension ObservableType {
      - parameter predicate: A function to test each element for a condition.
      - returns: An observable sequence that contains the elements from the input sequence starting at the first element in the linear series that does not pass the test specified by predicate.
      */
-    public func skipWhile(_ predicate: @escaping (E) throws -> Bool) -> Observable {
-        return SkipWhile(source: asObservable(), predicate: predicate)
+    public func skipWhile(_ predicate: @escaping (Element) throws -> Bool) -> Observable {
+        return SkipWhile(source: self.asObservable(), predicate: predicate)
     }
 }
 
-final fileprivate class SkipWhileSink : Sink, ObserverType {
-
-    typealias Element = O.E
+final private class SkipWhileSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
     typealias Parent = SkipWhile
 
     fileprivate let _parent: Parent
     fileprivate var _running = false
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
 
     func on(_ event: Event) {
         switch event {
         case .next(let value):
-            if !_running {
+            if !self._running {
                 do {
-                    _running = try !_parent._predicate(value)
+                    self._running = try !self._parent._predicate(value)
                 } catch let e {
-                    forwardOn(.error(e))
-                    dispose()
+                    self.forwardOn(.error(e))
+                    self.dispose()
                     return
                 }
             }
 
-            if _running {
-                forwardOn(.next(value))
+            if self._running {
+                self.forwardOn(.next(value))
             }
         case .error, .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class SkipWhile: Producer {
+final private class SkipWhile: Producer {
     typealias Predicate = (Element) throws -> Bool
-    typealias PredicateWithIndex = (Element, Int) throws -> Bool
 
     fileprivate let _source: Observable
     fileprivate let _predicate: Predicate
 
     init(source: Observable, predicate: @escaping Predicate) {
-        _source = source
-        _predicate = predicate
+        self._source = source
+        self._predicate = predicate
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = SkipWhileSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/StartWith.swift b/Demo/Pods/RxSwift/RxSwift/Observables/StartWith.swift
index 14776f9..13fb31d 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/StartWith.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/StartWith.swift
@@ -16,13 +16,13 @@ extension ObservableType {
      - parameter elements: Elements to prepend to the specified sequence.
      - returns: The source sequence prepended with the specified values.
      */
-    public func startWith(_ elements: E ...)
-        -> Observable {
+    public func startWith(_ elements: Element ...)
+        -> Observable {
             return StartWith(source: self.asObservable(), elements: elements)
     }
 }
 
-final fileprivate class StartWith: Producer {
+final private class StartWith: Producer {
     let elements: [Element]
     let source: Observable
 
@@ -32,11 +32,11 @@ final fileprivate class StartWith: Producer {
         super.init()
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        for e in elements {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        for e in self.elements {
             observer.on(.next(e))
         }
 
-        return (sink: Disposables.create(), subscription: source.subscribe(observer))
+        return (sink: Disposables.create(), subscription: self.source.subscribe(observer))
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift
index 2a33e03..5f7be0b 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift
@@ -24,24 +24,24 @@ extension ObservableType {
      - returns: The source sequence whose subscriptions and unsubscriptions happen on the specified scheduler.
      */
     public func subscribeOn(_ scheduler: ImmediateSchedulerType)
-        -> Observable {
+        -> Observable {
         return SubscribeOn(source: self, scheduler: scheduler)
     }
 }
 
-final fileprivate class SubscribeOnSink : Sink, ObserverType where Ob.E == O.E {
-    typealias Element = O.E
+final private class SubscribeOnSink: Sink, ObserverType where Ob.Element == Observer.Element {
+    typealias Element = Observer.Element 
     typealias Parent = SubscribeOn
     
     let parent: Parent
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
         self.parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event) {
-        forwardOn(event)
+        self.forwardOn(event)
         
         if event.isStopEvent {
             self.dispose()
@@ -54,7 +54,7 @@ final fileprivate class SubscribeOnSink : S
         
         disposeEverything.disposable = cancelSchedule
         
-        let disposeSchedule = parent.scheduler.schedule(()) { (_) -> Disposable in
+        let disposeSchedule = self.parent.scheduler.schedule(()) { _ -> Disposable in
             let subscription = self.parent.source.subscribe(self)
             disposeEverything.disposable = ScheduledDisposable(scheduler: self.parent.scheduler, disposable: subscription)
             return Disposables.create()
@@ -66,7 +66,7 @@ final fileprivate class SubscribeOnSink : S
     }
 }
 
-final fileprivate class SubscribeOn : Producer {
+final private class SubscribeOn: Producer {
     let source: Ob
     let scheduler: ImmediateSchedulerType
     
@@ -75,7 +75,7 @@ final fileprivate class SubscribeOn : Producer {
         self.scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Ob.E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Ob.Element {
         let sink = SubscribeOnSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Switch.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Switch.swift
index 2da1000..ac12f2f 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Switch.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Switch.swift
@@ -19,13 +19,13 @@ extension ObservableType {
      - returns: An observable sequence whose elements are the result of invoking the transform function on each element of source producing an
      Observable of Observable sequences and that at any point in time produces the elements of the most recent inner observable sequence that has been received.
      */
-    public func flatMapLatest(_ selector: @escaping (E) throws -> O)
-        -> Observable {
-            return FlatMapLatest(source: asObservable(), selector: selector)
+    public func flatMapLatest(_ selector: @escaping (Element) throws -> Source)
+        -> Observable {
+            return FlatMapLatest(source: self.asObservable(), selector: selector)
     }
 }
 
-extension ObservableType where E : ObservableConvertibleType {
+extension ObservableType where Element : ObservableConvertibleType {
 
     /**
      Transforms an observable sequence of observable sequences into an observable sequence
@@ -38,15 +38,15 @@ extension ObservableType where E : ObservableConvertibleType {
 
      - returns: The observable sequence that at any point in time produces the elements of the most recent inner observable sequence that has been received.
      */
-    public func switchLatest() -> Observable {
-        return Switch(source: asObservable())
+    public func switchLatest() -> Observable {
+        return Switch(source: self.asObservable())
     }
 }
 
-fileprivate class SwitchSink
-    : Sink
-    , ObserverType where S.E == O.E {
-    typealias E = SourceType
+private class SwitchSink
+    : Sink
+    , ObserverType where Source.Element == Observer.Element {
+    typealias Element = SourceType
 
     fileprivate let _subscriptions: SingleAssignmentDisposable = SingleAssignmentDisposable()
     fileprivate let _innerSubscription: SerialDisposable = SerialDisposable()
@@ -58,114 +58,114 @@ fileprivate class SwitchSink) -> Disposable {
         let subscription = source.subscribe(self)
-        _subscriptions.setDisposable(subscription)
+        self._subscriptions.setDisposable(subscription)
         return Disposables.create(_subscriptions, _innerSubscription)
     }
 
-    func performMap(_ element: SourceType) throws -> S {
+    func performMap(_ element: SourceType) throws -> Source {
         rxAbstractMethod()
     }
 
     @inline(__always)
-    final private func nextElementArrived(element: E) -> (Int, Observable)? {
-        _lock.lock(); defer { _lock.unlock() } // {
+    final private func nextElementArrived(element: Element) -> (Int, Observable)? {
+        self._lock.lock(); defer { self._lock.unlock() } // {
             do {
-                let observable = try performMap(element).asObservable()
-                _hasLatest = true
-                _latest = _latest &+ 1
-                return (_latest, observable)
+                let observable = try self.performMap(element).asObservable()
+                self._hasLatest = true
+                self._latest = self._latest &+ 1
+                return (self._latest, observable)
             }
             catch let error {
-                forwardOn(.error(error))
-                dispose()
+                self.forwardOn(.error(error))
+                self.dispose()
             }
 
             return nil
         // }
     }
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next(let element):
-            if let (latest, observable) = nextElementArrived(element: element) {
+            if let (latest, observable) = self.nextElementArrived(element: element) {
                 let d = SingleAssignmentDisposable()
-                _innerSubscription.disposable = d
+                self._innerSubscription.disposable = d
                    
                 let observer = SwitchSinkIter(parent: self, id: latest, _self: d)
                 let disposable = observable.subscribe(observer)
                 d.setDisposable(disposable)
             }
         case .error(let error):
-            _lock.lock(); defer { _lock.unlock() }
-            forwardOn(.error(error))
-            dispose()
+            self._lock.lock(); defer { self._lock.unlock() }
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            _lock.lock(); defer { _lock.unlock() }
-            _stopped = true
+            self._lock.lock(); defer { self._lock.unlock() }
+            self._stopped = true
             
-            _subscriptions.dispose()
+            self._subscriptions.dispose()
             
-            if !_hasLatest {
-                forwardOn(.completed)
-                dispose()
+            if !self._hasLatest {
+                self.forwardOn(.completed)
+                self.dispose()
             }
         }
     }
 }
 
-final fileprivate class SwitchSinkIter
+final private class SwitchSinkIter
     : ObserverType
     , LockOwnerType
-    , SynchronizedOnType where S.E == O.E {
-    typealias E = S.E
-    typealias Parent = SwitchSink
+    , SynchronizedOnType where Source.Element == Observer.Element {
+    typealias Element = Source.Element
+    typealias Parent = SwitchSink
     
     fileprivate let _parent: Parent
     fileprivate let _id: Int
     fileprivate let _self: Disposable
 
     var _lock: RecursiveLock {
-        return _parent._lock
+        return self._parent._lock
     }
 
     init(parent: Parent, id: Int, _self: Disposable) {
-        _parent = parent
-        _id = id
+        self._parent = parent
+        self._id = id
         self._self = _self
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next: break
         case .error, .completed:
-            _self.dispose()
+            self._self.dispose()
         }
         
-        if _parent._latest != _id {
+        if self._parent._latest != self._id {
             return
         }
        
         switch event {
         case .next:
-            _parent.forwardOn(event)
+            self._parent.forwardOn(event)
         case .error:
-            _parent.forwardOn(event)
-            _parent.dispose()
+            self._parent.forwardOn(event)
+            self._parent.dispose()
         case .completed:
-            _parent._hasLatest = false
-            if _parent._stopped {
-                _parent.forwardOn(event)
-                _parent.dispose()
+            self._parent._hasLatest = false
+            if self._parent._stopped {
+                self._parent.forwardOn(event)
+                self._parent.dispose()
             }
         }
     }
@@ -173,61 +173,62 @@ final fileprivate class SwitchSinkIter : SwitchSink where O.E == S.E {
-    override init(observer: O, cancel: Cancelable) {
+final private class SwitchIdentitySink: SwitchSink
+    where Observer.Element == Source.Element {
+    override init(observer: Observer, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
 
-    override func performMap(_ element: S) throws -> S {
+    override func performMap(_ element: Source) throws -> Source {
         return element
     }
 }
 
-final fileprivate class MapSwitchSink : SwitchSink where O.E == S.E {
-    typealias Selector = (SourceType) throws -> S
+final private class MapSwitchSink: SwitchSink where Observer.Element == Source.Element {
+    typealias Selector = (SourceType) throws -> Source
 
     fileprivate let _selector: Selector
 
-    init(selector: @escaping Selector, observer: O, cancel: Cancelable) {
-        _selector = selector
+    init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
+        self._selector = selector
         super.init(observer: observer, cancel: cancel)
     }
 
-    override func performMap(_ element: SourceType) throws -> S {
-        return try _selector(element)
+    override func performMap(_ element: SourceType) throws -> Source {
+        return try self._selector(element)
     }
 }
 
 // MARK: Producers
 
-final fileprivate class Switch : Producer {
-    fileprivate let _source: Observable
+final private class Switch: Producer {
+    fileprivate let _source: Observable
     
-    init(source: Observable) {
-        _source = source
+    init(source: Observable) {
+        self._source = source
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
-        let sink = SwitchIdentitySink(observer: observer, cancel: cancel)
-        let subscription = sink.run(_source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Source.Element {
+        let sink = SwitchIdentitySink(observer: observer, cancel: cancel)
+        let subscription = sink.run(self._source)
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class FlatMapLatest : Producer {
-    typealias Selector = (SourceType) throws -> S
+final private class FlatMapLatest: Producer {
+    typealias Selector = (SourceType) throws -> Source
 
     fileprivate let _source: Observable
     fileprivate let _selector: Selector
 
     init(source: Observable, selector: @escaping Selector) {
-        _source = source
-        _selector = selector
+        self._source = source
+        self._selector = selector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
-        let sink = MapSwitchSink(selector: _selector, observer: observer, cancel: cancel)
-        let subscription = sink.run(_source)
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Source.Element {
+        let sink = MapSwitchSink(selector: self._selector, observer: observer, cancel: cancel)
+        let subscription = sink.run(self._source)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift
index 0b10dc6..5ead0f2 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift
@@ -15,90 +15,90 @@ extension ObservableType {
      - parameter switchTo: Observable sequence being returned when source sequence is empty.
      - returns: Observable sequence that contains elements from switchTo sequence if source is empty, otherwise returns source sequence elements.
      */
-    public func ifEmpty(switchTo other: Observable) -> Observable {
-        return SwitchIfEmpty(source: asObservable(), ifEmpty: other)
+    public func ifEmpty(switchTo other: Observable) -> Observable {
+        return SwitchIfEmpty(source: self.asObservable(), ifEmpty: other)
     }
 }
 
-final fileprivate class SwitchIfEmpty: Producer {
+final private class SwitchIfEmpty: Producer {
     
-    private let _source: Observable
-    private let _ifEmpty: Observable
+    private let _source: Observable
+    private let _ifEmpty: Observable
     
-    init(source: Observable, ifEmpty: Observable) {
-        _source = source
-        _ifEmpty = ifEmpty
+    init(source: Observable, ifEmpty: Observable) {
+        self._source = source
+        self._ifEmpty = ifEmpty
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
-        let sink = SwitchIfEmptySink(ifEmpty: _ifEmpty,
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = SwitchIfEmptySink(ifEmpty: self._ifEmpty,
                                      observer: observer,
                                      cancel: cancel)
-        let subscription = sink.run(_source.asObservable())
+        let subscription = sink.run(self._source.asObservable())
         
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class SwitchIfEmptySink: Sink
+final private class SwitchIfEmptySink: Sink
     , ObserverType {
-    typealias E = O.E
+    typealias Element = Observer.Element
     
-    private let _ifEmpty: Observable
+    private let _ifEmpty: Observable
     private var _isEmpty = true
     private let _ifEmptySubscription = SingleAssignmentDisposable()
     
-    init(ifEmpty: Observable, observer: O, cancel: Cancelable) {
-        _ifEmpty = ifEmpty
+    init(ifEmpty: Observable, observer: Observer, cancel: Cancelable) {
+        self._ifEmpty = ifEmpty
         super.init(observer: observer, cancel: cancel)
     }
     
-    func run(_ source: Observable) -> Disposable {
+    func run(_ source: Observable) -> Disposable {
         let subscription = source.subscribe(self)
         return Disposables.create(subscription, _ifEmptySubscription)
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            _isEmpty = false
-            forwardOn(event)
+            self._isEmpty = false
+            self.forwardOn(event)
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            guard _isEmpty else {
-                forwardOn(.completed)
-                dispose()
+            guard self._isEmpty else {
+                self.forwardOn(.completed)
+                self.dispose()
                 return
             }
             let ifEmptySink = SwitchIfEmptySinkIter(parent: self)
-            _ifEmptySubscription.setDisposable(_ifEmpty.subscribe(ifEmptySink))
+            self._ifEmptySubscription.setDisposable(self._ifEmpty.subscribe(ifEmptySink))
         }
     }
 }
 
-final fileprivate class SwitchIfEmptySinkIter
+final private class SwitchIfEmptySinkIter
     : ObserverType {
-    typealias E = O.E
-    typealias Parent = SwitchIfEmptySink
+    typealias Element = Observer.Element
+    typealias Parent = SwitchIfEmptySink
     
     private let _parent: Parent
 
     init(parent: Parent) {
-        _parent = parent
+        self._parent = parent
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            _parent.forwardOn(event)
+            self._parent.forwardOn(event)
         case .error:
-            _parent.forwardOn(event)
-            _parent.dispose()
+            self._parent.forwardOn(event)
+            self._parent.dispose()
         case .completed:
-            _parent.forwardOn(event)
-            _parent.dispose()
+            self._parent.forwardOn(event)
+            self._parent.dispose()
         }
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Take.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Take.swift
index 661f858..95b0b60 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Take.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Take.swift
@@ -17,12 +17,12 @@ extension ObservableType {
      - returns: An observable sequence that contains the specified number of elements from the start of the input sequence.
      */
     public func take(_ count: Int)
-        -> Observable {
+        -> Observable {
         if count == 0 {
             return Observable.empty()
         }
         else {
-            return TakeCount(source: asObservable(), count: count)
+            return TakeCount(source: self.asObservable(), count: count)
         }
     }
 }
@@ -39,53 +39,53 @@ extension ObservableType {
      - returns: An observable sequence with the elements taken during the specified duration from the start of the source sequence.
      */
     public func take(_ duration: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
         return TakeTime(source: self.asObservable(), duration: duration, scheduler: scheduler)
     }
 }
 
 // count version
 
-final fileprivate class TakeCountSink : Sink, ObserverType {
-    typealias E = O.E
-    typealias Parent = TakeCount
+final private class TakeCountSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = TakeCount
     
     private let _parent: Parent
     
     private var _remaining: Int
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _remaining = parent._count
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._remaining = parent._count
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next(let value):
             
-            if _remaining > 0 {
-                _remaining -= 1
+            if self._remaining > 0 {
+                self._remaining -= 1
                 
-                forwardOn(.next(value))
+                self.forwardOn(.next(value))
             
-                if _remaining == 0 {
-                    forwardOn(.completed)
-                    dispose()
+                if self._remaining == 0 {
+                    self.forwardOn(.completed)
+                    self.dispose()
                 }
             }
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
     
 }
 
-final fileprivate class TakeCount: Producer {
+final private class TakeCount: Producer {
     fileprivate let _source: Observable
     fileprivate let _count: Int
     
@@ -93,73 +93,72 @@ final fileprivate class TakeCount: Producer {
         if count < 0 {
             rxFatalError("count can't be negative")
         }
-        _source = source
-        _count = count
+        self._source = source
+        self._count = count
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = TakeCountSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
 
 // time version
 
-final fileprivate class TakeTimeSink
-    : Sink
+final private class TakeTimeSink
+    : Sink
     , LockOwnerType
     , ObserverType
-    , SynchronizedOnType where O.E == ElementType {
-    typealias Parent = TakeTime
-    typealias E = ElementType
+    , SynchronizedOnType where Observer.Element == Element {
+    typealias Parent = TakeTime
 
     fileprivate let _parent: Parent
     
     let _lock = RecursiveLock()
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next(let value):
-            forwardOn(.next(value))
+            self.forwardOn(.next(value))
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
     
     func tick() {
-        _lock.lock(); defer { _lock.unlock() }
+        self._lock.lock(); defer { self._lock.unlock() }
 
-        forwardOn(.completed)
-        dispose()
+        self.forwardOn(.completed)
+        self.dispose()
     }
     
     func run() -> Disposable {
-        let disposeTimer = _parent._scheduler.scheduleRelative((), dueTime: _parent._duration) { _ in
+        let disposeTimer = self._parent._scheduler.scheduleRelative((), dueTime: self._parent._duration) { _ in
             self.tick()
             return Disposables.create()
         }
         
-        let disposeSubscription = _parent._source.subscribe(self)
+        let disposeSubscription = self._parent._source.subscribe(self)
         
         return Disposables.create(disposeTimer, disposeSubscription)
     }
 }
 
-final fileprivate class TakeTime : Producer {
+final private class TakeTime: Producer {
     typealias TimeInterval = RxTimeInterval
     
     fileprivate let _source: Observable
@@ -167,12 +166,12 @@ final fileprivate class TakeTime : Producer {
     fileprivate let _scheduler: SchedulerType
     
     init(source: Observable, duration: TimeInterval, scheduler: SchedulerType) {
-        _source = source
-        _scheduler = scheduler
-        _duration = duration
+        self._source = source
+        self._scheduler = scheduler
+        self._duration = duration
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = TakeTimeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/TakeLast.swift b/Demo/Pods/RxSwift/RxSwift/Observables/TakeLast.swift
index 7bf1664..5a5d684 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/TakeLast.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/TakeLast.swift
@@ -19,46 +19,46 @@ extension ObservableType {
      - returns: An observable sequence containing the specified number of elements from the end of the source sequence.
      */
     public func takeLast(_ count: Int)
-        -> Observable {
-        return TakeLast(source: asObservable(), count: count)
+        -> Observable {
+        return TakeLast(source: self.asObservable(), count: count)
     }
 }
 
-final fileprivate class TakeLastSink : Sink, ObserverType {
-    typealias E = O.E
-    typealias Parent = TakeLast
+final private class TakeLastSink: Sink, ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = TakeLast
     
     private let _parent: Parent
     
-    private var _elements: Queue
+    private var _elements: Queue
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _elements = Queue(capacity: parent._count + 1)
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._elements = Queue(capacity: parent._count + 1)
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next(let value):
-            _elements.enqueue(value)
-            if _elements.count > self._parent._count {
-                let _ = _elements.dequeue()
+            self._elements.enqueue(value)
+            if self._elements.count > self._parent._count {
+                _ = self._elements.dequeue()
             }
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            for e in _elements {
-                forwardOn(.next(e))
+            for e in self._elements {
+                self.forwardOn(.next(e))
             }
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class TakeLast: Producer {
+final private class TakeLast: Producer {
     fileprivate let _source: Observable
     fileprivate let _count: Int
     
@@ -66,13 +66,13 @@ final fileprivate class TakeLast: Producer {
         if count < 0 {
             rxFatalError("count can't be negative")
         }
-        _source = source
-        _count = count
+        self._source = source
+        self._count = count
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = TakeLastSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift b/Demo/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift
index f2e5f98..f6490d4 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift
@@ -16,116 +16,212 @@ extension ObservableType {
      - parameter other: Observable sequence that terminates propagation of elements of the source sequence.
      - returns: An observable sequence containing the elements of the source sequence up to the point the other sequence interrupted further propagation.
      */
-    public func takeUntil(_ other: O)
-        -> Observable {
-        return TakeUntil(source: asObservable(), other: other.asObservable())
+    public func takeUntil(_ other: Source)
+        -> Observable {
+        return TakeUntil(source: self.asObservable(), other: other.asObservable())
+    }
+
+    /**
+     Returns elements from an observable sequence until the specified condition is true.
+
+     - seealso: [takeUntil operator on reactivex.io](http://reactivex.io/documentation/operators/takeuntil.html)
+
+     - parameter behavior: Whether or not to include the last element matching the predicate.
+     - parameter predicate: A function to test each element for a condition.
+     - returns: An observable sequence that contains the elements from the input sequence that occur before the element at which the test passes.
+     */
+    public func takeUntil(_ behavior: TakeUntilBehavior,
+                          predicate: @escaping (Element) throws -> Bool)
+        -> Observable {
+        return TakeUntilPredicate(source: self.asObservable(),
+                                  behavior: behavior,
+                                  predicate: predicate)
     }
 }
 
-final fileprivate class TakeUntilSinkOther
+/// Behaviors for the `takeUntil(_ behavior:predicate:)` operator.
+public enum TakeUntilBehavior {
+    /// Include the last element matching the predicate.
+    case inclusive
+
+    /// Exclude the last element matching the predicate.
+    case exclusive
+}
+
+// MARK: - TakeUntil Observable
+final private class TakeUntilSinkOther
     : ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias Parent = TakeUntilSink
-    typealias E = Other
+    typealias Parent = TakeUntilSink
+    typealias Element = Other
     
     fileprivate let _parent: Parent
 
     var _lock: RecursiveLock {
-        return _parent._lock
+        return self._parent._lock
     }
     
     fileprivate let _subscription = SingleAssignmentDisposable()
     
     init(parent: Parent) {
-        _parent = parent
+        self._parent = parent
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next:
-            _parent.forwardOn(.completed)
-            _parent.dispose()
+            self._parent.forwardOn(.completed)
+            self._parent.dispose()
         case .error(let e):
-            _parent.forwardOn(.error(e))
-            _parent.dispose()
+            self._parent.forwardOn(.error(e))
+            self._parent.dispose()
         case .completed:
-            _subscription.dispose()
+            self._subscription.dispose()
         }
     }
     
 #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
     }
 #endif
 }
 
-final fileprivate class TakeUntilSink
-    : Sink
+final private class TakeUntilSink
+    : Sink
     , LockOwnerType
     , ObserverType
     , SynchronizedOnType {
-    typealias E = O.E
-    typealias Parent = TakeUntil
+    typealias Element = Observer.Element 
+    typealias Parent = TakeUntil
     
     fileprivate let _parent: Parent
  
     let _lock = RecursiveLock()
     
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case .next:
-            forwardOn(event)
+            self.forwardOn(event)
         case .error:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
     
     func run() -> Disposable {
         let otherObserver = TakeUntilSinkOther(parent: self)
-        let otherSubscription = _parent._other.subscribe(otherObserver)
+        let otherSubscription = self._parent._other.subscribe(otherObserver)
         otherObserver._subscription.setDisposable(otherSubscription)
-        let sourceSubscription = _parent._source.subscribe(self)
+        let sourceSubscription = self._parent._source.subscribe(self)
         
         return Disposables.create(sourceSubscription, otherObserver._subscription)
     }
 }
 
-final fileprivate class TakeUntil: Producer {
+final private class TakeUntil: Producer {
     
     fileprivate let _source: Observable
     fileprivate let _other: Observable
     
     init(source: Observable, other: Observable) {
-        _source = source
-        _other = other
+        self._source = source
+        self._other = other
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = TakeUntilSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
+
+// MARK: - TakeUntil Predicate
+final private class TakeUntilPredicateSink
+    : Sink, ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = TakeUntilPredicate
+
+    fileprivate let _parent: Parent
+    fileprivate var _running = true
+
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        super.init(observer: observer, cancel: cancel)
+    }
+
+    func on(_ event: Event) {
+        switch event {
+        case .next(let value):
+            if !self._running {
+                return
+            }
+
+            do {
+                self._running = try !self._parent._predicate(value)
+            } catch let e {
+                self.forwardOn(.error(e))
+                self.dispose()
+                return
+            }
+
+            if self._running {
+                self.forwardOn(.next(value))
+            } else {
+                if self._parent._behavior == .inclusive {
+                    self.forwardOn(.next(value))
+                }
+
+                self.forwardOn(.completed)
+                self.dispose()
+            }
+        case .error, .completed:
+            self.forwardOn(event)
+            self.dispose()
+        }
+    }
+
+}
+
+final private class TakeUntilPredicate: Producer {
+    typealias Predicate = (Element) throws -> Bool
+
+    fileprivate let _source: Observable
+    fileprivate let _predicate: Predicate
+    fileprivate let _behavior: TakeUntilBehavior
+
+    init(source: Observable,
+         behavior: TakeUntilBehavior,
+         predicate: @escaping Predicate) {
+        self._source = source
+        self._behavior = behavior
+        self._predicate = predicate
+    }
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        let sink = TakeUntilPredicateSink(parent: self, observer: observer, cancel: cancel)
+        let subscription = self._source.subscribe(sink)
+        return (sink: sink, subscription: subscription)
+    }
+}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift b/Demo/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift
index 2b7b551..efd5311 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift
@@ -16,70 +16,70 @@ extension ObservableType {
      - parameter predicate: A function to test each element for a condition.
      - returns: An observable sequence that contains the elements from the input sequence that occur before the element at which the test no longer passes.
      */
-    public func takeWhile(_ predicate: @escaping (E) throws -> Bool)
-        -> Observable {
-        return TakeWhile(source: asObservable(), predicate: predicate)
+    public func takeWhile(_ predicate: @escaping (Element) throws -> Bool)
+        -> Observable {
+        return TakeWhile(source: self.asObservable(), predicate: predicate)
     }
 }
 
-final fileprivate class TakeWhileSink
-    : Sink
+final private class TakeWhileSink
+    : Sink
     , ObserverType {
-    typealias Element = O.E
+    typealias Element = Observer.Element 
     typealias Parent = TakeWhile
 
     fileprivate let _parent: Parent
 
     fileprivate var _running = true
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event) {
         switch event {
         case .next(let value):
-            if !_running {
+            if !self._running {
                 return
             }
             
             do {
-                _running = try _parent._predicate(value)
+                self._running = try self._parent._predicate(value)
             } catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
                 return
             }
             
-            if _running {
-                forwardOn(.next(value))
+            if self._running {
+                self.forwardOn(.next(value))
             } else {
-                forwardOn(.completed)
-                dispose()
+                self.forwardOn(.completed)
+                self.dispose()
             }
         case .error, .completed:
-            forwardOn(event)
-            dispose()
+            self.forwardOn(event)
+            self.dispose()
         }
     }
     
 }
 
-final fileprivate class TakeWhile: Producer {
+final private class TakeWhile: Producer {
     typealias Predicate = (Element) throws -> Bool
 
     fileprivate let _source: Observable
     fileprivate let _predicate: Predicate
 
     init(source: Observable, predicate: @escaping Predicate) {
-        _source = source
-        _predicate = predicate
+        self._source = source
+        self._predicate = predicate
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = TakeWhileSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Throttle.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Throttle.swift
index 0c4ca74..f682433 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Throttle.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Throttle.swift
@@ -23,17 +23,17 @@ extension ObservableType {
      - returns: The throttled sequence.
      */
     public func throttle(_ dueTime: RxTimeInterval, latest: Bool = true, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
         return Throttle(source: self.asObservable(), dueTime: dueTime, latest: latest, scheduler: scheduler)
     }
 }
 
-final fileprivate class ThrottleSink
-    : Sink
+final private class ThrottleSink
+    : Sink
     , ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias Element = O.E
+    typealias Element = Observer.Element 
     typealias ParentType = Throttle
     
     private let _parent: ParentType
@@ -41,120 +41,116 @@ final fileprivate class ThrottleSink
     let _lock = RecursiveLock()
     
     // state
-    private var _lastUnsentElement: Element? = nil
-    private var _lastSentTime: Date? = nil
+    private var _lastUnsentElement: Element?
+    private var _lastSentTime: Date?
     private var _completed: Bool = false
 
     let cancellable = SerialDisposable()
     
-    init(parent: ParentType, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: ParentType, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
-        let subscription = _parent._source.subscribe(self)
+        let subscription = self._parent._source.subscribe(self)
         
         return Disposables.create(subscription, cancellable)
     }
 
     func on(_ event: Event) {
-        synchronizedOn(event)
+        self.synchronizedOn(event)
     }
 
     func _synchronized_on(_ event: Event) {
         switch event {
         case .next(let element):
-            let now = _parent._scheduler.now
+            let now = self._parent._scheduler.now
 
-            let timeIntervalSinceLast: RxTimeInterval
+            let reducedScheduledTime: RxTimeInterval
 
-            if let lastSendingTime = _lastSentTime {
-                timeIntervalSinceLast = now.timeIntervalSince(lastSendingTime)
+            if let lastSendingTime = self._lastSentTime {
+                reducedScheduledTime = self._parent._dueTime.reduceWithSpanBetween(earlierDate: lastSendingTime, laterDate: now)
             }
             else {
-                timeIntervalSinceLast = _parent._dueTime
+                reducedScheduledTime = .nanoseconds(0)
             }
 
-            let couldSendNow = timeIntervalSinceLast >= _parent._dueTime
-
-            if couldSendNow {
+            if reducedScheduledTime.isNow {
                 self.sendNow(element: element)
                 return
             }
 
-            if !_parent._latest {
+            if !self._parent._latest {
                 return
             }
 
-            let isThereAlreadyInFlightRequest = _lastUnsentElement != nil
+            let isThereAlreadyInFlightRequest = self._lastUnsentElement != nil
             
-            _lastUnsentElement = element
+            self._lastUnsentElement = element
 
             if isThereAlreadyInFlightRequest {
                 return
             }
 
-            let scheduler = _parent._scheduler
-            let dueTime = _parent._dueTime
+            let scheduler = self._parent._scheduler
 
             let d = SingleAssignmentDisposable()
             self.cancellable.disposable = d
 
-            d.setDisposable(scheduler.scheduleRelative(0, dueTime: dueTime - timeIntervalSinceLast, action: self.propagate))
+            d.setDisposable(scheduler.scheduleRelative(0, dueTime: reducedScheduledTime, action: self.propagate))
         case .error:
-            _lastUnsentElement = nil
-            forwardOn(event)
-            dispose()
+            self._lastUnsentElement = nil
+            self.forwardOn(event)
+            self.dispose()
         case .completed:
-            if let _ = _lastUnsentElement {
-                _completed = true
+            if self._lastUnsentElement != nil {
+                self._completed = true
             }
             else {
-                forwardOn(.completed)
-                dispose()
+                self.forwardOn(.completed)
+                self.dispose()
             }
         }
     }
 
     private func sendNow(element: Element) {
-        _lastUnsentElement = nil
+        self._lastUnsentElement = nil
         self.forwardOn(.next(element))
         // in case element processing takes a while, this should give some more room
-        _lastSentTime = _parent._scheduler.now
+        self._lastSentTime = self._parent._scheduler.now
     }
     
     func propagate(_: Int) -> Disposable {
-        _lock.lock(); defer { _lock.unlock() } // {
-            if let lastUnsentElement = _lastUnsentElement {
-                sendNow(element: lastUnsentElement)
+        self._lock.lock(); defer { self._lock.unlock() } // {
+            if let lastUnsentElement = self._lastUnsentElement {
+                self.sendNow(element: lastUnsentElement)
             }
 
-            if _completed {
-                forwardOn(.completed)
-                dispose()
+            if self._completed {
+                self.forwardOn(.completed)
+                self.dispose()
             }
         // }
         return Disposables.create()
     }
 }
 
-final fileprivate class Throttle : Producer {
-    
+final private class Throttle: Producer {
     fileprivate let _source: Observable
     fileprivate let _dueTime: RxTimeInterval
     fileprivate let _latest: Bool
     fileprivate let _scheduler: SchedulerType
 
     init(source: Observable, dueTime: RxTimeInterval, latest: Bool, scheduler: SchedulerType) {
-        _source = source
-        _dueTime = dueTime
-        _latest = latest
-        _scheduler = scheduler
+        self._source = source
+        self._dueTime = dueTime
+        self._latest = latest
+        self._scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = ThrottleSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Timeout.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Timeout.swift
index 7008de8..3177c42 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Timeout.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Timeout.swift
@@ -18,7 +18,7 @@ extension ObservableType {
      - returns: An observable sequence with a `RxError.timeout` in case of a timeout.
      */
     public func timeout(_ dueTime: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
             return Timeout(source: self.asObservable(), dueTime: dueTime, other: Observable.error(RxError.timeout), scheduler: scheduler)
     }
 
@@ -32,15 +32,15 @@ extension ObservableType {
      - parameter scheduler: Scheduler to run the timeout timer on.
      - returns: The source sequence switching to the other sequence in case of a timeout.
      */
-    public func timeout(_ dueTime: RxTimeInterval, other: O, scheduler: SchedulerType)
-        -> Observable where E == O.E {
+    public func timeout(_ dueTime: RxTimeInterval, other: Source, scheduler: SchedulerType)
+        -> Observable where Element == Source.Element {
             return Timeout(source: self.asObservable(), dueTime: dueTime, other: other.asObservable(), scheduler: scheduler)
     }
 }
 
-final fileprivate class TimeoutSink: Sink, LockOwnerType, ObserverType {
-    typealias E = O.E
-    typealias Parent = Timeout
+final private class TimeoutSink: Sink, LockOwnerType, ObserverType {
+    typealias Element = Observer.Element 
+    typealias Parent = Timeout
     
     private let _parent: Parent
     
@@ -52,28 +52,28 @@ final fileprivate class TimeoutSink: Sink, LockOwnerType, Ob
     private var _id = 0
     private var _switched = false
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
         let original = SingleAssignmentDisposable()
-        _subscription.disposable = original
+        self._subscription.disposable = original
         
-        _createTimeoutTimer()
+        self._createTimeoutTimer()
         
-        original.setDisposable(_parent._source.subscribe(self))
+        original.setDisposable(self._parent._source.subscribe(self))
         
         return Disposables.create(_subscription, _timerD)
     }
 
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
             var onNextWins = false
             
-            _lock.performLocked() {
+            self._lock.performLocked {
                 onNextWins = !self._switched
                 if onNextWins {
                     self._id = self._id &+ 1
@@ -81,13 +81,13 @@ final fileprivate class TimeoutSink: Sink, LockOwnerType, Ob
             }
             
             if onNextWins {
-                forwardOn(event)
+                self.forwardOn(event)
                 self._createTimeoutTimer()
             }
         case .error, .completed:
             var onEventWins = false
             
-            _lock.performLocked() {
+            self._lock.performLocked {
                 onEventWins = !self._switched
                 if onEventWins {
                     self._id = self._id &+ 1
@@ -95,25 +95,25 @@ final fileprivate class TimeoutSink: Sink, LockOwnerType, Ob
             }
             
             if onEventWins {
-                forwardOn(event)
+                self.forwardOn(event)
                 self.dispose()
             }
         }
     }
     
     private func _createTimeoutTimer() {
-        if _timerD.isDisposed {
+        if self._timerD.isDisposed {
             return
         }
         
         let nextTimer = SingleAssignmentDisposable()
-        _timerD.disposable = nextTimer
+        self._timerD.disposable = nextTimer
         
-        let disposeSchedule = _parent._scheduler.scheduleRelative(_id, dueTime: _parent._dueTime) { state in
+        let disposeSchedule = self._parent._scheduler.scheduleRelative(self._id, dueTime: self._parent._dueTime) { state in
             
             var timerWins = false
             
-            self._lock.performLocked() {
+            self._lock.performLocked {
                 self._switched = (state == self._id)
                 timerWins = self._switched
             }
@@ -130,21 +130,20 @@ final fileprivate class TimeoutSink: Sink, LockOwnerType, Ob
 }
 
 
-final fileprivate class Timeout : Producer {
-    
+final private class Timeout: Producer {
     fileprivate let _source: Observable
     fileprivate let _dueTime: RxTimeInterval
     fileprivate let _other: Observable
     fileprivate let _scheduler: SchedulerType
     
     init(source: Observable, dueTime: RxTimeInterval, other: Observable, scheduler: SchedulerType) {
-        _source = source
-        _dueTime = dueTime
-        _other = other
-        _scheduler = scheduler
+        self._source = source
+        self._dueTime = dueTime
+        self._other = other
+        self._scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = TimeoutSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Timer.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Timer.swift
index dec69e1..7b29bca 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Timer.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Timer.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-extension ObservableType where E : RxAbstractInteger {
+extension ObservableType where Element : RxAbstractInteger {
     /**
      Returns an observable sequence that produces a value after each period, using the specified scheduler to run timers and to send out observer messages.
 
@@ -17,15 +17,16 @@ extension ObservableType where E : RxAbstractInteger {
      - returns: An observable sequence that produces a value after each period.
      */
     public static func interval(_ period: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
-        return Timer(dueTime: period,
-                     period: period,
-                     scheduler: scheduler
+        -> Observable {
+        return Timer(
+            dueTime: period,
+            period: period,
+            scheduler: scheduler
         )
     }
 }
 
-extension ObservableType where E: RxAbstractInteger {
+extension ObservableType where Element: RxAbstractInteger {
     /**
      Returns an observable sequence that periodically produces a value after the specified initial relative due time has elapsed, using the specified scheduler to run timers.
 
@@ -37,7 +38,7 @@ extension ObservableType where E: RxAbstractInteger {
      - returns: An observable sequence that produces a value after due time has elapsed and then each period.
      */
     public static func timer(_ dueTime: RxTimeInterval, period: RxTimeInterval? = nil, scheduler: SchedulerType)
-        -> Observable {
+        -> Observable {
         return Timer(
             dueTime: dueTime,
             period: period,
@@ -46,36 +47,40 @@ extension ObservableType where E: RxAbstractInteger {
     }
 }
 
-final fileprivate class TimerSink : Sink where O.E : RxAbstractInteger  {
-    typealias Parent = Timer
-    
+import Foundation
+
+final private class TimerSink : Sink where Observer.Element : RxAbstractInteger  {
+    typealias Parent = Timer
+
     private let _parent: Parent
-    
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    private let _lock = RecursiveLock()
+
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
-        return _parent._scheduler.schedulePeriodic(0 as O.E, startAfter: _parent._dueTime, period: _parent._period!) { state in
+        return self._parent._scheduler.schedulePeriodic(0 as Observer.Element, startAfter: self._parent._dueTime, period: self._parent._period!) { state in
+            self._lock.lock(); defer { self._lock.unlock() }
             self.forwardOn(.next(state))
             return state &+ 1
         }
     }
 }
 
-final fileprivate class TimerOneOffSink : Sink where O.E : RxAbstractInteger {
-    typealias Parent = Timer
-    
+final private class TimerOneOffSink: Sink where Observer.Element: RxAbstractInteger {
+    typealias Parent = Timer
+
     private let _parent: Parent
-    
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
-        return _parent._scheduler.scheduleRelative(self, dueTime: _parent._dueTime) { (`self`) -> Disposable in
+        return self._parent._scheduler.scheduleRelative(self, dueTime: self._parent._dueTime) { [unowned self] _ -> Disposable in
             self.forwardOn(.next(0))
             self.forwardOn(.completed)
             self.dispose()
@@ -85,19 +90,19 @@ final fileprivate class TimerOneOffSink : Sink where O.E : R
     }
 }
 
-final fileprivate class Timer: Producer {
+final private class Timer: Producer {
     fileprivate let _scheduler: SchedulerType
     fileprivate let _dueTime: RxTimeInterval
     fileprivate let _period: RxTimeInterval?
-    
+
     init(dueTime: RxTimeInterval, period: RxTimeInterval?, scheduler: SchedulerType) {
-        _scheduler = scheduler
-        _dueTime = dueTime
-        _period = period
+        self._scheduler = scheduler
+        self._dueTime = dueTime
+        self._period = period
     }
-    
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
-        if let _ = _period {
+
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
+        if self._period != nil {
             let sink = TimerSink(parent: self, observer: observer, cancel: cancel)
             let subscription = sink.run()
             return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/ToArray.swift b/Demo/Pods/RxSwift/RxSwift/Observables/ToArray.swift
index 93fcb80..2821a60 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/ToArray.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/ToArray.swift
@@ -10,28 +10,28 @@
 extension ObservableType {
 
     /**
-    Converts an Observable into another Observable that emits the whole sequence as a single array and then terminates.
+    Converts an Observable into a Single that emits the whole sequence as a single array and then terminates.
     
     For aggregation behavior see `reduce`.
 
     - seealso: [toArray operator on reactivex.io](http://reactivex.io/documentation/operators/to.html)
     
-    - returns: An observable sequence containing all the emitted elements as array.
+    - returns: A Single sequence containing all the emitted elements as array.
     */
     public func toArray()
-        -> Observable<[E]> {
-        return ToArray(source: self.asObservable())
+        -> Single<[Element]> {
+        return PrimitiveSequence(raw: ToArray(source: self.asObservable()))
     }
 }
 
-final fileprivate class ToArraySink : Sink, ObserverType where O.E == [SourceType] {
+final private class ToArraySink: Sink, ObserverType where Observer.Element == [SourceType] {
     typealias Parent = ToArray
     
     let _parent: Parent
-    var _list = Array()
+    var _list = [SourceType]()
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         
         super.init(observer: observer, cancel: cancel)
     }
@@ -41,26 +41,26 @@ final fileprivate class ToArraySink : Sink, Obse
         case .next(let value):
             self._list.append(value)
         case .error(let e):
-            forwardOn(.error(e))
+            self.forwardOn(.error(e))
             self.dispose()
         case .completed:
-            forwardOn(.next(_list))
-            forwardOn(.completed)
+            self.forwardOn(.next(self._list))
+            self.forwardOn(.completed)
             self.dispose()
         }
     }
 }
 
-final fileprivate class ToArray : Producer<[SourceType]> {
+final private class ToArray: Producer<[SourceType]> {
     let _source: Observable
 
     init(source: Observable) {
-        _source = source
+        self._source = source
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == [SourceType] {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == [SourceType] {
         let sink = ToArraySink(parent: self, observer: observer, cancel: cancel)
-        let subscription = _source.subscribe(sink)
+        let subscription = self._source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Using.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Using.swift
index 8ea8326..14c5698 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Using.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Using.swift
@@ -16,19 +16,19 @@ extension ObservableType {
      - parameter observableFactory: Factory function to obtain an observable sequence that depends on the obtained resource.
      - returns: An observable sequence whose lifetime controls the lifetime of the dependent resource object.
      */
-    public static func using(_ resourceFactory: @escaping () throws -> Resource, observableFactory: @escaping (Resource) throws -> Observable) -> Observable {
+    public static func using(_ resourceFactory: @escaping () throws -> Resource, observableFactory: @escaping (Resource) throws -> Observable) -> Observable {
         return Using(resourceFactory: resourceFactory, observableFactory: observableFactory)
     }
 }
 
-final fileprivate class UsingSink : Sink, ObserverType {
-    typealias SourceType = O.E
+final private class UsingSink: Sink, ObserverType {
+    typealias SourceType = Observer.Element 
     typealias Parent = Using
 
     private let _parent: Parent
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(observer: observer, cancel: cancel)
     }
     
@@ -36,9 +36,9 @@ final fileprivate class UsingSink : S
         var disposable = Disposables.create()
         
         do {
-            let resource = try _parent._resourceFactory()
+            let resource = try self._parent._resourceFactory()
             disposable = resource
-            let source = try _parent._observableFactory(resource)
+            let source = try self._parent._observableFactory(resource)
             
             return Disposables.create(
                 source.subscribe(self),
@@ -55,20 +55,20 @@ final fileprivate class UsingSink : S
     func on(_ event: Event) {
         switch event {
         case let .next(value):
-            forwardOn(.next(value))
+            self.forwardOn(.next(value))
         case let .error(error):
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
 
-final fileprivate class Using: Producer {
+final private class Using: Producer {
     
-    typealias E = SourceType
+    typealias Element = SourceType
     
     typealias ResourceFactory = () throws -> ResourceType
     typealias ObservableFactory = (ResourceType) throws -> Observable
@@ -78,11 +78,11 @@ final fileprivate class Using: Producer(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
         let sink = UsingSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Window.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Window.swift
index c862dfb..b93cfa6 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Window.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Window.swift
@@ -19,18 +19,17 @@ extension ObservableType {
      - returns: An observable sequence of windows (instances of `Observable`).
      */
     public func window(timeSpan: RxTimeInterval, count: Int, scheduler: SchedulerType)
-        -> Observable> {
+        -> Observable> {
             return WindowTimeCount(source: self.asObservable(), timeSpan: timeSpan, count: count, scheduler: scheduler)
     }
 }
 
-final fileprivate class WindowTimeCountSink
-    : Sink
+final private class WindowTimeCountSink
+    : Sink
     , ObserverType
     , LockOwnerType
-    , SynchronizedOnType where O.E == Observable {
+    , SynchronizedOnType where Observer.Element == Observable {
     typealias Parent = WindowTimeCount
-    typealias E = Element
     
     private let _parent: Parent
     
@@ -44,87 +43,87 @@ final fileprivate class WindowTimeCountSink
     private let _refCountDisposable: RefCountDisposable
     private let _groupDisposable = CompositeDisposable()
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         
-        let _ = _groupDisposable.insert(_timerD)
+        _ = self._groupDisposable.insert(self._timerD)
         
-        _refCountDisposable = RefCountDisposable(disposable: _groupDisposable)
+        self._refCountDisposable = RefCountDisposable(disposable: self._groupDisposable)
         super.init(observer: observer, cancel: cancel)
     }
     
     func run() -> Disposable {
         
-        forwardOn(.next(AddRef(source: _subject, refCount: _refCountDisposable).asObservable()))
-        createTimer(_windowId)
+        self.forwardOn(.next(AddRef(source: self._subject, refCount: self._refCountDisposable).asObservable()))
+        self.createTimer(self._windowId)
         
-        let _ = _groupDisposable.insert(_parent._source.subscribe(self))
-        return _refCountDisposable
+        _ = self._groupDisposable.insert(self._parent._source.subscribe(self))
+        return self._refCountDisposable
     }
     
     func startNewWindowAndCompleteCurrentOne() {
-        _subject.on(.completed)
-        _subject = PublishSubject()
+        self._subject.on(.completed)
+        self._subject = PublishSubject()
         
-        forwardOn(.next(AddRef(source: _subject, refCount: _refCountDisposable).asObservable()))
+        self.forwardOn(.next(AddRef(source: self._subject, refCount: self._refCountDisposable).asObservable()))
     }
 
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         var newWindow = false
         var newId = 0
         
         switch event {
         case .next(let element):
-            _subject.on(.next(element))
+            self._subject.on(.next(element))
             
             do {
-                let _ = try incrementChecked(&_count)
-            } catch (let e) {
-                _subject.on(.error(e as Swift.Error))
-                dispose()
+                _ = try incrementChecked(&self._count)
+            } catch let e {
+                self._subject.on(.error(e as Swift.Error))
+                self.dispose()
             }
             
-            if (_count == _parent._count) {
+            if self._count == self._parent._count {
                 newWindow = true
-                _count = 0
-                _windowId += 1
-                newId = _windowId
+                self._count = 0
+                self._windowId += 1
+                newId = self._windowId
                 self.startNewWindowAndCompleteCurrentOne()
             }
             
         case .error(let error):
-            _subject.on(.error(error))
-            forwardOn(.error(error))
-            dispose()
+            self._subject.on(.error(error))
+            self.forwardOn(.error(error))
+            self.dispose()
         case .completed:
-            _subject.on(.completed)
-            forwardOn(.completed)
-            dispose()
+            self._subject.on(.completed)
+            self.forwardOn(.completed)
+            self.dispose()
         }
 
         if newWindow {
-            createTimer(newId)
+            self.createTimer(newId)
         }
     }
     
     func createTimer(_ windowId: Int) {
-        if _timerD.isDisposed {
+        if self._timerD.isDisposed {
             return
         }
         
-        if _windowId != windowId {
+        if self._windowId != windowId {
             return
         }
 
         let nextTimer = SingleAssignmentDisposable()
 
-        _timerD.disposable = nextTimer
+        self._timerD.disposable = nextTimer
 
-        let scheduledRelative = _parent._scheduler.scheduleRelative(windowId, dueTime: _parent._timeSpan) { previousWindowId in
+        let scheduledRelative = self._parent._scheduler.scheduleRelative(windowId, dueTime: self._parent._timeSpan) { previousWindowId in
             
             var newId = 0
             
@@ -148,21 +147,20 @@ final fileprivate class WindowTimeCountSink
     }
 }
 
-final fileprivate class WindowTimeCount : Producer> {
-    
+final private class WindowTimeCount: Producer> {
     fileprivate let _timeSpan: RxTimeInterval
     fileprivate let _count: Int
     fileprivate let _scheduler: SchedulerType
     fileprivate let _source: Observable
     
     init(source: Observable, timeSpan: RxTimeInterval, count: Int, scheduler: SchedulerType) {
-        _source = source
-        _timeSpan = timeSpan
-        _count = count
-        _scheduler = scheduler
+        self._source = source
+        self._timeSpan = timeSpan
+        self._count = count
+        self._scheduler = scheduler
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Observable {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Observable {
         let sink = WindowTimeCountSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift b/Demo/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift
index bd22e2f..b471f29 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift
@@ -17,8 +17,8 @@ extension ObservableType {
      - parameter resultSelector: Function to invoke for each element from the self combined with the latest element from the second source, if any.
      - returns: An observable sequence containing the result of combining each element of the self  with the latest element from the second source, if any, using the specified result selector function.
      */
-    public func withLatestFrom(_ second: SecondO, resultSelector: @escaping (E, SecondO.E) throws -> ResultType) -> Observable {
-        return WithLatestFrom(first: asObservable(), second: second.asObservable(), resultSelector: resultSelector)
+    public func withLatestFrom(_ second: Source, resultSelector: @escaping (Element, Source.Element) throws -> ResultType) -> Observable {
+        return WithLatestFrom(first: self.asObservable(), second: second.asObservable(), resultSelector: resultSelector)
     }
 
     /**
@@ -29,27 +29,27 @@ extension ObservableType {
      - parameter second: Second observable source.
      - returns: An observable sequence containing the result of combining each element of the self  with the latest element from the second source, if any, using the specified result selector function.
      */
-    public func withLatestFrom(_ second: SecondO) -> Observable {
-        return WithLatestFrom(first: asObservable(), second: second.asObservable(), resultSelector: { $1 })
+    public func withLatestFrom(_ second: Source) -> Observable {
+        return WithLatestFrom(first: self.asObservable(), second: second.asObservable(), resultSelector: { $1 })
     }
 }
 
-final fileprivate class WithLatestFromSink
-    : Sink
+final private class WithLatestFromSink
+    : Sink
     , ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias ResultType = O.E
+    typealias ResultType = Observer.Element
     typealias Parent = WithLatestFrom
-    typealias E = FirstType
+    typealias Element = FirstType
     
     fileprivate let _parent: Parent
     
     var _lock = RecursiveLock()
     fileprivate var _latest: SecondType?
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         
         super.init(observer: observer, cancel: cancel)
     }
@@ -58,77 +58,77 @@ final fileprivate class WithLatestFromSink) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case let .next(value):
-            guard let latest = _latest else { return }
+            guard let latest = self._latest else { return }
             do {
-                let res = try _parent._resultSelector(value, latest)
+                let res = try self._parent._resultSelector(value, latest)
                 
-                forwardOn(.next(res))
+                self.forwardOn(.next(res))
             } catch let e {
-                forwardOn(.error(e))
-                dispose()
+                self.forwardOn(.error(e))
+                self.dispose()
             }
         case .completed:
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         case let .error(error):
-            forwardOn(.error(error))
-            dispose()
+            self.forwardOn(.error(error))
+            self.dispose()
         }
     }
 }
 
-final fileprivate class WithLatestFromSecond
+final private class WithLatestFromSecond
     : ObserverType
     , LockOwnerType
     , SynchronizedOnType {
     
-    typealias ResultType = O.E
-    typealias Parent = WithLatestFromSink
-    typealias E = SecondType
+    typealias ResultType = Observer.Element
+    typealias Parent = WithLatestFromSink
+    typealias Element = SecondType
     
     private let _parent: Parent
     private let _disposable: Disposable
 
     var _lock: RecursiveLock {
-        return _parent._lock
+        return self._parent._lock
     }
 
     init(parent: Parent, disposable: Disposable) {
-        _parent = parent
-        _disposable = disposable
+        self._parent = parent
+        self._disposable = disposable
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
+    func _synchronized_on(_ event: Event) {
         switch event {
         case let .next(value):
-            _parent._latest = value
+            self._parent._latest = value
         case .completed:
-            _disposable.dispose()
+            self._disposable.dispose()
         case let .error(error):
-            _parent.forwardOn(.error(error))
-            _parent.dispose()
+            self._parent.forwardOn(.error(error))
+            self._parent.dispose()
         }
     }
 }
 
-final fileprivate class WithLatestFrom: Producer {
+final private class WithLatestFrom: Producer {
     typealias ResultSelector = (FirstType, SecondType) throws -> ResultType
     
     fileprivate let _first: Observable
@@ -136,12 +136,12 @@ final fileprivate class WithLatestFrom: Produ
     fileprivate let _resultSelector: ResultSelector
 
     init(first: Observable, second: Observable, resultSelector: @escaping ResultSelector) {
-        _first = first
-        _second = second
-        _resultSelector = resultSelector
+        self._first = first
+        self._second = second
+        self._resultSelector = resultSelector
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == ResultType {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == ResultType {
         let sink = WithLatestFromSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift
index 11f25fc..cc232ab 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift
@@ -15,8 +15,8 @@ extension ObservableType {
      - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
      - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
      */
-    public static func zip(_ collection: C, _ resultSelector: @escaping ([C.Iterator.Element.E]) throws -> E) -> Observable
-        where C.Iterator.Element: ObservableType {
+    public static func zip(_ collection: Collection, resultSelector: @escaping ([Collection.Element.Element]) throws -> Element) -> Observable
+        where Collection.Element: ObservableType {
         return ZipCollectionType(sources: collection, resultSelector: resultSelector)
     }
 
@@ -27,18 +27,18 @@ extension ObservableType {
 
      - returns: An observable sequence containing the result of combining elements of the sources.
      */
-    public static func zip(_ collection: C) -> Observable<[E]>
-        where C.Iterator.Element: ObservableType, C.Iterator.Element.E == E {
+    public static func zip(_ collection: Collection) -> Observable<[Element]>
+        where Collection.Element: ObservableType, Collection.Element.Element == Element {
         return ZipCollectionType(sources: collection, resultSelector: { $0 })
     }
     
 }
 
-final fileprivate class ZipCollectionTypeSink
-    : Sink where C.Iterator.Element : ObservableConvertibleType {
-    typealias R = O.E
-    typealias Parent = ZipCollectionType
-    typealias SourceElement = C.Iterator.Element.E
+final private class ZipCollectionTypeSink
+    : Sink where Collection.Element: ObservableConvertibleType {
+    typealias Result = Observer.Element 
+    typealias Parent = ZipCollectionType
+    typealias SourceElement = Collection.Element.Element
     
     private let _parent: Parent
     
@@ -51,32 +51,32 @@ final fileprivate class ZipCollectionTypeSink
     private var _numberOfDone = 0
     private var _subscriptions: [SingleAssignmentDisposable]
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
-        _values = [Queue](repeating: Queue(capacity: 4), count: parent.count)
-        _isDone = [Bool](repeating: false, count: parent.count)
-        _subscriptions = Array()
-        _subscriptions.reserveCapacity(parent.count)
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
+        self._values = [Queue](repeating: Queue(capacity: 4), count: parent.count)
+        self._isDone = [Bool](repeating: false, count: parent.count)
+        self._subscriptions = [SingleAssignmentDisposable]()
+        self._subscriptions.reserveCapacity(parent.count)
         
         for _ in 0 ..< parent.count {
-            _subscriptions.append(SingleAssignmentDisposable())
+            self._subscriptions.append(SingleAssignmentDisposable())
         }
         
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event, atIndex: Int) {
-        _lock.lock(); defer { _lock.unlock() } // {
+        self._lock.lock(); defer { self._lock.unlock() } // {
             switch event {
             case .next(let element):
-                _values[atIndex].enqueue(element)
+                self._values[atIndex].enqueue(element)
                 
-                if _values[atIndex].count == 1 {
-                    _numberOfValues += 1
+                if self._values[atIndex].count == 1 {
+                    self._numberOfValues += 1
                 }
                 
-                if _numberOfValues < _parent.count {
-                    if _numberOfDone == _parent.count - 1 {
+                if self._numberOfValues < self._parent.count {
+                    if self._numberOfDone == self._parent.count - 1 {
                         self.forwardOn(.completed)
                         self.dispose()
                     }
@@ -85,19 +85,19 @@ final fileprivate class ZipCollectionTypeSink
                 
                 do {
                     var arguments = [SourceElement]()
-                    arguments.reserveCapacity(_parent.count)
+                    arguments.reserveCapacity(self._parent.count)
                     
                     // recalculate number of values
-                    _numberOfValues = 0
+                    self._numberOfValues = 0
                     
-                    for i in 0 ..< _values.count {
-                        arguments.append(_values[i].dequeue()!)
-                        if _values[i].count > 0 {
-                            _numberOfValues += 1
+                    for i in 0 ..< self._values.count {
+                        arguments.append(self._values[i].dequeue()!)
+                        if !self._values[i].isEmpty {
+                            self._numberOfValues += 1
                         }
                     }
                     
-                    let result = try _parent.resultSelector(arguments)
+                    let result = try self._parent.resultSelector(arguments)
                     self.forwardOn(.next(result))
                 }
                 catch let error {
@@ -109,19 +109,19 @@ final fileprivate class ZipCollectionTypeSink
                 self.forwardOn(.error(error))
                 self.dispose()
             case .completed:
-                if _isDone[atIndex] {
+                if self._isDone[atIndex] {
                     return
                 }
                 
-                _isDone[atIndex] = true
-                _numberOfDone += 1
+                self._isDone[atIndex] = true
+                self._numberOfDone += 1
                 
-                if _numberOfDone == _parent.count {
+                if self._numberOfDone == self._parent.count {
                     self.forwardOn(.completed)
                     self.dispose()
                 }
                 else {
-                    _subscriptions[atIndex].dispose()
+                    self._subscriptions[atIndex].dispose()
                 }
             }
         // }
@@ -129,18 +129,18 @@ final fileprivate class ZipCollectionTypeSink
     
     func run() -> Disposable {
         var j = 0
-        for i in _parent.sources {
+        for i in self._parent.sources {
             let index = j
             let source = i.asObservable()
 
             let disposable = source.subscribe(AnyObserver { event in
                 self.on(event, atIndex: index)
                 })
-            _subscriptions[j].setDisposable(disposable)
+            self._subscriptions[j].setDisposable(disposable)
             j += 1
         }
 
-        if _parent.sources.isEmpty {
+        if self._parent.sources.isEmpty {
             self.forwardOn(.completed)
         }
         
@@ -148,20 +148,20 @@ final fileprivate class ZipCollectionTypeSink
     }
 }
 
-final fileprivate class ZipCollectionType : Producer where C.Iterator.Element : ObservableConvertibleType {
-    typealias ResultSelector = ([C.Iterator.Element.E]) throws -> R
+final private class ZipCollectionType: Producer where Collection.Element: ObservableConvertibleType {
+    typealias ResultSelector = ([Collection.Element.Element]) throws -> Result
     
-    let sources: C
+    let sources: Collection
     let resultSelector: ResultSelector
     let count: Int
     
-    init(sources: C, resultSelector: @escaping ResultSelector) {
+    init(sources: Collection, resultSelector: @escaping ResultSelector) {
         self.sources = sources
         self.resultSelector = resultSelector
-        self.count = Int(Int64(self.sources.count))
+        self.count = self.sources.count
     }
     
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipCollectionTypeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift
index 04bf68f..d2a28d4 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift
@@ -21,8 +21,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func zip
-        (_ source1: O1, _ source2: O2, resultSelector: @escaping (O1.E, O2.E) throws -> E)
-        -> Observable {
+        (_ source1: O1, _ source2: O2, resultSelector: @escaping (O1.Element, O2.Element) throws -> Element)
+        -> Observable {
         return Zip2(
             source1: source1.asObservable(), source2: source2.asObservable(),
             resultSelector: resultSelector
@@ -30,7 +30,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
 
@@ -40,7 +40,7 @@ extension ObservableType where E == Any {
     */
     public static func zip
         (_ source1: O1, _ source2: O2)
-        -> Observable<(O1.E, O2.E)> {
+        -> Observable<(O1.Element, O2.Element)> {
         return Zip2(
             source1: source1.asObservable(), source2: source2.asObservable(),
             resultSelector: { ($0, $1) }
@@ -48,41 +48,39 @@ extension ObservableType where E == Any {
     }
 }
 
-final class ZipSink2_ : ZipSink {
-    typealias R = O.E
-    typealias Parent = Zip2
+final class ZipSink2_ : ZipSink {
+    typealias Result = Observer.Element 
+    typealias Parent = Zip2
 
     let _parent: Parent
 
     var _values1: Queue = Queue(capacity: 2)
     var _values2: Queue = Queue(capacity: 2)
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 2, observer: observer, cancel: cancel)
     }
 
     override func hasElements(_ index: Int) -> Bool {
-        switch (index) {
-        case 0: return _values1.count > 0
-        case 1: return _values2.count > 0
+        switch index {
+        case 0: return !self._values1.isEmpty
+        case 1: return !self._values2.isEmpty
 
         default:
             rxFatalError("Unhandled case (Function)")
         }
-
-        return false
     }
 
     func run() -> Disposable {
         let subscription1 = SingleAssignmentDisposable()
         let subscription2 = SingleAssignmentDisposable()
 
-        let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
+        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
+        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
 
-        subscription1.setDisposable(_parent.source1.subscribe(observer1))
-        subscription2.setDisposable(_parent.source2.subscribe(observer2))
+        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
+        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
 
         return Disposables.create([
            subscription1,
@@ -90,13 +88,13 @@ final class ZipSink2_ : ZipSink {
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_values1.dequeue()!, _values2.dequeue()!)
+    override func getResult() throws -> Result {
+        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!)
     }
 }
 
-final class Zip2 : Producer {
-    typealias ResultSelector = (E1, E2) throws -> R
+final class Zip2 : Producer {
+    typealias ResultSelector = (E1, E2) throws -> Result
 
     let source1: Observable
     let source2: Observable
@@ -107,10 +105,10 @@ final class Zip2 : Producer {
         self.source1 = source1
         self.source2 = source2
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipSink2_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -131,8 +129,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, resultSelector: @escaping (O1.E, O2.E, O3.E) throws -> E)
-        -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, resultSelector: @escaping (O1.Element, O2.Element, O3.Element) throws -> Element)
+        -> Observable {
         return Zip3(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(),
             resultSelector: resultSelector
@@ -140,7 +138,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
 
@@ -150,7 +148,7 @@ extension ObservableType where E == Any {
     */
     public static func zip
         (_ source1: O1, _ source2: O2, _ source3: O3)
-        -> Observable<(O1.E, O2.E, O3.E)> {
+        -> Observable<(O1.Element, O2.Element, O3.Element)> {
         return Zip3(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(),
             resultSelector: { ($0, $1, $2) }
@@ -158,9 +156,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class ZipSink3_ : ZipSink {
-    typealias R = O.E
-    typealias Parent = Zip3
+final class ZipSink3_ : ZipSink {
+    typealias Result = Observer.Element 
+    typealias Parent = Zip3
 
     let _parent: Parent
 
@@ -168,22 +166,20 @@ final class ZipSink3_ : ZipSink {
     var _values2: Queue = Queue(capacity: 2)
     var _values3: Queue = Queue(capacity: 2)
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 3, observer: observer, cancel: cancel)
     }
 
     override func hasElements(_ index: Int) -> Bool {
-        switch (index) {
-        case 0: return _values1.count > 0
-        case 1: return _values2.count > 0
-        case 2: return _values3.count > 0
+        switch index {
+        case 0: return !self._values1.isEmpty
+        case 1: return !self._values2.isEmpty
+        case 2: return !self._values3.isEmpty
 
         default:
             rxFatalError("Unhandled case (Function)")
         }
-
-        return false
     }
 
     func run() -> Disposable {
@@ -191,13 +187,13 @@ final class ZipSink3_ : ZipSink {
         let subscription2 = SingleAssignmentDisposable()
         let subscription3 = SingleAssignmentDisposable()
 
-        let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
+        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
+        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
+        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
 
-        subscription1.setDisposable(_parent.source1.subscribe(observer1))
-        subscription2.setDisposable(_parent.source2.subscribe(observer2))
-        subscription3.setDisposable(_parent.source3.subscribe(observer3))
+        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
+        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
+        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
 
         return Disposables.create([
            subscription1,
@@ -206,13 +202,13 @@ final class ZipSink3_ : ZipSink {
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_values1.dequeue()!, _values2.dequeue()!, _values3.dequeue()!)
+    override func getResult() throws -> Result {
+        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!)
     }
 }
 
-final class Zip3 : Producer {
-    typealias ResultSelector = (E1, E2, E3) throws -> R
+final class Zip3 : Producer {
+    typealias ResultSelector = (E1, E2, E3) throws -> Result
 
     let source1: Observable
     let source2: Observable
@@ -225,10 +221,10 @@ final class Zip3 : Producer {
         self.source2 = source2
         self.source3 = source3
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipSink3_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -249,8 +245,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E) throws -> E)
-        -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element) throws -> Element)
+        -> Observable {
         return Zip4(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(),
             resultSelector: resultSelector
@@ -258,7 +254,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
 
@@ -268,7 +264,7 @@ extension ObservableType where E == Any {
     */
     public static func zip
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4)
-        -> Observable<(O1.E, O2.E, O3.E, O4.E)> {
+        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element)> {
         return Zip4(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(),
             resultSelector: { ($0, $1, $2, $3) }
@@ -276,9 +272,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class ZipSink4_ : ZipSink {
-    typealias R = O.E
-    typealias Parent = Zip4
+final class ZipSink4_ : ZipSink {
+    typealias Result = Observer.Element 
+    typealias Parent = Zip4
 
     let _parent: Parent
 
@@ -287,23 +283,21 @@ final class ZipSink4_ : ZipSink {
     var _values3: Queue = Queue(capacity: 2)
     var _values4: Queue = Queue(capacity: 2)
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 4, observer: observer, cancel: cancel)
     }
 
     override func hasElements(_ index: Int) -> Bool {
-        switch (index) {
-        case 0: return _values1.count > 0
-        case 1: return _values2.count > 0
-        case 2: return _values3.count > 0
-        case 3: return _values4.count > 0
+        switch index {
+        case 0: return !self._values1.isEmpty
+        case 1: return !self._values2.isEmpty
+        case 2: return !self._values3.isEmpty
+        case 3: return !self._values4.isEmpty
 
         default:
             rxFatalError("Unhandled case (Function)")
         }
-
-        return false
     }
 
     func run() -> Disposable {
@@ -312,15 +306,15 @@ final class ZipSink4_ : ZipSink {
         let subscription3 = SingleAssignmentDisposable()
         let subscription4 = SingleAssignmentDisposable()
 
-        let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
+        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
+        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
+        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
+        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
 
-        subscription1.setDisposable(_parent.source1.subscribe(observer1))
-        subscription2.setDisposable(_parent.source2.subscribe(observer2))
-        subscription3.setDisposable(_parent.source3.subscribe(observer3))
-        subscription4.setDisposable(_parent.source4.subscribe(observer4))
+        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
+        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
+        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
+        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
 
         return Disposables.create([
            subscription1,
@@ -330,13 +324,13 @@ final class ZipSink4_ : ZipSink {
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_values1.dequeue()!, _values2.dequeue()!, _values3.dequeue()!, _values4.dequeue()!)
+    override func getResult() throws -> Result {
+        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!)
     }
 }
 
-final class Zip4 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4) throws -> R
+final class Zip4 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4) throws -> Result
 
     let source1: Observable
     let source2: Observable
@@ -351,10 +345,10 @@ final class Zip4 : Producer {
         self.source3 = source3
         self.source4 = source4
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipSink4_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -375,8 +369,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E) throws -> E)
-        -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element) throws -> Element)
+        -> Observable {
         return Zip5(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(),
             resultSelector: resultSelector
@@ -384,7 +378,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
 
@@ -394,7 +388,7 @@ extension ObservableType where E == Any {
     */
     public static func zip
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5)
-        -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E)> {
+        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element)> {
         return Zip5(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4) }
@@ -402,9 +396,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class ZipSink5_ : ZipSink {
-    typealias R = O.E
-    typealias Parent = Zip5
+final class ZipSink5_ : ZipSink {
+    typealias Result = Observer.Element 
+    typealias Parent = Zip5
 
     let _parent: Parent
 
@@ -414,24 +408,22 @@ final class ZipSink5_ : ZipSink {
     var _values4: Queue = Queue(capacity: 2)
     var _values5: Queue = Queue(capacity: 2)
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 5, observer: observer, cancel: cancel)
     }
 
     override func hasElements(_ index: Int) -> Bool {
-        switch (index) {
-        case 0: return _values1.count > 0
-        case 1: return _values2.count > 0
-        case 2: return _values3.count > 0
-        case 3: return _values4.count > 0
-        case 4: return _values5.count > 0
+        switch index {
+        case 0: return !self._values1.isEmpty
+        case 1: return !self._values2.isEmpty
+        case 2: return !self._values3.isEmpty
+        case 3: return !self._values4.isEmpty
+        case 4: return !self._values5.isEmpty
 
         default:
             rxFatalError("Unhandled case (Function)")
         }
-
-        return false
     }
 
     func run() -> Disposable {
@@ -441,17 +433,17 @@ final class ZipSink5_ : ZipSink {
         let subscription4 = SingleAssignmentDisposable()
         let subscription5 = SingleAssignmentDisposable()
 
-        let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
+        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
+        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
+        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
+        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
+        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
 
-        subscription1.setDisposable(_parent.source1.subscribe(observer1))
-        subscription2.setDisposable(_parent.source2.subscribe(observer2))
-        subscription3.setDisposable(_parent.source3.subscribe(observer3))
-        subscription4.setDisposable(_parent.source4.subscribe(observer4))
-        subscription5.setDisposable(_parent.source5.subscribe(observer5))
+        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
+        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
+        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
+        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
+        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
 
         return Disposables.create([
            subscription1,
@@ -462,13 +454,13 @@ final class ZipSink5_ : ZipSink {
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_values1.dequeue()!, _values2.dequeue()!, _values3.dequeue()!, _values4.dequeue()!, _values5.dequeue()!)
+    override func getResult() throws -> Result {
+        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!)
     }
 }
 
-final class Zip5 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5) throws -> R
+final class Zip5 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5) throws -> Result
 
     let source1: Observable
     let source2: Observable
@@ -485,10 +477,10 @@ final class Zip5 : Producer {
         self.source4 = source4
         self.source5 = source5
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipSink5_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -509,8 +501,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E) throws -> E)
-        -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element) throws -> Element)
+        -> Observable {
         return Zip6(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(),
             resultSelector: resultSelector
@@ -518,7 +510,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
 
@@ -528,7 +520,7 @@ extension ObservableType where E == Any {
     */
     public static func zip
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6)
-        -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E, O6.E)> {
+        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element)> {
         return Zip6(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4, $5) }
@@ -536,9 +528,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class ZipSink6_ : ZipSink {
-    typealias R = O.E
-    typealias Parent = Zip6
+final class ZipSink6_ : ZipSink {
+    typealias Result = Observer.Element 
+    typealias Parent = Zip6
 
     let _parent: Parent
 
@@ -549,25 +541,23 @@ final class ZipSink6_ : ZipSink {
     var _values5: Queue = Queue(capacity: 2)
     var _values6: Queue = Queue(capacity: 2)
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 6, observer: observer, cancel: cancel)
     }
 
     override func hasElements(_ index: Int) -> Bool {
-        switch (index) {
-        case 0: return _values1.count > 0
-        case 1: return _values2.count > 0
-        case 2: return _values3.count > 0
-        case 3: return _values4.count > 0
-        case 4: return _values5.count > 0
-        case 5: return _values6.count > 0
+        switch index {
+        case 0: return !self._values1.isEmpty
+        case 1: return !self._values2.isEmpty
+        case 2: return !self._values3.isEmpty
+        case 3: return !self._values4.isEmpty
+        case 4: return !self._values5.isEmpty
+        case 5: return !self._values6.isEmpty
 
         default:
             rxFatalError("Unhandled case (Function)")
         }
-
-        return false
     }
 
     func run() -> Disposable {
@@ -578,19 +568,19 @@ final class ZipSink6_ : ZipSink {
         let subscription5 = SingleAssignmentDisposable()
         let subscription6 = SingleAssignmentDisposable()
 
-        let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
-        let observer6 = ZipObserver(lock: _lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
+        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
+        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
+        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
+        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
+        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
+        let observer6 = ZipObserver(lock: self._lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
 
-        subscription1.setDisposable(_parent.source1.subscribe(observer1))
-        subscription2.setDisposable(_parent.source2.subscribe(observer2))
-        subscription3.setDisposable(_parent.source3.subscribe(observer3))
-        subscription4.setDisposable(_parent.source4.subscribe(observer4))
-        subscription5.setDisposable(_parent.source5.subscribe(observer5))
-        subscription6.setDisposable(_parent.source6.subscribe(observer6))
+        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
+        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
+        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
+        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
+        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
+        subscription6.setDisposable(self._parent.source6.subscribe(observer6))
 
         return Disposables.create([
            subscription1,
@@ -602,13 +592,13 @@ final class ZipSink6_ : ZipSink {
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_values1.dequeue()!, _values2.dequeue()!, _values3.dequeue()!, _values4.dequeue()!, _values5.dequeue()!, _values6.dequeue()!)
+    override func getResult() throws -> Result {
+        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!, self._values6.dequeue()!)
     }
 }
 
-final class Zip6 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6) throws -> R
+final class Zip6 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5, E6) throws -> Result
 
     let source1: Observable
     let source2: Observable
@@ -627,10 +617,10 @@ final class Zip6 : Producer {
         self.source5 = source5
         self.source6 = source6
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipSink6_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -651,8 +641,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E) throws -> E)
-        -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element) throws -> Element)
+        -> Observable {
         return Zip7(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(),
             resultSelector: resultSelector
@@ -660,7 +650,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
 
@@ -670,7 +660,7 @@ extension ObservableType where E == Any {
     */
     public static func zip
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7)
-        -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E)> {
+        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element)> {
         return Zip7(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4, $5, $6) }
@@ -678,9 +668,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class ZipSink7_ : ZipSink {
-    typealias R = O.E
-    typealias Parent = Zip7
+final class ZipSink7_ : ZipSink {
+    typealias Result = Observer.Element 
+    typealias Parent = Zip7
 
     let _parent: Parent
 
@@ -692,26 +682,24 @@ final class ZipSink7_ : ZipSink
     var _values6: Queue = Queue(capacity: 2)
     var _values7: Queue = Queue(capacity: 2)
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 7, observer: observer, cancel: cancel)
     }
 
     override func hasElements(_ index: Int) -> Bool {
-        switch (index) {
-        case 0: return _values1.count > 0
-        case 1: return _values2.count > 0
-        case 2: return _values3.count > 0
-        case 3: return _values4.count > 0
-        case 4: return _values5.count > 0
-        case 5: return _values6.count > 0
-        case 6: return _values7.count > 0
+        switch index {
+        case 0: return !self._values1.isEmpty
+        case 1: return !self._values2.isEmpty
+        case 2: return !self._values3.isEmpty
+        case 3: return !self._values4.isEmpty
+        case 4: return !self._values5.isEmpty
+        case 5: return !self._values6.isEmpty
+        case 6: return !self._values7.isEmpty
 
         default:
             rxFatalError("Unhandled case (Function)")
         }
-
-        return false
     }
 
     func run() -> Disposable {
@@ -723,21 +711,21 @@ final class ZipSink7_ : ZipSink
         let subscription6 = SingleAssignmentDisposable()
         let subscription7 = SingleAssignmentDisposable()
 
-        let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
-        let observer6 = ZipObserver(lock: _lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
-        let observer7 = ZipObserver(lock: _lock, parent: self, index: 6, setNextValue: { self._values7.enqueue($0) }, this: subscription7)
-
-        subscription1.setDisposable(_parent.source1.subscribe(observer1))
-        subscription2.setDisposable(_parent.source2.subscribe(observer2))
-        subscription3.setDisposable(_parent.source3.subscribe(observer3))
-        subscription4.setDisposable(_parent.source4.subscribe(observer4))
-        subscription5.setDisposable(_parent.source5.subscribe(observer5))
-        subscription6.setDisposable(_parent.source6.subscribe(observer6))
-        subscription7.setDisposable(_parent.source7.subscribe(observer7))
+        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
+        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
+        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
+        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
+        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
+        let observer6 = ZipObserver(lock: self._lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
+        let observer7 = ZipObserver(lock: self._lock, parent: self, index: 6, setNextValue: { self._values7.enqueue($0) }, this: subscription7)
+
+        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
+        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
+        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
+        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
+        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
+        subscription6.setDisposable(self._parent.source6.subscribe(observer6))
+        subscription7.setDisposable(self._parent.source7.subscribe(observer7))
 
         return Disposables.create([
            subscription1,
@@ -750,13 +738,13 @@ final class ZipSink7_ : ZipSink
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_values1.dequeue()!, _values2.dequeue()!, _values3.dequeue()!, _values4.dequeue()!, _values5.dequeue()!, _values6.dequeue()!, _values7.dequeue()!)
+    override func getResult() throws -> Result {
+        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!, self._values6.dequeue()!, self._values7.dequeue()!)
     }
 }
 
-final class Zip7 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7) throws -> R
+final class Zip7 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7) throws -> Result
 
     let source1: Observable
     let source2: Observable
@@ -777,10 +765,10 @@ final class Zip7 : Producer {
         self.source6 = source6
         self.source7 = source7
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipSink7_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
@@ -801,8 +789,8 @@ extension ObservableType {
     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
     */
     public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8, resultSelector: @escaping (O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E, O8.E) throws -> E)
-        -> Observable {
+        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element, O8.Element) throws -> Element)
+        -> Observable {
         return Zip8(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(), source8: source8.asObservable(),
             resultSelector: resultSelector
@@ -810,7 +798,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E == Any {
+extension ObservableType where Element == Any {
     /**
     Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
 
@@ -820,7 +808,7 @@ extension ObservableType where E == Any {
     */
     public static func zip
         (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8)
-        -> Observable<(O1.E, O2.E, O3.E, O4.E, O5.E, O6.E, O7.E, O8.E)> {
+        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element, O8.Element)> {
         return Zip8(
             source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(), source8: source8.asObservable(),
             resultSelector: { ($0, $1, $2, $3, $4, $5, $6, $7) }
@@ -828,9 +816,9 @@ extension ObservableType where E == Any {
     }
 }
 
-final class ZipSink8_ : ZipSink {
-    typealias R = O.E
-    typealias Parent = Zip8
+final class ZipSink8_ : ZipSink {
+    typealias Result = Observer.Element 
+    typealias Parent = Zip8
 
     let _parent: Parent
 
@@ -843,27 +831,25 @@ final class ZipSink8_ : ZipSink
     var _values7: Queue = Queue(capacity: 2)
     var _values8: Queue = Queue(capacity: 2)
 
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(parent: Parent, observer: Observer, cancel: Cancelable) {
+        self._parent = parent
         super.init(arity: 8, observer: observer, cancel: cancel)
     }
 
     override func hasElements(_ index: Int) -> Bool {
-        switch (index) {
-        case 0: return _values1.count > 0
-        case 1: return _values2.count > 0
-        case 2: return _values3.count > 0
-        case 3: return _values4.count > 0
-        case 4: return _values5.count > 0
-        case 5: return _values6.count > 0
-        case 6: return _values7.count > 0
-        case 7: return _values8.count > 0
+        switch index {
+        case 0: return !self._values1.isEmpty
+        case 1: return !self._values2.isEmpty
+        case 2: return !self._values3.isEmpty
+        case 3: return !self._values4.isEmpty
+        case 4: return !self._values5.isEmpty
+        case 5: return !self._values6.isEmpty
+        case 6: return !self._values7.isEmpty
+        case 7: return !self._values8.isEmpty
 
         default:
             rxFatalError("Unhandled case (Function)")
         }
-
-        return false
     }
 
     func run() -> Disposable {
@@ -876,23 +862,23 @@ final class ZipSink8_ : ZipSink
         let subscription7 = SingleAssignmentDisposable()
         let subscription8 = SingleAssignmentDisposable()
 
-        let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
-        let observer6 = ZipObserver(lock: _lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
-        let observer7 = ZipObserver(lock: _lock, parent: self, index: 6, setNextValue: { self._values7.enqueue($0) }, this: subscription7)
-        let observer8 = ZipObserver(lock: _lock, parent: self, index: 7, setNextValue: { self._values8.enqueue($0) }, this: subscription8)
-
-        subscription1.setDisposable(_parent.source1.subscribe(observer1))
-        subscription2.setDisposable(_parent.source2.subscribe(observer2))
-        subscription3.setDisposable(_parent.source3.subscribe(observer3))
-        subscription4.setDisposable(_parent.source4.subscribe(observer4))
-        subscription5.setDisposable(_parent.source5.subscribe(observer5))
-        subscription6.setDisposable(_parent.source6.subscribe(observer6))
-        subscription7.setDisposable(_parent.source7.subscribe(observer7))
-        subscription8.setDisposable(_parent.source8.subscribe(observer8))
+        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
+        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
+        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
+        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
+        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
+        let observer6 = ZipObserver(lock: self._lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
+        let observer7 = ZipObserver(lock: self._lock, parent: self, index: 6, setNextValue: { self._values7.enqueue($0) }, this: subscription7)
+        let observer8 = ZipObserver(lock: self._lock, parent: self, index: 7, setNextValue: { self._values8.enqueue($0) }, this: subscription8)
+
+        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
+        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
+        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
+        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
+        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
+        subscription6.setDisposable(self._parent.source6.subscribe(observer6))
+        subscription7.setDisposable(self._parent.source7.subscribe(observer7))
+        subscription8.setDisposable(self._parent.source8.subscribe(observer8))
 
         return Disposables.create([
            subscription1,
@@ -906,13 +892,13 @@ final class ZipSink8_ : ZipSink
         ])
     }
 
-    override func getResult() throws -> R {
-        return try _parent._resultSelector(_values1.dequeue()!, _values2.dequeue()!, _values3.dequeue()!, _values4.dequeue()!, _values5.dequeue()!, _values6.dequeue()!, _values7.dequeue()!, _values8.dequeue()!)
+    override func getResult() throws -> Result {
+        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!, self._values6.dequeue()!, self._values7.dequeue()!, self._values8.dequeue()!)
     }
 }
 
-final class Zip8 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7, E8) throws -> R
+final class Zip8 : Producer {
+    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7, E8) throws -> Result
 
     let source1: Observable
     let source2: Observable
@@ -935,10 +921,10 @@ final class Zip8 : Producer {
         self.source7 = source7
         self.source8 = source8
 
-        _resultSelector = resultSelector
+        self._resultSelector = resultSelector
     }
 
-    override func run(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
         let sink = ZipSink8_(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Zip.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Zip.swift
index a283bf2..911eb57 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Zip.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observables/Zip.swift
@@ -13,8 +13,8 @@ protocol ZipSinkProtocol : class
     func done(_ index: Int)
 }
 
-class ZipSink : Sink, ZipSinkProtocol {
-    typealias Element = O.E
+class ZipSink : Sink, ZipSinkProtocol {
+    typealias Element = Observer.Element
     
     let _arity: Int
 
@@ -23,9 +23,9 @@ class ZipSink : Sink, ZipSinkProtocol {
     // state
     private var _isDone: [Bool]
     
-    init(arity: Int, observer: O, cancel: Cancelable) {
-        _isDone = [Bool](repeating: false, count: arity)
-        _arity = arity
+    init(arity: Int, observer: Observer, cancel: Cancelable) {
+        self._isDone = [Bool](repeating: false, count: arity)
+        self._arity = arity
         
         super.init(observer: observer, cancel: cancel)
     }
@@ -41,8 +41,8 @@ class ZipSink : Sink, ZipSinkProtocol {
     func next(_ index: Int) {
         var hasValueAll = true
         
-        for i in 0 ..< _arity {
-            if !hasElements(i) {
+        for i in 0 ..< self._arity {
+            if !self.hasElements(i) {
                 hasValueAll = false
                 break
             }
@@ -50,62 +50,43 @@ class ZipSink : Sink, ZipSinkProtocol {
         
         if hasValueAll {
             do {
-                let result = try getResult()
+                let result = try self.getResult()
                 self.forwardOn(.next(result))
             }
             catch let e {
                 self.forwardOn(.error(e))
-                dispose()
-            }
-        }
-        else {
-            var allOthersDone = true
-            
-            let arity = _isDone.count
-            for i in 0 ..< arity {
-                if i != index && !_isDone[i] {
-                    allOthersDone = false
-                    break
-                }
-            }
-            
-            if allOthersDone {
-                forwardOn(.completed)
                 self.dispose()
             }
         }
     }
     
     func fail(_ error: Swift.Error) {
-        forwardOn(.error(error))
-        dispose()
+        self.forwardOn(.error(error))
+        self.dispose()
     }
     
     func done(_ index: Int) {
-        _isDone[index] = true
+        self._isDone[index] = true
         
         var allDone = true
         
-        for done in _isDone {
-            if !done {
-                allDone = false
-                break
-            }
+        for done in self._isDone where !done {
+            allDone = false
+            break
         }
         
         if allDone {
-            forwardOn(.completed)
-            dispose()
+            self.forwardOn(.completed)
+            self.dispose()
         }
     }
 }
 
-final class ZipObserver
+final class ZipObserver
     : ObserverType
     , LockOwnerType
     , SynchronizedOnType {
-    typealias E = ElementType
-    typealias ValueSetter = (ElementType) -> ()
+    typealias ValueSetter = (Element) -> Void
 
     private var _parent: ZipSinkProtocol?
     
@@ -117,38 +98,38 @@ final class ZipObserver
     private let _setNextValue: ValueSetter
     
     init(lock: RecursiveLock, parent: ZipSinkProtocol, index: Int, setNextValue: @escaping ValueSetter, this: Disposable) {
-        _lock = lock
-        _parent = parent
-        _index = index
-        _this = this
-        _setNextValue = setNextValue
+        self._lock = lock
+        self._parent = parent
+        self._index = index
+        self._this = this
+        self._setNextValue = setNextValue
     }
     
-    func on(_ event: Event) {
-        synchronizedOn(event)
+    func on(_ event: Event) {
+        self.synchronizedOn(event)
     }
 
-    func _synchronized_on(_ event: Event) {
-        if let _ = _parent {
+    func _synchronized_on(_ event: Event) {
+        if self._parent != nil {
             switch event {
-            case .next(_):
+            case .next:
                 break
-            case .error(_):
-                _this.dispose()
+            case .error:
+                self._this.dispose()
             case .completed:
-                _this.dispose()
+                self._this.dispose()
             }
         }
         
-        if let parent = _parent {
+        if let parent = self._parent {
             switch event {
             case .next(let value):
-                _setNextValue(value)
-                parent.next(_index)
+                self._setNextValue(value)
+                parent.next(self._index)
             case .error(let error):
                 parent.fail(error)
             case .completed:
-                parent.done(_index)
+                parent.done(self._index)
             }
         }
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/ObserverType.swift b/Demo/Pods/RxSwift/RxSwift/ObserverType.swift
index e3ed7aa..e3db94a 100644
--- a/Demo/Pods/RxSwift/RxSwift/ObserverType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/ObserverType.swift
@@ -9,32 +9,35 @@
 /// Supports push-style iteration over an observable sequence.
 public protocol ObserverType {
     /// The type of elements in sequence that observer can observe.
-    associatedtype E
+    associatedtype Element
+
+    @available(*, deprecated, message: "Use `Element` instead.")
+    typealias E = Element
 
     /// Notify observer about sequence event.
     ///
     /// - parameter event: Event that occurred.
-    func on(_ event: Event)
+    func on(_ event: Event)
 }
 
 /// Convenience API extensions to provide alternate next, error, completed events
 extension ObserverType {
     
-    /// Convenience method equivalent to `on(.next(element: E))`
+    /// Convenience method equivalent to `on(.next(element: Element))`
     ///
     /// - parameter element: Next element to send to observer(s)
-    public func onNext(_ element: E) {
-        on(.next(element))
+    public func onNext(_ element: Element) {
+        self.on(.next(element))
     }
     
     /// Convenience method equivalent to `on(.completed)`
     public func onCompleted() {
-        on(.completed)
+        self.on(.completed)
     }
     
     /// Convenience method equivalent to `on(.error(Swift.Error))`
     /// - parameter error: Swift.Error to send to observer(s)
     public func onError(_ error: Swift.Error) {
-        on(.error(error))
+        self.on(.error(error))
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift b/Demo/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift
index 54e83f5..804e289 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift
@@ -6,27 +6,25 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-final class AnonymousObserver : ObserverBase {
-    typealias Element = ElementType
-    
+final class AnonymousObserver: ObserverBase {
     typealias EventHandler = (Event) -> Void
     
     private let _eventHandler : EventHandler
     
     init(_ eventHandler: @escaping EventHandler) {
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
-        _eventHandler = eventHandler
+        self._eventHandler = eventHandler
     }
 
     override func onCore(_ event: Event) {
-        return _eventHandler(event)
+        return self._eventHandler(event)
     }
     
 #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
     }
 #endif
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observers/ObserverBase.swift b/Demo/Pods/RxSwift/RxSwift/Observers/ObserverBase.swift
index 3811565..57be8e2 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observers/ObserverBase.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observers/ObserverBase.swift
@@ -6,29 +6,27 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-class ObserverBase : Disposable, ObserverType {
-    typealias E = ElementType
+class ObserverBase : Disposable, ObserverType {
+    private let _isStopped = AtomicInt(0)
 
-    private var _isStopped: AtomicInt = 0
-
-    func on(_ event: Event) {
+    func on(_ event: Event) {
         switch event {
         case .next:
-            if _isStopped == 0 {
-                onCore(event)
+            if load(self._isStopped) == 0 {
+                self.onCore(event)
             }
         case .error, .completed:
-            if AtomicCompareAndSwap(0, 1, &_isStopped) {
-                onCore(event)
+            if fetchOr(self._isStopped, 1) == 0 {
+                self.onCore(event)
             }
         }
     }
 
-    func onCore(_ event: Event) {
+    func onCore(_ event: Event) {
         rxAbstractMethod()
     }
 
     func dispose() {
-        _ = AtomicCompareAndSwap(0, 1, &_isStopped)
+        fetchOr(self._isStopped, 1)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift b/Demo/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift
index 48a599d..41363a9 100644
--- a/Demo/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift
@@ -16,70 +16,70 @@ enum TailRecursiveSinkCommand {
 #endif
 
 /// This class is usually used with `Generator` version of the operators.
-class TailRecursiveSink
-    : Sink
-    , InvocableWithValueType where S.Iterator.Element: ObservableConvertibleType, S.Iterator.Element.E == O.E {
+class TailRecursiveSink
+    : Sink
+    , InvocableWithValueType where Sequence.Element: ObservableConvertibleType, Sequence.Element.Element == Observer.Element {
     typealias Value = TailRecursiveSinkCommand
-    typealias E = O.E
-    typealias SequenceGenerator = (generator: S.Iterator, remaining: IntMax?)
+    typealias Element = Observer.Element 
+    typealias SequenceGenerator = (generator: Sequence.Iterator, remaining: IntMax?)
 
     var _generators: [SequenceGenerator] = []
     var _isDisposed = false
     var _subscription = SerialDisposable()
 
     // this is thread safe object
-    var _gate = AsyncLock>>()
+    var _gate = AsyncLock>>()
 
-    override init(observer: O, cancel: Cancelable) {
+    override init(observer: Observer, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
 
     func run(_ sources: SequenceGenerator) -> Disposable {
-        _generators.append(sources)
+        self._generators.append(sources)
 
-        schedule(.moveNext)
+        self.schedule(.moveNext)
 
-        return _subscription
+        return self._subscription
     }
 
     func invoke(_ command: TailRecursiveSinkCommand) {
         switch command {
         case .dispose:
-            disposeCommand()
+            self.disposeCommand()
         case .moveNext:
-            moveNextCommand()
+            self.moveNextCommand()
         }
     }
 
     // simple implementation for now
     func schedule(_ command: TailRecursiveSinkCommand) {
-        _gate.invoke(InvocableScheduledItem(invocable: self, state: command))
+        self._gate.invoke(InvocableScheduledItem(invocable: self, state: command))
     }
 
     func done() {
-        forwardOn(.completed)
-        dispose()
+        self.forwardOn(.completed)
+        self.dispose()
     }
 
-    func extract(_ observable: Observable) -> SequenceGenerator? {
+    func extract(_ observable: Observable) -> SequenceGenerator? {
         rxAbstractMethod()
     }
 
     // should be done on gate locked
 
     private func moveNextCommand() {
-        var next: Observable? = nil
+        var next: Observable?
 
         repeat {
-            guard let (g, left) = _generators.last else {
+            guard let (g, left) = self._generators.last else {
                 break
             }
             
-            if _isDisposed {
+            if self._isDisposed {
                 return
             }
 
-            _generators.removeLast()
+            self._generators.removeLast()
             
             var e = g
 
@@ -98,20 +98,20 @@ class TailRecursiveSink
             if let knownOriginalLeft = left {
                 // `- 1` because generator.next() has just been called
                 if knownOriginalLeft - 1 >= 1 {
-                    _generators.append((e, knownOriginalLeft - 1))
+                    self._generators.append((e, knownOriginalLeft - 1))
                 }
             }
             else {
-                _generators.append((e, nil))
+                self._generators.append((e, nil))
             }
 
-            let nextGenerator = extract(nextCandidate)
+            let nextGenerator = self.extract(nextCandidate)
 
             if let nextGenerator = nextGenerator {
-                _generators.append(nextGenerator)
+                self._generators.append(nextGenerator)
                 #if DEBUG || TRACE_RESOURCES
-                    if maxTailRecursiveSinkStackSize < _generators.count {
-                        maxTailRecursiveSinkStackSize = _generators.count
+                    if maxTailRecursiveSinkStackSize < self._generators.count {
+                        maxTailRecursiveSinkStackSize = self._generators.count
                     }
                 #endif
             }
@@ -120,32 +120,32 @@ class TailRecursiveSink
             }
         } while next == nil
 
-        guard let existingNext = next else  {
-            done()
+        guard let existingNext = next else {
+            self.done()
             return
         }
 
         let disposable = SingleAssignmentDisposable()
-        _subscription.disposable = disposable
-        disposable.setDisposable(subscribeToNext(existingNext))
+        self._subscription.disposable = disposable
+        disposable.setDisposable(self.subscribeToNext(existingNext))
     }
 
-    func subscribeToNext(_ source: Observable) -> Disposable {
+    func subscribeToNext(_ source: Observable) -> Disposable {
         rxAbstractMethod()
     }
 
     func disposeCommand() {
-        _isDisposed = true
-        _generators.removeAll(keepingCapacity: false)
+        self._isDisposed = true
+        self._generators.removeAll(keepingCapacity: false)
     }
 
     override func dispose() {
         super.dispose()
         
-        _subscription.dispose()
-        _gate.dispose()
+        self._subscription.dispose()
+        self._gate.dispose()
         
-        schedule(.dispose)
+        self.schedule(.dispose)
     }
 }
 
diff --git a/Demo/Pods/RxSwift/RxSwift/Reactive.swift b/Demo/Pods/RxSwift/RxSwift/Reactive.swift
index b873996..8fdfa18 100644
--- a/Demo/Pods/RxSwift/RxSwift/Reactive.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Reactive.swift
@@ -37,13 +37,16 @@ public struct Reactive {
 /// A type that has reactive extensions.
 public protocol ReactiveCompatible {
     /// Extended type
-    associatedtype CompatibleType
+    associatedtype ReactiveBase
+
+    @available(*, deprecated, message: "Use `ReactiveBase` instead.")
+    typealias CompatibleType = ReactiveBase
 
     /// Reactive extensions.
-    static var rx: Reactive.Type { get set }
+    static var rx: Reactive.Type { get set }
 
     /// Reactive extensions.
-    var rx: Reactive { get set }
+    var rx: Reactive { get set }
 }
 
 extension ReactiveCompatible {
diff --git a/Demo/Pods/RxSwift/RxSwift/Rx.swift b/Demo/Pods/RxSwift/RxSwift/Rx.swift
index 99292ca..a547a8f 100644
--- a/Demo/Pods/RxSwift/RxSwift/Rx.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Rx.swift
@@ -7,27 +7,27 @@
 //
 
 #if TRACE_RESOURCES
-    fileprivate var resourceCount: AtomicInt = 0
+    fileprivate let resourceCount = AtomicInt(0)
 
     /// Resource utilization information
     public struct Resources {
         /// Counts internal Rx resource allocations (Observables, Observers, Disposables, etc.). This provides a simple way to detect leaks during development.
         public static var total: Int32 {
-            return resourceCount.valueSnapshot()
+            return load(resourceCount)
         }
 
         /// Increments `Resources.total` resource count.
         ///
         /// - returns: New resource count
         public static func incrementTotal() -> Int32 {
-            return AtomicIncrement(&resourceCount)
+            return increment(resourceCount)
         }
 
         /// Decrements `Resources.total` resource count
         ///
         /// - returns: New resource count
         public static func decrementTotal() -> Int32 {
-            return AtomicDecrement(&resourceCount)
+            return decrement(resourceCount)
         }
     }
 #endif
@@ -38,7 +38,6 @@ func rxAbstractMethod(file: StaticString = #file, line: UInt = #line) -> Swift.N
 }
 
 func rxFatalError(_ lastMessage: @autoclosure () -> String, file: StaticString = #file, line: UInt = #line) -> Swift.Never  {
-    // The temptation to comment this line is great, but please don't, it's for your own good. The choice is yours.
     fatalError(lastMessage(), file: file, line: line)
 }
 
@@ -76,7 +75,7 @@ func decrementChecked(_ i: inout Int) throws -> Int {
             case `default` = "Two different unsynchronized threads are trying to send some event simultaneously.\n    This is undefined behavior because the ordering of the effects caused by these events is nondeterministic and depends on the \n    operating system thread scheduler. This will result in a random behavior of your program.\n"
         }
 
-        private var _threads = Dictionary()
+        private var _threads = [UnsafeMutableRawPointer: Int]()
 
         private func synchronizationError(_ message: String) {
             #if FATAL_SYNCHRONIZATION
@@ -87,12 +86,12 @@ func decrementChecked(_ i: inout Int) throws -> Int {
         }
         
         func register(synchronizationErrorMessage: SynchronizationErrorMessages) {
-            _lock.lock(); defer { _lock.unlock() }
+            self._lock.lock(); defer { self._lock.unlock() }
             let pointer = Unmanaged.passUnretained(Thread.current).toOpaque()
-            let count = (_threads[pointer] ?? 0) + 1
+            let count = (self._threads[pointer] ?? 0) + 1
 
             if count > 1 {
-                synchronizationError(
+                self.synchronizationError(
                     "⚠️ Reentrancy anomaly was detected.\n" +
                     "  > Debugging: To debug this issue you can set a breakpoint in \(#file):\(#line) and observe the call stack.\n" +
                     "  > Problem: This behavior is breaking the observable sequence grammar. `next (error | completed)?`\n" +
@@ -101,14 +100,14 @@ func decrementChecked(_ i: inout Int) throws -> Int {
                     "  > Interpretation: This could mean that there is some kind of unexpected cyclic dependency in your code,\n" +
                     "    or that the system is not behaving in the expected way.\n" +
                     "  > Remedy: If this is the expected behavior this message can be suppressed by adding `.observeOn(MainScheduler.asyncInstance)`\n" +
-                    "    or by enqueing sequence events in some other way.\n"
+                    "    or by enqueuing sequence events in some other way.\n"
                 )
             }
             
-            _threads[pointer] = count
+            self._threads[pointer] = count
 
-            if _threads.count > 1 {
-                synchronizationError(
+            if self._threads.count > 1 {
+                self.synchronizationError(
                     "⚠️ Synchronization anomaly was detected.\n" +
                     "  > Debugging: To debug this issue you can set a breakpoint in \(#file):\(#line) and observe the call stack.\n" +
                     "  > Problem: This behavior is breaking the observable sequence grammar. `next (error | completed)?`\n" +
@@ -122,11 +121,11 @@ func decrementChecked(_ i: inout Int) throws -> Int {
         }
 
         func unregister() {
-            _lock.lock(); defer { _lock.unlock() }
+            self._lock.lock(); defer { self._lock.unlock() }
             let pointer = Unmanaged.passUnretained(Thread.current).toOpaque()
-            _threads[pointer] = (_threads[pointer] ?? 1) - 1
-            if _threads[pointer] == 0 {
-                _threads[pointer] = nil
+            self._threads[pointer] = (self._threads[pointer] ?? 1) - 1
+            if self._threads[pointer] == 0 {
+                self._threads[pointer] = nil
             }
         }
     }
diff --git a/Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift b/Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift
index 7f3c333..fd6fc98 100644
--- a/Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift
+++ b/Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift
@@ -6,10 +6,35 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+#if os(Linux)
+/// As Swift 5 was released, A patch to `Thread` for Linux
+/// changed `threadDictionary` to a `NSMutableDictionary` instead of
+/// a `Dictionary`: https://github.com/apple/swift-corelibs-foundation/pull/1762/files
+///
+/// This means that on Linux specifically, `RxMutableBox` must be a `NSObject`
+/// or it won't be possible to store it in `Thread.threadDictionary`.
+///
+/// For more information, read the discussion at:
+/// https://github.com/ReactiveX/RxSwift/issues/1911#issuecomment-479723298
+import class Foundation.NSObject
+
+/// Creates mutable reference wrapper for any type.
+final class RxMutableBox: NSObject {
+    /// Wrapped value
+    var value: T
+
+    /// Creates reference wrapper for `value`.
+    ///
+    /// - parameter value: Value to wrap.
+    init (_ value: T) {
+        self.value = value
+    }
+}
+#else
 /// Creates mutable reference wrapper for any type.
-final class RxMutableBox : CustomDebugStringConvertible {
+final class RxMutableBox: CustomDebugStringConvertible {
     /// Wrapped value
-    var value : T
+    var value: T
     
     /// Creates reference wrapper for `value`.
     ///
@@ -25,3 +50,4 @@ extension RxMutableBox {
         return "MutatingBox(\(self.value))"
     }
 }
+#endif
diff --git a/Demo/Pods/RxSwift/RxSwift/SchedulerType.swift b/Demo/Pods/RxSwift/RxSwift/SchedulerType.swift
index bdfcf8b..96664b4 100644
--- a/Demo/Pods/RxSwift/RxSwift/SchedulerType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/SchedulerType.swift
@@ -6,11 +6,11 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-import struct Foundation.TimeInterval
+import enum Dispatch.DispatchTimeInterval
 import struct Foundation.Date
 
 // Type that represents time interval in the context of RxSwift.
-public typealias RxTimeInterval = TimeInterval
+public typealias RxTimeInterval = DispatchTimeInterval
 
 /// Type that represents absolute time in the context of RxSwift.
 public typealias RxTime = Date
@@ -61,7 +61,7 @@ extension SchedulerType {
         return schedule.start()
     }
 
-    func scheduleRecursive(_ state: State, dueTime: RxTimeInterval, action: @escaping (State, AnyRecursiveScheduler) -> ()) -> Disposable {
+    func scheduleRecursive(_ state: State, dueTime: RxTimeInterval, action: @escaping (State, AnyRecursiveScheduler) -> Void) -> Disposable {
         let scheduler = AnyRecursiveScheduler(scheduler: self, action: action)
          
         scheduler.schedule(state, dueTime: dueTime)
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
index aa1f480..ac51324 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
@@ -28,7 +28,7 @@ public class ConcurrentDispatchQueueScheduler: SchedulerType {
     /// - parameter queue: Target dispatch queue.
     /// - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
     public init(queue: DispatchQueue, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        configuration = DispatchQueueConfiguration(queue: queue, leeway: leeway)
+        self.configuration = DispatchQueueConfiguration(queue: queue, leeway: leeway)
     }
     
     /// Convenience init for scheduler that wraps one of the global concurrent dispatch queues.
@@ -65,7 +65,7 @@ public class ConcurrentDispatchQueueScheduler: SchedulerType {
     - parameter action: Action to be executed.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public final func scheduleRelative(_ state: StateType, dueTime: Foundation.TimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
+    public final func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
         return self.configuration.scheduleRelative(state, dueTime: dueTime, action: action)
     }
     
@@ -78,7 +78,7 @@ public class ConcurrentDispatchQueueScheduler: SchedulerType {
     - parameter action: Action to be executed.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public func schedulePeriodic(_ state: StateType, startAfter: TimeInterval, period: TimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
+    public func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
         return self.configuration.schedulePeriodic(state, startAfter: startAfter, period: period, action: action)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
index a98ad21..f535a22 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
@@ -24,13 +24,13 @@ public final class ConcurrentMainScheduler : SchedulerType {
     private let _mainQueue: DispatchQueue
 
     /// - returns: Current time.
-    public var now : Date {
-        return _mainScheduler.now as Date
+    public var now: Date {
+        return self._mainScheduler.now as Date
     }
 
     private init(mainScheduler: MainScheduler) {
-        _mainQueue = DispatchQueue.main
-        _mainScheduler = mainScheduler
+        self._mainQueue = DispatchQueue.main
+        self._mainScheduler = mainScheduler
     }
 
     /// Singleton instance of `ConcurrentMainScheduler`
@@ -50,7 +50,7 @@ public final class ConcurrentMainScheduler : SchedulerType {
 
         let cancel = SingleAssignmentDisposable()
 
-        _mainQueue.async {
+        self._mainQueue.async {
             if cancel.isDisposed {
                 return
             }
@@ -69,8 +69,8 @@ public final class ConcurrentMainScheduler : SchedulerType {
     - parameter action: Action to be executed.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public final func scheduleRelative(_ state: StateType, dueTime: Foundation.TimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return _mainScheduler.scheduleRelative(state, dueTime: dueTime, action: action)
+    public final func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
+        return self._mainScheduler.scheduleRelative(state, dueTime: dueTime, action: action)
     }
 
     /**
@@ -82,7 +82,7 @@ public final class ConcurrentMainScheduler : SchedulerType {
     - parameter action: Action to be executed.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public func schedulePeriodic(_ state: StateType, startAfter: TimeInterval, period: TimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
-        return _mainScheduler.schedulePeriodic(state, startAfter: startAfter, period: period, action: action)
+    public func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
+        return self._mainScheduler.schedulePeriodic(state, startAfter: startAfter, period: period, action: action)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift
index 0676444..8f9939a 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift
@@ -21,7 +21,7 @@ import Dispatch
         fileprivate static let instance = "RxSwift.CurrentThreadScheduler.Queue"
     }
 #else
-    fileprivate class CurrentThreadSchedulerQueueKey: NSObject, NSCopying {
+    private class CurrentThreadSchedulerQueueKey: NSObject, NSCopying {
         static let instance = CurrentThreadSchedulerQueueKey()
         private override init() {
             super.init()
@@ -50,13 +50,7 @@ public class CurrentThreadScheduler : ImmediateSchedulerType {
 
     private static var isScheduleRequiredKey: pthread_key_t = { () -> pthread_key_t in
         let key = UnsafeMutablePointer.allocate(capacity: 1)
-        defer {
-#if swift(>=4.1)
-            key.deallocate()
-#else
-            key.deallocate(capacity: 1)
-#endif
-        }
+        defer { key.deallocate() }
                                                                
         guard pthread_key_create(key, nil) == 0 else {
             rxFatalError("isScheduleRequired key creation failed")
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift
index 930ca37..12eeb5c 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-import struct Foundation.Date
+import Foundation
 
 /// Converts historical virtual time into real time.
 ///
@@ -16,7 +16,7 @@ public struct HistoricalSchedulerTimeConverter : VirtualTimeConverterType {
     public typealias VirtualTimeUnit = RxTime
 
     /// Virtual time unit used to represent differences of virtual times.
-    public typealias VirtualTimeIntervalUnit = RxTimeInterval
+    public typealias VirtualTimeIntervalUnit = TimeInterval
 
     /// Returns identical value of argument passed because historical virtual time is equal to real time, just
     /// decoupled from local machine clock.
@@ -32,13 +32,13 @@ public struct HistoricalSchedulerTimeConverter : VirtualTimeConverterType {
 
     /// Returns identical value of argument passed because historical virtual time is equal to real time, just
     /// decoupled from local machine clock.
-    public func convertFromVirtualTimeInterval(_ virtualTimeInterval: VirtualTimeIntervalUnit) -> RxTimeInterval {
+    public func convertFromVirtualTimeInterval(_ virtualTimeInterval: VirtualTimeIntervalUnit) -> TimeInterval {
         return virtualTimeInterval
     }
 
     /// Returns identical value of argument passed because historical virtual time is equal to real time, just
     /// decoupled from local machine clock.
-    public func convertToVirtualTimeInterval(_ timeInterval: RxTimeInterval) -> VirtualTimeIntervalUnit {
+    public func convertToVirtualTimeInterval(_ timeInterval: TimeInterval) -> VirtualTimeIntervalUnit {
         return timeInterval
     }
 
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
index b82f011..bac5e9a 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
@@ -14,18 +14,11 @@ struct DispatchQueueConfiguration {
     let leeway: DispatchTimeInterval
 }
 
-private func dispatchInterval(_ interval: Foundation.TimeInterval) -> DispatchTimeInterval {
-    precondition(interval >= 0.0)
-    // TODO: Replace 1000 with something that actually works 
-    // NSEC_PER_MSEC returns 1000000
-    return DispatchTimeInterval.milliseconds(Int(interval * 1000.0))
-}
-
 extension DispatchQueueConfiguration {
     func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
         let cancel = SingleAssignmentDisposable()
 
-        queue.async {
+        self.queue.async {
             if cancel.isDisposed {
                 return
             }
@@ -37,17 +30,13 @@ extension DispatchQueueConfiguration {
         return cancel
     }
 
-    func scheduleRelative(_ state: StateType, dueTime: Foundation.TimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let deadline = DispatchTime.now() + dispatchInterval(dueTime)
+    func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
+        let deadline = DispatchTime.now() + dueTime
 
         let compositeDisposable = CompositeDisposable()
 
-        let timer = DispatchSource.makeTimerSource(queue: queue)
-        #if swift(>=4.0)
-            timer.schedule(deadline: deadline, leeway: leeway)
-        #else
-            timer.scheduleOneshot(deadline: deadline, leeway: leeway)
-        #endif
+        let timer = DispatchSource.makeTimerSource(queue: self.queue)
+        timer.schedule(deadline: deadline, leeway: self.leeway)
 
         // TODO:
         // This looks horrible, and yes, it is.
@@ -75,17 +64,13 @@ extension DispatchQueueConfiguration {
         return compositeDisposable
     }
 
-    func schedulePeriodic(_ state: StateType, startAfter: TimeInterval, period: TimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
-        let initial = DispatchTime.now() + dispatchInterval(startAfter)
+    func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
+        let initial = DispatchTime.now() + startAfter
 
         var timerState = state
 
-        let timer = DispatchSource.makeTimerSource(queue: queue)
-        #if swift(>=4.0)
-            timer.schedule(deadline: initial, repeating: dispatchInterval(period), leeway: leeway)
-        #else
-            timer.scheduleRepeating(deadline: initial, interval: dispatchInterval(period), leeway: leeway)
-        #endif
+        let timer = DispatchSource.makeTimerSource(queue: self.queue)
+        timer.schedule(deadline: initial, repeating: period, leeway: self.leeway)
         
         // TODO:
         // This looks horrible, and yes, it is.
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift
index 90445f8..f31469e 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift
@@ -12,11 +12,11 @@ struct InvocableScheduledItem : InvocableType {
     let _state: I.Value
 
     init(invocable: I, state: I.Value) {
-        _invocable = invocable
-        _state = state
+        self._invocable = invocable
+        self._state = state
     }
 
     func invoke() {
-        _invocable.invoke(_state)
+        self._invocable.invoke(self._state)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift
index 454fb34..6e7a0c1 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift
@@ -17,19 +17,19 @@ struct ScheduledItem
     private let _disposable = SingleAssignmentDisposable()
 
     var isDisposed: Bool {
-        return _disposable.isDisposed
+        return self._disposable.isDisposed
     }
     
     init(action: @escaping Action, state: T) {
-        _action = action
-        _state = state
+        self._action = action
+        self._state = state
     }
     
     func invoke() {
-         _disposable.setDisposable(_action(_state))
+         self._disposable.setDisposable(self._action(self._state))
     }
     
     func dispose() {
-        _disposable.dispose()
+        self._disposable.dispose()
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift
index e219e4e..8fb0907 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift
@@ -7,6 +7,9 @@
 //
 
 import Dispatch
+#if !os(Linux)
+    import Foundation
+#endif
 
 /**
 Abstracts work that needs to be performed on `DispatchQueue.main`. In case `schedule` methods are called from `DispatchQueue.main`, it will perform action immediately without scheduling.
@@ -22,12 +25,12 @@ public final class MainScheduler : SerialDispatchQueueScheduler {
 
     private let _mainQueue: DispatchQueue
 
-    var numberEnqueued: AtomicInt = 0
+    let numberEnqueued = AtomicInt(0)
 
     /// Initializes new instance of `MainScheduler`.
     public init() {
-        _mainQueue = DispatchQueue.main
-        super.init(serialQueue: _mainQueue)
+        self._mainQueue = DispatchQueue.main
+        super.init(serialQueue: self._mainQueue)
     }
 
     /// Singleton instance of `MainScheduler`
@@ -44,23 +47,32 @@ public final class MainScheduler : SerialDispatchQueueScheduler {
         }
     }
 
+    /// In case this method is running on a background thread it will throw an exception.
+    public class func ensureRunningOnMainThread(errorMessage: String? = nil) {
+        #if !os(Linux) // isMainThread is not implemented in Linux Foundation
+            guard Thread.isMainThread else {
+                rxFatalError(errorMessage ?? "Running on background thread.")
+            }
+        #endif
+    }
+
     override func scheduleInternal(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let currentNumberEnqueued = AtomicIncrement(&numberEnqueued)
+        let previousNumberEnqueued = increment(self.numberEnqueued)
 
-        if DispatchQueue.isMain && currentNumberEnqueued == 1 {
+        if DispatchQueue.isMain && previousNumberEnqueued == 0 {
             let disposable = action(state)
-            _ = AtomicDecrement(&numberEnqueued)
+            decrement(self.numberEnqueued)
             return disposable
         }
 
         let cancel = SingleAssignmentDisposable()
 
-        _mainQueue.async {
+        self._mainQueue.async {
             if !cancel.isDisposed {
                 _ = action(state)
             }
 
-            _ = AtomicDecrement(&self.numberEnqueued)
+            decrement(self.numberEnqueued)
         }
 
         return cancel
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift
index 24d19cc..9e9b4ff 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-fileprivate enum ScheduleState {
+private enum ScheduleState {
     case initial
     case added(CompositeDisposable.DisposeKey)
     case done
@@ -26,8 +26,8 @@ final class AnyRecursiveScheduler {
     private var _action: Action?
     
     init(scheduler: SchedulerType, action: @escaping Action) {
-        _action = action
-        _scheduler = scheduler
+        self._action = action
+        self._scheduler = scheduler
     }
 
     /**
@@ -39,7 +39,7 @@ final class AnyRecursiveScheduler {
     func schedule(_ state: State, dueTime: RxTimeInterval) {
         var scheduleState: ScheduleState = .initial
 
-        let d = _scheduler.scheduleRelative(state, dueTime: dueTime) { (state) -> Disposable in
+        let d = self._scheduler.scheduleRelative(state, dueTime: dueTime) { state -> Disposable in
             // best effort
             if self._group.isDisposed {
                 return Disposables.create()
@@ -67,19 +67,17 @@ final class AnyRecursiveScheduler {
             return Disposables.create()
         }
             
-        _lock.performLocked {
+        self._lock.performLocked {
             switch scheduleState {
             case .added:
                 rxFatalError("Invalid state")
-                break
             case .initial:
-                if let removeKey = _group.insert(d) {
+                if let removeKey = self._group.insert(d) {
                     scheduleState = .added(removeKey)
                 }
                 else {
                     scheduleState = .done
                 }
-                break
             case .done:
                 break
             }
@@ -92,7 +90,7 @@ final class AnyRecursiveScheduler {
     func schedule(_ state: State) {
         var scheduleState: ScheduleState = .initial
 
-        let d = _scheduler.schedule(state) { (state) -> Disposable in
+        let d = self._scheduler.schedule(state) { state -> Disposable in
             // best effort
             if self._group.isDisposed {
                 return Disposables.create()
@@ -120,19 +118,17 @@ final class AnyRecursiveScheduler {
             return Disposables.create()
         }
         
-        _lock.performLocked {
+        self._lock.performLocked {
             switch scheduleState {
             case .added:
                 rxFatalError("Invalid state")
-                break
             case .initial:
-                if let removeKey = _group.insert(d) {
+                if let removeKey = self._group.insert(d) {
                     scheduleState = .added(removeKey)
                 }
                 else {
                     scheduleState = .done
                 }
-                break
             case .done:
                 break
             }
@@ -140,10 +136,10 @@ final class AnyRecursiveScheduler {
     }
     
     func dispose() {
-        _lock.performLocked {
-            _action = nil
+        self._lock.performLocked {
+            self._action = nil
         }
-        _group.dispose()
+        self._group.dispose()
     }
 }
 
@@ -158,8 +154,8 @@ final class RecursiveImmediateScheduler {
     private let _scheduler: ImmediateSchedulerType
     
     init(action: @escaping Action, scheduler: ImmediateSchedulerType) {
-        _action = action
-        _scheduler = scheduler
+        self._action = action
+        self._scheduler = scheduler
     }
     
     // immediate scheduling
@@ -170,7 +166,7 @@ final class RecursiveImmediateScheduler {
     func schedule(_ state: State) {
         var scheduleState: ScheduleState = .initial
 
-        let d = _scheduler.schedule(state) { (state) -> Disposable in
+        let d = self._scheduler.schedule(state) { state -> Disposable in
             // best effort
             if self._group.isDisposed {
                 return Disposables.create()
@@ -198,19 +194,17 @@ final class RecursiveImmediateScheduler {
             return Disposables.create()
         }
         
-        _lock.performLocked {
+        self._lock.performLocked {
             switch scheduleState {
             case .added:
                 rxFatalError("Invalid state")
-                break
             case .initial:
-                if let removeKey = _group.insert(d) {
+                if let removeKey = self._group.insert(d) {
                     scheduleState = .added(removeKey)
                 }
                 else {
                     scheduleState = .done
                 }
-                break
             case .done:
                 break
             }
@@ -218,9 +212,9 @@ final class RecursiveImmediateScheduler {
     }
     
     func dispose() {
-        _lock.performLocked {
-            _action = nil
+        self._lock.performLocked {
+            self._action = nil
         }
-        _group.dispose()
+        self._group.dispose()
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
index 41f2947..5b7b840 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
@@ -21,38 +21,38 @@ final class SchedulePeriodicRecursive {
     private let _action: RecursiveAction
 
     private var _state: State
-    private var _pendingTickCount: AtomicInt = 0
+    private let _pendingTickCount = AtomicInt(0)
 
     init(scheduler: SchedulerType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping RecursiveAction, state: State) {
-        _scheduler = scheduler
-        _startAfter = startAfter
-        _period = period
-        _action = action
-        _state = state
+        self._scheduler = scheduler
+        self._startAfter = startAfter
+        self._period = period
+        self._action = action
+        self._state = state
     }
 
     func start() -> Disposable {
-        return _scheduler.scheduleRecursive(SchedulePeriodicRecursiveCommand.tick, dueTime: _startAfter, action: self.tick)
+        return self._scheduler.scheduleRecursive(SchedulePeriodicRecursiveCommand.tick, dueTime: self._startAfter, action: self.tick)
     }
 
-    func tick(_ command: SchedulePeriodicRecursiveCommand, scheduler: RecursiveScheduler) -> Void {
+    func tick(_ command: SchedulePeriodicRecursiveCommand, scheduler: RecursiveScheduler) {
         // Tries to emulate periodic scheduling as best as possible.
         // The problem that could arise is if handling periodic ticks take too long, or
         // tick interval is short.
         switch command {
         case .tick:
-            scheduler.schedule(.tick, dueTime: _period)
+            scheduler.schedule(.tick, dueTime: self._period)
 
             // The idea is that if on tick there wasn't any item enqueued, schedule to perform work immediately.
             // Else work will be scheduled after previous enqueued work completes.
-            if AtomicIncrement(&_pendingTickCount) == 1 {
+            if increment(self._pendingTickCount) == 0 {
                 self.tick(.dispatchStart, scheduler: scheduler)
             }
 
         case .dispatchStart:
-            _state = _action(_state)
+            self._state = self._action(self._state)
             // Start work and schedule check is this last batch of work
-            if AtomicDecrement(&_pendingTickCount) > 0 {
+            if decrement(self._pendingTickCount) > 1 {
                 // This gives priority to scheduler emulation, it's not perfect, but helps
                 scheduler.schedule(SchedulePeriodicRecursiveCommand.dispatchStart)
             }
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
index 1a38a73..57ae8bd 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
@@ -45,7 +45,7 @@ public class SerialDispatchQueueScheduler : SchedulerType {
     - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
     */
     init(serialQueue: DispatchQueue, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        configuration = DispatchQueueConfiguration(queue: serialQueue, leeway: leeway)
+        self.configuration = DispatchQueueConfiguration(queue: serialQueue, leeway: leeway)
     }
 
     /**
@@ -113,7 +113,7 @@ public class SerialDispatchQueueScheduler : SchedulerType {
     - parameter action: Action to be executed.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public final func scheduleRelative(_ state: StateType, dueTime: Foundation.TimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
+    public final func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
         return self.configuration.scheduleRelative(state, dueTime: dueTime, action: action)
     }
     
@@ -126,7 +126,7 @@ public class SerialDispatchQueueScheduler : SchedulerType {
     - parameter action: Action to be executed.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public func schedulePeriodic(_ state: StateType, startAfter: TimeInterval, period: TimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
+    public func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
         return self.configuration.schedulePeriodic(state, startAfter: startAfter, period: period, action: action)
     }
 }
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeConverterType.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeConverterType.swift
index a17475a..7069b00 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeConverterType.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeConverterType.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+import Foundation
+
 /// Parametrization for virtual time used by `VirtualTimeScheduler`s.
 public protocol VirtualTimeConverterType {
     /// Virtual time unit used that represents ticks of virtual clock.
@@ -36,7 +38,7 @@ public protocol VirtualTimeConverterType {
      - parameter virtualTimeInterval: Virtual time interval to convert to `NSTimeInterval`.
      - returns: `NSTimeInterval` corresponding to virtual time interval.
     */
-    func convertFromVirtualTimeInterval(_ virtualTimeInterval: VirtualTimeIntervalUnit) -> RxTimeInterval
+    func convertFromVirtualTimeInterval(_ virtualTimeInterval: VirtualTimeIntervalUnit) -> TimeInterval
 
     /**
      Converts from `NSTimeInterval` to virtual time interval.
@@ -44,7 +46,7 @@ public protocol VirtualTimeConverterType {
      - parameter timeInterval: `NSTimeInterval` to convert to virtual time interval.
      - returns: Virtual time interval corresponding to time interval.
     */
-    func convertToVirtualTimeInterval(_ timeInterval: RxTimeInterval) -> VirtualTimeIntervalUnit
+    func convertToVirtualTimeInterval(_ timeInterval: TimeInterval) -> VirtualTimeIntervalUnit
 
     /**
      Offsets virtual time by virtual time interval.
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
index c0e1aa5..e63cece 100644
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
+++ b/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
@@ -24,22 +24,22 @@ open class VirtualTimeScheduler
 
     /// - returns: Current time.
     public var now: RxTime {
-        return _converter.convertFromVirtualTime(clock)
+        return self._converter.convertFromVirtualTime(self.clock)
     }
 
     /// - returns: Scheduler's absolute time clock value.
     public var clock: VirtualTime {
-        return _clock
+        return self._clock
     }
 
     /// Creates a new virtual time scheduler.
     ///
     /// - parameter initialClock: Initial value for the clock.
     public init(initialClock: VirtualTime, converter: Converter) {
-        _clock = initialClock
-        _running = false
-        _converter = converter
-        _schedulerQueue = PriorityQueue(hasHigherPriority: {
+        self._clock = initialClock
+        self._running = false
+        self._converter = converter
+        self._schedulerQueue = PriorityQueue(hasHigherPriority: {
             switch converter.compareVirtualTime($0.time, $1.time) {
             case .lessThan:
                 return true
@@ -50,7 +50,7 @@ open class VirtualTimeScheduler
             }
         }, isEqual: { $0 === $1 })
         #if TRACE_RESOURCES
-            let _ = Resources.incrementTotal()
+            _ = Resources.incrementTotal()
         #endif
     }
 
@@ -62,7 +62,7 @@ open class VirtualTimeScheduler
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
     public func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self.scheduleRelative(state, dueTime: 0.0) { a in
+        return self.scheduleRelative(state, dueTime: .microseconds(0)) { a in
             return action(a)
         }
     }
@@ -76,10 +76,10 @@ open class VirtualTimeScheduler
      - returns: The disposable object used to cancel the scheduled action (best effort).
      */
     public func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let time = self.now.addingTimeInterval(dueTime)
-        let absoluteTime = _converter.convertToVirtualTime(time)
+        let time = self.now.addingDispatchInterval(dueTime)
+        let absoluteTime = self._converter.convertToVirtualTime(time)
         let adjustedTime = self.adjustScheduledTime(absoluteTime)
-        return scheduleAbsoluteVirtual(state, time: adjustedTime, action: action)
+        return self.scheduleAbsoluteVirtual(state, time: adjustedTime, action: action)
     }
 
     /**
@@ -91,8 +91,8 @@ open class VirtualTimeScheduler
      - returns: The disposable object used to cancel the scheduled action (best effort).
      */
     public func scheduleRelativeVirtual(_ state: StateType, dueTime: VirtualTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let time = _converter.offsetVirtualTime(self.clock, offset: dueTime)
-        return scheduleAbsoluteVirtual(state, time: time, action: action)
+        let time = self._converter.offsetVirtualTime(self.clock, offset: dueTime)
+        return self.scheduleAbsoluteVirtual(state, time: time, action: action)
     }
 
     /**
@@ -111,11 +111,11 @@ open class VirtualTimeScheduler
         let item = VirtualSchedulerItem(action: {
             let dispose = action(state)
             return dispose
-        }, time: time, id: _nextId)
+        }, time: time, id: self._nextId)
 
-        _nextId += 1
+        self._nextId += 1
 
-        _schedulerQueue.enqueue(item)
+        self._schedulerQueue.enqueue(item)
         
         _ = compositeDisposable.insert(item)
         
@@ -131,31 +131,31 @@ open class VirtualTimeScheduler
     public func start() {
         MainScheduler.ensureExecutingOnScheduler()
 
-        if _running {
+        if self._running {
             return
         }
 
-        _running = true
+        self._running = true
         repeat {
-            guard let next = findNext() else {
+            guard let next = self.findNext() else {
                 break
             }
 
-            if _converter.compareVirtualTime(next.time, self.clock).greaterThan  {
-                _clock = next.time
+            if self._converter.compareVirtualTime(next.time, self.clock).greaterThan {
+                self._clock = next.time
             }
 
             next.invoke()
-            _schedulerQueue.remove(next)
-        } while _running
+            self._schedulerQueue.remove(next)
+        } while self._running
 
-        _running = false
+        self._running = false
     }
 
     func findNext() -> VirtualSchedulerItem? {
-        while let front = _schedulerQueue.peek() {
+        while let front = self._schedulerQueue.peek() {
             if front.isDisposed {
-                _schedulerQueue.remove(front)
+                self._schedulerQueue.remove(front)
                 continue
             }
 
@@ -171,49 +171,49 @@ open class VirtualTimeScheduler
     public func advanceTo(_ virtualTime: VirtualTime) {
         MainScheduler.ensureExecutingOnScheduler()
 
-        if _running {
+        if self._running {
             fatalError("Scheduler is already running")
         }
 
-        _running = true
+        self._running = true
         repeat {
-            guard let next = findNext() else {
+            guard let next = self.findNext() else {
                 break
             }
 
-            if _converter.compareVirtualTime(next.time, virtualTime).greaterThan {
+            if self._converter.compareVirtualTime(next.time, virtualTime).greaterThan {
                 break
             }
 
-            if _converter.compareVirtualTime(next.time, self.clock).greaterThan  {
-                _clock = next.time
+            if self._converter.compareVirtualTime(next.time, self.clock).greaterThan {
+                self._clock = next.time
             }
 
             next.invoke()
-            _schedulerQueue.remove(next)
-        } while _running
+            self._schedulerQueue.remove(next)
+        } while self._running
 
-        _clock = virtualTime
-        _running = false
+        self._clock = virtualTime
+        self._running = false
     }
 
     /// Advances the scheduler's clock by the specified relative time.
     public func sleep(_ virtualInterval: VirtualTimeInterval) {
         MainScheduler.ensureExecutingOnScheduler()
 
-        let sleepTo = _converter.offsetVirtualTime(clock, offset: virtualInterval)
-        if _converter.compareVirtualTime(sleepTo, clock).lessThen {
+        let sleepTo = self._converter.offsetVirtualTime(self.clock, offset: virtualInterval)
+        if self._converter.compareVirtualTime(sleepTo, self.clock).lessThen {
             fatalError("Can't sleep to past.")
         }
 
-        _clock = sleepTo
+        self._clock = sleepTo
     }
 
     /// Stops the virtual time scheduler.
     public func stop() {
         MainScheduler.ensureExecutingOnScheduler()
 
-        _running = false
+        self._running = false
     }
 
     #if TRACE_RESOURCES
@@ -241,7 +241,7 @@ final class VirtualSchedulerItem(_ seed: A, accumulator: @escaping (A, Element) throws -> A)
-        -> Observable {
-        return Reduce(source: self.asObservable(), seed: seed, accumulator: accumulator, mapResult: { $0 })
-    }
-}
-
-final private class ReduceSink: Sink, ObserverType {
-    typealias ResultType = Observer.Element 
-    typealias Parent = Reduce
-    
-    private let _parent: Parent
-    private var _accumulation: AccumulateType
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        self._accumulation = parent._seed
-        
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            do {
-                self._accumulation = try self._parent._accumulator(self._accumulation, value)
-            }
-            catch let e {
-                self.forwardOn(.error(e))
-                self.dispose()
-            }
-        case .error(let e):
-            self.forwardOn(.error(e))
-            self.dispose()
-        case .completed:
-            do {
-                let result = try self._parent._mapResult(self._accumulation)
-                self.forwardOn(.next(result))
-                self.forwardOn(.completed)
-                self.dispose()
-            }
-            catch let e {
-                self.forwardOn(.error(e))
-                self.dispose()
-            }
-        }
-    }
-}
-
-final private class Reduce: Producer {
-    typealias AccumulatorType = (AccumulateType, SourceType) throws -> AccumulateType
-    typealias ResultSelectorType = (AccumulateType) throws -> ResultType
-    
-    fileprivate let _source: Observable
-    fileprivate let _seed: AccumulateType
-    fileprivate let _accumulator: AccumulatorType
-    fileprivate let _mapResult: ResultSelectorType
-    
-    init(source: Observable, seed: AccumulateType, accumulator: @escaping AccumulatorType, mapResult: @escaping ResultSelectorType) {
-        self._source = source
-        self._seed = seed
-        self._accumulator = accumulator
-        self._mapResult = mapResult
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == ResultType {
-        let sink = ReduceSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
-
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Repeat.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Repeat.swift
deleted file mode 100644
index 4fed45c..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Repeat.swift
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-//  Repeat.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 9/13/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-    /**
-     Generates an observable sequence that repeats the given element infinitely, using the specified scheduler to send out observer messages.
-
-     - seealso: [repeat operator on reactivex.io](http://reactivex.io/documentation/operators/repeat.html)
-
-     - parameter element: Element to repeat.
-     - parameter scheduler: Scheduler to run the producer loop on.
-     - returns: An observable sequence that repeats the given element infinitely.
-     */
-    public static func repeatElement(_ element: Element, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
-        return RepeatElement(element: element, scheduler: scheduler)
-    }
-}
-
-final private class RepeatElement: Producer {
-    fileprivate let _element: Element
-    fileprivate let _scheduler: ImmediateSchedulerType
-    
-    init(element: Element, scheduler: ImmediateSchedulerType) {
-        self._element = element
-        self._scheduler = scheduler
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = RepeatElementSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-final private class RepeatElementSink: Sink {
-    typealias Parent = RepeatElement
-    
-    private let _parent: Parent
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run() -> Disposable {
-        return self._parent._scheduler.scheduleRecursive(self._parent._element) { e, recurse in
-            self.forwardOn(.next(e))
-            recurse(e)
-        }
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift b/Demo/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift
deleted file mode 100644
index decd309..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift
+++ /dev/null
@@ -1,182 +0,0 @@
-//
-//  RetryWhen.swift
-//  RxSwift
-//
-//  Created by Junior B. on 06/10/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Repeats the source observable sequence on error when the notifier emits a next value.
-     If the source observable errors and the notifier completes, it will complete the source sequence.
-
-     - seealso: [retry operator on reactivex.io](http://reactivex.io/documentation/operators/retry.html)
-
-     - parameter notificationHandler: A handler that is passed an observable sequence of errors raised by the source observable and returns and observable that either continues, completes or errors. This behavior is then applied to the source observable.
-     - returns: An observable sequence producing the elements of the given sequence repeatedly until it terminates successfully or is notified to error or complete.
-     */
-    public func retryWhen(_ notificationHandler: @escaping (Observable) -> TriggerObservable)
-        -> Observable {
-        return RetryWhenSequence(sources: InfiniteSequence(repeatedValue: self.asObservable()), notificationHandler: notificationHandler)
-    }
-
-    /**
-     Repeats the source observable sequence on error when the notifier emits a next value.
-     If the source observable errors and the notifier completes, it will complete the source sequence.
-
-     - seealso: [retry operator on reactivex.io](http://reactivex.io/documentation/operators/retry.html)
-
-     - parameter notificationHandler: A handler that is passed an observable sequence of errors raised by the source observable and returns and observable that either continues, completes or errors. This behavior is then applied to the source observable.
-     - returns: An observable sequence producing the elements of the given sequence repeatedly until it terminates successfully or is notified to error or complete.
-     */
-    public func retryWhen(_ notificationHandler: @escaping (Observable) -> TriggerObservable)
-        -> Observable {
-        return RetryWhenSequence(sources: InfiniteSequence(repeatedValue: self.asObservable()), notificationHandler: notificationHandler)
-    }
-}
-
-final private class RetryTriggerSink
-    : ObserverType where Sequence.Element: ObservableType, Sequence.Element.Element == Observer.Element {
-    typealias Element = TriggerObservable.Element
-    
-    typealias Parent = RetryWhenSequenceSinkIter
-    
-    fileprivate let _parent: Parent
-
-    init(parent: Parent) {
-        self._parent = parent
-    }
-
-    func on(_ event: Event) {
-        switch event {
-        case .next:
-            self._parent._parent._lastError = nil
-            self._parent._parent.schedule(.moveNext)
-        case .error(let e):
-            self._parent._parent.forwardOn(.error(e))
-            self._parent._parent.dispose()
-        case .completed:
-            self._parent._parent.forwardOn(.completed)
-            self._parent._parent.dispose()
-        }
-    }
-}
-
-final private class RetryWhenSequenceSinkIter
-    : ObserverType
-    , Disposable where Sequence.Element: ObservableType, Sequence.Element.Element == Observer.Element {
-    typealias Element = Observer.Element 
-    typealias Parent = RetryWhenSequenceSink
-
-    fileprivate let _parent: Parent
-    fileprivate let _errorHandlerSubscription = SingleAssignmentDisposable()
-    fileprivate let _subscription: Disposable
-
-    init(parent: Parent, subscription: Disposable) {
-        self._parent = parent
-        self._subscription = subscription
-    }
-
-    func on(_ event: Event) {
-        switch event {
-        case .next:
-            self._parent.forwardOn(event)
-        case .error(let error):
-            self._parent._lastError = error
-
-            if let failedWith = error as? Error {
-                // dispose current subscription
-                self._subscription.dispose()
-
-                let errorHandlerSubscription = self._parent._notifier.subscribe(RetryTriggerSink(parent: self))
-                self._errorHandlerSubscription.setDisposable(errorHandlerSubscription)
-                self._parent._errorSubject.on(.next(failedWith))
-            }
-            else {
-                self._parent.forwardOn(.error(error))
-                self._parent.dispose()
-            }
-        case .completed:
-            self._parent.forwardOn(event)
-            self._parent.dispose()
-        }
-    }
-
-    final func dispose() {
-        self._subscription.dispose()
-        self._errorHandlerSubscription.dispose()
-    }
-}
-
-final private class RetryWhenSequenceSink
-    : TailRecursiveSink where Sequence.Element: ObservableType, Sequence.Element.Element == Observer.Element {
-    typealias Element = Observer.Element 
-    typealias Parent = RetryWhenSequence
-    
-    let _lock = RecursiveLock()
-    
-    fileprivate let _parent: Parent
-    
-    fileprivate var _lastError: Swift.Error?
-    fileprivate let _errorSubject = PublishSubject()
-    fileprivate let _handler: Observable
-    fileprivate let _notifier = PublishSubject()
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        self._handler = parent._notificationHandler(self._errorSubject).asObservable()
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    override func done() {
-        if let lastError = self._lastError {
-            self.forwardOn(.error(lastError))
-            self._lastError = nil
-        }
-        else {
-            self.forwardOn(.completed)
-        }
-
-        self.dispose()
-    }
-    
-    override func extract(_ observable: Observable) -> SequenceGenerator? {
-        // It is important to always return `nil` here because there are sideffects in the `run` method
-        // that are dependant on particular `retryWhen` operator so single operator stack can't be reused in this
-        // case.
-        return nil
-    }
-
-    override func subscribeToNext(_ source: Observable) -> Disposable {
-        let subscription = SingleAssignmentDisposable()
-        let iter = RetryWhenSequenceSinkIter(parent: self, subscription: subscription)
-        subscription.setDisposable(source.subscribe(iter))
-        return iter
-    }
-
-    override func run(_ sources: SequenceGenerator) -> Disposable {
-        let triggerSubscription = self._handler.subscribe(self._notifier.asObserver())
-        let superSubscription = super.run(sources)
-        return Disposables.create(superSubscription, triggerSubscription)
-    }
-}
-
-final private class RetryWhenSequence: Producer where Sequence.Element: ObservableType {
-    typealias Element = Sequence.Element.Element
-    
-    fileprivate let _sources: Sequence
-    fileprivate let _notificationHandler: (Observable) -> TriggerObservable
-    
-    init(sources: Sequence, notificationHandler: @escaping (Observable) -> TriggerObservable) {
-        self._sources = sources
-        self._notificationHandler = notificationHandler
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = RetryWhenSequenceSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run((self._sources.makeIterator(), nil))
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Sample.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Sample.swift
deleted file mode 100644
index 4fab683..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Sample.swift
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-//  Sample.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 5/1/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Samples the source observable sequence using a sampler observable sequence producing sampling ticks.
-
-     Upon each sampling tick, the latest element (if any) in the source sequence during the last sampling interval is sent to the resulting sequence.
-
-     **In case there were no new elements between sampler ticks, no element is sent to the resulting sequence.**
-
-     - seealso: [sample operator on reactivex.io](http://reactivex.io/documentation/operators/sample.html)
-
-     - parameter sampler: Sampling tick sequence.
-     - returns: Sampled observable sequence.
-     */
-    public func sample(_ sampler: Source)
-        -> Observable {
-            return Sample(source: self.asObservable(), sampler: sampler.asObservable())
-    }
-}
-
-final private class SamplerSink
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias Element = SampleType
-    
-    typealias Parent = SampleSequenceSink
-    
-    fileprivate let _parent: Parent
-
-    var _lock: RecursiveLock {
-        return self._parent._lock
-    }
-    
-    init(parent: Parent) {
-        self._parent = parent
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next, .completed:
-            if let element = _parent._element {
-                self._parent._element = nil
-                self._parent.forwardOn(.next(element))
-            }
-
-            if self._parent._atEnd {
-                self._parent.forwardOn(.completed)
-                self._parent.dispose()
-            }
-        case .error(let e):
-            self._parent.forwardOn(.error(e))
-            self._parent.dispose()
-        }
-    }
-}
-
-final private class SampleSequenceSink
-    : Sink
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias Element = Observer.Element 
-    typealias Parent = Sample
-    
-    fileprivate let _parent: Parent
-
-    let _lock = RecursiveLock()
-    
-    // state
-    fileprivate var _element = nil as Element?
-    fileprivate var _atEnd = false
-    
-    fileprivate let _sourceSubscription = SingleAssignmentDisposable()
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run() -> Disposable {
-        self._sourceSubscription.setDisposable(self._parent._source.subscribe(self))
-        let samplerSubscription = self._parent._sampler.subscribe(SamplerSink(parent: self))
-        
-        return Disposables.create(_sourceSubscription, samplerSubscription)
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next(let element):
-            self._element = element
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            self._atEnd = true
-            self._sourceSubscription.dispose()
-        }
-    }
-    
-}
-
-final private class Sample: Producer {
-    fileprivate let _source: Observable
-    fileprivate let _sampler: Observable
-
-    init(source: Observable, sampler: Observable) {
-        self._source = source
-        self._sampler = sampler
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = SampleSequenceSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Scan.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Scan.swift
deleted file mode 100644
index 7920ae9..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Scan.swift
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-//  Scan.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/14/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Applies an accumulator function over an observable sequence and returns each intermediate result. The specified seed value is used as the initial accumulator value.
-
-     For aggregation behavior with no intermediate results, see `reduce`.
-
-     - seealso: [scan operator on reactivex.io](http://reactivex.io/documentation/operators/scan.html)
-
-     - parameter seed: The initial accumulator value.
-     - parameter accumulator: An accumulator function to be invoked on each element.
-     - returns: An observable sequence containing the accumulated values.
-     */
-    public func scan(into seed: A, accumulator: @escaping (inout A, Element) throws -> Void)
-        -> Observable {
-        return Scan(source: self.asObservable(), seed: seed, accumulator: accumulator)
-    }
-
-    /**
-     Applies an accumulator function over an observable sequence and returns each intermediate result. The specified seed value is used as the initial accumulator value.
-
-     For aggregation behavior with no intermediate results, see `reduce`.
-
-     - seealso: [scan operator on reactivex.io](http://reactivex.io/documentation/operators/scan.html)
-
-     - parameter seed: The initial accumulator value.
-     - parameter accumulator: An accumulator function to be invoked on each element.
-     - returns: An observable sequence containing the accumulated values.
-     */
-    public func scan(_ seed: A, accumulator: @escaping (A, Element) throws -> A)
-        -> Observable {
-        return Scan(source: self.asObservable(), seed: seed) { acc, element in
-            let currentAcc = acc
-            acc = try accumulator(currentAcc, element)
-        }
-    }
-}
-
-final private class ScanSink: Sink, ObserverType {
-    typealias Accumulate = Observer.Element 
-    typealias Parent = Scan
-
-    fileprivate let _parent: Parent
-    fileprivate var _accumulate: Accumulate
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        self._accumulate = parent._seed
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let element):
-            do {
-                try self._parent._accumulator(&self._accumulate, element)
-                self.forwardOn(.next(self._accumulate))
-            }
-            catch let error {
-                self.forwardOn(.error(error))
-                self.dispose()
-            }
-        case .error(let error):
-            self.forwardOn(.error(error))
-            self.dispose()
-        case .completed:
-            self.forwardOn(.completed)
-            self.dispose()
-        }
-    }
-    
-}
-
-final private class Scan: Producer {
-    typealias Accumulator = (inout Accumulate, Element) throws -> Void
-    
-    fileprivate let _source: Observable
-    fileprivate let _seed: Accumulate
-    fileprivate let _accumulator: Accumulator
-    
-    init(source: Observable, seed: Accumulate, accumulator: @escaping Accumulator) {
-        self._source = source
-        self._seed = seed
-        self._accumulator = accumulator
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Accumulate {
-        let sink = ScanSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Sequence.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Sequence.swift
deleted file mode 100644
index f158565..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Sequence.swift
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-//  Sequence.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 11/14/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-    // MARK: of
-
-    /**
-     This method creates a new Observable instance with a variable number of elements.
-
-     - seealso: [from operator on reactivex.io](http://reactivex.io/documentation/operators/from.html)
-
-     - parameter elements: Elements to generate.
-     - parameter scheduler: Scheduler to send elements on. If `nil`, elements are sent immediately on subscription.
-     - returns: The observable sequence whose elements are pulled from the given arguments.
-     */
-    public static func of(_ elements: Element ..., scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
-        return ObservableSequence(elements: elements, scheduler: scheduler)
-    }
-}
-
-extension ObservableType {
-    /**
-     Converts an array to an observable sequence.
-
-     - seealso: [from operator on reactivex.io](http://reactivex.io/documentation/operators/from.html)
-
-     - returns: The observable sequence whose elements are pulled from the given enumerable sequence.
-     */
-    public static func from(_ array: [Element], scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable {
-        return ObservableSequence(elements: array, scheduler: scheduler)
-    }
-
-    /**
-     Converts a sequence to an observable sequence.
-
-     - seealso: [from operator on reactivex.io](http://reactivex.io/documentation/operators/from.html)
-
-     - returns: The observable sequence whose elements are pulled from the given enumerable sequence.
-     */
-    public static func from(_ sequence: Sequence, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable where Sequence.Element == Element {
-        return ObservableSequence(elements: sequence, scheduler: scheduler)
-    }
-}
-
-final private class ObservableSequenceSink: Sink where Sequence.Element == Observer.Element {
-    typealias Parent = ObservableSequence
-
-    private let _parent: Parent
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    func run() -> Disposable {
-        return self._parent._scheduler.scheduleRecursive(self._parent._elements.makeIterator()) { iterator, recurse in
-            var mutableIterator = iterator
-            if let next = mutableIterator.next() {
-                self.forwardOn(.next(next))
-                recurse(mutableIterator)
-            }
-            else {
-                self.forwardOn(.completed)
-                self.dispose()
-            }
-        }
-    }
-}
-
-final private class ObservableSequence: Producer {
-    fileprivate let _elements: Sequence
-    fileprivate let _scheduler: ImmediateSchedulerType
-
-    init(elements: Sequence, scheduler: ImmediateSchedulerType) {
-        self._elements = elements
-        self._scheduler = scheduler
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = ObservableSequenceSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift b/Demo/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
deleted file mode 100644
index 9565a49..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
+++ /dev/null
@@ -1,456 +0,0 @@
-//
-//  ShareReplayScope.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 5/28/17.
-//  Copyright © 2017 Krunoslav Zaher. All rights reserved.
-//
-
-/// Subject lifetime scope
-public enum SubjectLifetimeScope {
-    /**
-     **Each connection will have it's own subject instance to store replay events.**
-     **Connections will be isolated from each another.**
-
-     Configures the underlying implementation to behave equivalent to.
-     
-     ```
-     source.multicast(makeSubject: { MySubject() }).refCount()
-     ```
-
-     **This is the recommended default.**
-
-     This has the following consequences:
-     * `retry` or `concat` operators will function as expected because terminating the sequence will clear internal state.
-     * Each connection to source observable sequence will use it's own subject.
-     * When the number of subscribers drops from 1 to 0 and connection to source sequence is disposed, subject will be cleared.
-
-     
-     ```
-     let xs = Observable.deferred { () -> Observable in
-             print("Performing work ...")
-             return Observable.just(Date().timeIntervalSince1970)
-         }
-         .share(replay: 1, scope: .whileConnected)
-
-     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
-     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
-     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
-
-     ```
-
-     Notice how time interval is different and `Performing work ...` is printed each time)
-     
-     ```
-     Performing work ...
-     next 1495998900.82141
-     completed
-
-     Performing work ...
-     next 1495998900.82359
-     completed
-
-     Performing work ...
-     next 1495998900.82444
-     completed
-
-
-     ```
-     
-     */
-    case whileConnected
-
-    /**
-     **One subject will store replay events for all connections to source.**
-     **Connections won't be isolated from each another.**
-
-     Configures the underlying implementation behave equivalent to.
-
-     ```
-     source.multicast(MySubject()).refCount()
-     ```
-     
-     This has the following consequences:
-     * Using `retry` or `concat` operators after this operator usually isn't advised.
-     * Each connection to source observable sequence will share the same subject.
-     * After number of subscribers drops from 1 to 0 and connection to source observable sequence is dispose, this operator will 
-       continue holding a reference to the same subject.
-       If at some later moment a new observer initiates a new connection to source it can potentially receive
-       some of the stale events received during previous connection.
-     * After source sequence terminates any new observer will always immediately receive replayed elements and terminal event.
-       No new subscriptions to source observable sequence will be attempted.
-
-     ```
-     let xs = Observable.deferred { () -> Observable in
-             print("Performing work ...")
-             return Observable.just(Date().timeIntervalSince1970)
-         }
-         .share(replay: 1, scope: .forever)
-
-     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
-     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
-     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
-     ```
-     
-     Notice how time interval is the same, replayed, and `Performing work ...` is printed only once
-     
-     ```
-     Performing work ...
-     next 1495999013.76356
-     completed
-
-     next 1495999013.76356
-     completed
-
-     next 1495999013.76356
-     completed
-     ```
-     
-    */
-    case forever
-}
-
-extension ObservableType {
-
-    /**
-     Returns an observable sequence that **shares a single subscription to the underlying sequence**, and immediately upon subscription replays  elements in buffer.
-     
-     This operator is equivalent to:
-     * `.whileConnected`
-     ```
-     // Each connection will have it's own subject instance to store replay events.
-     // Connections will be isolated from each another.
-     source.multicast(makeSubject: { Replay.create(bufferSize: replay) }).refCount()
-     ```
-     * `.forever`
-     ```
-     // One subject will store replay events for all connections to source.
-     // Connections won't be isolated from each another.
-     source.multicast(Replay.create(bufferSize: replay)).refCount()
-     ```
-     
-     It uses optimized versions of the operators for most common operations.
-
-     - parameter replay: Maximum element count of the replay buffer.
-     - parameter scope: Lifetime scope of sharing subject. For more information see `SubjectLifetimeScope` enum.
-
-     - seealso: [shareReplay operator on reactivex.io](http://reactivex.io/documentation/operators/replay.html)
-
-     - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
-     */
-    public func share(replay: Int = 0, scope: SubjectLifetimeScope = .whileConnected)
-        -> Observable {
-        switch scope {
-        case .forever:
-            switch replay {
-            case 0: return self.multicast(PublishSubject()).refCount()
-            default: return self.multicast(ReplaySubject.create(bufferSize: replay)).refCount()
-            }
-        case .whileConnected:
-            switch replay {
-            case 0: return ShareWhileConnected(source: self.asObservable())
-            case 1: return ShareReplay1WhileConnected(source: self.asObservable())
-            default: return self.multicast(makeSubject: { ReplaySubject.create(bufferSize: replay) }).refCount()
-            }
-        }
-    }
-}
-
-fileprivate final class ShareReplay1WhileConnectedConnection
-    : ObserverType
-    , SynchronizedUnsubscribeType {
-    typealias Observers = AnyObserver.s
-    typealias DisposeKey = Observers.KeyType
-
-    typealias Parent = ShareReplay1WhileConnected
-    private let _parent: Parent
-    private let _subscription = SingleAssignmentDisposable()
-
-    private let _lock: RecursiveLock
-    private var _disposed: Bool = false
-    fileprivate var _observers = Observers()
-    fileprivate var _element: Element?
-
-    init(parent: Parent, lock: RecursiveLock) {
-        self._parent = parent
-        self._lock = lock
-
-        #if TRACE_RESOURCES
-            _ = Resources.incrementTotal()
-        #endif
-    }
-
-    final func on(_ event: Event) {
-        self._lock.lock()
-        let observers = self._synchronized_on(event)
-        self._lock.unlock()
-        dispatch(observers, event)
-    }
-
-    final private func _synchronized_on(_ event: Event) -> Observers {
-        if self._disposed {
-            return Observers()
-        }
-
-        switch event {
-        case .next(let element):
-            self._element = element
-            return self._observers
-        case .error, .completed:
-            let observers = self._observers
-            self._synchronized_dispose()
-            return observers
-        }
-    }
-
-    final func connect() {
-        self._subscription.setDisposable(self._parent._source.subscribe(self))
-    }
-
-    final func _synchronized_subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
-        self._lock.lock(); defer { self._lock.unlock() }
-        if let element = self._element {
-            observer.on(.next(element))
-        }
-
-        let disposeKey = self._observers.insert(observer.on)
-
-        return SubscriptionDisposable(owner: self, key: disposeKey)
-    }
-
-    final private func _synchronized_dispose() {
-        self._disposed = true
-        if self._parent._connection === self {
-            self._parent._connection = nil
-        }
-        self._observers = Observers()
-    }
-
-    final func synchronizedUnsubscribe(_ disposeKey: DisposeKey) {
-        self._lock.lock()
-        let shouldDisconnect = self._synchronized_unsubscribe(disposeKey)
-        self._lock.unlock()
-        if shouldDisconnect {
-            self._subscription.dispose()
-        }
-    }
-
-    @inline(__always)
-    final private func _synchronized_unsubscribe(_ disposeKey: DisposeKey) -> Bool {
-        // if already unsubscribed, just return
-        if self._observers.removeKey(disposeKey) == nil {
-            return false
-        }
-
-        if self._observers.count == 0 {
-            self._synchronized_dispose()
-            return true
-        }
-
-        return false
-    }
-
-    #if TRACE_RESOURCES
-        deinit {
-            _ = Resources.decrementTotal()
-        }
-    #endif
-}
-
-// optimized version of share replay for most common case
-final private class ShareReplay1WhileConnected
-    : Observable {
-
-    fileprivate typealias Connection = ShareReplay1WhileConnectedConnection
-
-    fileprivate let _source: Observable
-
-    fileprivate let _lock = RecursiveLock()
-
-    fileprivate var _connection: Connection?
-
-    init(source: Observable) {
-        self._source = source
-    }
-
-    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
-        self._lock.lock()
-
-        let connection = self._synchronized_subscribe(observer)
-        let count = connection._observers.count
-
-        let disposable = connection._synchronized_subscribe(observer)
-
-        self._lock.unlock()
-        
-        if count == 0 {
-            connection.connect()
-        }
-
-        return disposable
-    }
-
-    @inline(__always)
-    private func _synchronized_subscribe(_ observer: Observer) -> Connection where Observer.Element == Element {
-        let connection: Connection
-
-        if let existingConnection = self._connection {
-            connection = existingConnection
-        }
-        else {
-            connection = ShareReplay1WhileConnectedConnection(
-                parent: self,
-                lock: self._lock)
-            self._connection = connection
-        }
-
-        return connection
-    }
-}
-
-fileprivate final class ShareWhileConnectedConnection
-    : ObserverType
-    , SynchronizedUnsubscribeType {
-    typealias Observers = AnyObserver.s
-    typealias DisposeKey = Observers.KeyType
-
-    typealias Parent = ShareWhileConnected
-    private let _parent: Parent
-    private let _subscription = SingleAssignmentDisposable()
-
-    private let _lock: RecursiveLock
-    private var _disposed: Bool = false
-    fileprivate var _observers = Observers()
-
-    init(parent: Parent, lock: RecursiveLock) {
-        self._parent = parent
-        self._lock = lock
-
-        #if TRACE_RESOURCES
-            _ = Resources.incrementTotal()
-        #endif
-    }
-
-    final func on(_ event: Event) {
-        self._lock.lock()
-        let observers = self._synchronized_on(event)
-        self._lock.unlock()
-        dispatch(observers, event)
-    }
-
-    final private func _synchronized_on(_ event: Event) -> Observers {
-        if self._disposed {
-            return Observers()
-        }
-
-        switch event {
-        case .next:
-            return self._observers
-        case .error, .completed:
-            let observers = self._observers
-            self._synchronized_dispose()
-            return observers
-        }
-    }
-
-    final func connect() {
-        self._subscription.setDisposable(self._parent._source.subscribe(self))
-    }
-
-    final func _synchronized_subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
-        self._lock.lock(); defer { self._lock.unlock() }
-
-        let disposeKey = self._observers.insert(observer.on)
-
-        return SubscriptionDisposable(owner: self, key: disposeKey)
-    }
-
-    final private func _synchronized_dispose() {
-        self._disposed = true
-        if self._parent._connection === self {
-            self._parent._connection = nil
-        }
-        self._observers = Observers()
-    }
-
-    final func synchronizedUnsubscribe(_ disposeKey: DisposeKey) {
-        self._lock.lock()
-        let shouldDisconnect = self._synchronized_unsubscribe(disposeKey)
-        self._lock.unlock()
-        if shouldDisconnect {
-            self._subscription.dispose()
-        }
-    }
-
-    @inline(__always)
-    final private func _synchronized_unsubscribe(_ disposeKey: DisposeKey) -> Bool {
-        // if already unsubscribed, just return
-        if self._observers.removeKey(disposeKey) == nil {
-            return false
-        }
-
-        if self._observers.count == 0 {
-            self._synchronized_dispose()
-            return true
-        }
-
-        return false
-    }
-
-    #if TRACE_RESOURCES
-    deinit {
-        _ = Resources.decrementTotal()
-    }
-    #endif
-}
-
-// optimized version of share replay for most common case
-final private class ShareWhileConnected
-    : Observable {
-
-    fileprivate typealias Connection = ShareWhileConnectedConnection
-
-    fileprivate let _source: Observable
-
-    fileprivate let _lock = RecursiveLock()
-
-    fileprivate var _connection: Connection?
-
-    init(source: Observable) {
-        self._source = source
-    }
-
-    override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element {
-        self._lock.lock()
-
-        let connection = self._synchronized_subscribe(observer)
-        let count = connection._observers.count
-
-        let disposable = connection._synchronized_subscribe(observer)
-
-        self._lock.unlock()
-
-        if count == 0 {
-            connection.connect()
-        }
-
-        return disposable
-    }
-
-    @inline(__always)
-    private func _synchronized_subscribe(_ observer: Observer) -> Connection where Observer.Element == Element {
-        let connection: Connection
-
-        if let existingConnection = self._connection {
-            connection = existingConnection
-        }
-        else {
-            connection = ShareWhileConnectedConnection(
-                parent: self,
-                lock: self._lock)
-            self._connection = connection
-        }
-        
-        return connection
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift
deleted file mode 100644
index e50a9be..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-//  SingleAsync.swift
-//  RxSwift
-//
-//  Created by Junior B. on 09/11/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     The single operator is similar to first, but throws a `RxError.noElements` or `RxError.moreThanOneElement`
-     if the source Observable does not emit exactly one element before successfully completing.
-
-     - seealso: [single operator on reactivex.io](http://reactivex.io/documentation/operators/first.html)
-
-     - returns: An observable sequence that emits a single element or throws an exception if more (or none) of them are emitted.
-     */
-    public func single()
-        -> Observable {
-        return SingleAsync(source: self.asObservable())
-    }
-
-    /**
-     The single operator is similar to first, but throws a `RxError.NoElements` or `RxError.MoreThanOneElement`
-     if the source Observable does not emit exactly one element before successfully completing.
-
-     - seealso: [single operator on reactivex.io](http://reactivex.io/documentation/operators/first.html)
-
-     - parameter predicate: A function to test each source element for a condition.
-     - returns: An observable sequence that emits a single element or throws an exception if more (or none) of them are emitted.
-     */
-    public func single(_ predicate: @escaping (Element) throws -> Bool)
-        -> Observable {
-        return SingleAsync(source: self.asObservable(), predicate: predicate)
-    }
-}
-
-fileprivate final class SingleAsyncSink : Sink, ObserverType {
-    typealias Element = Observer.Element
-    typealias Parent = SingleAsync
-    
-    private let _parent: Parent
-    private var _seenValue: Bool = false
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            do {
-                let forward = try self._parent._predicate?(value) ?? true
-                if !forward {
-                    return
-                }
-            }
-            catch let error {
-                self.forwardOn(.error(error as Swift.Error))
-                self.dispose()
-                return
-            }
-
-            if self._seenValue {
-                self.forwardOn(.error(RxError.moreThanOneElement))
-                self.dispose()
-                return
-            }
-
-            self._seenValue = true
-            self.forwardOn(.next(value))
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            if self._seenValue {
-                self.forwardOn(.completed)
-            } else {
-                self.forwardOn(.error(RxError.noElements))
-            }
-            self.dispose()
-        }
-    }
-}
-
-final class SingleAsync: Producer {
-    typealias Predicate = (Element) throws -> Bool
-    
-    fileprivate let _source: Observable
-    fileprivate let _predicate: Predicate?
-    
-    init(source: Observable, predicate: Predicate? = nil) {
-        self._source = source
-        self._predicate = predicate
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = SingleAsyncSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Sink.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Sink.swift
deleted file mode 100644
index 1305d1b..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Sink.swift
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-//  Sink.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/19/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-class Sink : Disposable {
-    fileprivate let _observer: Observer
-    fileprivate let _cancel: Cancelable
-    fileprivate let _disposed = AtomicInt(0)
-
-    #if DEBUG
-        fileprivate let _synchronizationTracker = SynchronizationTracker()
-    #endif
-
-    init(observer: Observer, cancel: Cancelable) {
-#if TRACE_RESOURCES
-        _ = Resources.incrementTotal()
-#endif
-        self._observer = observer
-        self._cancel = cancel
-    }
-
-    final func forwardOn(_ event: Event) {
-        #if DEBUG
-            self._synchronizationTracker.register(synchronizationErrorMessage: .default)
-            defer { self._synchronizationTracker.unregister() }
-        #endif
-        if isFlagSet(self._disposed, 1) {
-            return
-        }
-        self._observer.on(event)
-    }
-
-    final func forwarder() -> SinkForward {
-        return SinkForward(forward: self)
-    }
-
-    final var disposed: Bool {
-        return isFlagSet(self._disposed, 1)
-    }
-
-    func dispose() {
-        fetchOr(self._disposed, 1)
-        self._cancel.dispose()
-    }
-
-    deinit {
-#if TRACE_RESOURCES
-       _ =  Resources.decrementTotal()
-#endif
-    }
-}
-
-final class SinkForward: ObserverType {
-    typealias Element = Observer.Element 
-
-    private let _forward: Sink
-
-    init(forward: Sink) {
-        self._forward = forward
-    }
-
-    final func on(_ event: Event) {
-        switch event {
-        case .next:
-            self._forward._observer.on(event)
-        case .error, .completed:
-            self._forward._observer.on(event)
-            self._forward._cancel.dispose()
-        }
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Skip.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Skip.swift
deleted file mode 100644
index 3076f9c..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Skip.swift
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-//  Skip.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/25/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Bypasses a specified number of elements in an observable sequence and then returns the remaining elements.
-
-     - seealso: [skip operator on reactivex.io](http://reactivex.io/documentation/operators/skip.html)
-
-     - parameter count: The number of elements to skip before returning the remaining elements.
-     - returns: An observable sequence that contains the elements that occur after the specified index in the input sequence.
-     */
-    public func skip(_ count: Int)
-        -> Observable {
-        return SkipCount(source: self.asObservable(), count: count)
-    }
-}
-
-extension ObservableType {
-
-    /**
-     Skips elements for the specified duration from the start of the observable source sequence, using the specified scheduler to run timers.
-
-     - seealso: [skip operator on reactivex.io](http://reactivex.io/documentation/operators/skip.html)
-
-     - parameter duration: Duration for skipping elements from the start of the sequence.
-     - parameter scheduler: Scheduler to run the timer on.
-     - returns: An observable sequence with the elements skipped during the specified duration from the start of the source sequence.
-     */
-    public func skip(_ duration: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
-        return SkipTime(source: self.asObservable(), duration: duration, scheduler: scheduler)
-    }
-}
-
-// count version
-
-final private class SkipCountSink: Sink, ObserverType {
-    typealias Element = Observer.Element 
-    typealias Parent = SkipCount
-    
-    let parent: Parent
-    
-    var remaining: Int
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self.parent = parent
-        self.remaining = parent.count
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            
-            if self.remaining <= 0 {
-                self.forwardOn(.next(value))
-            }
-            else {
-                self.remaining -= 1
-            }
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-    
-}
-
-final private class SkipCount: Producer {
-    let source: Observable
-    let count: Int
-    
-    init(source: Observable, count: Int) {
-        self.source = source
-        self.count = count
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = SkipCountSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self.source.subscribe(sink)
-
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-// time version
-
-final private class SkipTimeSink: Sink, ObserverType where Observer.Element == Element {
-    typealias Parent = SkipTime
-
-    let parent: Parent
-    
-    // state
-    var open = false
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self.parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            if self.open {
-                self.forwardOn(.next(value))
-            }
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-    
-    func tick() {
-        self.open = true
-    }
-    
-    func run() -> Disposable {
-        let disposeTimer = self.parent.scheduler.scheduleRelative((), dueTime: self.parent.duration) { _ in 
-            self.tick()
-            return Disposables.create()
-        }
-        
-        let disposeSubscription = self.parent.source.subscribe(self)
-        
-        return Disposables.create(disposeTimer, disposeSubscription)
-    }
-}
-
-final private class SkipTime: Producer {
-    let source: Observable
-    let duration: RxTimeInterval
-    let scheduler: SchedulerType
-    
-    init(source: Observable, duration: RxTimeInterval, scheduler: SchedulerType) {
-        self.source = source
-        self.scheduler = scheduler
-        self.duration = duration
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = SkipTimeSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift
deleted file mode 100644
index 056d795..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-//  SkipUntil.swift
-//  RxSwift
-//
-//  Created by Yury Korolev on 10/3/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Returns the elements from the source observable sequence that are emitted after the other observable sequence produces an element.
-
-     - seealso: [skipUntil operator on reactivex.io](http://reactivex.io/documentation/operators/skipuntil.html)
-
-     - parameter other: Observable sequence that starts propagation of elements of the source sequence.
-     - returns: An observable sequence containing the elements of the source sequence that are emitted after the other sequence emits an item.
-     */
-    public func skipUntil(_ other: Source)
-        -> Observable {
-        return SkipUntil(source: self.asObservable(), other: other.asObservable())
-    }
-}
-
-final private class SkipUntilSinkOther
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias Parent = SkipUntilSink
-    typealias Element = Other
-    
-    fileprivate let _parent: Parent
-
-    var _lock: RecursiveLock {
-        return self._parent._lock
-    }
-    
-    let _subscription = SingleAssignmentDisposable()
-
-    init(parent: Parent) {
-        self._parent = parent
-        #if TRACE_RESOURCES
-            _ = Resources.incrementTotal()
-        #endif
-    }
-
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next:
-            self._parent._forwardElements = true
-            self._subscription.dispose()
-        case .error(let e):
-            self._parent.forwardOn(.error(e))
-            self._parent.dispose()
-        case .completed:
-            self._subscription.dispose()
-        }
-    }
-    
-    #if TRACE_RESOURCES
-    deinit {
-        _ = Resources.decrementTotal()
-    }
-    #endif
-
-}
-
-
-final private class SkipUntilSink
-    : Sink
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias Element = Observer.Element 
-    typealias Parent = SkipUntil
-    
-    let _lock = RecursiveLock()
-    fileprivate let _parent: Parent
-    fileprivate var _forwardElements = false
-    
-    fileprivate let _sourceSubscription = SingleAssignmentDisposable()
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next:
-            if self._forwardElements {
-                self.forwardOn(event)
-            }
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            if self._forwardElements {
-                self.forwardOn(event)
-            }
-            self.dispose()
-        }
-    }
-    
-    func run() -> Disposable {
-        let sourceSubscription = self._parent._source.subscribe(self)
-        let otherObserver = SkipUntilSinkOther(parent: self)
-        let otherSubscription = self._parent._other.subscribe(otherObserver)
-        self._sourceSubscription.setDisposable(sourceSubscription)
-        otherObserver._subscription.setDisposable(otherSubscription)
-        
-        return Disposables.create(_sourceSubscription, otherObserver._subscription)
-    }
-}
-
-final private class SkipUntil: Producer {
-    
-    fileprivate let _source: Observable
-    fileprivate let _other: Observable
-    
-    init(source: Observable, other: Observable) {
-        self._source = source
-        self._other = other
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = SkipUntilSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift
deleted file mode 100644
index db9f5a6..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-//  SkipWhile.swift
-//  RxSwift
-//
-//  Created by Yury Korolev on 10/9/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Bypasses elements in an observable sequence as long as a specified condition is true and then returns the remaining elements.
-
-     - seealso: [skipWhile operator on reactivex.io](http://reactivex.io/documentation/operators/skipwhile.html)
-
-     - parameter predicate: A function to test each element for a condition.
-     - returns: An observable sequence that contains the elements from the input sequence starting at the first element in the linear series that does not pass the test specified by predicate.
-     */
-    public func skipWhile(_ predicate: @escaping (Element) throws -> Bool) -> Observable {
-        return SkipWhile(source: self.asObservable(), predicate: predicate)
-    }
-}
-
-final private class SkipWhileSink: Sink, ObserverType {
-    typealias Element = Observer.Element 
-    typealias Parent = SkipWhile
-
-    fileprivate let _parent: Parent
-    fileprivate var _running = false
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            if !self._running {
-                do {
-                    self._running = try !self._parent._predicate(value)
-                } catch let e {
-                    self.forwardOn(.error(e))
-                    self.dispose()
-                    return
-                }
-            }
-
-            if self._running {
-                self.forwardOn(.next(value))
-            }
-        case .error, .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-}
-
-final private class SkipWhile: Producer {
-    typealias Predicate = (Element) throws -> Bool
-
-    fileprivate let _source: Observable
-    fileprivate let _predicate: Predicate
-
-    init(source: Observable, predicate: @escaping Predicate) {
-        self._source = source
-        self._predicate = predicate
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = SkipWhileSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/StartWith.swift b/Demo/Pods/RxSwift/RxSwift/Observables/StartWith.swift
deleted file mode 100644
index 13fb31d..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/StartWith.swift
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-//  StartWith.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 4/6/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Prepends a sequence of values to an observable sequence.
-
-     - seealso: [startWith operator on reactivex.io](http://reactivex.io/documentation/operators/startwith.html)
-
-     - parameter elements: Elements to prepend to the specified sequence.
-     - returns: The source sequence prepended with the specified values.
-     */
-    public func startWith(_ elements: Element ...)
-        -> Observable {
-            return StartWith(source: self.asObservable(), elements: elements)
-    }
-}
-
-final private class StartWith: Producer {
-    let elements: [Element]
-    let source: Observable
-
-    init(source: Observable, elements: [Element]) {
-        self.source = source
-        self.elements = elements
-        super.init()
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        for e in self.elements {
-            observer.on(.next(e))
-        }
-
-        return (sink: Disposables.create(), subscription: self.source.subscribe(observer))
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift
deleted file mode 100644
index 5f7be0b..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-//  SubscribeOn.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/14/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Wraps the source sequence in order to run its subscription and unsubscription logic on the specified
-     scheduler.
-
-     This operation is not commonly used.
-
-     This only performs the side-effects of subscription and unsubscription on the specified scheduler.
-
-     In order to invoke observer callbacks on a `scheduler`, use `observeOn`.
-
-     - seealso: [subscribeOn operator on reactivex.io](http://reactivex.io/documentation/operators/subscribeon.html)
-
-     - parameter scheduler: Scheduler to perform subscription and unsubscription actions on.
-     - returns: The source sequence whose subscriptions and unsubscriptions happen on the specified scheduler.
-     */
-    public func subscribeOn(_ scheduler: ImmediateSchedulerType)
-        -> Observable {
-        return SubscribeOn(source: self, scheduler: scheduler)
-    }
-}
-
-final private class SubscribeOnSink: Sink, ObserverType where Ob.Element == Observer.Element {
-    typealias Element = Observer.Element 
-    typealias Parent = SubscribeOn
-    
-    let parent: Parent
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self.parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        self.forwardOn(event)
-        
-        if event.isStopEvent {
-            self.dispose()
-        }
-    }
-    
-    func run() -> Disposable {
-        let disposeEverything = SerialDisposable()
-        let cancelSchedule = SingleAssignmentDisposable()
-        
-        disposeEverything.disposable = cancelSchedule
-        
-        let disposeSchedule = self.parent.scheduler.schedule(()) { _ -> Disposable in
-            let subscription = self.parent.source.subscribe(self)
-            disposeEverything.disposable = ScheduledDisposable(scheduler: self.parent.scheduler, disposable: subscription)
-            return Disposables.create()
-        }
-
-        cancelSchedule.setDisposable(disposeSchedule)
-    
-        return disposeEverything
-    }
-}
-
-final private class SubscribeOn: Producer {
-    let source: Ob
-    let scheduler: ImmediateSchedulerType
-    
-    init(source: Ob, scheduler: ImmediateSchedulerType) {
-        self.source = source
-        self.scheduler = scheduler
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Ob.Element {
-        let sink = SubscribeOnSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Switch.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Switch.swift
deleted file mode 100644
index ac12f2f..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Switch.swift
+++ /dev/null
@@ -1,234 +0,0 @@
-//
-//  Switch.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 3/12/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-    /**
-     Projects each element of an observable sequence into a new sequence of observable sequences and then
-     transforms an observable sequence of observable sequences into an observable sequence producing values only from the most recent observable sequence.
-
-     It is a combination of `map` + `switchLatest` operator
-
-     - seealso: [flatMapLatest operator on reactivex.io](http://reactivex.io/documentation/operators/flatmap.html)
-
-     - parameter selector: A transform function to apply to each element.
-     - returns: An observable sequence whose elements are the result of invoking the transform function on each element of source producing an
-     Observable of Observable sequences and that at any point in time produces the elements of the most recent inner observable sequence that has been received.
-     */
-    public func flatMapLatest(_ selector: @escaping (Element) throws -> Source)
-        -> Observable {
-            return FlatMapLatest(source: self.asObservable(), selector: selector)
-    }
-}
-
-extension ObservableType where Element : ObservableConvertibleType {
-
-    /**
-     Transforms an observable sequence of observable sequences into an observable sequence
-     producing values only from the most recent observable sequence.
-
-     Each time a new inner observable sequence is received, unsubscribe from the
-     previous inner observable sequence.
-
-     - seealso: [switch operator on reactivex.io](http://reactivex.io/documentation/operators/switch.html)
-
-     - returns: The observable sequence that at any point in time produces the elements of the most recent inner observable sequence that has been received.
-     */
-    public func switchLatest() -> Observable {
-        return Switch(source: self.asObservable())
-    }
-}
-
-private class SwitchSink
-    : Sink
-    , ObserverType where Source.Element == Observer.Element {
-    typealias Element = SourceType
-
-    fileprivate let _subscriptions: SingleAssignmentDisposable = SingleAssignmentDisposable()
-    fileprivate let _innerSubscription: SerialDisposable = SerialDisposable()
-
-    let _lock = RecursiveLock()
-    
-    // state
-    fileprivate var _stopped = false
-    fileprivate var _latest = 0
-    fileprivate var _hasLatest = false
-    
-    override init(observer: Observer, cancel: Cancelable) {
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run(_ source: Observable) -> Disposable {
-        let subscription = source.subscribe(self)
-        self._subscriptions.setDisposable(subscription)
-        return Disposables.create(_subscriptions, _innerSubscription)
-    }
-
-    func performMap(_ element: SourceType) throws -> Source {
-        rxAbstractMethod()
-    }
-
-    @inline(__always)
-    final private func nextElementArrived(element: Element) -> (Int, Observable)? {
-        self._lock.lock(); defer { self._lock.unlock() } // {
-            do {
-                let observable = try self.performMap(element).asObservable()
-                self._hasLatest = true
-                self._latest = self._latest &+ 1
-                return (self._latest, observable)
-            }
-            catch let error {
-                self.forwardOn(.error(error))
-                self.dispose()
-            }
-
-            return nil
-        // }
-    }
-
-    func on(_ event: Event) {
-        switch event {
-        case .next(let element):
-            if let (latest, observable) = self.nextElementArrived(element: element) {
-                let d = SingleAssignmentDisposable()
-                self._innerSubscription.disposable = d
-                   
-                let observer = SwitchSinkIter(parent: self, id: latest, _self: d)
-                let disposable = observable.subscribe(observer)
-                d.setDisposable(disposable)
-            }
-        case .error(let error):
-            self._lock.lock(); defer { self._lock.unlock() }
-            self.forwardOn(.error(error))
-            self.dispose()
-        case .completed:
-            self._lock.lock(); defer { self._lock.unlock() }
-            self._stopped = true
-            
-            self._subscriptions.dispose()
-            
-            if !self._hasLatest {
-                self.forwardOn(.completed)
-                self.dispose()
-            }
-        }
-    }
-}
-
-final private class SwitchSinkIter
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType where Source.Element == Observer.Element {
-    typealias Element = Source.Element
-    typealias Parent = SwitchSink
-    
-    fileprivate let _parent: Parent
-    fileprivate let _id: Int
-    fileprivate let _self: Disposable
-
-    var _lock: RecursiveLock {
-        return self._parent._lock
-    }
-
-    init(parent: Parent, id: Int, _self: Disposable) {
-        self._parent = parent
-        self._id = id
-        self._self = _self
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next: break
-        case .error, .completed:
-            self._self.dispose()
-        }
-        
-        if self._parent._latest != self._id {
-            return
-        }
-       
-        switch event {
-        case .next:
-            self._parent.forwardOn(event)
-        case .error:
-            self._parent.forwardOn(event)
-            self._parent.dispose()
-        case .completed:
-            self._parent._hasLatest = false
-            if self._parent._stopped {
-                self._parent.forwardOn(event)
-                self._parent.dispose()
-            }
-        }
-    }
-}
-
-// MARK: Specializations
-
-final private class SwitchIdentitySink: SwitchSink
-    where Observer.Element == Source.Element {
-    override init(observer: Observer, cancel: Cancelable) {
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    override func performMap(_ element: Source) throws -> Source {
-        return element
-    }
-}
-
-final private class MapSwitchSink: SwitchSink where Observer.Element == Source.Element {
-    typealias Selector = (SourceType) throws -> Source
-
-    fileprivate let _selector: Selector
-
-    init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
-        self._selector = selector
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    override func performMap(_ element: SourceType) throws -> Source {
-        return try self._selector(element)
-    }
-}
-
-// MARK: Producers
-
-final private class Switch: Producer {
-    fileprivate let _source: Observable
-    
-    init(source: Observable) {
-        self._source = source
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Source.Element {
-        let sink = SwitchIdentitySink(observer: observer, cancel: cancel)
-        let subscription = sink.run(self._source)
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-final private class FlatMapLatest: Producer {
-    typealias Selector = (SourceType) throws -> Source
-
-    fileprivate let _source: Observable
-    fileprivate let _selector: Selector
-
-    init(source: Observable, selector: @escaping Selector) {
-        self._source = source
-        self._selector = selector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Source.Element {
-        let sink = MapSwitchSink(selector: self._selector, observer: observer, cancel: cancel)
-        let subscription = sink.run(self._source)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift b/Demo/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift
deleted file mode 100644
index 5ead0f2..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-//  SwitchIfEmpty.swift
-//  RxSwift
-//
-//  Created by sergdort on 23/12/2016.
-//  Copyright © 2016 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-    /**
-     Returns the elements of the specified sequence or `switchTo` sequence if the sequence is empty.
-
-     - seealso: [DefaultIfEmpty operator on reactivex.io](http://reactivex.io/documentation/operators/defaultifempty.html)
-
-     - parameter switchTo: Observable sequence being returned when source sequence is empty.
-     - returns: Observable sequence that contains elements from switchTo sequence if source is empty, otherwise returns source sequence elements.
-     */
-    public func ifEmpty(switchTo other: Observable) -> Observable {
-        return SwitchIfEmpty(source: self.asObservable(), ifEmpty: other)
-    }
-}
-
-final private class SwitchIfEmpty: Producer {
-    
-    private let _source: Observable
-    private let _ifEmpty: Observable
-    
-    init(source: Observable, ifEmpty: Observable) {
-        self._source = source
-        self._ifEmpty = ifEmpty
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = SwitchIfEmptySink(ifEmpty: self._ifEmpty,
-                                     observer: observer,
-                                     cancel: cancel)
-        let subscription = sink.run(self._source.asObservable())
-        
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-final private class SwitchIfEmptySink: Sink
-    , ObserverType {
-    typealias Element = Observer.Element
-    
-    private let _ifEmpty: Observable
-    private var _isEmpty = true
-    private let _ifEmptySubscription = SingleAssignmentDisposable()
-    
-    init(ifEmpty: Observable, observer: Observer, cancel: Cancelable) {
-        self._ifEmpty = ifEmpty
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run(_ source: Observable) -> Disposable {
-        let subscription = source.subscribe(self)
-        return Disposables.create(subscription, _ifEmptySubscription)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next:
-            self._isEmpty = false
-            self.forwardOn(event)
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            guard self._isEmpty else {
-                self.forwardOn(.completed)
-                self.dispose()
-                return
-            }
-            let ifEmptySink = SwitchIfEmptySinkIter(parent: self)
-            self._ifEmptySubscription.setDisposable(self._ifEmpty.subscribe(ifEmptySink))
-        }
-    }
-}
-
-final private class SwitchIfEmptySinkIter
-    : ObserverType {
-    typealias Element = Observer.Element
-    typealias Parent = SwitchIfEmptySink
-    
-    private let _parent: Parent
-
-    init(parent: Parent) {
-        self._parent = parent
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next:
-            self._parent.forwardOn(event)
-        case .error:
-            self._parent.forwardOn(event)
-            self._parent.dispose()
-        case .completed:
-            self._parent.forwardOn(event)
-            self._parent.dispose()
-        }
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Take.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Take.swift
deleted file mode 100644
index 95b0b60..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Take.swift
+++ /dev/null
@@ -1,179 +0,0 @@
-//
-//  Take.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/12/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Returns a specified number of contiguous elements from the start of an observable sequence.
-
-     - seealso: [take operator on reactivex.io](http://reactivex.io/documentation/operators/take.html)
-
-     - parameter count: The number of elements to return.
-     - returns: An observable sequence that contains the specified number of elements from the start of the input sequence.
-     */
-    public func take(_ count: Int)
-        -> Observable {
-        if count == 0 {
-            return Observable.empty()
-        }
-        else {
-            return TakeCount(source: self.asObservable(), count: count)
-        }
-    }
-}
-
-extension ObservableType {
-
-    /**
-     Takes elements for the specified duration from the start of the observable source sequence, using the specified scheduler to run timers.
-
-     - seealso: [take operator on reactivex.io](http://reactivex.io/documentation/operators/take.html)
-
-     - parameter duration: Duration for taking elements from the start of the sequence.
-     - parameter scheduler: Scheduler to run the timer on.
-     - returns: An observable sequence with the elements taken during the specified duration from the start of the source sequence.
-     */
-    public func take(_ duration: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
-        return TakeTime(source: self.asObservable(), duration: duration, scheduler: scheduler)
-    }
-}
-
-// count version
-
-final private class TakeCountSink: Sink, ObserverType {
-    typealias Element = Observer.Element 
-    typealias Parent = TakeCount
-    
-    private let _parent: Parent
-    
-    private var _remaining: Int
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        self._remaining = parent._count
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            
-            if self._remaining > 0 {
-                self._remaining -= 1
-                
-                self.forwardOn(.next(value))
-            
-                if self._remaining == 0 {
-                    self.forwardOn(.completed)
-                    self.dispose()
-                }
-            }
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-    
-}
-
-final private class TakeCount: Producer {
-    fileprivate let _source: Observable
-    fileprivate let _count: Int
-    
-    init(source: Observable, count: Int) {
-        if count < 0 {
-            rxFatalError("count can't be negative")
-        }
-        self._source = source
-        self._count = count
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = TakeCountSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-// time version
-
-final private class TakeTimeSink
-    : Sink
-    , LockOwnerType
-    , ObserverType
-    , SynchronizedOnType where Observer.Element == Element {
-    typealias Parent = TakeTime
-
-    fileprivate let _parent: Parent
-    
-    let _lock = RecursiveLock()
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            self.forwardOn(.next(value))
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-    
-    func tick() {
-        self._lock.lock(); defer { self._lock.unlock() }
-
-        self.forwardOn(.completed)
-        self.dispose()
-    }
-    
-    func run() -> Disposable {
-        let disposeTimer = self._parent._scheduler.scheduleRelative((), dueTime: self._parent._duration) { _ in
-            self.tick()
-            return Disposables.create()
-        }
-        
-        let disposeSubscription = self._parent._source.subscribe(self)
-        
-        return Disposables.create(disposeTimer, disposeSubscription)
-    }
-}
-
-final private class TakeTime: Producer {
-    typealias TimeInterval = RxTimeInterval
-    
-    fileprivate let _source: Observable
-    fileprivate let _duration: TimeInterval
-    fileprivate let _scheduler: SchedulerType
-    
-    init(source: Observable, duration: TimeInterval, scheduler: SchedulerType) {
-        self._source = source
-        self._scheduler = scheduler
-        self._duration = duration
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = TakeTimeSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/TakeLast.swift b/Demo/Pods/RxSwift/RxSwift/Observables/TakeLast.swift
deleted file mode 100644
index 5a5d684..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/TakeLast.swift
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-//  TakeLast.swift
-//  RxSwift
-//
-//  Created by Tomi Koskinen on 25/10/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Returns a specified number of contiguous elements from the end of an observable sequence.
-
-     This operator accumulates a buffer with a length enough to store elements count elements. Upon completion of the source sequence, this buffer is drained on the result sequence. This causes the elements to be delayed.
-
-     - seealso: [takeLast operator on reactivex.io](http://reactivex.io/documentation/operators/takelast.html)
-
-     - parameter count: Number of elements to take from the end of the source sequence.
-     - returns: An observable sequence containing the specified number of elements from the end of the source sequence.
-     */
-    public func takeLast(_ count: Int)
-        -> Observable {
-        return TakeLast(source: self.asObservable(), count: count)
-    }
-}
-
-final private class TakeLastSink: Sink, ObserverType {
-    typealias Element = Observer.Element 
-    typealias Parent = TakeLast
-    
-    private let _parent: Parent
-    
-    private var _elements: Queue
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        self._elements = Queue(capacity: parent._count + 1)
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            self._elements.enqueue(value)
-            if self._elements.count > self._parent._count {
-                _ = self._elements.dequeue()
-            }
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            for e in self._elements {
-                self.forwardOn(.next(e))
-            }
-            self.forwardOn(.completed)
-            self.dispose()
-        }
-    }
-}
-
-final private class TakeLast: Producer {
-    fileprivate let _source: Observable
-    fileprivate let _count: Int
-    
-    init(source: Observable, count: Int) {
-        if count < 0 {
-            rxFatalError("count can't be negative")
-        }
-        self._source = source
-        self._count = count
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = TakeLastSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift b/Demo/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift
deleted file mode 100644
index f6490d4..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift
+++ /dev/null
@@ -1,227 +0,0 @@
-//
-//  TakeUntil.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/7/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Returns the elements from the source observable sequence until the other observable sequence produces an element.
-
-     - seealso: [takeUntil operator on reactivex.io](http://reactivex.io/documentation/operators/takeuntil.html)
-
-     - parameter other: Observable sequence that terminates propagation of elements of the source sequence.
-     - returns: An observable sequence containing the elements of the source sequence up to the point the other sequence interrupted further propagation.
-     */
-    public func takeUntil(_ other: Source)
-        -> Observable {
-        return TakeUntil(source: self.asObservable(), other: other.asObservable())
-    }
-
-    /**
-     Returns elements from an observable sequence until the specified condition is true.
-
-     - seealso: [takeUntil operator on reactivex.io](http://reactivex.io/documentation/operators/takeuntil.html)
-
-     - parameter behavior: Whether or not to include the last element matching the predicate.
-     - parameter predicate: A function to test each element for a condition.
-     - returns: An observable sequence that contains the elements from the input sequence that occur before the element at which the test passes.
-     */
-    public func takeUntil(_ behavior: TakeUntilBehavior,
-                          predicate: @escaping (Element) throws -> Bool)
-        -> Observable {
-        return TakeUntilPredicate(source: self.asObservable(),
-                                  behavior: behavior,
-                                  predicate: predicate)
-    }
-}
-
-/// Behaviors for the `takeUntil(_ behavior:predicate:)` operator.
-public enum TakeUntilBehavior {
-    /// Include the last element matching the predicate.
-    case inclusive
-
-    /// Exclude the last element matching the predicate.
-    case exclusive
-}
-
-// MARK: - TakeUntil Observable
-final private class TakeUntilSinkOther
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias Parent = TakeUntilSink
-    typealias Element = Other
-    
-    fileprivate let _parent: Parent
-
-    var _lock: RecursiveLock {
-        return self._parent._lock
-    }
-    
-    fileprivate let _subscription = SingleAssignmentDisposable()
-    
-    init(parent: Parent) {
-        self._parent = parent
-#if TRACE_RESOURCES
-        _ = Resources.incrementTotal()
-#endif
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next:
-            self._parent.forwardOn(.completed)
-            self._parent.dispose()
-        case .error(let e):
-            self._parent.forwardOn(.error(e))
-            self._parent.dispose()
-        case .completed:
-            self._subscription.dispose()
-        }
-    }
-    
-#if TRACE_RESOURCES
-    deinit {
-        _ = Resources.decrementTotal()
-    }
-#endif
-}
-
-final private class TakeUntilSink
-    : Sink
-    , LockOwnerType
-    , ObserverType
-    , SynchronizedOnType {
-    typealias Element = Observer.Element 
-    typealias Parent = TakeUntil
-    
-    fileprivate let _parent: Parent
- 
-    let _lock = RecursiveLock()
-    
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next:
-            self.forwardOn(event)
-        case .error:
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-    
-    func run() -> Disposable {
-        let otherObserver = TakeUntilSinkOther(parent: self)
-        let otherSubscription = self._parent._other.subscribe(otherObserver)
-        otherObserver._subscription.setDisposable(otherSubscription)
-        let sourceSubscription = self._parent._source.subscribe(self)
-        
-        return Disposables.create(sourceSubscription, otherObserver._subscription)
-    }
-}
-
-final private class TakeUntil: Producer {
-    
-    fileprivate let _source: Observable
-    fileprivate let _other: Observable
-    
-    init(source: Observable, other: Observable) {
-        self._source = source
-        self._other = other
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = TakeUntilSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-// MARK: - TakeUntil Predicate
-final private class TakeUntilPredicateSink
-    : Sink, ObserverType {
-    typealias Element = Observer.Element 
-    typealias Parent = TakeUntilPredicate
-
-    fileprivate let _parent: Parent
-    fileprivate var _running = true
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            if !self._running {
-                return
-            }
-
-            do {
-                self._running = try !self._parent._predicate(value)
-            } catch let e {
-                self.forwardOn(.error(e))
-                self.dispose()
-                return
-            }
-
-            if self._running {
-                self.forwardOn(.next(value))
-            } else {
-                if self._parent._behavior == .inclusive {
-                    self.forwardOn(.next(value))
-                }
-
-                self.forwardOn(.completed)
-                self.dispose()
-            }
-        case .error, .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-
-}
-
-final private class TakeUntilPredicate: Producer {
-    typealias Predicate = (Element) throws -> Bool
-
-    fileprivate let _source: Observable
-    fileprivate let _predicate: Predicate
-    fileprivate let _behavior: TakeUntilBehavior
-
-    init(source: Observable,
-         behavior: TakeUntilBehavior,
-         predicate: @escaping Predicate) {
-        self._source = source
-        self._behavior = behavior
-        self._predicate = predicate
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = TakeUntilPredicateSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift b/Demo/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift
deleted file mode 100644
index efd5311..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-//  TakeWhile.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/7/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Returns elements from an observable sequence as long as a specified condition is true.
-
-     - seealso: [takeWhile operator on reactivex.io](http://reactivex.io/documentation/operators/takewhile.html)
-
-     - parameter predicate: A function to test each element for a condition.
-     - returns: An observable sequence that contains the elements from the input sequence that occur before the element at which the test no longer passes.
-     */
-    public func takeWhile(_ predicate: @escaping (Element) throws -> Bool)
-        -> Observable {
-        return TakeWhile(source: self.asObservable(), predicate: predicate)
-    }
-}
-
-final private class TakeWhileSink
-    : Sink
-    , ObserverType {
-    typealias Element = Observer.Element 
-    typealias Parent = TakeWhile
-
-    fileprivate let _parent: Parent
-
-    fileprivate var _running = true
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            if !self._running {
-                return
-            }
-            
-            do {
-                self._running = try self._parent._predicate(value)
-            } catch let e {
-                self.forwardOn(.error(e))
-                self.dispose()
-                return
-            }
-            
-            if self._running {
-                self.forwardOn(.next(value))
-            } else {
-                self.forwardOn(.completed)
-                self.dispose()
-            }
-        case .error, .completed:
-            self.forwardOn(event)
-            self.dispose()
-        }
-    }
-    
-}
-
-final private class TakeWhile: Producer {
-    typealias Predicate = (Element) throws -> Bool
-
-    fileprivate let _source: Observable
-    fileprivate let _predicate: Predicate
-
-    init(source: Observable, predicate: @escaping Predicate) {
-        self._source = source
-        self._predicate = predicate
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = TakeWhileSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Throttle.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Throttle.swift
deleted file mode 100644
index f682433..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Throttle.swift
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-//  Throttle.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 3/22/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import struct Foundation.Date
-
-extension ObservableType {
-
-    /**
-     Returns an Observable that emits the first and the latest item emitted by the source Observable during sequential time windows of a specified duration.
-
-     This operator makes sure that no two elements are emitted in less then dueTime.
-
-     - seealso: [debounce operator on reactivex.io](http://reactivex.io/documentation/operators/debounce.html)
-
-     - parameter dueTime: Throttling duration for each element.
-     - parameter latest: Should latest element received in a dueTime wide time window since last element emission be emitted.
-     - parameter scheduler: Scheduler to run the throttle timers on.
-     - returns: The throttled sequence.
-     */
-    public func throttle(_ dueTime: RxTimeInterval, latest: Bool = true, scheduler: SchedulerType)
-        -> Observable {
-        return Throttle(source: self.asObservable(), dueTime: dueTime, latest: latest, scheduler: scheduler)
-    }
-}
-
-final private class ThrottleSink
-    : Sink
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias Element = Observer.Element 
-    typealias ParentType = Throttle
-    
-    private let _parent: ParentType
-    
-    let _lock = RecursiveLock()
-    
-    // state
-    private var _lastUnsentElement: Element?
-    private var _lastSentTime: Date?
-    private var _completed: Bool = false
-
-    let cancellable = SerialDisposable()
-    
-    init(parent: ParentType, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run() -> Disposable {
-        let subscription = self._parent._source.subscribe(self)
-        
-        return Disposables.create(subscription, cancellable)
-    }
-
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case .next(let element):
-            let now = self._parent._scheduler.now
-
-            let reducedScheduledTime: RxTimeInterval
-
-            if let lastSendingTime = self._lastSentTime {
-                reducedScheduledTime = self._parent._dueTime.reduceWithSpanBetween(earlierDate: lastSendingTime, laterDate: now)
-            }
-            else {
-                reducedScheduledTime = .nanoseconds(0)
-            }
-
-            if reducedScheduledTime.isNow {
-                self.sendNow(element: element)
-                return
-            }
-
-            if !self._parent._latest {
-                return
-            }
-
-            let isThereAlreadyInFlightRequest = self._lastUnsentElement != nil
-            
-            self._lastUnsentElement = element
-
-            if isThereAlreadyInFlightRequest {
-                return
-            }
-
-            let scheduler = self._parent._scheduler
-
-            let d = SingleAssignmentDisposable()
-            self.cancellable.disposable = d
-
-            d.setDisposable(scheduler.scheduleRelative(0, dueTime: reducedScheduledTime, action: self.propagate))
-        case .error:
-            self._lastUnsentElement = nil
-            self.forwardOn(event)
-            self.dispose()
-        case .completed:
-            if self._lastUnsentElement != nil {
-                self._completed = true
-            }
-            else {
-                self.forwardOn(.completed)
-                self.dispose()
-            }
-        }
-    }
-
-    private func sendNow(element: Element) {
-        self._lastUnsentElement = nil
-        self.forwardOn(.next(element))
-        // in case element processing takes a while, this should give some more room
-        self._lastSentTime = self._parent._scheduler.now
-    }
-    
-    func propagate(_: Int) -> Disposable {
-        self._lock.lock(); defer { self._lock.unlock() } // {
-            if let lastUnsentElement = self._lastUnsentElement {
-                self.sendNow(element: lastUnsentElement)
-            }
-
-            if self._completed {
-                self.forwardOn(.completed)
-                self.dispose()
-            }
-        // }
-        return Disposables.create()
-    }
-}
-
-final private class Throttle: Producer {
-    fileprivate let _source: Observable
-    fileprivate let _dueTime: RxTimeInterval
-    fileprivate let _latest: Bool
-    fileprivate let _scheduler: SchedulerType
-
-    init(source: Observable, dueTime: RxTimeInterval, latest: Bool, scheduler: SchedulerType) {
-        self._source = source
-        self._dueTime = dueTime
-        self._latest = latest
-        self._scheduler = scheduler
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = ThrottleSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-    
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Timeout.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Timeout.swift
deleted file mode 100644
index 3177c42..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Timeout.swift
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-//  Timeout.swift
-//  RxSwift
-//
-//  Created by Tomi Koskinen on 13/11/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Applies a timeout policy for each element in the observable sequence. If the next element isn't received within the specified timeout duration starting from its predecessor, a TimeoutError is propagated to the observer.
-
-     - seealso: [timeout operator on reactivex.io](http://reactivex.io/documentation/operators/timeout.html)
-
-     - parameter dueTime: Maximum duration between values before a timeout occurs.
-     - parameter scheduler: Scheduler to run the timeout timer on.
-     - returns: An observable sequence with a `RxError.timeout` in case of a timeout.
-     */
-    public func timeout(_ dueTime: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
-            return Timeout(source: self.asObservable(), dueTime: dueTime, other: Observable.error(RxError.timeout), scheduler: scheduler)
-    }
-
-    /**
-     Applies a timeout policy for each element in the observable sequence, using the specified scheduler to run timeout timers. If the next element isn't received within the specified timeout duration starting from its predecessor, the other observable sequence is used to produce future messages from that point on.
-
-     - seealso: [timeout operator on reactivex.io](http://reactivex.io/documentation/operators/timeout.html)
-
-     - parameter dueTime: Maximum duration between values before a timeout occurs.
-     - parameter other: Sequence to return in case of a timeout.
-     - parameter scheduler: Scheduler to run the timeout timer on.
-     - returns: The source sequence switching to the other sequence in case of a timeout.
-     */
-    public func timeout(_ dueTime: RxTimeInterval, other: Source, scheduler: SchedulerType)
-        -> Observable where Element == Source.Element {
-            return Timeout(source: self.asObservable(), dueTime: dueTime, other: other.asObservable(), scheduler: scheduler)
-    }
-}
-
-final private class TimeoutSink: Sink, LockOwnerType, ObserverType {
-    typealias Element = Observer.Element 
-    typealias Parent = Timeout
-    
-    private let _parent: Parent
-    
-    let _lock = RecursiveLock()
-
-    private let _timerD = SerialDisposable()
-    private let _subscription = SerialDisposable()
-    
-    private var _id = 0
-    private var _switched = false
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run() -> Disposable {
-        let original = SingleAssignmentDisposable()
-        self._subscription.disposable = original
-        
-        self._createTimeoutTimer()
-        
-        original.setDisposable(self._parent._source.subscribe(self))
-        
-        return Disposables.create(_subscription, _timerD)
-    }
-
-    func on(_ event: Event) {
-        switch event {
-        case .next:
-            var onNextWins = false
-            
-            self._lock.performLocked {
-                onNextWins = !self._switched
-                if onNextWins {
-                    self._id = self._id &+ 1
-                }
-            }
-            
-            if onNextWins {
-                self.forwardOn(event)
-                self._createTimeoutTimer()
-            }
-        case .error, .completed:
-            var onEventWins = false
-            
-            self._lock.performLocked {
-                onEventWins = !self._switched
-                if onEventWins {
-                    self._id = self._id &+ 1
-                }
-            }
-            
-            if onEventWins {
-                self.forwardOn(event)
-                self.dispose()
-            }
-        }
-    }
-    
-    private func _createTimeoutTimer() {
-        if self._timerD.isDisposed {
-            return
-        }
-        
-        let nextTimer = SingleAssignmentDisposable()
-        self._timerD.disposable = nextTimer
-        
-        let disposeSchedule = self._parent._scheduler.scheduleRelative(self._id, dueTime: self._parent._dueTime) { state in
-            
-            var timerWins = false
-            
-            self._lock.performLocked {
-                self._switched = (state == self._id)
-                timerWins = self._switched
-            }
-            
-            if timerWins {
-                self._subscription.disposable = self._parent._other.subscribe(self.forwarder())
-            }
-            
-            return Disposables.create()
-        }
-
-        nextTimer.setDisposable(disposeSchedule)
-    }
-}
-
-
-final private class Timeout: Producer {
-    fileprivate let _source: Observable
-    fileprivate let _dueTime: RxTimeInterval
-    fileprivate let _other: Observable
-    fileprivate let _scheduler: SchedulerType
-    
-    init(source: Observable, dueTime: RxTimeInterval, other: Observable, scheduler: SchedulerType) {
-        self._source = source
-        self._dueTime = dueTime
-        self._other = other
-        self._scheduler = scheduler
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = TimeoutSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Timer.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Timer.swift
deleted file mode 100644
index 7b29bca..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Timer.swift
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-//  Timer.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/7/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType where Element : RxAbstractInteger {
-    /**
-     Returns an observable sequence that produces a value after each period, using the specified scheduler to run timers and to send out observer messages.
-
-     - seealso: [interval operator on reactivex.io](http://reactivex.io/documentation/operators/interval.html)
-
-     - parameter period: Period for producing the values in the resulting sequence.
-     - parameter scheduler: Scheduler to run the timer on.
-     - returns: An observable sequence that produces a value after each period.
-     */
-    public static func interval(_ period: RxTimeInterval, scheduler: SchedulerType)
-        -> Observable {
-        return Timer(
-            dueTime: period,
-            period: period,
-            scheduler: scheduler
-        )
-    }
-}
-
-extension ObservableType where Element: RxAbstractInteger {
-    /**
-     Returns an observable sequence that periodically produces a value after the specified initial relative due time has elapsed, using the specified scheduler to run timers.
-
-     - seealso: [timer operator on reactivex.io](http://reactivex.io/documentation/operators/timer.html)
-
-     - parameter dueTime: Relative time at which to produce the first value.
-     - parameter period: Period to produce subsequent values.
-     - parameter scheduler: Scheduler to run timers on.
-     - returns: An observable sequence that produces a value after due time has elapsed and then each period.
-     */
-    public static func timer(_ dueTime: RxTimeInterval, period: RxTimeInterval? = nil, scheduler: SchedulerType)
-        -> Observable {
-        return Timer(
-            dueTime: dueTime,
-            period: period,
-            scheduler: scheduler
-        )
-    }
-}
-
-import Foundation
-
-final private class TimerSink : Sink where Observer.Element : RxAbstractInteger  {
-    typealias Parent = Timer
-
-    private let _parent: Parent
-    private let _lock = RecursiveLock()
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    func run() -> Disposable {
-        return self._parent._scheduler.schedulePeriodic(0 as Observer.Element, startAfter: self._parent._dueTime, period: self._parent._period!) { state in
-            self._lock.lock(); defer { self._lock.unlock() }
-            self.forwardOn(.next(state))
-            return state &+ 1
-        }
-    }
-}
-
-final private class TimerOneOffSink: Sink where Observer.Element: RxAbstractInteger {
-    typealias Parent = Timer
-
-    private let _parent: Parent
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    func run() -> Disposable {
-        return self._parent._scheduler.scheduleRelative(self, dueTime: self._parent._dueTime) { [unowned self] _ -> Disposable in
-            self.forwardOn(.next(0))
-            self.forwardOn(.completed)
-            self.dispose()
-
-            return Disposables.create()
-        }
-    }
-}
-
-final private class Timer: Producer {
-    fileprivate let _scheduler: SchedulerType
-    fileprivate let _dueTime: RxTimeInterval
-    fileprivate let _period: RxTimeInterval?
-
-    init(dueTime: RxTimeInterval, period: RxTimeInterval?, scheduler: SchedulerType) {
-        self._scheduler = scheduler
-        self._dueTime = dueTime
-        self._period = period
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        if self._period != nil {
-            let sink = TimerSink(parent: self, observer: observer, cancel: cancel)
-            let subscription = sink.run()
-            return (sink: sink, subscription: subscription)
-        }
-        else {
-            let sink = TimerOneOffSink(parent: self, observer: observer, cancel: cancel)
-            let subscription = sink.run()
-            return (sink: sink, subscription: subscription)
-        }
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/ToArray.swift b/Demo/Pods/RxSwift/RxSwift/Observables/ToArray.swift
deleted file mode 100644
index 2821a60..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/ToArray.swift
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-//  ToArray.swift
-//  RxSwift
-//
-//  Created by Junior B. on 20/10/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-
-extension ObservableType {
-
-    /**
-    Converts an Observable into a Single that emits the whole sequence as a single array and then terminates.
-    
-    For aggregation behavior see `reduce`.
-
-    - seealso: [toArray operator on reactivex.io](http://reactivex.io/documentation/operators/to.html)
-    
-    - returns: A Single sequence containing all the emitted elements as array.
-    */
-    public func toArray()
-        -> Single<[Element]> {
-        return PrimitiveSequence(raw: ToArray(source: self.asObservable()))
-    }
-}
-
-final private class ToArraySink: Sink, ObserverType where Observer.Element == [SourceType] {
-    typealias Parent = ToArray
-    
-    let _parent: Parent
-    var _list = [SourceType]()
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case .next(let value):
-            self._list.append(value)
-        case .error(let e):
-            self.forwardOn(.error(e))
-            self.dispose()
-        case .completed:
-            self.forwardOn(.next(self._list))
-            self.forwardOn(.completed)
-            self.dispose()
-        }
-    }
-}
-
-final private class ToArray: Producer<[SourceType]> {
-    let _source: Observable
-
-    init(source: Observable) {
-        self._source = source
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == [SourceType] {
-        let sink = ToArraySink(parent: self, observer: observer, cancel: cancel)
-        let subscription = self._source.subscribe(sink)
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Using.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Using.swift
deleted file mode 100644
index 14c5698..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Using.swift
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-//  Using.swift
-//  RxSwift
-//
-//  Created by Yury Korolev on 10/15/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-    /**
-     Constructs an observable sequence that depends on a resource object, whose lifetime is tied to the resulting observable sequence's lifetime.
-
-     - seealso: [using operator on reactivex.io](http://reactivex.io/documentation/operators/using.html)
-
-     - parameter resourceFactory: Factory function to obtain a resource object.
-     - parameter observableFactory: Factory function to obtain an observable sequence that depends on the obtained resource.
-     - returns: An observable sequence whose lifetime controls the lifetime of the dependent resource object.
-     */
-    public static func using(_ resourceFactory: @escaping () throws -> Resource, observableFactory: @escaping (Resource) throws -> Observable) -> Observable {
-        return Using(resourceFactory: resourceFactory, observableFactory: observableFactory)
-    }
-}
-
-final private class UsingSink: Sink, ObserverType {
-    typealias SourceType = Observer.Element 
-    typealias Parent = Using
-
-    private let _parent: Parent
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run() -> Disposable {
-        var disposable = Disposables.create()
-        
-        do {
-            let resource = try self._parent._resourceFactory()
-            disposable = resource
-            let source = try self._parent._observableFactory(resource)
-            
-            return Disposables.create(
-                source.subscribe(self),
-                disposable
-            )
-        } catch let error {
-            return Disposables.create(
-                Observable.error(error).subscribe(self),
-                disposable
-            )
-        }
-    }
-    
-    func on(_ event: Event) {
-        switch event {
-        case let .next(value):
-            self.forwardOn(.next(value))
-        case let .error(error):
-            self.forwardOn(.error(error))
-            self.dispose()
-        case .completed:
-            self.forwardOn(.completed)
-            self.dispose()
-        }
-    }
-}
-
-final private class Using: Producer {
-    
-    typealias Element = SourceType
-    
-    typealias ResourceFactory = () throws -> ResourceType
-    typealias ObservableFactory = (ResourceType) throws -> Observable
-    
-    fileprivate let _resourceFactory: ResourceFactory
-    fileprivate let _observableFactory: ObservableFactory
-    
-    
-    init(resourceFactory: @escaping ResourceFactory, observableFactory: @escaping ObservableFactory) {
-        self._resourceFactory = resourceFactory
-        self._observableFactory = observableFactory
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Element {
-        let sink = UsingSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Window.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Window.swift
deleted file mode 100644
index b93cfa6..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Window.swift
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-//  Window.swift
-//  RxSwift
-//
-//  Created by Junior B. on 29/10/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Projects each element of an observable sequence into a window that is completed when either it’s full or a given amount of time has elapsed.
-
-     - seealso: [window operator on reactivex.io](http://reactivex.io/documentation/operators/window.html)
-
-     - parameter timeSpan: Maximum time length of a window.
-     - parameter count: Maximum element count of a window.
-     - parameter scheduler: Scheduler to run windowing timers on.
-     - returns: An observable sequence of windows (instances of `Observable`).
-     */
-    public func window(timeSpan: RxTimeInterval, count: Int, scheduler: SchedulerType)
-        -> Observable> {
-            return WindowTimeCount(source: self.asObservable(), timeSpan: timeSpan, count: count, scheduler: scheduler)
-    }
-}
-
-final private class WindowTimeCountSink
-    : Sink
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType where Observer.Element == Observable {
-    typealias Parent = WindowTimeCount
-    
-    private let _parent: Parent
-    
-    let _lock = RecursiveLock()
-    
-    private var _subject = PublishSubject()
-    private var _count = 0
-    private var _windowId = 0
-    
-    private let _timerD = SerialDisposable()
-    private let _refCountDisposable: RefCountDisposable
-    private let _groupDisposable = CompositeDisposable()
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        
-        _ = self._groupDisposable.insert(self._timerD)
-        
-        self._refCountDisposable = RefCountDisposable(disposable: self._groupDisposable)
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run() -> Disposable {
-        
-        self.forwardOn(.next(AddRef(source: self._subject, refCount: self._refCountDisposable).asObservable()))
-        self.createTimer(self._windowId)
-        
-        _ = self._groupDisposable.insert(self._parent._source.subscribe(self))
-        return self._refCountDisposable
-    }
-    
-    func startNewWindowAndCompleteCurrentOne() {
-        self._subject.on(.completed)
-        self._subject = PublishSubject()
-        
-        self.forwardOn(.next(AddRef(source: self._subject, refCount: self._refCountDisposable).asObservable()))
-    }
-
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        var newWindow = false
-        var newId = 0
-        
-        switch event {
-        case .next(let element):
-            self._subject.on(.next(element))
-            
-            do {
-                _ = try incrementChecked(&self._count)
-            } catch let e {
-                self._subject.on(.error(e as Swift.Error))
-                self.dispose()
-            }
-            
-            if self._count == self._parent._count {
-                newWindow = true
-                self._count = 0
-                self._windowId += 1
-                newId = self._windowId
-                self.startNewWindowAndCompleteCurrentOne()
-            }
-            
-        case .error(let error):
-            self._subject.on(.error(error))
-            self.forwardOn(.error(error))
-            self.dispose()
-        case .completed:
-            self._subject.on(.completed)
-            self.forwardOn(.completed)
-            self.dispose()
-        }
-
-        if newWindow {
-            self.createTimer(newId)
-        }
-    }
-    
-    func createTimer(_ windowId: Int) {
-        if self._timerD.isDisposed {
-            return
-        }
-        
-        if self._windowId != windowId {
-            return
-        }
-
-        let nextTimer = SingleAssignmentDisposable()
-
-        self._timerD.disposable = nextTimer
-
-        let scheduledRelative = self._parent._scheduler.scheduleRelative(windowId, dueTime: self._parent._timeSpan) { previousWindowId in
-            
-            var newId = 0
-            
-            self._lock.performLocked {
-                if previousWindowId != self._windowId {
-                    return
-                }
-                
-                self._count = 0
-                self._windowId = self._windowId &+ 1
-                newId = self._windowId
-                self.startNewWindowAndCompleteCurrentOne()
-            }
-            
-            self.createTimer(newId)
-            
-            return Disposables.create()
-        }
-
-        nextTimer.setDisposable(scheduledRelative)
-    }
-}
-
-final private class WindowTimeCount: Producer> {
-    fileprivate let _timeSpan: RxTimeInterval
-    fileprivate let _count: Int
-    fileprivate let _scheduler: SchedulerType
-    fileprivate let _source: Observable
-    
-    init(source: Observable, timeSpan: RxTimeInterval, count: Int, scheduler: SchedulerType) {
-        self._source = source
-        self._timeSpan = timeSpan
-        self._count = count
-        self._scheduler = scheduler
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Observable {
-        let sink = WindowTimeCountSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift b/Demo/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift
deleted file mode 100644
index b471f29..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-//  WithLatestFrom.swift
-//  RxSwift
-//
-//  Created by Yury Korolev on 10/19/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Merges two observable sequences into one observable sequence by combining each element from self with the latest element from the second source, if any.
-
-     - seealso: [combineLatest operator on reactivex.io](http://reactivex.io/documentation/operators/combinelatest.html)
-
-     - parameter second: Second observable source.
-     - parameter resultSelector: Function to invoke for each element from the self combined with the latest element from the second source, if any.
-     - returns: An observable sequence containing the result of combining each element of the self  with the latest element from the second source, if any, using the specified result selector function.
-     */
-    public func withLatestFrom(_ second: Source, resultSelector: @escaping (Element, Source.Element) throws -> ResultType) -> Observable {
-        return WithLatestFrom(first: self.asObservable(), second: second.asObservable(), resultSelector: resultSelector)
-    }
-
-    /**
-     Merges two observable sequences into one observable sequence by using latest element from the second sequence every time when `self` emits an element.
-
-     - seealso: [combineLatest operator on reactivex.io](http://reactivex.io/documentation/operators/combinelatest.html)
-
-     - parameter second: Second observable source.
-     - returns: An observable sequence containing the result of combining each element of the self  with the latest element from the second source, if any, using the specified result selector function.
-     */
-    public func withLatestFrom(_ second: Source) -> Observable {
-        return WithLatestFrom(first: self.asObservable(), second: second.asObservable(), resultSelector: { $1 })
-    }
-}
-
-final private class WithLatestFromSink
-    : Sink
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias ResultType = Observer.Element
-    typealias Parent = WithLatestFrom
-    typealias Element = FirstType
-    
-    fileprivate let _parent: Parent
-    
-    var _lock = RecursiveLock()
-    fileprivate var _latest: SecondType?
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func run() -> Disposable {
-        let sndSubscription = SingleAssignmentDisposable()
-        let sndO = WithLatestFromSecond(parent: self, disposable: sndSubscription)
-        
-        sndSubscription.setDisposable(self._parent._second.subscribe(sndO))
-        let fstSubscription = self._parent._first.subscribe(self)
-
-        return Disposables.create(fstSubscription, sndSubscription)
-    }
-
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case let .next(value):
-            guard let latest = self._latest else { return }
-            do {
-                let res = try self._parent._resultSelector(value, latest)
-                
-                self.forwardOn(.next(res))
-            } catch let e {
-                self.forwardOn(.error(e))
-                self.dispose()
-            }
-        case .completed:
-            self.forwardOn(.completed)
-            self.dispose()
-        case let .error(error):
-            self.forwardOn(.error(error))
-            self.dispose()
-        }
-    }
-}
-
-final private class WithLatestFromSecond
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    
-    typealias ResultType = Observer.Element
-    typealias Parent = WithLatestFromSink
-    typealias Element = SecondType
-    
-    private let _parent: Parent
-    private let _disposable: Disposable
-
-    var _lock: RecursiveLock {
-        return self._parent._lock
-    }
-
-    init(parent: Parent, disposable: Disposable) {
-        self._parent = parent
-        self._disposable = disposable
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        switch event {
-        case let .next(value):
-            self._parent._latest = value
-        case .completed:
-            self._disposable.dispose()
-        case let .error(error):
-            self._parent.forwardOn(.error(error))
-            self._parent.dispose()
-        }
-    }
-}
-
-final private class WithLatestFrom: Producer {
-    typealias ResultSelector = (FirstType, SecondType) throws -> ResultType
-    
-    fileprivate let _first: Observable
-    fileprivate let _second: Observable
-    fileprivate let _resultSelector: ResultSelector
-
-    init(first: Observable, second: Observable, resultSelector: @escaping ResultSelector) {
-        self._first = first
-        self._second = second
-        self._resultSelector = resultSelector
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == ResultType {
-        let sink = WithLatestFromSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift
deleted file mode 100644
index cc232ab..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift
+++ /dev/null
@@ -1,169 +0,0 @@
-//
-//  Zip+Collection.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 8/30/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-    /**
-     Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-     - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-     - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-     - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-     */
-    public static func zip(_ collection: Collection, resultSelector: @escaping ([Collection.Element.Element]) throws -> Element) -> Observable
-        where Collection.Element: ObservableType {
-        return ZipCollectionType(sources: collection, resultSelector: resultSelector)
-    }
-
-    /**
-     Merges the specified observable sequences into one observable sequence whenever all of the observable sequences have produced an element at a corresponding index.
-
-     - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-     - returns: An observable sequence containing the result of combining elements of the sources.
-     */
-    public static func zip(_ collection: Collection) -> Observable<[Element]>
-        where Collection.Element: ObservableType, Collection.Element.Element == Element {
-        return ZipCollectionType(sources: collection, resultSelector: { $0 })
-    }
-    
-}
-
-final private class ZipCollectionTypeSink
-    : Sink where Collection.Element: ObservableConvertibleType {
-    typealias Result = Observer.Element 
-    typealias Parent = ZipCollectionType
-    typealias SourceElement = Collection.Element.Element
-    
-    private let _parent: Parent
-    
-    private let _lock = RecursiveLock()
-    
-    // state
-    private var _numberOfValues = 0
-    private var _values: [Queue]
-    private var _isDone: [Bool]
-    private var _numberOfDone = 0
-    private var _subscriptions: [SingleAssignmentDisposable]
-    
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        self._values = [Queue](repeating: Queue(capacity: 4), count: parent.count)
-        self._isDone = [Bool](repeating: false, count: parent.count)
-        self._subscriptions = [SingleAssignmentDisposable]()
-        self._subscriptions.reserveCapacity(parent.count)
-        
-        for _ in 0 ..< parent.count {
-            self._subscriptions.append(SingleAssignmentDisposable())
-        }
-        
-        super.init(observer: observer, cancel: cancel)
-    }
-    
-    func on(_ event: Event, atIndex: Int) {
-        self._lock.lock(); defer { self._lock.unlock() } // {
-            switch event {
-            case .next(let element):
-                self._values[atIndex].enqueue(element)
-                
-                if self._values[atIndex].count == 1 {
-                    self._numberOfValues += 1
-                }
-                
-                if self._numberOfValues < self._parent.count {
-                    if self._numberOfDone == self._parent.count - 1 {
-                        self.forwardOn(.completed)
-                        self.dispose()
-                    }
-                    return
-                }
-                
-                do {
-                    var arguments = [SourceElement]()
-                    arguments.reserveCapacity(self._parent.count)
-                    
-                    // recalculate number of values
-                    self._numberOfValues = 0
-                    
-                    for i in 0 ..< self._values.count {
-                        arguments.append(self._values[i].dequeue()!)
-                        if !self._values[i].isEmpty {
-                            self._numberOfValues += 1
-                        }
-                    }
-                    
-                    let result = try self._parent.resultSelector(arguments)
-                    self.forwardOn(.next(result))
-                }
-                catch let error {
-                    self.forwardOn(.error(error))
-                    self.dispose()
-                }
-                
-            case .error(let error):
-                self.forwardOn(.error(error))
-                self.dispose()
-            case .completed:
-                if self._isDone[atIndex] {
-                    return
-                }
-                
-                self._isDone[atIndex] = true
-                self._numberOfDone += 1
-                
-                if self._numberOfDone == self._parent.count {
-                    self.forwardOn(.completed)
-                    self.dispose()
-                }
-                else {
-                    self._subscriptions[atIndex].dispose()
-                }
-            }
-        // }
-    }
-    
-    func run() -> Disposable {
-        var j = 0
-        for i in self._parent.sources {
-            let index = j
-            let source = i.asObservable()
-
-            let disposable = source.subscribe(AnyObserver { event in
-                self.on(event, atIndex: index)
-                })
-            self._subscriptions[j].setDisposable(disposable)
-            j += 1
-        }
-
-        if self._parent.sources.isEmpty {
-            self.forwardOn(.completed)
-        }
-        
-        return Disposables.create(_subscriptions)
-    }
-}
-
-final private class ZipCollectionType: Producer where Collection.Element: ObservableConvertibleType {
-    typealias ResultSelector = ([Collection.Element.Element]) throws -> Result
-    
-    let sources: Collection
-    let resultSelector: ResultSelector
-    let count: Int
-    
-    init(sources: Collection, resultSelector: @escaping ResultSelector) {
-        self.sources = sources
-        self.resultSelector = resultSelector
-        self.count = self.sources.count
-    }
-    
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipCollectionTypeSink(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift
deleted file mode 100644
index d2a28d4..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift
+++ /dev/null
@@ -1,934 +0,0 @@
-// This file is autogenerated. Take a look at `Preprocessor` target in RxSwift project 
-//
-//  Zip+arity.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 5/23/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-
-
-// 2
-
-extension ObservableType {
-    /**
-    Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-    - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, resultSelector: @escaping (O1.Element, O2.Element) throws -> Element)
-        -> Observable {
-        return Zip2(
-            source1: source1.asObservable(), source2: source2.asObservable(),
-            resultSelector: resultSelector
-        )
-    }
-}
-
-extension ObservableType where Element == Any {
-    /**
-    Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - returns: An observable sequence containing the result of combining elements of the sources.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2)
-        -> Observable<(O1.Element, O2.Element)> {
-        return Zip2(
-            source1: source1.asObservable(), source2: source2.asObservable(),
-            resultSelector: { ($0, $1) }
-        )
-    }
-}
-
-final class ZipSink2_ : ZipSink {
-    typealias Result = Observer.Element 
-    typealias Parent = Zip2
-
-    let _parent: Parent
-
-    var _values1: Queue = Queue(capacity: 2)
-    var _values2: Queue = Queue(capacity: 2)
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(arity: 2, observer: observer, cancel: cancel)
-    }
-
-    override func hasElements(_ index: Int) -> Bool {
-        switch index {
-        case 0: return !self._values1.isEmpty
-        case 1: return !self._values2.isEmpty
-
-        default:
-            rxFatalError("Unhandled case (Function)")
-        }
-    }
-
-    func run() -> Disposable {
-        let subscription1 = SingleAssignmentDisposable()
-        let subscription2 = SingleAssignmentDisposable()
-
-        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-
-        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
-        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
-
-        return Disposables.create([
-           subscription1,
-           subscription2
-        ])
-    }
-
-    override func getResult() throws -> Result {
-        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!)
-    }
-}
-
-final class Zip2 : Producer {
-    typealias ResultSelector = (E1, E2) throws -> Result
-
-    let source1: Observable
-    let source2: Observable
-
-    let _resultSelector: ResultSelector
-
-    init(source1: Observable, source2: Observable, resultSelector: @escaping ResultSelector) {
-        self.source1 = source1
-        self.source2 = source2
-
-        self._resultSelector = resultSelector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipSink2_(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-
-
-// 3
-
-extension ObservableType {
-    /**
-    Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-    - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, resultSelector: @escaping (O1.Element, O2.Element, O3.Element) throws -> Element)
-        -> Observable {
-        return Zip3(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(),
-            resultSelector: resultSelector
-        )
-    }
-}
-
-extension ObservableType where Element == Any {
-    /**
-    Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - returns: An observable sequence containing the result of combining elements of the sources.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3)
-        -> Observable<(O1.Element, O2.Element, O3.Element)> {
-        return Zip3(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(),
-            resultSelector: { ($0, $1, $2) }
-        )
-    }
-}
-
-final class ZipSink3_ : ZipSink {
-    typealias Result = Observer.Element 
-    typealias Parent = Zip3
-
-    let _parent: Parent
-
-    var _values1: Queue = Queue(capacity: 2)
-    var _values2: Queue = Queue(capacity: 2)
-    var _values3: Queue = Queue(capacity: 2)
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(arity: 3, observer: observer, cancel: cancel)
-    }
-
-    override func hasElements(_ index: Int) -> Bool {
-        switch index {
-        case 0: return !self._values1.isEmpty
-        case 1: return !self._values2.isEmpty
-        case 2: return !self._values3.isEmpty
-
-        default:
-            rxFatalError("Unhandled case (Function)")
-        }
-    }
-
-    func run() -> Disposable {
-        let subscription1 = SingleAssignmentDisposable()
-        let subscription2 = SingleAssignmentDisposable()
-        let subscription3 = SingleAssignmentDisposable()
-
-        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-
-        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
-        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
-        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
-
-        return Disposables.create([
-           subscription1,
-           subscription2,
-           subscription3
-        ])
-    }
-
-    override func getResult() throws -> Result {
-        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!)
-    }
-}
-
-final class Zip3 : Producer {
-    typealias ResultSelector = (E1, E2, E3) throws -> Result
-
-    let source1: Observable
-    let source2: Observable
-    let source3: Observable
-
-    let _resultSelector: ResultSelector
-
-    init(source1: Observable, source2: Observable, source3: Observable, resultSelector: @escaping ResultSelector) {
-        self.source1 = source1
-        self.source2 = source2
-        self.source3 = source3
-
-        self._resultSelector = resultSelector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipSink3_(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-
-
-// 4
-
-extension ObservableType {
-    /**
-    Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-    - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element) throws -> Element)
-        -> Observable {
-        return Zip4(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(),
-            resultSelector: resultSelector
-        )
-    }
-}
-
-extension ObservableType where Element == Any {
-    /**
-    Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - returns: An observable sequence containing the result of combining elements of the sources.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4)
-        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element)> {
-        return Zip4(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(),
-            resultSelector: { ($0, $1, $2, $3) }
-        )
-    }
-}
-
-final class ZipSink4_ : ZipSink {
-    typealias Result = Observer.Element 
-    typealias Parent = Zip4
-
-    let _parent: Parent
-
-    var _values1: Queue = Queue(capacity: 2)
-    var _values2: Queue = Queue(capacity: 2)
-    var _values3: Queue = Queue(capacity: 2)
-    var _values4: Queue = Queue(capacity: 2)
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(arity: 4, observer: observer, cancel: cancel)
-    }
-
-    override func hasElements(_ index: Int) -> Bool {
-        switch index {
-        case 0: return !self._values1.isEmpty
-        case 1: return !self._values2.isEmpty
-        case 2: return !self._values3.isEmpty
-        case 3: return !self._values4.isEmpty
-
-        default:
-            rxFatalError("Unhandled case (Function)")
-        }
-    }
-
-    func run() -> Disposable {
-        let subscription1 = SingleAssignmentDisposable()
-        let subscription2 = SingleAssignmentDisposable()
-        let subscription3 = SingleAssignmentDisposable()
-        let subscription4 = SingleAssignmentDisposable()
-
-        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-
-        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
-        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
-        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
-        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
-
-        return Disposables.create([
-           subscription1,
-           subscription2,
-           subscription3,
-           subscription4
-        ])
-    }
-
-    override func getResult() throws -> Result {
-        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!)
-    }
-}
-
-final class Zip4 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4) throws -> Result
-
-    let source1: Observable
-    let source2: Observable
-    let source3: Observable
-    let source4: Observable
-
-    let _resultSelector: ResultSelector
-
-    init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, resultSelector: @escaping ResultSelector) {
-        self.source1 = source1
-        self.source2 = source2
-        self.source3 = source3
-        self.source4 = source4
-
-        self._resultSelector = resultSelector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipSink4_(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-
-
-// 5
-
-extension ObservableType {
-    /**
-    Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-    - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element) throws -> Element)
-        -> Observable {
-        return Zip5(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(),
-            resultSelector: resultSelector
-        )
-    }
-}
-
-extension ObservableType where Element == Any {
-    /**
-    Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - returns: An observable sequence containing the result of combining elements of the sources.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5)
-        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element)> {
-        return Zip5(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(),
-            resultSelector: { ($0, $1, $2, $3, $4) }
-        )
-    }
-}
-
-final class ZipSink5_ : ZipSink {
-    typealias Result = Observer.Element 
-    typealias Parent = Zip5
-
-    let _parent: Parent
-
-    var _values1: Queue = Queue(capacity: 2)
-    var _values2: Queue = Queue(capacity: 2)
-    var _values3: Queue = Queue(capacity: 2)
-    var _values4: Queue = Queue(capacity: 2)
-    var _values5: Queue = Queue(capacity: 2)
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(arity: 5, observer: observer, cancel: cancel)
-    }
-
-    override func hasElements(_ index: Int) -> Bool {
-        switch index {
-        case 0: return !self._values1.isEmpty
-        case 1: return !self._values2.isEmpty
-        case 2: return !self._values3.isEmpty
-        case 3: return !self._values4.isEmpty
-        case 4: return !self._values5.isEmpty
-
-        default:
-            rxFatalError("Unhandled case (Function)")
-        }
-    }
-
-    func run() -> Disposable {
-        let subscription1 = SingleAssignmentDisposable()
-        let subscription2 = SingleAssignmentDisposable()
-        let subscription3 = SingleAssignmentDisposable()
-        let subscription4 = SingleAssignmentDisposable()
-        let subscription5 = SingleAssignmentDisposable()
-
-        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
-
-        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
-        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
-        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
-        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
-        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
-
-        return Disposables.create([
-           subscription1,
-           subscription2,
-           subscription3,
-           subscription4,
-           subscription5
-        ])
-    }
-
-    override func getResult() throws -> Result {
-        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!)
-    }
-}
-
-final class Zip5 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5) throws -> Result
-
-    let source1: Observable
-    let source2: Observable
-    let source3: Observable
-    let source4: Observable
-    let source5: Observable
-
-    let _resultSelector: ResultSelector
-
-    init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, resultSelector: @escaping ResultSelector) {
-        self.source1 = source1
-        self.source2 = source2
-        self.source3 = source3
-        self.source4 = source4
-        self.source5 = source5
-
-        self._resultSelector = resultSelector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipSink5_(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-
-
-// 6
-
-extension ObservableType {
-    /**
-    Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-    - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element) throws -> Element)
-        -> Observable {
-        return Zip6(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(),
-            resultSelector: resultSelector
-        )
-    }
-}
-
-extension ObservableType where Element == Any {
-    /**
-    Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - returns: An observable sequence containing the result of combining elements of the sources.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6)
-        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element)> {
-        return Zip6(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(),
-            resultSelector: { ($0, $1, $2, $3, $4, $5) }
-        )
-    }
-}
-
-final class ZipSink6_ : ZipSink {
-    typealias Result = Observer.Element 
-    typealias Parent = Zip6
-
-    let _parent: Parent
-
-    var _values1: Queue = Queue(capacity: 2)
-    var _values2: Queue = Queue(capacity: 2)
-    var _values3: Queue = Queue(capacity: 2)
-    var _values4: Queue = Queue(capacity: 2)
-    var _values5: Queue = Queue(capacity: 2)
-    var _values6: Queue = Queue(capacity: 2)
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(arity: 6, observer: observer, cancel: cancel)
-    }
-
-    override func hasElements(_ index: Int) -> Bool {
-        switch index {
-        case 0: return !self._values1.isEmpty
-        case 1: return !self._values2.isEmpty
-        case 2: return !self._values3.isEmpty
-        case 3: return !self._values4.isEmpty
-        case 4: return !self._values5.isEmpty
-        case 5: return !self._values6.isEmpty
-
-        default:
-            rxFatalError("Unhandled case (Function)")
-        }
-    }
-
-    func run() -> Disposable {
-        let subscription1 = SingleAssignmentDisposable()
-        let subscription2 = SingleAssignmentDisposable()
-        let subscription3 = SingleAssignmentDisposable()
-        let subscription4 = SingleAssignmentDisposable()
-        let subscription5 = SingleAssignmentDisposable()
-        let subscription6 = SingleAssignmentDisposable()
-
-        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
-        let observer6 = ZipObserver(lock: self._lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
-
-        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
-        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
-        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
-        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
-        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
-        subscription6.setDisposable(self._parent.source6.subscribe(observer6))
-
-        return Disposables.create([
-           subscription1,
-           subscription2,
-           subscription3,
-           subscription4,
-           subscription5,
-           subscription6
-        ])
-    }
-
-    override func getResult() throws -> Result {
-        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!, self._values6.dequeue()!)
-    }
-}
-
-final class Zip6 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6) throws -> Result
-
-    let source1: Observable
-    let source2: Observable
-    let source3: Observable
-    let source4: Observable
-    let source5: Observable
-    let source6: Observable
-
-    let _resultSelector: ResultSelector
-
-    init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, source6: Observable, resultSelector: @escaping ResultSelector) {
-        self.source1 = source1
-        self.source2 = source2
-        self.source3 = source3
-        self.source4 = source4
-        self.source5 = source5
-        self.source6 = source6
-
-        self._resultSelector = resultSelector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipSink6_(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-
-
-// 7
-
-extension ObservableType {
-    /**
-    Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-    - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element) throws -> Element)
-        -> Observable {
-        return Zip7(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(),
-            resultSelector: resultSelector
-        )
-    }
-}
-
-extension ObservableType where Element == Any {
-    /**
-    Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - returns: An observable sequence containing the result of combining elements of the sources.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7)
-        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element)> {
-        return Zip7(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(),
-            resultSelector: { ($0, $1, $2, $3, $4, $5, $6) }
-        )
-    }
-}
-
-final class ZipSink7_ : ZipSink {
-    typealias Result = Observer.Element 
-    typealias Parent = Zip7
-
-    let _parent: Parent
-
-    var _values1: Queue = Queue(capacity: 2)
-    var _values2: Queue = Queue(capacity: 2)
-    var _values3: Queue = Queue(capacity: 2)
-    var _values4: Queue = Queue(capacity: 2)
-    var _values5: Queue = Queue(capacity: 2)
-    var _values6: Queue = Queue(capacity: 2)
-    var _values7: Queue = Queue(capacity: 2)
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(arity: 7, observer: observer, cancel: cancel)
-    }
-
-    override func hasElements(_ index: Int) -> Bool {
-        switch index {
-        case 0: return !self._values1.isEmpty
-        case 1: return !self._values2.isEmpty
-        case 2: return !self._values3.isEmpty
-        case 3: return !self._values4.isEmpty
-        case 4: return !self._values5.isEmpty
-        case 5: return !self._values6.isEmpty
-        case 6: return !self._values7.isEmpty
-
-        default:
-            rxFatalError("Unhandled case (Function)")
-        }
-    }
-
-    func run() -> Disposable {
-        let subscription1 = SingleAssignmentDisposable()
-        let subscription2 = SingleAssignmentDisposable()
-        let subscription3 = SingleAssignmentDisposable()
-        let subscription4 = SingleAssignmentDisposable()
-        let subscription5 = SingleAssignmentDisposable()
-        let subscription6 = SingleAssignmentDisposable()
-        let subscription7 = SingleAssignmentDisposable()
-
-        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
-        let observer6 = ZipObserver(lock: self._lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
-        let observer7 = ZipObserver(lock: self._lock, parent: self, index: 6, setNextValue: { self._values7.enqueue($0) }, this: subscription7)
-
-        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
-        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
-        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
-        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
-        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
-        subscription6.setDisposable(self._parent.source6.subscribe(observer6))
-        subscription7.setDisposable(self._parent.source7.subscribe(observer7))
-
-        return Disposables.create([
-           subscription1,
-           subscription2,
-           subscription3,
-           subscription4,
-           subscription5,
-           subscription6,
-           subscription7
-        ])
-    }
-
-    override func getResult() throws -> Result {
-        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!, self._values6.dequeue()!, self._values7.dequeue()!)
-    }
-}
-
-final class Zip7 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7) throws -> Result
-
-    let source1: Observable
-    let source2: Observable
-    let source3: Observable
-    let source4: Observable
-    let source5: Observable
-    let source6: Observable
-    let source7: Observable
-
-    let _resultSelector: ResultSelector
-
-    init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, source6: Observable, source7: Observable, resultSelector: @escaping ResultSelector) {
-        self.source1 = source1
-        self.source2 = source2
-        self.source3 = source3
-        self.source4 = source4
-        self.source5 = source5
-        self.source6 = source6
-        self.source7 = source7
-
-        self._resultSelector = resultSelector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipSink7_(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-
-
-// 8
-
-extension ObservableType {
-    /**
-    Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - parameter resultSelector: Function to invoke for each series of elements at corresponding indexes in the sources.
-    - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8, resultSelector: @escaping (O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element, O8.Element) throws -> Element)
-        -> Observable {
-        return Zip8(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(), source8: source8.asObservable(),
-            resultSelector: resultSelector
-        )
-    }
-}
-
-extension ObservableType where Element == Any {
-    /**
-    Merges the specified observable sequences into one observable sequence of tuples whenever all of the observable sequences have produced an element at a corresponding index.
-
-    - seealso: [zip operator on reactivex.io](http://reactivex.io/documentation/operators/zip.html)
-
-    - returns: An observable sequence containing the result of combining elements of the sources.
-    */
-    public static func zip
-        (_ source1: O1, _ source2: O2, _ source3: O3, _ source4: O4, _ source5: O5, _ source6: O6, _ source7: O7, _ source8: O8)
-        -> Observable<(O1.Element, O2.Element, O3.Element, O4.Element, O5.Element, O6.Element, O7.Element, O8.Element)> {
-        return Zip8(
-            source1: source1.asObservable(), source2: source2.asObservable(), source3: source3.asObservable(), source4: source4.asObservable(), source5: source5.asObservable(), source6: source6.asObservable(), source7: source7.asObservable(), source8: source8.asObservable(),
-            resultSelector: { ($0, $1, $2, $3, $4, $5, $6, $7) }
-        )
-    }
-}
-
-final class ZipSink8_ : ZipSink {
-    typealias Result = Observer.Element 
-    typealias Parent = Zip8
-
-    let _parent: Parent
-
-    var _values1: Queue = Queue(capacity: 2)
-    var _values2: Queue = Queue(capacity: 2)
-    var _values3: Queue = Queue(capacity: 2)
-    var _values4: Queue = Queue(capacity: 2)
-    var _values5: Queue = Queue(capacity: 2)
-    var _values6: Queue = Queue(capacity: 2)
-    var _values7: Queue = Queue(capacity: 2)
-    var _values8: Queue = Queue(capacity: 2)
-
-    init(parent: Parent, observer: Observer, cancel: Cancelable) {
-        self._parent = parent
-        super.init(arity: 8, observer: observer, cancel: cancel)
-    }
-
-    override func hasElements(_ index: Int) -> Bool {
-        switch index {
-        case 0: return !self._values1.isEmpty
-        case 1: return !self._values2.isEmpty
-        case 2: return !self._values3.isEmpty
-        case 3: return !self._values4.isEmpty
-        case 4: return !self._values5.isEmpty
-        case 5: return !self._values6.isEmpty
-        case 6: return !self._values7.isEmpty
-        case 7: return !self._values8.isEmpty
-
-        default:
-            rxFatalError("Unhandled case (Function)")
-        }
-    }
-
-    func run() -> Disposable {
-        let subscription1 = SingleAssignmentDisposable()
-        let subscription2 = SingleAssignmentDisposable()
-        let subscription3 = SingleAssignmentDisposable()
-        let subscription4 = SingleAssignmentDisposable()
-        let subscription5 = SingleAssignmentDisposable()
-        let subscription6 = SingleAssignmentDisposable()
-        let subscription7 = SingleAssignmentDisposable()
-        let subscription8 = SingleAssignmentDisposable()
-
-        let observer1 = ZipObserver(lock: self._lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1)
-        let observer2 = ZipObserver(lock: self._lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2)
-        let observer3 = ZipObserver(lock: self._lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3)
-        let observer4 = ZipObserver(lock: self._lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4)
-        let observer5 = ZipObserver(lock: self._lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5)
-        let observer6 = ZipObserver(lock: self._lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6)
-        let observer7 = ZipObserver(lock: self._lock, parent: self, index: 6, setNextValue: { self._values7.enqueue($0) }, this: subscription7)
-        let observer8 = ZipObserver(lock: self._lock, parent: self, index: 7, setNextValue: { self._values8.enqueue($0) }, this: subscription8)
-
-        subscription1.setDisposable(self._parent.source1.subscribe(observer1))
-        subscription2.setDisposable(self._parent.source2.subscribe(observer2))
-        subscription3.setDisposable(self._parent.source3.subscribe(observer3))
-        subscription4.setDisposable(self._parent.source4.subscribe(observer4))
-        subscription5.setDisposable(self._parent.source5.subscribe(observer5))
-        subscription6.setDisposable(self._parent.source6.subscribe(observer6))
-        subscription7.setDisposable(self._parent.source7.subscribe(observer7))
-        subscription8.setDisposable(self._parent.source8.subscribe(observer8))
-
-        return Disposables.create([
-           subscription1,
-           subscription2,
-           subscription3,
-           subscription4,
-           subscription5,
-           subscription6,
-           subscription7,
-           subscription8
-        ])
-    }
-
-    override func getResult() throws -> Result {
-        return try self._parent._resultSelector(self._values1.dequeue()!, self._values2.dequeue()!, self._values3.dequeue()!, self._values4.dequeue()!, self._values5.dequeue()!, self._values6.dequeue()!, self._values7.dequeue()!, self._values8.dequeue()!)
-    }
-}
-
-final class Zip8 : Producer {
-    typealias ResultSelector = (E1, E2, E3, E4, E5, E6, E7, E8) throws -> Result
-
-    let source1: Observable
-    let source2: Observable
-    let source3: Observable
-    let source4: Observable
-    let source5: Observable
-    let source6: Observable
-    let source7: Observable
-    let source8: Observable
-
-    let _resultSelector: ResultSelector
-
-    init(source1: Observable, source2: Observable, source3: Observable, source4: Observable, source5: Observable, source6: Observable, source7: Observable, source8: Observable, resultSelector: @escaping ResultSelector) {
-        self.source1 = source1
-        self.source2 = source2
-        self.source3 = source3
-        self.source4 = source4
-        self.source5 = source5
-        self.source6 = source6
-        self.source7 = source7
-        self.source8 = source8
-
-        self._resultSelector = resultSelector
-    }
-
-    override func run(_ observer: Observer, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where Observer.Element == Result {
-        let sink = ZipSink8_(parent: self, observer: observer, cancel: cancel)
-        let subscription = sink.run()
-        return (sink: sink, subscription: subscription)
-    }
-}
-
-
diff --git a/Demo/Pods/RxSwift/RxSwift/Observables/Zip.swift b/Demo/Pods/RxSwift/RxSwift/Observables/Zip.swift
deleted file mode 100644
index 911eb57..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observables/Zip.swift
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-//  Zip.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 5/23/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-protocol ZipSinkProtocol : class
-{
-    func next(_ index: Int)
-    func fail(_ error: Swift.Error)
-    func done(_ index: Int)
-}
-
-class ZipSink : Sink, ZipSinkProtocol {
-    typealias Element = Observer.Element
-    
-    let _arity: Int
-
-    let _lock = RecursiveLock()
-
-    // state
-    private var _isDone: [Bool]
-    
-    init(arity: Int, observer: Observer, cancel: Cancelable) {
-        self._isDone = [Bool](repeating: false, count: arity)
-        self._arity = arity
-        
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    func getResult() throws -> Element {
-        rxAbstractMethod()
-    }
-    
-    func hasElements(_ index: Int) -> Bool {
-        rxAbstractMethod()
-    }
-    
-    func next(_ index: Int) {
-        var hasValueAll = true
-        
-        for i in 0 ..< self._arity {
-            if !self.hasElements(i) {
-                hasValueAll = false
-                break
-            }
-        }
-        
-        if hasValueAll {
-            do {
-                let result = try self.getResult()
-                self.forwardOn(.next(result))
-            }
-            catch let e {
-                self.forwardOn(.error(e))
-                self.dispose()
-            }
-        }
-    }
-    
-    func fail(_ error: Swift.Error) {
-        self.forwardOn(.error(error))
-        self.dispose()
-    }
-    
-    func done(_ index: Int) {
-        self._isDone[index] = true
-        
-        var allDone = true
-        
-        for done in self._isDone where !done {
-            allDone = false
-            break
-        }
-        
-        if allDone {
-            self.forwardOn(.completed)
-            self.dispose()
-        }
-    }
-}
-
-final class ZipObserver
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    typealias ValueSetter = (Element) -> Void
-
-    private var _parent: ZipSinkProtocol?
-    
-    let _lock: RecursiveLock
-    
-    // state
-    private let _index: Int
-    private let _this: Disposable
-    private let _setNextValue: ValueSetter
-    
-    init(lock: RecursiveLock, parent: ZipSinkProtocol, index: Int, setNextValue: @escaping ValueSetter, this: Disposable) {
-        self._lock = lock
-        self._parent = parent
-        self._index = index
-        self._this = this
-        self._setNextValue = setNextValue
-    }
-    
-    func on(_ event: Event) {
-        self.synchronizedOn(event)
-    }
-
-    func _synchronized_on(_ event: Event) {
-        if self._parent != nil {
-            switch event {
-            case .next:
-                break
-            case .error:
-                self._this.dispose()
-            case .completed:
-                self._this.dispose()
-            }
-        }
-        
-        if let parent = self._parent {
-            switch event {
-            case .next(let value):
-                self._setNextValue(value)
-                parent.next(self._index)
-            case .error(let error):
-                parent.fail(error)
-            case .completed:
-                parent.done(self._index)
-            }
-        }
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/ObserverType.swift b/Demo/Pods/RxSwift/RxSwift/ObserverType.swift
deleted file mode 100644
index e3db94a..0000000
--- a/Demo/Pods/RxSwift/RxSwift/ObserverType.swift
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-//  ObserverType.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/8/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-/// Supports push-style iteration over an observable sequence.
-public protocol ObserverType {
-    /// The type of elements in sequence that observer can observe.
-    associatedtype Element
-
-    @available(*, deprecated, message: "Use `Element` instead.")
-    typealias E = Element
-
-    /// Notify observer about sequence event.
-    ///
-    /// - parameter event: Event that occurred.
-    func on(_ event: Event)
-}
-
-/// Convenience API extensions to provide alternate next, error, completed events
-extension ObserverType {
-    
-    /// Convenience method equivalent to `on(.next(element: Element))`
-    ///
-    /// - parameter element: Next element to send to observer(s)
-    public func onNext(_ element: Element) {
-        self.on(.next(element))
-    }
-    
-    /// Convenience method equivalent to `on(.completed)`
-    public func onCompleted() {
-        self.on(.completed)
-    }
-    
-    /// Convenience method equivalent to `on(.error(Swift.Error))`
-    /// - parameter error: Swift.Error to send to observer(s)
-    public func onError(_ error: Swift.Error) {
-        self.on(.error(error))
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift b/Demo/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift
deleted file mode 100644
index 804e289..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-//  AnonymousObserver.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/8/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-final class AnonymousObserver: ObserverBase {
-    typealias EventHandler = (Event) -> Void
-    
-    private let _eventHandler : EventHandler
-    
-    init(_ eventHandler: @escaping EventHandler) {
-#if TRACE_RESOURCES
-        _ = Resources.incrementTotal()
-#endif
-        self._eventHandler = eventHandler
-    }
-
-    override func onCore(_ event: Event) {
-        return self._eventHandler(event)
-    }
-    
-#if TRACE_RESOURCES
-    deinit {
-        _ = Resources.decrementTotal()
-    }
-#endif
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observers/ObserverBase.swift b/Demo/Pods/RxSwift/RxSwift/Observers/ObserverBase.swift
deleted file mode 100644
index 57be8e2..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observers/ObserverBase.swift
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-//  ObserverBase.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/15/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-class ObserverBase : Disposable, ObserverType {
-    private let _isStopped = AtomicInt(0)
-
-    func on(_ event: Event) {
-        switch event {
-        case .next:
-            if load(self._isStopped) == 0 {
-                self.onCore(event)
-            }
-        case .error, .completed:
-            if fetchOr(self._isStopped, 1) == 0 {
-                self.onCore(event)
-            }
-        }
-    }
-
-    func onCore(_ event: Event) {
-        rxAbstractMethod()
-    }
-
-    func dispose() {
-        fetchOr(self._isStopped, 1)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift b/Demo/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift
deleted file mode 100644
index 41363a9..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-//  TailRecursiveSink.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 3/21/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-enum TailRecursiveSinkCommand {
-    case moveNext
-    case dispose
-}
-
-#if DEBUG || TRACE_RESOURCES
-    public var maxTailRecursiveSinkStackSize = 0
-#endif
-
-/// This class is usually used with `Generator` version of the operators.
-class TailRecursiveSink
-    : Sink
-    , InvocableWithValueType where Sequence.Element: ObservableConvertibleType, Sequence.Element.Element == Observer.Element {
-    typealias Value = TailRecursiveSinkCommand
-    typealias Element = Observer.Element 
-    typealias SequenceGenerator = (generator: Sequence.Iterator, remaining: IntMax?)
-
-    var _generators: [SequenceGenerator] = []
-    var _isDisposed = false
-    var _subscription = SerialDisposable()
-
-    // this is thread safe object
-    var _gate = AsyncLock>>()
-
-    override init(observer: Observer, cancel: Cancelable) {
-        super.init(observer: observer, cancel: cancel)
-    }
-
-    func run(_ sources: SequenceGenerator) -> Disposable {
-        self._generators.append(sources)
-
-        self.schedule(.moveNext)
-
-        return self._subscription
-    }
-
-    func invoke(_ command: TailRecursiveSinkCommand) {
-        switch command {
-        case .dispose:
-            self.disposeCommand()
-        case .moveNext:
-            self.moveNextCommand()
-        }
-    }
-
-    // simple implementation for now
-    func schedule(_ command: TailRecursiveSinkCommand) {
-        self._gate.invoke(InvocableScheduledItem(invocable: self, state: command))
-    }
-
-    func done() {
-        self.forwardOn(.completed)
-        self.dispose()
-    }
-
-    func extract(_ observable: Observable) -> SequenceGenerator? {
-        rxAbstractMethod()
-    }
-
-    // should be done on gate locked
-
-    private func moveNextCommand() {
-        var next: Observable?
-
-        repeat {
-            guard let (g, left) = self._generators.last else {
-                break
-            }
-            
-            if self._isDisposed {
-                return
-            }
-
-            self._generators.removeLast()
-            
-            var e = g
-
-            guard let nextCandidate = e.next()?.asObservable() else {
-                continue
-            }
-
-            // `left` is a hint of how many elements are left in generator.
-            // In case this is the last element, then there is no need to push
-            // that generator on stack.
-            //
-            // This is an optimization used to make sure in tail recursive case
-            // there is no memory leak in case this operator is used to generate non terminating
-            // sequence.
-
-            if let knownOriginalLeft = left {
-                // `- 1` because generator.next() has just been called
-                if knownOriginalLeft - 1 >= 1 {
-                    self._generators.append((e, knownOriginalLeft - 1))
-                }
-            }
-            else {
-                self._generators.append((e, nil))
-            }
-
-            let nextGenerator = self.extract(nextCandidate)
-
-            if let nextGenerator = nextGenerator {
-                self._generators.append(nextGenerator)
-                #if DEBUG || TRACE_RESOURCES
-                    if maxTailRecursiveSinkStackSize < self._generators.count {
-                        maxTailRecursiveSinkStackSize = self._generators.count
-                    }
-                #endif
-            }
-            else {
-                next = nextCandidate
-            }
-        } while next == nil
-
-        guard let existingNext = next else {
-            self.done()
-            return
-        }
-
-        let disposable = SingleAssignmentDisposable()
-        self._subscription.disposable = disposable
-        disposable.setDisposable(self.subscribeToNext(existingNext))
-    }
-
-    func subscribeToNext(_ source: Observable) -> Disposable {
-        rxAbstractMethod()
-    }
-
-    func disposeCommand() {
-        self._isDisposed = true
-        self._generators.removeAll(keepingCapacity: false)
-    }
-
-    override func dispose() {
-        super.dispose()
-        
-        self._subscription.dispose()
-        self._gate.dispose()
-        
-        self.schedule(.dispose)
-    }
-}
-
diff --git a/Demo/Pods/RxSwift/RxSwift/Reactive.swift b/Demo/Pods/RxSwift/RxSwift/Reactive.swift
deleted file mode 100644
index 8fdfa18..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Reactive.swift
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-//  Reactive.swift
-//  RxSwift
-//
-//  Created by Yury Korolev on 5/2/16.
-//  Copyright © 2016 Krunoslav Zaher. All rights reserved.
-//
-
-/**
- Use `Reactive` proxy as customization point for constrained protocol extensions.
-
- General pattern would be:
-
- // 1. Extend Reactive protocol with constrain on Base
- // Read as: Reactive Extension where Base is a SomeType
- extension Reactive where Base: SomeType {
- // 2. Put any specific reactive extension for SomeType here
- }
-
- With this approach we can have more specialized methods and properties using
- `Base` and not just specialized on common base type.
-
- */
-
-public struct Reactive {
-    /// Base object to extend.
-    public let base: Base
-
-    /// Creates extensions with base object.
-    ///
-    /// - parameter base: Base object.
-    public init(_ base: Base) {
-        self.base = base
-    }
-}
-
-/// A type that has reactive extensions.
-public protocol ReactiveCompatible {
-    /// Extended type
-    associatedtype ReactiveBase
-
-    @available(*, deprecated, message: "Use `ReactiveBase` instead.")
-    typealias CompatibleType = ReactiveBase
-
-    /// Reactive extensions.
-    static var rx: Reactive.Type { get set }
-
-    /// Reactive extensions.
-    var rx: Reactive { get set }
-}
-
-extension ReactiveCompatible {
-    /// Reactive extensions.
-    public static var rx: Reactive.Type {
-        get {
-            return Reactive.self
-        }
-        set {
-            // this enables using Reactive to "mutate" base type
-        }
-    }
-
-    /// Reactive extensions.
-    public var rx: Reactive {
-        get {
-            return Reactive(self)
-        }
-        set {
-            // this enables using Reactive to "mutate" base object
-        }
-    }
-}
-
-import class Foundation.NSObject
-
-/// Extend NSObject with `rx` proxy.
-extension NSObject: ReactiveCompatible { }
diff --git a/Demo/Pods/RxSwift/RxSwift/Rx.swift b/Demo/Pods/RxSwift/RxSwift/Rx.swift
deleted file mode 100644
index a547a8f..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Rx.swift
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-//  Rx.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/14/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-#if TRACE_RESOURCES
-    fileprivate let resourceCount = AtomicInt(0)
-
-    /// Resource utilization information
-    public struct Resources {
-        /// Counts internal Rx resource allocations (Observables, Observers, Disposables, etc.). This provides a simple way to detect leaks during development.
-        public static var total: Int32 {
-            return load(resourceCount)
-        }
-
-        /// Increments `Resources.total` resource count.
-        ///
-        /// - returns: New resource count
-        public static func incrementTotal() -> Int32 {
-            return increment(resourceCount)
-        }
-
-        /// Decrements `Resources.total` resource count
-        ///
-        /// - returns: New resource count
-        public static func decrementTotal() -> Int32 {
-            return decrement(resourceCount)
-        }
-    }
-#endif
-
-/// Swift does not implement abstract methods. This method is used as a runtime check to ensure that methods which intended to be abstract (i.e., they should be implemented in subclasses) are not called directly on the superclass.
-func rxAbstractMethod(file: StaticString = #file, line: UInt = #line) -> Swift.Never {
-    rxFatalError("Abstract method", file: file, line: line)
-}
-
-func rxFatalError(_ lastMessage: @autoclosure () -> String, file: StaticString = #file, line: UInt = #line) -> Swift.Never  {
-    fatalError(lastMessage(), file: file, line: line)
-}
-
-func rxFatalErrorInDebug(_ lastMessage: @autoclosure () -> String, file: StaticString = #file, line: UInt = #line) {
-    #if DEBUG
-        fatalError(lastMessage(), file: file, line: line)
-    #else
-        print("\(file):\(line): \(lastMessage())")
-    #endif
-}
-
-func incrementChecked(_ i: inout Int) throws -> Int {
-    if i == Int.max {
-        throw RxError.overflow
-    }
-    defer { i += 1 }
-    return i
-}
-
-func decrementChecked(_ i: inout Int) throws -> Int {
-    if i == Int.min {
-        throw RxError.overflow
-    }
-    defer { i -= 1 }
-    return i
-}
-
-#if DEBUG
-    import class Foundation.Thread
-    final class SynchronizationTracker {
-        private let _lock = RecursiveLock()
-
-        public enum SynchronizationErrorMessages: String {
-            case variable = "Two different threads are trying to assign the same `Variable.value` unsynchronized.\n    This is undefined behavior because the end result (variable value) is nondeterministic and depends on the \n    operating system thread scheduler. This will cause random behavior of your program.\n"
-            case `default` = "Two different unsynchronized threads are trying to send some event simultaneously.\n    This is undefined behavior because the ordering of the effects caused by these events is nondeterministic and depends on the \n    operating system thread scheduler. This will result in a random behavior of your program.\n"
-        }
-
-        private var _threads = [UnsafeMutableRawPointer: Int]()
-
-        private func synchronizationError(_ message: String) {
-            #if FATAL_SYNCHRONIZATION
-                rxFatalError(message)
-            #else
-                print(message)
-            #endif
-        }
-        
-        func register(synchronizationErrorMessage: SynchronizationErrorMessages) {
-            self._lock.lock(); defer { self._lock.unlock() }
-            let pointer = Unmanaged.passUnretained(Thread.current).toOpaque()
-            let count = (self._threads[pointer] ?? 0) + 1
-
-            if count > 1 {
-                self.synchronizationError(
-                    "⚠️ Reentrancy anomaly was detected.\n" +
-                    "  > Debugging: To debug this issue you can set a breakpoint in \(#file):\(#line) and observe the call stack.\n" +
-                    "  > Problem: This behavior is breaking the observable sequence grammar. `next (error | completed)?`\n" +
-                    "    This behavior breaks the grammar because there is overlapping between sequence events.\n" +
-                    "    Observable sequence is trying to send an event before sending of previous event has finished.\n" +
-                    "  > Interpretation: This could mean that there is some kind of unexpected cyclic dependency in your code,\n" +
-                    "    or that the system is not behaving in the expected way.\n" +
-                    "  > Remedy: If this is the expected behavior this message can be suppressed by adding `.observeOn(MainScheduler.asyncInstance)`\n" +
-                    "    or by enqueuing sequence events in some other way.\n"
-                )
-            }
-            
-            self._threads[pointer] = count
-
-            if self._threads.count > 1 {
-                self.synchronizationError(
-                    "⚠️ Synchronization anomaly was detected.\n" +
-                    "  > Debugging: To debug this issue you can set a breakpoint in \(#file):\(#line) and observe the call stack.\n" +
-                    "  > Problem: This behavior is breaking the observable sequence grammar. `next (error | completed)?`\n" +
-                    "    This behavior breaks the grammar because there is overlapping between sequence events.\n" +
-                    "    Observable sequence is trying to send an event before sending of previous event has finished.\n" +
-                    "  > Interpretation: " + synchronizationErrorMessage.rawValue +
-                    "  > Remedy: If this is the expected behavior this message can be suppressed by adding `.observeOn(MainScheduler.asyncInstance)`\n" +
-                    "    or by synchronizing sequence events in some other way.\n"
-                )
-            }
-        }
-
-        func unregister() {
-            self._lock.lock(); defer { self._lock.unlock() }
-            let pointer = Unmanaged.passUnretained(Thread.current).toOpaque()
-            self._threads[pointer] = (self._threads[pointer] ?? 1) - 1
-            if self._threads[pointer] == 0 {
-                self._threads[pointer] = nil
-            }
-        }
-    }
-
-#endif
-
-/// RxSwift global hooks
-public enum Hooks {
-    
-    // Should capture call stack
-    public static var recordCallStackOnError: Bool = false
-
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift b/Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift
deleted file mode 100644
index fd6fc98..0000000
--- a/Demo/Pods/RxSwift/RxSwift/RxMutableBox.swift
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-//  RxMutableBox.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 5/22/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-#if os(Linux)
-/// As Swift 5 was released, A patch to `Thread` for Linux
-/// changed `threadDictionary` to a `NSMutableDictionary` instead of
-/// a `Dictionary`: https://github.com/apple/swift-corelibs-foundation/pull/1762/files
-///
-/// This means that on Linux specifically, `RxMutableBox` must be a `NSObject`
-/// or it won't be possible to store it in `Thread.threadDictionary`.
-///
-/// For more information, read the discussion at:
-/// https://github.com/ReactiveX/RxSwift/issues/1911#issuecomment-479723298
-import class Foundation.NSObject
-
-/// Creates mutable reference wrapper for any type.
-final class RxMutableBox: NSObject {
-    /// Wrapped value
-    var value: T
-
-    /// Creates reference wrapper for `value`.
-    ///
-    /// - parameter value: Value to wrap.
-    init (_ value: T) {
-        self.value = value
-    }
-}
-#else
-/// Creates mutable reference wrapper for any type.
-final class RxMutableBox: CustomDebugStringConvertible {
-    /// Wrapped value
-    var value: T
-    
-    /// Creates reference wrapper for `value`.
-    ///
-    /// - parameter value: Value to wrap.
-    init (_ value: T) {
-        self.value = value
-    }
-}
-
-extension RxMutableBox {
-    /// - returns: Box description.
-    var debugDescription: String {
-        return "MutatingBox(\(self.value))"
-    }
-}
-#endif
diff --git a/Demo/Pods/RxSwift/RxSwift/SchedulerType.swift b/Demo/Pods/RxSwift/RxSwift/SchedulerType.swift
deleted file mode 100644
index 96664b4..0000000
--- a/Demo/Pods/RxSwift/RxSwift/SchedulerType.swift
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-//  SchedulerType.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/8/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import enum Dispatch.DispatchTimeInterval
-import struct Foundation.Date
-
-// Type that represents time interval in the context of RxSwift.
-public typealias RxTimeInterval = DispatchTimeInterval
-
-/// Type that represents absolute time in the context of RxSwift.
-public typealias RxTime = Date
-
-/// Represents an object that schedules units of work.
-public protocol SchedulerType: ImmediateSchedulerType {
-
-    /// - returns: Current time.
-    var now : RxTime {
-        get
-    }
-
-    /**
-    Schedules an action to be executed.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter dueTime: Relative time after which to execute the action.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable
- 
-    /**
-    Schedules a periodic piece of work.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter startAfter: Period after which initial work should be run.
-    - parameter period: Period for running the work periodically.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable
-}
-
-extension SchedulerType {
-
-    /**
-    Periodic task will be emulated using recursive scheduling.
-
-    - parameter state: Initial state passed to the action upon the first iteration.
-    - parameter startAfter: Period after which initial work should be run.
-    - parameter period: Period for running the work periodically.
-    - returns: The disposable object used to cancel the scheduled recurring action (best effort).
-    */
-    public func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
-        let schedule = SchedulePeriodicRecursive(scheduler: self, startAfter: startAfter, period: period, action: action, state: state)
-            
-        return schedule.start()
-    }
-
-    func scheduleRecursive(_ state: State, dueTime: RxTimeInterval, action: @escaping (State, AnyRecursiveScheduler) -> Void) -> Disposable {
-        let scheduler = AnyRecursiveScheduler(scheduler: self, action: action)
-         
-        scheduler.schedule(state, dueTime: dueTime)
-            
-        return Disposables.create(with: scheduler.dispose)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
deleted file mode 100644
index ac51324..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-//  ConcurrentDispatchQueueScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 7/5/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import struct Foundation.Date
-import struct Foundation.TimeInterval
-import Dispatch
-
-/// Abstracts the work that needs to be performed on a specific `dispatch_queue_t`. You can also pass a serial dispatch queue, it shouldn't cause any problems.
-///
-/// This scheduler is suitable when some work needs to be performed in background.
-public class ConcurrentDispatchQueueScheduler: SchedulerType {
-    public typealias TimeInterval = Foundation.TimeInterval
-    public typealias Time = Date
-    
-    public var now : Date {
-        return Date()
-    }
-
-    let configuration: DispatchQueueConfiguration
-    
-    /// Constructs new `ConcurrentDispatchQueueScheduler` that wraps `queue`.
-    ///
-    /// - parameter queue: Target dispatch queue.
-    /// - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
-    public init(queue: DispatchQueue, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        self.configuration = DispatchQueueConfiguration(queue: queue, leeway: leeway)
-    }
-    
-    /// Convenience init for scheduler that wraps one of the global concurrent dispatch queues.
-    ///
-    /// - parameter qos: Target global dispatch queue, by quality of service class.
-    /// - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
-    @available(iOS 8, OSX 10.10, *)
-    public convenience init(qos: DispatchQoS, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        self.init(queue: DispatchQueue(
-            label: "rxswift.queue.\(qos)",
-            qos: qos,
-            attributes: [DispatchQueue.Attributes.concurrent],
-            target: nil),
-            leeway: leeway
-        )
-    }
-
-    /**
-    Schedules an action to be executed immediately.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public final func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self.configuration.schedule(state, action: action)
-    }
-    
-    /**
-    Schedules an action to be executed.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter dueTime: Relative time after which to execute the action.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public final func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self.configuration.scheduleRelative(state, dueTime: dueTime, action: action)
-    }
-    
-    /**
-    Schedules a periodic piece of work.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter startAfter: Period after which initial work should be run.
-    - parameter period: Period for running the work periodically.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
-        return self.configuration.schedulePeriodic(state, startAfter: startAfter, period: period, action: action)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
deleted file mode 100644
index f535a22..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-//  ConcurrentMainScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 10/17/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import struct Foundation.Date
-import struct Foundation.TimeInterval
-import Dispatch
-
-/**
-Abstracts work that needs to be performed on `MainThread`. In case `schedule` methods are called from main thread, it will perform action immediately without scheduling.
-
-This scheduler is optimized for `subscribeOn` operator. If you want to observe observable sequence elements on main thread using `observeOn` operator,
-`MainScheduler` is more suitable for that purpose.
-*/
-public final class ConcurrentMainScheduler : SchedulerType {
-    public typealias TimeInterval = Foundation.TimeInterval
-    public typealias Time = Date
-
-    private let _mainScheduler: MainScheduler
-    private let _mainQueue: DispatchQueue
-
-    /// - returns: Current time.
-    public var now: Date {
-        return self._mainScheduler.now as Date
-    }
-
-    private init(mainScheduler: MainScheduler) {
-        self._mainQueue = DispatchQueue.main
-        self._mainScheduler = mainScheduler
-    }
-
-    /// Singleton instance of `ConcurrentMainScheduler`
-    public static let instance = ConcurrentMainScheduler(mainScheduler: MainScheduler.instance)
-
-    /**
-    Schedules an action to be executed immediately.
-
-    - parameter state: State passed to the action to be executed.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        if DispatchQueue.isMain {
-            return action(state)
-        }
-
-        let cancel = SingleAssignmentDisposable()
-
-        self._mainQueue.async {
-            if cancel.isDisposed {
-                return
-            }
-
-            cancel.setDisposable(action(state))
-        }
-
-        return cancel
-    }
-
-    /**
-    Schedules an action to be executed.
-
-    - parameter state: State passed to the action to be executed.
-    - parameter dueTime: Relative time after which to execute the action.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public final func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self._mainScheduler.scheduleRelative(state, dueTime: dueTime, action: action)
-    }
-
-    /**
-    Schedules a periodic piece of work.
-
-    - parameter state: State passed to the action to be executed.
-    - parameter startAfter: Period after which initial work should be run.
-    - parameter period: Period for running the work periodically.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
-        return self._mainScheduler.schedulePeriodic(state, startAfter: startAfter, period: period, action: action)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift
deleted file mode 100644
index 8f9939a..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-//  CurrentThreadScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 8/30/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import class Foundation.NSObject
-import protocol Foundation.NSCopying
-import class Foundation.Thread
-import Dispatch
-
-#if os(Linux)
-    import struct Foundation.pthread_key_t
-    import func Foundation.pthread_setspecific
-    import func Foundation.pthread_getspecific
-    import func Foundation.pthread_key_create
-    
-    fileprivate enum CurrentThreadSchedulerQueueKey {
-        fileprivate static let instance = "RxSwift.CurrentThreadScheduler.Queue"
-    }
-#else
-    private class CurrentThreadSchedulerQueueKey: NSObject, NSCopying {
-        static let instance = CurrentThreadSchedulerQueueKey()
-        private override init() {
-            super.init()
-        }
-
-        override var hash: Int {
-            return 0
-        }
-
-        public func copy(with zone: NSZone? = nil) -> Any {
-            return self
-        }
-    }
-#endif
-
-/// Represents an object that schedules units of work on the current thread.
-///
-/// This is the default scheduler for operators that generate elements.
-///
-/// This scheduler is also sometimes called `trampoline scheduler`.
-public class CurrentThreadScheduler : ImmediateSchedulerType {
-    typealias ScheduleQueue = RxMutableBox>
-
-    /// The singleton instance of the current thread scheduler.
-    public static let instance = CurrentThreadScheduler()
-
-    private static var isScheduleRequiredKey: pthread_key_t = { () -> pthread_key_t in
-        let key = UnsafeMutablePointer.allocate(capacity: 1)
-        defer { key.deallocate() }
-                                                               
-        guard pthread_key_create(key, nil) == 0 else {
-            rxFatalError("isScheduleRequired key creation failed")
-        }
-
-        return key.pointee
-    }()
-
-    private static var scheduleInProgressSentinel: UnsafeRawPointer = { () -> UnsafeRawPointer in
-        return UnsafeRawPointer(UnsafeMutablePointer.allocate(capacity: 1))
-    }()
-
-    static var queue : ScheduleQueue? {
-        get {
-            return Thread.getThreadLocalStorageValueForKey(CurrentThreadSchedulerQueueKey.instance)
-        }
-        set {
-            Thread.setThreadLocalStorageValue(newValue, forKey: CurrentThreadSchedulerQueueKey.instance)
-        }
-    }
-
-    /// Gets a value that indicates whether the caller must call a `schedule` method.
-    public static fileprivate(set) var isScheduleRequired: Bool {
-        get {
-            return pthread_getspecific(CurrentThreadScheduler.isScheduleRequiredKey) == nil
-        }
-        set(isScheduleRequired) {
-            if pthread_setspecific(CurrentThreadScheduler.isScheduleRequiredKey, isScheduleRequired ? nil : scheduleInProgressSentinel) != 0 {
-                rxFatalError("pthread_setspecific failed")
-            }
-        }
-    }
-
-    /**
-    Schedules an action to be executed as soon as possible on current thread.
-
-    If this method is called on some thread that doesn't have `CurrentThreadScheduler` installed, scheduler will be
-    automatically installed and uninstalled after all work is performed.
-
-    - parameter state: State passed to the action to be executed.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        if CurrentThreadScheduler.isScheduleRequired {
-            CurrentThreadScheduler.isScheduleRequired = false
-
-            let disposable = action(state)
-
-            defer {
-                CurrentThreadScheduler.isScheduleRequired = true
-                CurrentThreadScheduler.queue = nil
-            }
-
-            guard let queue = CurrentThreadScheduler.queue else {
-                return disposable
-            }
-
-            while let latest = queue.value.dequeue() {
-                if latest.isDisposed {
-                    continue
-                }
-                latest.invoke()
-            }
-
-            return disposable
-        }
-
-        let existingQueue = CurrentThreadScheduler.queue
-
-        let queue: RxMutableBox>
-        if let existingQueue = existingQueue {
-            queue = existingQueue
-        }
-        else {
-            queue = RxMutableBox(Queue(capacity: 1))
-            CurrentThreadScheduler.queue = queue
-        }
-
-        let scheduledItem = ScheduledItem(action: action, state: state)
-        queue.value.enqueue(scheduledItem)
-
-        return scheduledItem
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalScheduler.swift
deleted file mode 100644
index 11af238..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalScheduler.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  HistoricalScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 12/27/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import struct Foundation.Date
-
-/// Provides a virtual time scheduler that uses `Date` for absolute time and `NSTimeInterval` for relative time.
-public class HistoricalScheduler : VirtualTimeScheduler {
-
-    /**
-      Creates a new historical scheduler with initial clock value.
-     
-     - parameter initialClock: Initial value for virtual clock.
-    */
-    public init(initialClock: RxTime = Date(timeIntervalSince1970: 0)) {
-        super.init(initialClock: initialClock, converter: HistoricalSchedulerTimeConverter())
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift
deleted file mode 100644
index 12eeb5c..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-//  HistoricalSchedulerTimeConverter.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 12/27/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import Foundation
-
-/// Converts historical virtual time into real time.
-///
-/// Since historical virtual time is also measured in `Date`, this converter is identity function.
-public struct HistoricalSchedulerTimeConverter : VirtualTimeConverterType {
-    /// Virtual time unit used that represents ticks of virtual clock.
-    public typealias VirtualTimeUnit = RxTime
-
-    /// Virtual time unit used to represent differences of virtual times.
-    public typealias VirtualTimeIntervalUnit = TimeInterval
-
-    /// Returns identical value of argument passed because historical virtual time is equal to real time, just
-    /// decoupled from local machine clock.
-    public func convertFromVirtualTime(_ virtualTime: VirtualTimeUnit) -> RxTime {
-        return virtualTime
-    }
-
-    /// Returns identical value of argument passed because historical virtual time is equal to real time, just
-    /// decoupled from local machine clock.
-    public func convertToVirtualTime(_ time: RxTime) -> VirtualTimeUnit {
-        return time
-    }
-
-    /// Returns identical value of argument passed because historical virtual time is equal to real time, just
-    /// decoupled from local machine clock.
-    public func convertFromVirtualTimeInterval(_ virtualTimeInterval: VirtualTimeIntervalUnit) -> TimeInterval {
-        return virtualTimeInterval
-    }
-
-    /// Returns identical value of argument passed because historical virtual time is equal to real time, just
-    /// decoupled from local machine clock.
-    public func convertToVirtualTimeInterval(_ timeInterval: TimeInterval) -> VirtualTimeIntervalUnit {
-        return timeInterval
-    }
-
-    /**
-     Offsets `Date` by time interval.
-     
-     - parameter time: Time.
-     - parameter timeInterval: Time interval offset.
-     - returns: Time offsetted by time interval.
-    */
-    public func offsetVirtualTime(_ time: VirtualTimeUnit, offset: VirtualTimeIntervalUnit) -> VirtualTimeUnit {
-        return time.addingTimeInterval(offset)
-    }
-
-    /// Compares two `Date`s.
-    public func compareVirtualTime(_ lhs: VirtualTimeUnit, _ rhs: VirtualTimeUnit) -> VirtualTimeComparison {
-        switch lhs.compare(rhs as Date) {
-        case .orderedAscending:
-            return .lessThan
-        case .orderedSame:
-            return .equal
-        case .orderedDescending:
-            return .greaterThan
-        }
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
deleted file mode 100644
index bac5e9a..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-//  DispatchQueueConfiguration.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 7/23/16.
-//  Copyright © 2016 Krunoslav Zaher. All rights reserved.
-//
-
-import Dispatch
-import struct Foundation.TimeInterval
-
-struct DispatchQueueConfiguration {
-    let queue: DispatchQueue
-    let leeway: DispatchTimeInterval
-}
-
-extension DispatchQueueConfiguration {
-    func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let cancel = SingleAssignmentDisposable()
-
-        self.queue.async {
-            if cancel.isDisposed {
-                return
-            }
-
-
-            cancel.setDisposable(action(state))
-        }
-
-        return cancel
-    }
-
-    func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let deadline = DispatchTime.now() + dueTime
-
-        let compositeDisposable = CompositeDisposable()
-
-        let timer = DispatchSource.makeTimerSource(queue: self.queue)
-        timer.schedule(deadline: deadline, leeway: self.leeway)
-
-        // TODO:
-        // This looks horrible, and yes, it is.
-        // It looks like Apple has made a conceputal change here, and I'm unsure why.
-        // Need more info on this.
-        // It looks like just setting timer to fire and not holding a reference to it
-        // until deadline causes timer cancellation.
-        var timerReference: DispatchSourceTimer? = timer
-        let cancelTimer = Disposables.create {
-            timerReference?.cancel()
-            timerReference = nil
-        }
-
-        timer.setEventHandler(handler: {
-            if compositeDisposable.isDisposed {
-                return
-            }
-            _ = compositeDisposable.insert(action(state))
-            cancelTimer.dispose()
-        })
-        timer.resume()
-
-        _ = compositeDisposable.insert(cancelTimer)
-
-        return compositeDisposable
-    }
-
-    func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
-        let initial = DispatchTime.now() + startAfter
-
-        var timerState = state
-
-        let timer = DispatchSource.makeTimerSource(queue: self.queue)
-        timer.schedule(deadline: initial, repeating: period, leeway: self.leeway)
-        
-        // TODO:
-        // This looks horrible, and yes, it is.
-        // It looks like Apple has made a conceputal change here, and I'm unsure why.
-        // Need more info on this.
-        // It looks like just setting timer to fire and not holding a reference to it
-        // until deadline causes timer cancellation.
-        var timerReference: DispatchSourceTimer? = timer
-        let cancelTimer = Disposables.create {
-            timerReference?.cancel()
-            timerReference = nil
-        }
-
-        timer.setEventHandler(handler: {
-            if cancelTimer.isDisposed {
-                return
-            }
-            timerState = action(timerState)
-        })
-        timer.resume()
-        
-        return cancelTimer
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift
deleted file mode 100644
index f31469e..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  InvocableScheduledItem.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 11/7/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-struct InvocableScheduledItem : InvocableType {
-
-    let _invocable: I
-    let _state: I.Value
-
-    init(invocable: I, state: I.Value) {
-        self._invocable = invocable
-        self._state = state
-    }
-
-    func invoke() {
-        self._invocable.invoke(self._state)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableType.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableType.swift
deleted file mode 100644
index 0dba433..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/InvocableType.swift
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  InvocableType.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 11/7/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-protocol InvocableType {
-    func invoke()
-}
-
-protocol InvocableWithValueType {
-    associatedtype Value
-
-    func invoke(_ value: Value)
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift
deleted file mode 100644
index 6e7a0c1..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//  ScheduledItem.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 9/2/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-struct ScheduledItem
-    : ScheduledItemType
-    , InvocableType {
-    typealias Action = (T) -> Disposable
-    
-    private let _action: Action
-    private let _state: T
-
-    private let _disposable = SingleAssignmentDisposable()
-
-    var isDisposed: Bool {
-        return self._disposable.isDisposed
-    }
-    
-    init(action: @escaping Action, state: T) {
-        self._action = action
-        self._state = state
-    }
-    
-    func invoke() {
-         self._disposable.setDisposable(self._action(self._state))
-    }
-    
-    func dispose() {
-        self._disposable.dispose()
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItemType.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItemType.swift
deleted file mode 100644
index d2b16ca..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItemType.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  ScheduledItemType.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 11/7/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-protocol ScheduledItemType
-    : Cancelable
-    , InvocableType {
-    func invoke()
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift
deleted file mode 100644
index 8fb0907..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-//  MainScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/8/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import Dispatch
-#if !os(Linux)
-    import Foundation
-#endif
-
-/**
-Abstracts work that needs to be performed on `DispatchQueue.main`. In case `schedule` methods are called from `DispatchQueue.main`, it will perform action immediately without scheduling.
-
-This scheduler is usually used to perform UI work.
-
-Main scheduler is a specialization of `SerialDispatchQueueScheduler`.
-
-This scheduler is optimized for `observeOn` operator. To ensure observable sequence is subscribed on main thread using `subscribeOn`
-operator please use `ConcurrentMainScheduler` because it is more optimized for that purpose.
-*/
-public final class MainScheduler : SerialDispatchQueueScheduler {
-
-    private let _mainQueue: DispatchQueue
-
-    let numberEnqueued = AtomicInt(0)
-
-    /// Initializes new instance of `MainScheduler`.
-    public init() {
-        self._mainQueue = DispatchQueue.main
-        super.init(serialQueue: self._mainQueue)
-    }
-
-    /// Singleton instance of `MainScheduler`
-    public static let instance = MainScheduler()
-
-    /// Singleton instance of `MainScheduler` that always schedules work asynchronously
-    /// and doesn't perform optimizations for calls scheduled from main queue.
-    public static let asyncInstance = SerialDispatchQueueScheduler(serialQueue: DispatchQueue.main)
-
-    /// In case this method is called on a background thread it will throw an exception.
-    public class func ensureExecutingOnScheduler(errorMessage: String? = nil) {
-        if !DispatchQueue.isMain {
-            rxFatalError(errorMessage ?? "Executing on background thread. Please use `MainScheduler.instance.schedule` to schedule work on main thread.")
-        }
-    }
-
-    /// In case this method is running on a background thread it will throw an exception.
-    public class func ensureRunningOnMainThread(errorMessage: String? = nil) {
-        #if !os(Linux) // isMainThread is not implemented in Linux Foundation
-            guard Thread.isMainThread else {
-                rxFatalError(errorMessage ?? "Running on background thread.")
-            }
-        #endif
-    }
-
-    override func scheduleInternal(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let previousNumberEnqueued = increment(self.numberEnqueued)
-
-        if DispatchQueue.isMain && previousNumberEnqueued == 0 {
-            let disposable = action(state)
-            decrement(self.numberEnqueued)
-            return disposable
-        }
-
-        let cancel = SingleAssignmentDisposable()
-
-        self._mainQueue.async {
-            if !cancel.isDisposed {
-                _ = action(state)
-            }
-
-            decrement(self.numberEnqueued)
-        }
-
-        return cancel
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/OperationQueueScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/OperationQueueScheduler.swift
deleted file mode 100644
index 81ba59f..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/OperationQueueScheduler.swift
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-//  OperationQueueScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 4/4/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import class Foundation.Operation
-import class Foundation.OperationQueue
-import class Foundation.BlockOperation
-import Dispatch
-
-/// Abstracts the work that needs to be performed on a specific `NSOperationQueue`.
-///
-/// This scheduler is suitable for cases when there is some bigger chunk of work that needs to be performed in background and you want to fine tune concurrent processing using `maxConcurrentOperationCount`.
-public class OperationQueueScheduler: ImmediateSchedulerType {
-    public let operationQueue: OperationQueue
-    public let queuePriority: Operation.QueuePriority
-    
-    /// Constructs new instance of `OperationQueueScheduler` that performs work on `operationQueue`.
-    ///
-    /// - parameter operationQueue: Operation queue targeted to perform work on.
-    /// - parameter queuePriority: Queue priority which will be assigned to new operations.
-    public init(operationQueue: OperationQueue, queuePriority: Operation.QueuePriority = .normal) {
-        self.operationQueue = operationQueue
-        self.queuePriority = queuePriority
-    }
-    
-    /**
-    Schedules an action to be executed recursively.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter action: Action to execute recursively. The last parameter passed to the action is used to trigger recursive scheduling of the action, passing in recursive invocation state.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let cancel = SingleAssignmentDisposable()
-
-        let operation = BlockOperation {
-            if cancel.isDisposed {
-                return
-            }
-
-
-            cancel.setDisposable(action(state))
-        }
-
-        operation.queuePriority = self.queuePriority
-
-        self.operationQueue.addOperation(operation)
-        
-        return cancel
-    }
-
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift
deleted file mode 100644
index 9e9b4ff..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift
+++ /dev/null
@@ -1,220 +0,0 @@
-//
-//  RecursiveScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/7/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-private enum ScheduleState {
-    case initial
-    case added(CompositeDisposable.DisposeKey)
-    case done
-}
-
-/// Type erased recursive scheduler.
-final class AnyRecursiveScheduler {
-    
-    typealias Action =  (State, AnyRecursiveScheduler) -> Void
-
-    private let _lock = RecursiveLock()
-    
-    // state
-    private let _group = CompositeDisposable()
-
-    private var _scheduler: SchedulerType
-    private var _action: Action?
-    
-    init(scheduler: SchedulerType, action: @escaping Action) {
-        self._action = action
-        self._scheduler = scheduler
-    }
-
-    /**
-    Schedules an action to be executed recursively.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter dueTime: Relative time after which to execute the recursive action.
-    */
-    func schedule(_ state: State, dueTime: RxTimeInterval) {
-        var scheduleState: ScheduleState = .initial
-
-        let d = self._scheduler.scheduleRelative(state, dueTime: dueTime) { state -> Disposable in
-            // best effort
-            if self._group.isDisposed {
-                return Disposables.create()
-            }
-            
-            let action = self._lock.calculateLocked { () -> Action? in
-                switch scheduleState {
-                case let .added(removeKey):
-                    self._group.remove(for: removeKey)
-                case .initial:
-                    break
-                case .done:
-                    break
-                }
-
-                scheduleState = .done
-
-                return self._action
-            }
-            
-            if let action = action {
-                action(state, self)
-            }
-            
-            return Disposables.create()
-        }
-            
-        self._lock.performLocked {
-            switch scheduleState {
-            case .added:
-                rxFatalError("Invalid state")
-            case .initial:
-                if let removeKey = self._group.insert(d) {
-                    scheduleState = .added(removeKey)
-                }
-                else {
-                    scheduleState = .done
-                }
-            case .done:
-                break
-            }
-        }
-    }
-
-    /// Schedules an action to be executed recursively.
-    ///
-    /// - parameter state: State passed to the action to be executed.
-    func schedule(_ state: State) {
-        var scheduleState: ScheduleState = .initial
-
-        let d = self._scheduler.schedule(state) { state -> Disposable in
-            // best effort
-            if self._group.isDisposed {
-                return Disposables.create()
-            }
-            
-            let action = self._lock.calculateLocked { () -> Action? in
-                switch scheduleState {
-                case let .added(removeKey):
-                    self._group.remove(for: removeKey)
-                case .initial:
-                    break
-                case .done:
-                    break
-                }
-
-                scheduleState = .done
-                
-                return self._action
-            }
-           
-            if let action = action {
-                action(state, self)
-            }
-            
-            return Disposables.create()
-        }
-        
-        self._lock.performLocked {
-            switch scheduleState {
-            case .added:
-                rxFatalError("Invalid state")
-            case .initial:
-                if let removeKey = self._group.insert(d) {
-                    scheduleState = .added(removeKey)
-                }
-                else {
-                    scheduleState = .done
-                }
-            case .done:
-                break
-            }
-        }
-    }
-    
-    func dispose() {
-        self._lock.performLocked {
-            self._action = nil
-        }
-        self._group.dispose()
-    }
-}
-
-/// Type erased recursive scheduler.
-final class RecursiveImmediateScheduler {
-    typealias Action =  (_ state: State, _ recurse: (State) -> Void) -> Void
-    
-    private var _lock = SpinLock()
-    private let _group = CompositeDisposable()
-    
-    private var _action: Action?
-    private let _scheduler: ImmediateSchedulerType
-    
-    init(action: @escaping Action, scheduler: ImmediateSchedulerType) {
-        self._action = action
-        self._scheduler = scheduler
-    }
-    
-    // immediate scheduling
-    
-    /// Schedules an action to be executed recursively.
-    ///
-    /// - parameter state: State passed to the action to be executed.
-    func schedule(_ state: State) {
-        var scheduleState: ScheduleState = .initial
-
-        let d = self._scheduler.schedule(state) { state -> Disposable in
-            // best effort
-            if self._group.isDisposed {
-                return Disposables.create()
-            }
-            
-            let action = self._lock.calculateLocked { () -> Action? in
-                switch scheduleState {
-                case let .added(removeKey):
-                    self._group.remove(for: removeKey)
-                case .initial:
-                    break
-                case .done:
-                    break
-                }
-
-                scheduleState = .done
-
-                return self._action
-            }
-            
-            if let action = action {
-                action(state, self.schedule)
-            }
-            
-            return Disposables.create()
-        }
-        
-        self._lock.performLocked {
-            switch scheduleState {
-            case .added:
-                rxFatalError("Invalid state")
-            case .initial:
-                if let removeKey = self._group.insert(d) {
-                    scheduleState = .added(removeKey)
-                }
-                else {
-                    scheduleState = .done
-                }
-            case .done:
-                break
-            }
-        }
-    }
-    
-    func dispose() {
-        self._lock.performLocked {
-            self._action = nil
-        }
-        self._group.dispose()
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
deleted file mode 100644
index 5b7b840..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-//  SchedulerServices+Emulation.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 6/6/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-enum SchedulePeriodicRecursiveCommand {
-    case tick
-    case dispatchStart
-}
-
-final class SchedulePeriodicRecursive {
-    typealias RecursiveAction = (State) -> State
-    typealias RecursiveScheduler = AnyRecursiveScheduler
-
-    private let _scheduler: SchedulerType
-    private let _startAfter: RxTimeInterval
-    private let _period: RxTimeInterval
-    private let _action: RecursiveAction
-
-    private var _state: State
-    private let _pendingTickCount = AtomicInt(0)
-
-    init(scheduler: SchedulerType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping RecursiveAction, state: State) {
-        self._scheduler = scheduler
-        self._startAfter = startAfter
-        self._period = period
-        self._action = action
-        self._state = state
-    }
-
-    func start() -> Disposable {
-        return self._scheduler.scheduleRecursive(SchedulePeriodicRecursiveCommand.tick, dueTime: self._startAfter, action: self.tick)
-    }
-
-    func tick(_ command: SchedulePeriodicRecursiveCommand, scheduler: RecursiveScheduler) {
-        // Tries to emulate periodic scheduling as best as possible.
-        // The problem that could arise is if handling periodic ticks take too long, or
-        // tick interval is short.
-        switch command {
-        case .tick:
-            scheduler.schedule(.tick, dueTime: self._period)
-
-            // The idea is that if on tick there wasn't any item enqueued, schedule to perform work immediately.
-            // Else work will be scheduled after previous enqueued work completes.
-            if increment(self._pendingTickCount) == 0 {
-                self.tick(.dispatchStart, scheduler: scheduler)
-            }
-
-        case .dispatchStart:
-            self._state = self._action(self._state)
-            // Start work and schedule check is this last batch of work
-            if decrement(self._pendingTickCount) > 1 {
-                // This gives priority to scheduler emulation, it's not perfect, but helps
-                scheduler.schedule(SchedulePeriodicRecursiveCommand.dispatchStart)
-            }
-        }
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
deleted file mode 100644
index 57ae8bd..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-//  SerialDispatchQueueScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/8/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import struct Foundation.TimeInterval
-import struct Foundation.Date
-import Dispatch
-
-/**
-Abstracts the work that needs to be performed on a specific `dispatch_queue_t`. It will make sure 
-that even if concurrent dispatch queue is passed, it's transformed into a serial one.
-
-It is extremely important that this scheduler is serial, because
-certain operator perform optimizations that rely on that property.
-
-Because there is no way of detecting is passed dispatch queue serial or
-concurrent, for every queue that is being passed, worst case (concurrent)
-will be assumed, and internal serial proxy dispatch queue will be created.
-
-This scheduler can also be used with internal serial queue alone.
-
-In case some customization need to be made on it before usage,
-internal serial queue can be customized using `serialQueueConfiguration`
-callback.
-*/
-public class SerialDispatchQueueScheduler : SchedulerType {
-    public typealias TimeInterval = Foundation.TimeInterval
-    public typealias Time = Date
-    
-    /// - returns: Current time.
-    public var now : Date {
-        return Date()
-    }
-
-    let configuration: DispatchQueueConfiguration
-    
-    /**
-    Constructs new `SerialDispatchQueueScheduler` that wraps `serialQueue`.
-
-    - parameter serialQueue: Target dispatch queue.
-    - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
-    */
-    init(serialQueue: DispatchQueue, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        self.configuration = DispatchQueueConfiguration(queue: serialQueue, leeway: leeway)
-    }
-
-    /**
-    Constructs new `SerialDispatchQueueScheduler` with internal serial queue named `internalSerialQueueName`.
-    
-    Additional dispatch queue properties can be set after dispatch queue is created using `serialQueueConfiguration`.
-    
-    - parameter internalSerialQueueName: Name of internal serial dispatch queue.
-    - parameter serialQueueConfiguration: Additional configuration of internal serial dispatch queue.
-    - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
-    */
-    public convenience init(internalSerialQueueName: String, serialQueueConfiguration: ((DispatchQueue) -> Void)? = nil, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        let queue = DispatchQueue(label: internalSerialQueueName, attributes: [])
-        serialQueueConfiguration?(queue)
-        self.init(serialQueue: queue, leeway: leeway)
-    }
-    
-    /**
-    Constructs new `SerialDispatchQueueScheduler` named `internalSerialQueueName` that wraps `queue`.
-    
-    - parameter queue: Possibly concurrent dispatch queue used to perform work.
-    - parameter internalSerialQueueName: Name of internal serial dispatch queue proxy.
-    - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
-    */
-    public convenience init(queue: DispatchQueue, internalSerialQueueName: String, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        // Swift 3.0 IUO
-        let serialQueue = DispatchQueue(label: internalSerialQueueName,
-                                        attributes: [],
-                                        target: queue)
-        self.init(serialQueue: serialQueue, leeway: leeway)
-    }
-
-    /**
-     Constructs new `SerialDispatchQueueScheduler` that wraps on of the global concurrent dispatch queues.
-     
-     - parameter qos: Identifier for global dispatch queue with specified quality of service class.
-     - parameter internalSerialQueueName: Custom name for internal serial dispatch queue proxy.
-     - parameter leeway: The amount of time, in nanoseconds, that the system will defer the timer.
-     */
-    @available(iOS 8, OSX 10.10, *)
-    public convenience init(qos: DispatchQoS, internalSerialQueueName: String = "rx.global_dispatch_queue.serial", leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
-        self.init(queue: DispatchQueue.global(qos: qos.qosClass), internalSerialQueueName: internalSerialQueueName, leeway: leeway)
-    }
-    
-    /**
-    Schedules an action to be executed immediately.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public final func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self.scheduleInternal(state, action: action)
-    }
-
-    func scheduleInternal(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self.configuration.schedule(state, action: action)
-    }
-
-    /**
-    Schedules an action to be executed.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter dueTime: Relative time after which to execute the action.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public final func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self.configuration.scheduleRelative(state, dueTime: dueTime, action: action)
-    }
-    
-    /**
-    Schedules a periodic piece of work.
-    
-    - parameter state: State passed to the action to be executed.
-    - parameter startAfter: Period after which initial work should be run.
-    - parameter period: Period for running the work periodically.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public func schedulePeriodic(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
-        return self.configuration.schedulePeriodic(state, startAfter: startAfter, period: period, action: action)
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeConverterType.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeConverterType.swift
deleted file mode 100644
index 7069b00..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeConverterType.swift
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-//  VirtualTimeConverterType.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 12/23/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-import Foundation
-
-/// Parametrization for virtual time used by `VirtualTimeScheduler`s.
-public protocol VirtualTimeConverterType {
-    /// Virtual time unit used that represents ticks of virtual clock.
-    associatedtype VirtualTimeUnit
-
-    /// Virtual time unit used to represent differences of virtual times.
-    associatedtype VirtualTimeIntervalUnit
-
-    /**
-     Converts virtual time to real time.
-     
-     - parameter virtualTime: Virtual time to convert to `Date`.
-     - returns: `Date` corresponding to virtual time.
-    */
-    func convertFromVirtualTime(_ virtualTime: VirtualTimeUnit) -> RxTime
-
-    /**
-     Converts real time to virtual time.
-     
-     - parameter time: `Date` to convert to virtual time.
-     - returns: Virtual time corresponding to `Date`.
-    */
-    func convertToVirtualTime(_ time: RxTime) -> VirtualTimeUnit
-
-    /**
-     Converts from virtual time interval to `NSTimeInterval`.
-     
-     - parameter virtualTimeInterval: Virtual time interval to convert to `NSTimeInterval`.
-     - returns: `NSTimeInterval` corresponding to virtual time interval.
-    */
-    func convertFromVirtualTimeInterval(_ virtualTimeInterval: VirtualTimeIntervalUnit) -> TimeInterval
-
-    /**
-     Converts from `NSTimeInterval` to virtual time interval.
-     
-     - parameter timeInterval: `NSTimeInterval` to convert to virtual time interval.
-     - returns: Virtual time interval corresponding to time interval.
-    */
-    func convertToVirtualTimeInterval(_ timeInterval: TimeInterval) -> VirtualTimeIntervalUnit
-
-    /**
-     Offsets virtual time by virtual time interval.
-     
-     - parameter time: Virtual time.
-     - parameter offset: Virtual time interval.
-     - returns: Time corresponding to time offsetted by virtual time interval.
-    */
-    func offsetVirtualTime(_ time: VirtualTimeUnit, offset: VirtualTimeIntervalUnit) -> VirtualTimeUnit
-
-    /**
-     This is additional abstraction because `Date` is unfortunately not comparable.
-     Extending `Date` with `Comparable` would be too risky because of possible collisions with other libraries.
-    */
-    func compareVirtualTime(_ lhs: VirtualTimeUnit, _ rhs: VirtualTimeUnit) -> VirtualTimeComparison
-}
-
-/**
- Virtual time comparison result.
-
- This is additional abstraction because `Date` is unfortunately not comparable.
- Extending `Date` with `Comparable` would be too risky because of possible collisions with other libraries.
-*/
-public enum VirtualTimeComparison {
-    /// lhs < rhs.
-    case lessThan
-    /// lhs == rhs.
-    case equal
-    /// lhs > rhs.
-    case greaterThan
-}
-
-extension VirtualTimeComparison {
-    /// lhs < rhs.
-    var lessThen: Bool {
-        return self == .lessThan
-    }
-
-    /// lhs > rhs
-    var greaterThan: Bool {
-        return self == .greaterThan
-    }
-
-    /// lhs == rhs
-    var equal: Bool {
-        return self == .equal
-    }
-}
diff --git a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift b/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
deleted file mode 100644
index e63cece..0000000
--- a/Demo/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
+++ /dev/null
@@ -1,269 +0,0 @@
-//
-//  VirtualTimeScheduler.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 2/14/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-/// Base class for virtual time schedulers using a priority queue for scheduled items.
-open class VirtualTimeScheduler
-    : SchedulerType {
-
-    public typealias VirtualTime = Converter.VirtualTimeUnit
-    public typealias VirtualTimeInterval = Converter.VirtualTimeIntervalUnit
-
-    private var _running : Bool
-
-    private var _clock: VirtualTime
-
-    fileprivate var _schedulerQueue : PriorityQueue>
-    private var _converter: Converter
-
-    private var _nextId = 0
-
-    /// - returns: Current time.
-    public var now: RxTime {
-        return self._converter.convertFromVirtualTime(self.clock)
-    }
-
-    /// - returns: Scheduler's absolute time clock value.
-    public var clock: VirtualTime {
-        return self._clock
-    }
-
-    /// Creates a new virtual time scheduler.
-    ///
-    /// - parameter initialClock: Initial value for the clock.
-    public init(initialClock: VirtualTime, converter: Converter) {
-        self._clock = initialClock
-        self._running = false
-        self._converter = converter
-        self._schedulerQueue = PriorityQueue(hasHigherPriority: {
-            switch converter.compareVirtualTime($0.time, $1.time) {
-            case .lessThan:
-                return true
-            case .equal:
-                return $0.id < $1.id
-            case .greaterThan:
-                return false
-            }
-        }, isEqual: { $0 === $1 })
-        #if TRACE_RESOURCES
-            _ = Resources.incrementTotal()
-        #endif
-    }
-
-    /**
-    Schedules an action to be executed immediately.
-
-    - parameter state: State passed to the action to be executed.
-    - parameter action: Action to be executed.
-    - returns: The disposable object used to cancel the scheduled action (best effort).
-    */
-    public func schedule(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
-        return self.scheduleRelative(state, dueTime: .microseconds(0)) { a in
-            return action(a)
-        }
-    }
-
-    /**
-     Schedules an action to be executed.
-
-     - parameter state: State passed to the action to be executed.
-     - parameter dueTime: Relative time after which to execute the action.
-     - parameter action: Action to be executed.
-     - returns: The disposable object used to cancel the scheduled action (best effort).
-     */
-    public func scheduleRelative(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let time = self.now.addingDispatchInterval(dueTime)
-        let absoluteTime = self._converter.convertToVirtualTime(time)
-        let adjustedTime = self.adjustScheduledTime(absoluteTime)
-        return self.scheduleAbsoluteVirtual(state, time: adjustedTime, action: action)
-    }
-
-    /**
-     Schedules an action to be executed after relative time has passed.
-
-     - parameter state: State passed to the action to be executed.
-     - parameter time: Absolute time when to execute the action. If this is less or equal then `now`, `now + 1`  will be used.
-     - parameter action: Action to be executed.
-     - returns: The disposable object used to cancel the scheduled action (best effort).
-     */
-    public func scheduleRelativeVirtual(_ state: StateType, dueTime: VirtualTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
-        let time = self._converter.offsetVirtualTime(self.clock, offset: dueTime)
-        return self.scheduleAbsoluteVirtual(state, time: time, action: action)
-    }
-
-    /**
-     Schedules an action to be executed at absolute virtual time.
-
-     - parameter state: State passed to the action to be executed.
-     - parameter time: Absolute time when to execute the action.
-     - parameter action: Action to be executed.
-     - returns: The disposable object used to cancel the scheduled action (best effort).
-     */
-    public func scheduleAbsoluteVirtual(_ state: StateType, time: Converter.VirtualTimeUnit, action: @escaping (StateType) -> Disposable) -> Disposable {
-        MainScheduler.ensureExecutingOnScheduler()
-
-        let compositeDisposable = CompositeDisposable()
-
-        let item = VirtualSchedulerItem(action: {
-            let dispose = action(state)
-            return dispose
-        }, time: time, id: self._nextId)
-
-        self._nextId += 1
-
-        self._schedulerQueue.enqueue(item)
-        
-        _ = compositeDisposable.insert(item)
-        
-        return compositeDisposable
-    }
-
-    /// Adjusts time of scheduling before adding item to schedule queue.
-    open func adjustScheduledTime(_ time: Converter.VirtualTimeUnit) -> Converter.VirtualTimeUnit {
-        return time
-    }
-
-    /// Starts the virtual time scheduler.
-    public func start() {
-        MainScheduler.ensureExecutingOnScheduler()
-
-        if self._running {
-            return
-        }
-
-        self._running = true
-        repeat {
-            guard let next = self.findNext() else {
-                break
-            }
-
-            if self._converter.compareVirtualTime(next.time, self.clock).greaterThan {
-                self._clock = next.time
-            }
-
-            next.invoke()
-            self._schedulerQueue.remove(next)
-        } while self._running
-
-        self._running = false
-    }
-
-    func findNext() -> VirtualSchedulerItem? {
-        while let front = self._schedulerQueue.peek() {
-            if front.isDisposed {
-                self._schedulerQueue.remove(front)
-                continue
-            }
-
-            return front
-        }
-
-        return nil
-    }
-
-    /// Advances the scheduler's clock to the specified time, running all work till that point.
-    ///
-    /// - parameter virtualTime: Absolute time to advance the scheduler's clock to.
-    public func advanceTo(_ virtualTime: VirtualTime) {
-        MainScheduler.ensureExecutingOnScheduler()
-
-        if self._running {
-            fatalError("Scheduler is already running")
-        }
-
-        self._running = true
-        repeat {
-            guard let next = self.findNext() else {
-                break
-            }
-
-            if self._converter.compareVirtualTime(next.time, virtualTime).greaterThan {
-                break
-            }
-
-            if self._converter.compareVirtualTime(next.time, self.clock).greaterThan {
-                self._clock = next.time
-            }
-
-            next.invoke()
-            self._schedulerQueue.remove(next)
-        } while self._running
-
-        self._clock = virtualTime
-        self._running = false
-    }
-
-    /// Advances the scheduler's clock by the specified relative time.
-    public func sleep(_ virtualInterval: VirtualTimeInterval) {
-        MainScheduler.ensureExecutingOnScheduler()
-
-        let sleepTo = self._converter.offsetVirtualTime(self.clock, offset: virtualInterval)
-        if self._converter.compareVirtualTime(sleepTo, self.clock).lessThen {
-            fatalError("Can't sleep to past.")
-        }
-
-        self._clock = sleepTo
-    }
-
-    /// Stops the virtual time scheduler.
-    public func stop() {
-        MainScheduler.ensureExecutingOnScheduler()
-
-        self._running = false
-    }
-
-    #if TRACE_RESOURCES
-        deinit {
-            _ = Resources.decrementTotal()
-        }
-    #endif
-}
-
-// MARK: description
-
-extension VirtualTimeScheduler: CustomDebugStringConvertible {
-    /// A textual representation of `self`, suitable for debugging.
-    public var debugDescription: String {
-        return self._schedulerQueue.debugDescription
-    }
-}
-
-final class VirtualSchedulerItem