From c817823bfdc837bcdb92ca8d4b7f360df7f49537 Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Sat, 2 May 2015 10:39:16 +0200 Subject: [PATCH] Moves connectable observer into root. --- RxSwift/RxSwift.xcodeproj/project.pbxproj | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/RxSwift/RxSwift.xcodeproj/project.pbxproj b/RxSwift/RxSwift.xcodeproj/project.pbxproj index 22bd75cb..bfb8f256 100644 --- a/RxSwift/RxSwift.xcodeproj/project.pbxproj +++ b/RxSwift/RxSwift.xcodeproj/project.pbxproj @@ -210,8 +210,8 @@ C8A56B461AD7435900B4673B /* OperationQueueScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OperationQueueScheduler.swift; sourceTree = ""; }; C8A56B471AD7435900B4673B /* SchedulerDefaults.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SchedulerDefaults.swift; sourceTree = ""; }; C8A56B481AD7435900B4673B /* Scheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Scheduler.swift; sourceTree = ""; }; - C8A56B4A1AD7435900B4673B /* ConnectableObservableType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConnectableObservableType.swift; sourceTree = ""; }; - C8A56B4B1AD7435900B4673B /* SubjectType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubjectType.swift; sourceTree = ""; }; + C8A56B4A1AD7435900B4673B /* ConnectableObservableType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ConnectableObservableType.swift; path = Subjects/ConnectableObservableType.swift; sourceTree = ""; }; + C8A56B4B1AD7435900B4673B /* SubjectType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SubjectType.swift; path = Subjects/SubjectType.swift; sourceTree = ""; }; C8A56B961AD7436D00B4673B /* ColdObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColdObservable.swift; sourceTree = ""; }; C8A56B971AD7436D00B4673B /* HotObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HotObservable.swift; sourceTree = ""; }; C8A56B981AD7436D00B4673B /* MockObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockObserver.swift; sourceTree = ""; }; @@ -307,6 +307,8 @@ C8A56B101AD7435800B4673B /* Observable+Subscription.swift */, C8A56B331AD7435800B4673B /* ObserverOf.swift */, C8A56B3D1AD7435900B4673B /* ObserverType.swift */, + C8A56B4A1AD7435900B4673B /* ConnectableObservableType.swift */, + C8A56B4B1AD7435900B4673B /* SubjectType.swift */, C8A56B3E1AD7435900B4673B /* Result.swift */, C8A56B411AD7435900B4673B /* Rx.swift */, C8A56B481AD7435900B4673B /* Scheduler.swift */, @@ -316,7 +318,6 @@ C8A56B111AD7435800B4673B /* Observables */, C8A56B341AD7435800B4673B /* Observers */, C8A56B421AD7435900B4673B /* Scheduler */, - C8A56B491AD7435900B4673B /* Subjects */, C8A56ADA1AD7424700B4673B /* Supporting Files */, ); path = RxSwift; @@ -457,15 +458,6 @@ path = Scheduler; sourceTree = ""; }; - C8A56B491AD7435900B4673B /* Subjects */ = { - isa = PBXGroup; - children = ( - C8A56B4A1AD7435900B4673B /* ConnectableObservableType.swift */, - C8A56B4B1AD7435900B4673B /* SubjectType.swift */, - ); - path = Subjects; - sourceTree = ""; - }; C8A56B941AD7436D00B4673B /* TestImplementations */ = { isa = PBXGroup; children = (