From bf4fc86d12dd8d8e602f99d8994072c35f7c82fc Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Sun, 17 May 2015 23:26:49 +0200 Subject: [PATCH] Moves RxCocoa common files to common folder. --- RxCocoa/RxCocoa.xcodeproj/project.pbxproj | 88 +++++++++---------- .../RxCocoa/{ => Common}/ControlTarget.swift | 0 .../RxCocoa/{ => Common}/KVOObservable.swift | 0 RxCocoa/RxCocoa/{ => Common}/Logging.swift | 0 .../NSNotificationCenter+Rx.swift | 0 .../{ => Common}/NSURLSession+Rx.swift | 0 RxCocoa/RxCocoa/{ => Common}/RxCocoa.swift | 0 7 files changed, 44 insertions(+), 44 deletions(-) rename RxCocoa/RxCocoa/{ => Common}/ControlTarget.swift (100%) rename RxCocoa/RxCocoa/{ => Common}/KVOObservable.swift (100%) rename RxCocoa/RxCocoa/{ => Common}/Logging.swift (100%) rename RxCocoa/RxCocoa/{ => Common}/NSNotificationCenter+Rx.swift (100%) rename RxCocoa/RxCocoa/{ => Common}/NSURLSession+Rx.swift (100%) rename RxCocoa/RxCocoa/{ => Common}/RxCocoa.swift (100%) diff --git a/RxCocoa/RxCocoa.xcodeproj/project.pbxproj b/RxCocoa/RxCocoa.xcodeproj/project.pbxproj index 20f16921..97a9c9ba 100644 --- a/RxCocoa/RxCocoa.xcodeproj/project.pbxproj +++ b/RxCocoa/RxCocoa.xcodeproj/project.pbxproj @@ -7,22 +7,22 @@ objects = { /* Begin PBXBuildFile section */ - C8092BB91AF5041E008D9A2C /* NSNotificationCenter+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8092BB81AF5041E008D9A2C /* NSNotificationCenter+Rx.swift */; }; C8092BBB1AF50436008D9A2C /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8092BBA1AF50436008D9A2C /* CoreData.framework */; }; C81553E41A98AB4A00C63152 /* RxCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = C81553E31A98AB4A00C63152 /* RxCocoa.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C81553FF1A98AC3700C63152 /* KVOObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81553FE1A98AC3700C63152 /* KVOObservable.swift */; }; - C81554031A9900F700C63152 /* ControlTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81554021A9900F700C63152 /* ControlTarget.swift */; }; - C81554051A99037500C63152 /* RxCocoa.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81554041A99037500C63152 /* RxCocoa.swift */; }; C8633A981B08FD0600375D60 /* NSTextField+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8633A971B08FD0600375D60 /* NSTextField+Rx.swift */; }; C8633A9A1B08FEBB00375D60 /* NSImageView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8633A991B08FEBB00375D60 /* NSImageView+Rx.swift */; }; - C865B89A1ACF38A0008BE3B3 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = C865B8991ACF38A0008BE3B3 /* Logging.swift */; }; - C885B6391AC01F6100AD34DA /* NSURLSession+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C885B6381AC01F6100AD34DA /* NSURLSession+Rx.swift */; }; - C88BB8771B07E6130064D411 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = C865B8991ACF38A0008BE3B3 /* Logging.swift */; }; - C88BB87A1B07E6130064D411 /* NSNotificationCenter+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8092BB81AF5041E008D9A2C /* NSNotificationCenter+Rx.swift */; }; - C88BB87B1B07E6130064D411 /* ControlTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81554021A9900F700C63152 /* ControlTarget.swift */; }; - C88BB87D1B07E6130064D411 /* KVOObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81553FE1A98AC3700C63152 /* KVOObservable.swift */; }; - C88BB87E1B07E6130064D411 /* RxCocoa.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81554041A99037500C63152 /* RxCocoa.swift */; }; - C88BB87F1B07E6130064D411 /* NSURLSession+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C885B6381AC01F6100AD34DA /* NSURLSession+Rx.swift */; }; + C8633AB01B093EDF00375D60 /* ControlTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8633AAA1B093EDF00375D60 /* ControlTarget.swift */; }; + C8633AB11B093EDF00375D60 /* ControlTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8633AAA1B093EDF00375D60 /* ControlTarget.swift */; }; + C8633AB21B093EDF00375D60 /* KVOObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8633AAB1B093EDF00375D60 /* KVOObservable.swift */; }; + C8633AB31B093EDF00375D60 /* KVOObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8633AAB1B093EDF00375D60 /* KVOObservable.swift */; }; + C8633AB41B093EDF00375D60 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8633AAC1B093EDF00375D60 /* Logging.swift */; }; + C8633AB51B093EDF00375D60 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8633AAC1B093EDF00375D60 /* Logging.swift */; }; + C8633AB61B093EDF00375D60 /* NSNotificationCenter+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8633AAD1B093EDF00375D60 /* NSNotificationCenter+Rx.swift */; }; + C8633AB71B093EDF00375D60 /* NSNotificationCenter+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8633AAD1B093EDF00375D60 /* NSNotificationCenter+Rx.swift */; }; + C8633AB81B093EDF00375D60 /* NSURLSession+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8633AAE1B093EDF00375D60 /* NSURLSession+Rx.swift */; }; + C8633AB91B093EDF00375D60 /* NSURLSession+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8633AAE1B093EDF00375D60 /* NSURLSession+Rx.swift */; }; + C8633ABA1B093EDF00375D60 /* RxCocoa.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8633AAF1B093EDF00375D60 /* RxCocoa.swift */; }; + C8633ABB1B093EDF00375D60 /* RxCocoa.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8633AAF1B093EDF00375D60 /* RxCocoa.swift */; }; C88BB8851B07E6130064D411 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8092BBA1AF50436008D9A2C /* CoreData.framework */; }; C88BB8861B07E6130064D411 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8A56BCD1AD744FD00B4673B /* RxSwift.framework */; }; C88BB8881B07E6130064D411 /* RxCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = C81553E31A98AB4A00C63152 /* RxCocoa.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -39,18 +39,18 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - C8092BB81AF5041E008D9A2C /* NSNotificationCenter+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSNotificationCenter+Rx.swift"; sourceTree = ""; }; C8092BBA1AF50436008D9A2C /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; C81553DE1A98AB4A00C63152 /* RxCocoa.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxCocoa.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C81553E21A98AB4A00C63152 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; C81553E31A98AB4A00C63152 /* RxCocoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxCocoa.h; sourceTree = ""; }; - C81553FE1A98AC3700C63152 /* KVOObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KVOObservable.swift; sourceTree = ""; }; - C81554021A9900F700C63152 /* ControlTarget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ControlTarget.swift; sourceTree = ""; }; - C81554041A99037500C63152 /* RxCocoa.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxCocoa.swift; sourceTree = ""; }; C8633A971B08FD0600375D60 /* NSTextField+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSTextField+Rx.swift"; sourceTree = ""; }; C8633A991B08FEBB00375D60 /* NSImageView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSImageView+Rx.swift"; sourceTree = ""; }; - C865B8991ACF38A0008BE3B3 /* Logging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logging.swift; sourceTree = ""; }; - C885B6381AC01F6100AD34DA /* NSURLSession+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSURLSession+Rx.swift"; sourceTree = ""; }; + C8633AAA1B093EDF00375D60 /* ControlTarget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ControlTarget.swift; sourceTree = ""; }; + C8633AAB1B093EDF00375D60 /* KVOObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KVOObservable.swift; sourceTree = ""; }; + C8633AAC1B093EDF00375D60 /* Logging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logging.swift; sourceTree = ""; }; + C8633AAD1B093EDF00375D60 /* NSNotificationCenter+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSNotificationCenter+Rx.swift"; sourceTree = ""; }; + C8633AAE1B093EDF00375D60 /* NSURLSession+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSURLSession+Rx.swift"; sourceTree = ""; }; + C8633AAF1B093EDF00375D60 /* RxCocoa.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxCocoa.swift; sourceTree = ""; }; C88BB88D1B07E6130064D411 /* RxCocoa.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxCocoa.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C88BB8E01B07F2BE0064D411 /* UIButton+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIButton+Rx.swift"; sourceTree = ""; }; C88BB8E11B07F2BE0064D411 /* UICollectionView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UICollectionView+Rx.swift"; sourceTree = ""; }; @@ -116,16 +116,10 @@ C81553E01A98AB4A00C63152 /* RxCocoa */ = { isa = PBXGroup; children = ( - C88BB91E1B07FE5D0064D411 /* Common */, + C8633AA91B093EDF00375D60 /* Common */, C88BB8DF1B07F2190064D411 /* OSX */, C88BB8DE1B07F2100064D411 /* iOS */, C81553E31A98AB4A00C63152 /* RxCocoa.h */, - C81554041A99037500C63152 /* RxCocoa.swift */, - C885B6381AC01F6100AD34DA /* NSURLSession+Rx.swift */, - C81553FE1A98AC3700C63152 /* KVOObservable.swift */, - C81554021A9900F700C63152 /* ControlTarget.swift */, - C865B8991ACF38A0008BE3B3 /* Logging.swift */, - C8092BB81AF5041E008D9A2C /* NSNotificationCenter+Rx.swift */, C81553E11A98AB4A00C63152 /* Supporting Files */, ); path = RxCocoa; @@ -139,6 +133,19 @@ name = "Supporting Files"; sourceTree = ""; }; + C8633AA91B093EDF00375D60 /* Common */ = { + isa = PBXGroup; + children = ( + C8633AAA1B093EDF00375D60 /* ControlTarget.swift */, + C8633AAB1B093EDF00375D60 /* KVOObservable.swift */, + C8633AAC1B093EDF00375D60 /* Logging.swift */, + C8633AAD1B093EDF00375D60 /* NSNotificationCenter+Rx.swift */, + C8633AAE1B093EDF00375D60 /* NSURLSession+Rx.swift */, + C8633AAF1B093EDF00375D60 /* RxCocoa.swift */, + ); + path = Common; + sourceTree = ""; + }; C88BB8DE1B07F2100064D411 /* iOS */ = { isa = PBXGroup; children = ( @@ -164,13 +171,6 @@ path = OSX; sourceTree = ""; }; - C88BB91E1B07FE5D0064D411 /* Common */ = { - isa = PBXGroup; - children = ( - ); - path = Common; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -285,18 +285,18 @@ files = ( C88BB8EE1B07F2BE0064D411 /* UITableView+Rx.swift in Sources */, C88BB8EF1B07F2BE0064D411 /* UITextField+Rx.swift in Sources */, - C865B89A1ACF38A0008BE3B3 /* Logging.swift in Sources */, + C8633AB61B093EDF00375D60 /* NSNotificationCenter+Rx.swift in Sources */, C88BB8E81B07F2BE0064D411 /* UIButton+Rx.swift in Sources */, + C8633AB41B093EDF00375D60 /* Logging.swift in Sources */, C88BB8EB1B07F2BE0064D411 /* UILabel+Rx.swift in Sources */, - C8092BB91AF5041E008D9A2C /* NSNotificationCenter+Rx.swift in Sources */, - C81554031A9900F700C63152 /* ControlTarget.swift in Sources */, - C81553FF1A98AC3700C63152 /* KVOObservable.swift in Sources */, - C81554051A99037500C63152 /* RxCocoa.swift in Sources */, C88BB8E91B07F2BE0064D411 /* UICollectionView+Rx.swift in Sources */, - C885B6391AC01F6100AD34DA /* NSURLSession+Rx.swift in Sources */, + C8633ABA1B093EDF00375D60 /* RxCocoa.swift in Sources */, C88BB8ED1B07F2BE0064D411 /* UISearchBar+Rx.swift in Sources */, C88BB8EA1B07F2BE0064D411 /* UIImageView+Rx.swift in Sources */, C88BB8EC1B07F2BE0064D411 /* UIScrollView+Rx.swift in Sources */, + C8633AB01B093EDF00375D60 /* ControlTarget.swift in Sources */, + C8633AB21B093EDF00375D60 /* KVOObservable.swift in Sources */, + C8633AB81B093EDF00375D60 /* NSURLSession+Rx.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -305,14 +305,14 @@ buildActionMask = 2147483647; files = ( C88BB91D1B07FD960064D411 /* NSButton+Rx.swift in Sources */, + C8633AB51B093EDF00375D60 /* Logging.swift in Sources */, + C8633ABB1B093EDF00375D60 /* RxCocoa.swift in Sources */, C8633A981B08FD0600375D60 /* NSTextField+Rx.swift in Sources */, - C88BB8771B07E6130064D411 /* Logging.swift in Sources */, - C88BB87A1B07E6130064D411 /* NSNotificationCenter+Rx.swift in Sources */, - C88BB87B1B07E6130064D411 /* ControlTarget.swift in Sources */, - C88BB87D1B07E6130064D411 /* KVOObservable.swift in Sources */, - C88BB87E1B07E6130064D411 /* RxCocoa.swift in Sources */, + C8633AB11B093EDF00375D60 /* ControlTarget.swift in Sources */, C8633A9A1B08FEBB00375D60 /* NSImageView+Rx.swift in Sources */, - C88BB87F1B07E6130064D411 /* NSURLSession+Rx.swift in Sources */, + C8633AB91B093EDF00375D60 /* NSURLSession+Rx.swift in Sources */, + C8633AB71B093EDF00375D60 /* NSNotificationCenter+Rx.swift in Sources */, + C8633AB31B093EDF00375D60 /* KVOObservable.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/RxCocoa/RxCocoa/ControlTarget.swift b/RxCocoa/RxCocoa/Common/ControlTarget.swift similarity index 100% rename from RxCocoa/RxCocoa/ControlTarget.swift rename to RxCocoa/RxCocoa/Common/ControlTarget.swift diff --git a/RxCocoa/RxCocoa/KVOObservable.swift b/RxCocoa/RxCocoa/Common/KVOObservable.swift similarity index 100% rename from RxCocoa/RxCocoa/KVOObservable.swift rename to RxCocoa/RxCocoa/Common/KVOObservable.swift diff --git a/RxCocoa/RxCocoa/Logging.swift b/RxCocoa/RxCocoa/Common/Logging.swift similarity index 100% rename from RxCocoa/RxCocoa/Logging.swift rename to RxCocoa/RxCocoa/Common/Logging.swift diff --git a/RxCocoa/RxCocoa/NSNotificationCenter+Rx.swift b/RxCocoa/RxCocoa/Common/NSNotificationCenter+Rx.swift similarity index 100% rename from RxCocoa/RxCocoa/NSNotificationCenter+Rx.swift rename to RxCocoa/RxCocoa/Common/NSNotificationCenter+Rx.swift diff --git a/RxCocoa/RxCocoa/NSURLSession+Rx.swift b/RxCocoa/RxCocoa/Common/NSURLSession+Rx.swift similarity index 100% rename from RxCocoa/RxCocoa/NSURLSession+Rx.swift rename to RxCocoa/RxCocoa/Common/NSURLSession+Rx.swift diff --git a/RxCocoa/RxCocoa/RxCocoa.swift b/RxCocoa/RxCocoa/Common/RxCocoa.swift similarity index 100% rename from RxCocoa/RxCocoa/RxCocoa.swift rename to RxCocoa/RxCocoa/Common/RxCocoa.swift