diff --git a/Preprocessor/Preprocessor.xcodeproj/project.pbxproj b/Preprocessor/Preprocessor.xcodeproj/project.pbxproj new file mode 100644 index 00000000..55fd1f4c --- /dev/null +++ b/Preprocessor/Preprocessor.xcodeproj/project.pbxproj @@ -0,0 +1,243 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + C811087B1AF5114D001C13E4 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = C811087A1AF5114D001C13E4 /* main.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + C81108751AF5114D001C13E4 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = /usr/share/man/man1/; + dstSubfolderSpec = 0; + files = ( + ); + runOnlyForDeploymentPostprocessing = 1; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + C81108771AF5114D001C13E4 /* Preprocessor */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Preprocessor; sourceTree = BUILT_PRODUCTS_DIR; }; + C811087A1AF5114D001C13E4 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + C81108741AF5114D001C13E4 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + C811086E1AF5114D001C13E4 = { + isa = PBXGroup; + children = ( + C81108791AF5114D001C13E4 /* Preprocessor */, + C81108781AF5114D001C13E4 /* Products */, + ); + sourceTree = ""; + }; + C81108781AF5114D001C13E4 /* Products */ = { + isa = PBXGroup; + children = ( + C81108771AF5114D001C13E4 /* Preprocessor */, + ); + name = Products; + sourceTree = ""; + }; + C81108791AF5114D001C13E4 /* Preprocessor */ = { + isa = PBXGroup; + children = ( + C811087A1AF5114D001C13E4 /* main.swift */, + ); + path = Preprocessor; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + C81108761AF5114D001C13E4 /* Preprocessor */ = { + isa = PBXNativeTarget; + buildConfigurationList = C811087E1AF5114D001C13E4 /* Build configuration list for PBXNativeTarget "Preprocessor" */; + buildPhases = ( + C81108731AF5114D001C13E4 /* Sources */, + C81108741AF5114D001C13E4 /* Frameworks */, + C81108751AF5114D001C13E4 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Preprocessor; + productName = Preprocessor; + productReference = C81108771AF5114D001C13E4 /* Preprocessor */; + productType = "com.apple.product-type.tool"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + C811086F1AF5114D001C13E4 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0630; + ORGANIZATIONNAME = "Krunoslav Zaher"; + TargetAttributes = { + C81108761AF5114D001C13E4 = { + CreatedOnToolsVersion = 6.3; + }; + }; + }; + buildConfigurationList = C81108721AF5114D001C13E4 /* Build configuration list for PBXProject "Preprocessor" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = C811086E1AF5114D001C13E4; + productRefGroup = C81108781AF5114D001C13E4 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + C81108761AF5114D001C13E4 /* Preprocessor */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + C81108731AF5114D001C13E4 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C811087B1AF5114D001C13E4 /* main.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + C811087C1AF5114D001C13E4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + C811087D1AF5114D001C13E4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + }; + name = Release; + }; + C811087F1AF5114D001C13E4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + C81108801AF5114D001C13E4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + C81108721AF5114D001C13E4 /* Build configuration list for PBXProject "Preprocessor" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C811087C1AF5114D001C13E4 /* Debug */, + C811087D1AF5114D001C13E4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C811087E1AF5114D001C13E4 /* Build configuration list for PBXNativeTarget "Preprocessor" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C811087F1AF5114D001C13E4 /* Debug */, + C81108801AF5114D001C13E4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = C811086F1AF5114D001C13E4 /* Project object */; +} diff --git a/Preprocessor/Preprocessor.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Preprocessor/Preprocessor.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..53eb7a85 --- /dev/null +++ b/Preprocessor/Preprocessor.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/RxSwift/Preprocessor/main.swift b/Preprocessor/Preprocessor/main.swift similarity index 99% rename from RxSwift/Preprocessor/main.swift rename to Preprocessor/Preprocessor/main.swift index ff8241a0..eca3df6d 100644 --- a/RxSwift/Preprocessor/main.swift +++ b/Preprocessor/Preprocessor/main.swift @@ -31,7 +31,7 @@ func processFile(path: String, outputPath: String) -> String { let content = NSString(data: rawContent, encoding: NSUTF8StringEncoding)! as String let components = content.componentsSeparatedByString("<%") - + var functionContentComponents: [String] = [] functionContentComponents.append("var components: [String] = [\"// This file is autogenerated.\\n// Take a look at `Preprocessor` target in RxSwift project \\n\"]\n") functionContentComponents.append("components.append(\(escape(components[0])))\n") diff --git a/Rx.xcworkspace/contents.xcworkspacedata b/Rx.xcworkspace/contents.xcworkspacedata index b0b20eca..86c52ebc 100644 --- a/Rx.xcworkspace/contents.xcworkspacedata +++ b/Rx.xcworkspace/contents.xcworkspacedata @@ -13,6 +13,12 @@ + + + + diff --git a/RxCocoa/RxCocoa.xcodeproj/project.pbxproj b/RxCocoa/RxCocoa.xcodeproj/project.pbxproj index b9c3dbe8..b55b268e 100644 --- a/RxCocoa/RxCocoa.xcodeproj/project.pbxproj +++ b/RxCocoa/RxCocoa.xcodeproj/project.pbxproj @@ -10,8 +10,6 @@ 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, ); }; }; - C81553EA1A98AB4A00C63152 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C81553DE1A98AB4A00C63152 /* RxCocoa.framework */; }; - C81553F11A98AB4A00C63152 /* RxCocoaTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81553F01A98AB4A00C63152 /* RxCocoaTests.swift */; }; 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 */; }; @@ -30,25 +28,12 @@ C8A56BCE1AD744FD00B4673B /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8A56BCD1AD744FD00B4673B /* RxSwift.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - C81553EB1A98AB4A00C63152 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C81553D51A98AB4A00C63152 /* Project object */; - proxyType = 1; - remoteGlobalIDString = C81553DD1A98AB4A00C63152; - remoteInfo = RxCocoa; - }; -/* End PBXContainerItemProxy 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 = ""; }; - C81553E91A98AB4A00C63152 /* RxCocoaTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RxCocoaTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - C81553EF1A98AB4A00C63152 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C81553F01A98AB4A00C63152 /* RxCocoaTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxCocoaTests.swift; 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 = ""; }; @@ -77,14 +62,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - C81553E61A98AB4A00C63152 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - C81553EA1A98AB4A00C63152 /* RxCocoa.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -102,7 +79,6 @@ children = ( C8092BBC1AF504AD008D9A2C /* Frameworks */, C81553E01A98AB4A00C63152 /* RxCocoa */, - C81553ED1A98AB4A00C63152 /* RxCocoaTests */, C81553DF1A98AB4A00C63152 /* Products */, ); sourceTree = ""; @@ -111,7 +87,6 @@ isa = PBXGroup; children = ( C81553DE1A98AB4A00C63152 /* RxCocoa.framework */, - C81553E91A98AB4A00C63152 /* RxCocoaTests.xctest */, ); name = Products; sourceTree = ""; @@ -141,23 +116,6 @@ name = "Supporting Files"; sourceTree = ""; }; - C81553ED1A98AB4A00C63152 /* RxCocoaTests */ = { - isa = PBXGroup; - children = ( - C81553F01A98AB4A00C63152 /* RxCocoaTests.swift */, - C81553EE1A98AB4A00C63152 /* Supporting Files */, - ); - path = RxCocoaTests; - sourceTree = ""; - }; - C81553EE1A98AB4A00C63152 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - C81553EF1A98AB4A00C63152 /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; C8813D931AD2988A0072A050 /* Observables */ = { isa = PBXGroup; children = ( @@ -214,24 +172,6 @@ productReference = C81553DE1A98AB4A00C63152 /* RxCocoa.framework */; productType = "com.apple.product-type.framework"; }; - C81553E81A98AB4A00C63152 /* RxCocoaTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = C81553F71A98AB4A00C63152 /* Build configuration list for PBXNativeTarget "RxCocoaTests" */; - buildPhases = ( - C81553E51A98AB4A00C63152 /* Sources */, - C81553E61A98AB4A00C63152 /* Frameworks */, - C81553E71A98AB4A00C63152 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - C81553EC1A98AB4A00C63152 /* PBXTargetDependency */, - ); - name = RxCocoaTests; - productName = RxCocoaTests; - productReference = C81553E91A98AB4A00C63152 /* RxCocoaTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -244,9 +184,6 @@ C81553DD1A98AB4A00C63152 = { CreatedOnToolsVersion = 6.1.1; }; - C81553E81A98AB4A00C63152 = { - CreatedOnToolsVersion = 6.1.1; - }; }; }; buildConfigurationList = C81553D81A98AB4A00C63152 /* Build configuration list for PBXProject "RxCocoa" */; @@ -262,7 +199,6 @@ projectRoot = ""; targets = ( C81553DD1A98AB4A00C63152 /* RxCocoa */, - C81553E81A98AB4A00C63152 /* RxCocoaTests */, ); }; /* End PBXProject section */ @@ -275,13 +211,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - C81553E71A98AB4A00C63152 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -308,24 +237,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - C81553E51A98AB4A00C63152 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C81553F11A98AB4A00C63152 /* RxCocoaTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - C81553EC1A98AB4A00C63152 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = C81553DD1A98AB4A00C63152 /* RxCocoa */; - targetProxy = C81553EB1A98AB4A00C63152 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ C81553F21A98AB4A00C63152 /* Debug */ = { isa = XCBuildConfiguration; @@ -461,36 +374,6 @@ }; name = Release; }; - C81553F81A98AB4A00C63152 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = RxCocoaTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - C81553F91A98AB4A00C63152 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - INFOPLIST_FILE = RxCocoaTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -512,15 +395,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C81553F71A98AB4A00C63152 /* Build configuration list for PBXNativeTarget "RxCocoaTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C81553F81A98AB4A00C63152 /* Debug */, - C81553F91A98AB4A00C63152 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = C81553D51A98AB4A00C63152 /* Project object */; diff --git a/RxCocoa/RxCocoa/ControlTarget.swift b/RxCocoa/RxCocoa/ControlTarget.swift index 10f6bdcd..e8703941 100644 --- a/RxCocoa/RxCocoa/ControlTarget.swift +++ b/RxCocoa/RxCocoa/ControlTarget.swift @@ -9,6 +9,7 @@ import Foundation import RxSwift +// This should be only used from `MainScheduler` class ControlTarget: NSObject, Disposable { typealias Callback = (UIControl) -> Void diff --git a/RxCocoa/RxCocoaTests/RxCocoaTests.swift b/RxCocoa/RxCocoaTests/RxCocoaTests.swift deleted file mode 100644 index a8f32663..00000000 --- a/RxCocoa/RxCocoaTests/RxCocoaTests.swift +++ /dev/null @@ -1,14 +0,0 @@ -// -// RxCocoaTests.swift -// RxCocoaTests -// -// Created by Krunoslav Zaher on 2/21/15. -// Copyright (c) 2015 Krunoslav Zaher. All rights reserved. -// - -import UIKit -import XCTest - -class RxCocoaTests: XCTestCase { - -} diff --git a/RxExample/RxExample.xcodeproj/project.pbxproj b/RxExample/RxExample.xcodeproj/project.pbxproj index 49f8b8ea..684e03a5 100644 --- a/RxExample/RxExample.xcodeproj/project.pbxproj +++ b/RxExample/RxExample.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ C83366ED1AD0293800C668A7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C83366EC1AD0293800C668A7 /* Images.xcassets */; }; - C83366FC1AD0293900C668A7 /* RxExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C83366FB1AD0293900C668A7 /* RxExampleTests.swift */; }; C83367221AD029AE00C668A7 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C833670E1AD029AE00C668A7 /* AppDelegate.swift */; }; C83367231AD029AE00C668A7 /* Example.swift in Sources */ = {isa = PBXBuildFile; fileRef = C833670F1AD029AE00C668A7 /* Example.swift */; }; C83367241AD029AE00C668A7 /* HtmlParsing.swift in Sources */ = {isa = PBXBuildFile; fileRef = C83367111AD029AE00C668A7 /* HtmlParsing.swift */; }; @@ -36,16 +35,6 @@ C8F57F451AD02DBE006B8702 /* RxCocoa.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C8F57F431AD02DBE006B8702 /* RxCocoa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - C83366F61AD0293900C668A7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C83366D51AD0293800C668A7 /* Project object */; - proxyType = 1; - remoteGlobalIDString = C83366DC1AD0293800C668A7; - remoteInfo = RxExample; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ C83367351AD029C700C668A7 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; @@ -65,9 +54,6 @@ C83366DD1AD0293800C668A7 /* RxExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RxExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; C83366E11AD0293800C668A7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; C83366EC1AD0293800C668A7 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - C83366F51AD0293900C668A7 /* RxExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RxExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - C83366FA1AD0293900C668A7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C83366FB1AD0293900C668A7 /* RxExampleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxExampleTests.swift; sourceTree = ""; }; C833670E1AD029AE00C668A7 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; C833670F1AD029AE00C668A7 /* Example.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Example.swift; sourceTree = ""; }; C83367111AD029AE00C668A7 /* HtmlParsing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HtmlParsing.swift; sourceTree = ""; }; @@ -103,13 +89,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - C83366F21AD0293900C668A7 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -119,7 +98,6 @@ C8A56BCA1AD744E600B4673B /* RxSwift.framework */, C8F57F431AD02DBE006B8702 /* RxCocoa.framework */, C83366DF1AD0293800C668A7 /* RxExample */, - C83366F81AD0293900C668A7 /* RxExampleTests */, C83366DE1AD0293800C668A7 /* Products */, ); sourceTree = ""; @@ -128,7 +106,6 @@ isa = PBXGroup; children = ( C83366DD1AD0293800C668A7 /* RxExample.app */, - C83366F51AD0293900C668A7 /* RxExampleTests.xctest */, ); name = Products; sourceTree = ""; @@ -157,23 +134,6 @@ name = "Supporting Files"; sourceTree = ""; }; - C83366F81AD0293900C668A7 /* RxExampleTests */ = { - isa = PBXGroup; - children = ( - C83366FB1AD0293900C668A7 /* RxExampleTests.swift */, - C83366F91AD0293900C668A7 /* Supporting Files */, - ); - path = RxExampleTests; - sourceTree = ""; - }; - C83366F91AD0293900C668A7 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - C83366FA1AD0293900C668A7 /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; C83367101AD029AE00C668A7 /* Services */ = { isa = PBXGroup; children = ( @@ -273,24 +233,6 @@ productReference = C83366DD1AD0293800C668A7 /* RxExample.app */; productType = "com.apple.product-type.application"; }; - C83366F41AD0293900C668A7 /* RxExampleTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = C83367021AD0293900C668A7 /* Build configuration list for PBXNativeTarget "RxExampleTests" */; - buildPhases = ( - C83366F11AD0293900C668A7 /* Sources */, - C83366F21AD0293900C668A7 /* Frameworks */, - C83366F31AD0293900C668A7 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - C83366F71AD0293900C668A7 /* PBXTargetDependency */, - ); - name = RxExampleTests; - productName = RxExampleTests; - productReference = C83366F51AD0293900C668A7 /* RxExampleTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -303,10 +245,6 @@ C83366DC1AD0293800C668A7 = { CreatedOnToolsVersion = 6.2; }; - C83366F41AD0293900C668A7 = { - CreatedOnToolsVersion = 6.2; - TestTargetID = C83366DC1AD0293800C668A7; - }; }; }; buildConfigurationList = C83366D81AD0293800C668A7 /* Build configuration list for PBXProject "RxExample" */; @@ -323,7 +261,6 @@ projectRoot = ""; targets = ( C83366DC1AD0293800C668A7 /* RxExample */, - C83366F41AD0293900C668A7 /* RxExampleTests */, ); }; /* End PBXProject section */ @@ -341,13 +278,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - C83366F31AD0293900C668A7 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -375,24 +305,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - C83366F11AD0293900C668A7 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C83366FC1AD0293900C668A7 /* RxExampleTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - C83366F71AD0293900C668A7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = C83366DC1AD0293800C668A7 /* RxExample */; - targetProxy = C83366F61AD0293900C668A7 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ C83366FD1AD0293900C668A7 /* Debug */ = { isa = XCBuildConfiguration; @@ -510,40 +424,6 @@ }; name = Release; }; - C83367031AD0293900C668A7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = RxExampleTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RxExample.app/RxExample"; - }; - name = Debug; - }; - C83367041AD0293900C668A7 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - INFOPLIST_FILE = RxExampleTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RxExample.app/RxExample"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -565,15 +445,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C83367021AD0293900C668A7 /* Build configuration list for PBXNativeTarget "RxExampleTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C83367031AD0293900C668A7 /* Debug */, - C83367041AD0293900C668A7 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = C83366D51AD0293800C668A7 /* Project object */; diff --git a/RxExample/RxExampleTests/Info.plist b/RxExample/RxExampleTests/Info.plist deleted file mode 100644 index 7f80ab77..00000000 --- a/RxExample/RxExampleTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - Krunoslav-Zaher.$(PRODUCT_NAME:rfc1034identifier) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/RxExample/RxExampleTests/RxExampleTests.swift b/RxExample/RxExampleTests/RxExampleTests.swift deleted file mode 100644 index 6cbd3d03..00000000 --- a/RxExample/RxExampleTests/RxExampleTests.swift +++ /dev/null @@ -1,36 +0,0 @@ -// -// RxExampleTests.swift -// RxExampleTests -// -// Created by Krunoslav Zaher on 4/4/15. -// Copyright (c) 2015 Krunoslav Zaher. All rights reserved. -// - -import UIKit -import XCTest - -class RxExampleTests: XCTestCase { - - override func setUp() { - super.setUp() - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDown() { - // Put teardown code here. This method is called after the invocation of each test method in the class. - super.tearDown() - } - - func testExample() { - // This is an example of a functional test case. - XCTAssert(true, "Pass") - } - - func testPerformanceExample() { - // This is an example of a performance test case. - self.measureBlock() { - // Put the code you want to measure the time of here. - } - } - -} diff --git a/RxSwift/RxSwift.xcodeproj/project.pbxproj b/RxSwift/RxSwift.xcodeproj/project.pbxproj index bfb8f256..26ee5fd5 100644 --- a/RxSwift/RxSwift.xcodeproj/project.pbxproj +++ b/RxSwift/RxSwift.xcodeproj/project.pbxproj @@ -8,11 +8,8 @@ /* Begin PBXBuildFile section */ C84F67041ADDC16200EB0CB6 /* ReplaySubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = C84F67031ADDC16200EB0CB6 /* ReplaySubject.swift */; }; - C84F67061ADE63F600EB0CB6 /* Observable+BindingTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C84F67051ADE63F600EB0CB6 /* Observable+BindingTest.swift */; }; C86AE05C1AE3F0ED00C8A2A6 /* Catch.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86AE05B1AE3F0ED00C8A2A6 /* Catch.swift */; }; - C86AE0711AE46ACE00C8A2A6 /* Result+Equatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86AE0701AE46ACE00C8A2A6 /* Result+Equatable.swift */; }; C8A56ADD1AD7424700B4673B /* RxSwift.h in Headers */ = {isa = PBXBuildFile; fileRef = C8A56ADC1AD7424700B4673B /* RxSwift.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C8A56AE31AD7424700B4673B /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8A56AD71AD7424700B4673B /* RxSwift.framework */; }; C8A56B4C1AD7435900B4673B /* AnyObject+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56AFC1AD7435800B4673B /* AnyObject+Rx.swift */; }; C8A56B4D1AD7435900B4673B /* Cancelable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56AFD1AD7435800B4673B /* Cancelable.swift */; }; C8A56B4E1AD7435900B4673B /* AsyncLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56AFF1AD7435800B4673B /* AsyncLock.swift */; }; @@ -81,69 +78,18 @@ C8A56B911AD7435900B4673B /* Scheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56B481AD7435900B4673B /* Scheduler.swift */; }; C8A56B921AD7435900B4673B /* ConnectableObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56B4A1AD7435900B4673B /* ConnectableObservableType.swift */; }; C8A56B931AD7435900B4673B /* SubjectType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56B4B1AD7435900B4673B /* SubjectType.swift */; }; - C8A56BAD1AD7436D00B4673B /* ColdObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56B961AD7436D00B4673B /* ColdObservable.swift */; }; - C8A56BAE1AD7436D00B4673B /* HotObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56B971AD7436D00B4673B /* HotObservable.swift */; }; - C8A56BAF1AD7436D00B4673B /* MockObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56B981AD7436D00B4673B /* MockObserver.swift */; }; - C8A56BB01AD7436D00B4673B /* Observable.Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56B991AD7436D00B4673B /* Observable.Extensions.swift */; }; - C8A56BB11AD7436D00B4673B /* TestObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56B9A1AD7436D00B4673B /* TestObservable.swift */; }; - C8A56BB21AD7436D00B4673B /* TestObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56B9B1AD7436D00B4673B /* TestObserver.swift */; }; - C8A56BB31AD7436D00B4673B /* Recorded.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56B9C1AD7436D00B4673B /* Recorded.swift */; }; - C8A56BB41AD7436D00B4673B /* TestScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56B9E1AD7436D00B4673B /* TestScheduler.swift */; }; - C8A56BB51AD7436D00B4673B /* VirtualTimeSchedulerBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56B9F1AD7436D00B4673B /* VirtualTimeSchedulerBase.swift */; }; - C8A56BB61AD7436D00B4673B /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56BA01AD7436D00B4673B /* Subscription.swift */; }; - C8A56BB71AD7436D00B4673B /* TestExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56BA11AD7436D00B4673B /* TestExtensions.swift */; }; - C8A56BB81AD7436D00B4673B /* AssumptionsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56BA31AD7436D00B4673B /* AssumptionsTest.swift */; }; - C8A56BB91AD7436D00B4673B /* ConcurrencyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56BA41AD7436D00B4673B /* ConcurrencyTest.swift */; }; - C8A56BBA1AD7436D00B4673B /* DisposableTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56BA51AD7436D00B4673B /* DisposableTest.swift */; }; - C8A56BBB1AD7436D00B4673B /* Observable+AggregateTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56BA61AD7436D00B4673B /* Observable+AggregateTest.swift */; }; - C8A56BBC1AD7436D00B4673B /* Observable+MultipleTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56BA71AD7436D00B4673B /* Observable+MultipleTest.swift */; }; - C8A56BBD1AD7436D00B4673B /* Observable+SingleTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56BA81AD7436D00B4673B /* Observable+SingleTest.swift */; }; - C8A56BBE1AD7436D00B4673B /* Observable+StandardSequenceOperatorsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56BA91AD7436D00B4673B /* Observable+StandardSequenceOperatorsTest.swift */; }; - C8A56BBF1AD7436D00B4673B /* Observable+TimeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56BAA1AD7436D00B4673B /* Observable+TimeTest.swift */; }; - C8A56BC01AD7436D00B4673B /* QueueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56BAB1AD7436D00B4673B /* QueueTests.swift */; }; - C8A56BC11AD7436D00B4673B /* RxTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A56BAC1AD7436D00B4673B /* RxTest.swift */; }; C8A60C3C1AF4191B007923F0 /* Sample.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A60C3B1AF4191B007923F0 /* Sample.swift */; }; C8BA11451AE84932004D2FA8 /* CombineLatest+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8BA11441AE84932004D2FA8 /* CombineLatest+arity.swift */; }; - C8BA11501AE84A54004D2FA8 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8BA114F1AE84A54004D2FA8 /* main.swift */; }; - C8D559271AE2FBDC00DE7BDB /* MySubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8D559261AE2FBDC00DE7BDB /* MySubject.swift */; }; - C8D559291AE31D4F00DE7BDB /* ConnectableObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8D559281AE31D4F00DE7BDB /* ConnectableObservable.swift */; }; C8D5592B1AE32FBB00DE7BDB /* Defer.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8D5592A1AE32FBB00DE7BDB /* Defer.swift */; }; - C8DA57E51AEB9C680035AF28 /* Observable+MultipleTest+CombineLatest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DA57E41AEB9C680035AF28 /* Observable+MultipleTest+CombineLatest.swift */; }; C8DA57E91AEB9F7D0035AF28 /* CombineLatest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DA57E81AEB9F7D0035AF28 /* CombineLatest.swift */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - C8A56AE41AD7424700B4673B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C8A56ACE1AD7424700B4673B /* Project object */; - proxyType = 1; - remoteGlobalIDString = C8A56AD61AD7424700B4673B; - remoteInfo = RxSwift; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - C8BA114B1AE84A54004D2FA8 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ C84F67031ADDC16200EB0CB6 /* ReplaySubject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReplaySubject.swift; sourceTree = ""; }; - C84F67051ADE63F600EB0CB6 /* Observable+BindingTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+BindingTest.swift"; sourceTree = ""; }; C86AE05B1AE3F0ED00C8A2A6 /* Catch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Catch.swift; sourceTree = ""; }; - C86AE0701AE46ACE00C8A2A6 /* Result+Equatable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Result+Equatable.swift"; sourceTree = ""; }; C8A56AD71AD7424700B4673B /* RxSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C8A56ADB1AD7424700B4673B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; C8A56ADC1AD7424700B4673B /* RxSwift.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxSwift.h; sourceTree = ""; }; - C8A56AE21AD7424700B4673B /* RxSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RxSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - C8A56AE81AD7424700B4673B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; C8A56AFC1AD7435800B4673B /* AnyObject+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "AnyObject+Rx.swift"; sourceTree = ""; }; C8A56AFD1AD7435800B4673B /* Cancelable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cancelable.swift; sourceTree = ""; }; C8A56AFF1AD7435800B4673B /* AsyncLock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AsyncLock.swift; sourceTree = ""; }; @@ -212,37 +158,10 @@ C8A56B481AD7435900B4673B /* Scheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Scheduler.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 = ""; }; - C8A56B991AD7436D00B4673B /* Observable.Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Observable.Extensions.swift; sourceTree = ""; }; - C8A56B9A1AD7436D00B4673B /* TestObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestObservable.swift; sourceTree = ""; }; - C8A56B9B1AD7436D00B4673B /* TestObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestObserver.swift; sourceTree = ""; }; - C8A56B9C1AD7436D00B4673B /* Recorded.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Recorded.swift; sourceTree = ""; }; - C8A56B9E1AD7436D00B4673B /* TestScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestScheduler.swift; sourceTree = ""; }; - C8A56B9F1AD7436D00B4673B /* VirtualTimeSchedulerBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VirtualTimeSchedulerBase.swift; sourceTree = ""; }; - C8A56BA01AD7436D00B4673B /* Subscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Subscription.swift; sourceTree = ""; }; - C8A56BA11AD7436D00B4673B /* TestExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestExtensions.swift; sourceTree = ""; }; - C8A56BA31AD7436D00B4673B /* AssumptionsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssumptionsTest.swift; sourceTree = ""; }; - C8A56BA41AD7436D00B4673B /* ConcurrencyTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConcurrencyTest.swift; sourceTree = ""; }; - C8A56BA51AD7436D00B4673B /* DisposableTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisposableTest.swift; sourceTree = ""; }; - C8A56BA61AD7436D00B4673B /* Observable+AggregateTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+AggregateTest.swift"; sourceTree = ""; }; - C8A56BA71AD7436D00B4673B /* Observable+MultipleTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+MultipleTest.swift"; sourceTree = ""; }; - C8A56BA81AD7436D00B4673B /* Observable+SingleTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+SingleTest.swift"; sourceTree = ""; }; - C8A56BA91AD7436D00B4673B /* Observable+StandardSequenceOperatorsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+StandardSequenceOperatorsTest.swift"; sourceTree = ""; }; - C8A56BAA1AD7436D00B4673B /* Observable+TimeTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+TimeTest.swift"; sourceTree = ""; }; - C8A56BAB1AD7436D00B4673B /* QueueTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueueTests.swift; sourceTree = ""; }; - C8A56BAC1AD7436D00B4673B /* RxTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTest.swift; sourceTree = ""; }; C8A60C3B1AF4191B007923F0 /* Sample.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Sample.swift; sourceTree = ""; }; C8BA11421AE848E0004D2FA8 /* CombineLatest+arity.tt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "CombineLatest+arity.tt"; sourceTree = ""; }; C8BA11441AE84932004D2FA8 /* CombineLatest+arity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CombineLatest+arity.swift"; sourceTree = ""; }; - C8BA114D1AE84A54004D2FA8 /* Preprocessor */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Preprocessor; sourceTree = BUILT_PRODUCTS_DIR; }; - C8BA114F1AE84A54004D2FA8 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; - C8D559261AE2FBDC00DE7BDB /* MySubject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MySubject.swift; sourceTree = ""; }; - C8D559281AE31D4F00DE7BDB /* ConnectableObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConnectableObservable.swift; sourceTree = ""; }; C8D5592A1AE32FBB00DE7BDB /* Defer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Defer.swift; sourceTree = ""; }; - C8DA57E41AEB9C680035AF28 /* Observable+MultipleTest+CombineLatest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+MultipleTest+CombineLatest.swift"; sourceTree = ""; }; - C8DA57E61AEB9C7A0035AF28 /* Observable+MultipleTest+CombineLatest.tt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Observable+MultipleTest+CombineLatest.tt"; sourceTree = ""; }; C8DA57E81AEB9F7D0035AF28 /* CombineLatest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CombineLatest.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -254,21 +173,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - C8A56ADF1AD7424700B4673B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - C8A56AE31AD7424700B4673B /* RxSwift.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C8BA114A1AE84A54004D2FA8 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -276,9 +180,7 @@ isa = PBXGroup; children = ( C8A56AD91AD7424700B4673B /* RxSwift */, - C8A56AE61AD7424700B4673B /* RxSwiftTests */, C8A56AD81AD7424700B4673B /* Products */, - C8BA114E1AE84A54004D2FA8 /* Preprocessor */, ); sourceTree = ""; }; @@ -286,8 +188,6 @@ isa = PBXGroup; children = ( C8A56AD71AD7424700B4673B /* RxSwift.framework */, - C8A56AE21AD7424700B4673B /* RxSwiftTests.xctest */, - C8BA114D1AE84A54004D2FA8 /* Preprocessor */, ); name = Products; sourceTree = ""; @@ -331,24 +231,6 @@ name = "Supporting Files"; sourceTree = ""; }; - C8A56AE61AD7424700B4673B /* RxSwiftTests */ = { - isa = PBXGroup; - children = ( - C8A56B941AD7436D00B4673B /* TestImplementations */, - C8A56BA21AD7436D00B4673B /* Tests */, - C8A56AE71AD7424700B4673B /* Supporting Files */, - ); - path = RxSwiftTests; - sourceTree = ""; - }; - C8A56AE71AD7424700B4673B /* Supporting Files */ = { - isa = PBXGroup; - children = ( - C8A56AE81AD7424700B4673B /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; C8A56AFE1AD7435800B4673B /* Concurrency */ = { isa = PBXGroup; children = ( @@ -458,71 +340,6 @@ path = Scheduler; sourceTree = ""; }; - C8A56B941AD7436D00B4673B /* TestImplementations */ = { - isa = PBXGroup; - children = ( - C8A56B951AD7436D00B4673B /* Mocks */, - C8A56B9C1AD7436D00B4673B /* Recorded.swift */, - C8A56B9D1AD7436D00B4673B /* Schedulers */, - C8A56BA01AD7436D00B4673B /* Subscription.swift */, - C8A56BA11AD7436D00B4673B /* TestExtensions.swift */, - C86AE0701AE46ACE00C8A2A6 /* Result+Equatable.swift */, - ); - path = TestImplementations; - sourceTree = ""; - }; - C8A56B951AD7436D00B4673B /* Mocks */ = { - isa = PBXGroup; - children = ( - C8A56B961AD7436D00B4673B /* ColdObservable.swift */, - C8A56B971AD7436D00B4673B /* HotObservable.swift */, - C8A56B981AD7436D00B4673B /* MockObserver.swift */, - C8A56B991AD7436D00B4673B /* Observable.Extensions.swift */, - C8A56B9A1AD7436D00B4673B /* TestObservable.swift */, - C8A56B9B1AD7436D00B4673B /* TestObserver.swift */, - C8D559261AE2FBDC00DE7BDB /* MySubject.swift */, - C8D559281AE31D4F00DE7BDB /* ConnectableObservable.swift */, - ); - path = Mocks; - sourceTree = ""; - }; - C8A56B9D1AD7436D00B4673B /* Schedulers */ = { - isa = PBXGroup; - children = ( - C8A56B9E1AD7436D00B4673B /* TestScheduler.swift */, - C8A56B9F1AD7436D00B4673B /* VirtualTimeSchedulerBase.swift */, - ); - path = Schedulers; - sourceTree = ""; - }; - C8A56BA21AD7436D00B4673B /* Tests */ = { - isa = PBXGroup; - children = ( - C8A56BA31AD7436D00B4673B /* AssumptionsTest.swift */, - C8A56BA41AD7436D00B4673B /* ConcurrencyTest.swift */, - C8A56BA51AD7436D00B4673B /* DisposableTest.swift */, - C8A56BA61AD7436D00B4673B /* Observable+AggregateTest.swift */, - C84F67051ADE63F600EB0CB6 /* Observable+BindingTest.swift */, - C8A56BA71AD7436D00B4673B /* Observable+MultipleTest.swift */, - C8DA57E41AEB9C680035AF28 /* Observable+MultipleTest+CombineLatest.swift */, - C8DA57E61AEB9C7A0035AF28 /* Observable+MultipleTest+CombineLatest.tt */, - C8A56BA81AD7436D00B4673B /* Observable+SingleTest.swift */, - C8A56BA91AD7436D00B4673B /* Observable+StandardSequenceOperatorsTest.swift */, - C8A56BAA1AD7436D00B4673B /* Observable+TimeTest.swift */, - C8A56BAB1AD7436D00B4673B /* QueueTests.swift */, - C8A56BAC1AD7436D00B4673B /* RxTest.swift */, - ); - path = Tests; - sourceTree = ""; - }; - C8BA114E1AE84A54004D2FA8 /* Preprocessor */ = { - isa = PBXGroup; - children = ( - C8BA114F1AE84A54004D2FA8 /* main.swift */, - ); - path = Preprocessor; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -557,41 +374,6 @@ productReference = C8A56AD71AD7424700B4673B /* RxSwift.framework */; productType = "com.apple.product-type.framework"; }; - C8A56AE11AD7424700B4673B /* RxSwiftTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = C8A56AF01AD7424700B4673B /* Build configuration list for PBXNativeTarget "RxSwiftTests" */; - buildPhases = ( - C8A56ADE1AD7424700B4673B /* Sources */, - C8A56ADF1AD7424700B4673B /* Frameworks */, - C8A56AE01AD7424700B4673B /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - C8A56AE51AD7424700B4673B /* PBXTargetDependency */, - ); - name = RxSwiftTests; - productName = RxSwiftTests; - productReference = C8A56AE21AD7424700B4673B /* RxSwiftTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - C8BA114C1AE84A54004D2FA8 /* Preprocessor */ = { - isa = PBXNativeTarget; - buildConfigurationList = C8BA11511AE84A54004D2FA8 /* Build configuration list for PBXNativeTarget "Preprocessor" */; - buildPhases = ( - C8BA11491AE84A54004D2FA8 /* Sources */, - C8BA114A1AE84A54004D2FA8 /* Frameworks */, - C8BA114B1AE84A54004D2FA8 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Preprocessor; - productName = Preprocessor; - productReference = C8BA114D1AE84A54004D2FA8 /* Preprocessor */; - productType = "com.apple.product-type.tool"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -604,12 +386,6 @@ C8A56AD61AD7424700B4673B = { CreatedOnToolsVersion = 6.3; }; - C8A56AE11AD7424700B4673B = { - CreatedOnToolsVersion = 6.3; - }; - C8BA114C1AE84A54004D2FA8 = { - CreatedOnToolsVersion = 6.3; - }; }; }; buildConfigurationList = C8A56AD11AD7424700B4673B /* Build configuration list for PBXProject "RxSwift" */; @@ -625,8 +401,6 @@ projectRoot = ""; targets = ( C8A56AD61AD7424700B4673B /* RxSwift */, - C8A56AE11AD7424700B4673B /* RxSwiftTests */, - C8BA114C1AE84A54004D2FA8 /* Preprocessor */, ); }; /* End PBXProject section */ @@ -639,13 +413,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - C8A56AE01AD7424700B4673B /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -728,57 +495,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - C8A56ADE1AD7424700B4673B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C8A56BB11AD7436D00B4673B /* TestObservable.swift in Sources */, - C8D559291AE31D4F00DE7BDB /* ConnectableObservable.swift in Sources */, - C8A56BBF1AD7436D00B4673B /* Observable+TimeTest.swift in Sources */, - C8A56BAE1AD7436D00B4673B /* HotObservable.swift in Sources */, - C8A56BB01AD7436D00B4673B /* Observable.Extensions.swift in Sources */, - C84F67061ADE63F600EB0CB6 /* Observable+BindingTest.swift in Sources */, - C8A56BB51AD7436D00B4673B /* VirtualTimeSchedulerBase.swift in Sources */, - C8A56BBC1AD7436D00B4673B /* Observable+MultipleTest.swift in Sources */, - C8A56BB61AD7436D00B4673B /* Subscription.swift in Sources */, - C8DA57E51AEB9C680035AF28 /* Observable+MultipleTest+CombineLatest.swift in Sources */, - C8A56BC01AD7436D00B4673B /* QueueTests.swift in Sources */, - C86AE0711AE46ACE00C8A2A6 /* Result+Equatable.swift in Sources */, - C8A56BBA1AD7436D00B4673B /* DisposableTest.swift in Sources */, - C8A56BAD1AD7436D00B4673B /* ColdObservable.swift in Sources */, - C8A56BAF1AD7436D00B4673B /* MockObserver.swift in Sources */, - C8A56BBD1AD7436D00B4673B /* Observable+SingleTest.swift in Sources */, - C8A56BB41AD7436D00B4673B /* TestScheduler.swift in Sources */, - C8A56BB31AD7436D00B4673B /* Recorded.swift in Sources */, - C8A56BBB1AD7436D00B4673B /* Observable+AggregateTest.swift in Sources */, - C8D559271AE2FBDC00DE7BDB /* MySubject.swift in Sources */, - C8A56BB21AD7436D00B4673B /* TestObserver.swift in Sources */, - C8A56BC11AD7436D00B4673B /* RxTest.swift in Sources */, - C8A56BB81AD7436D00B4673B /* AssumptionsTest.swift in Sources */, - C8A56BB71AD7436D00B4673B /* TestExtensions.swift in Sources */, - C8A56BBE1AD7436D00B4673B /* Observable+StandardSequenceOperatorsTest.swift in Sources */, - C8A56BB91AD7436D00B4673B /* ConcurrencyTest.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - C8BA11491AE84A54004D2FA8 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C8BA11501AE84A54004D2FA8 /* main.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - C8A56AE51AD7424700B4673B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = C8A56AD61AD7424700B4673B /* RxSwift */; - targetProxy = C8A56AE41AD7424700B4673B /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ C8A56AEB1AD7424700B4673B /* Debug */ = { isa = XCBuildConfiguration; @@ -902,60 +620,6 @@ }; name = Release; }; - C8A56AF11AD7424700B4673B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = RxSwiftTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - OTHER_SWIFT_FLAGS = "-D DEBUG"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - C8A56AF21AD7424700B4673B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - INFOPLIST_FILE = RxSwiftTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - C8BA11521AE84A54004D2FA8 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - MACOSX_DEPLOYMENT_TARGET = 10.10; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - }; - name = Debug; - }; - C8BA11531AE84A54004D2FA8 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - MACOSX_DEPLOYMENT_TARGET = 10.10; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -977,24 +641,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C8A56AF01AD7424700B4673B /* Build configuration list for PBXNativeTarget "RxSwiftTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C8A56AF11AD7424700B4673B /* Debug */, - C8A56AF21AD7424700B4673B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C8BA11511AE84A54004D2FA8 /* Build configuration list for PBXNativeTarget "Preprocessor" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C8BA11521AE84A54004D2FA8 /* Debug */, - C8BA11531AE84A54004D2FA8 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = C8A56ACE1AD7424700B4673B /* Project object */; diff --git a/RxSwift/RxSwift/Scheduler/MainScheduler.swift b/RxSwift/RxSwift/Scheduler/MainScheduler.swift index 78e070f1..d2929906 100644 --- a/RxSwift/RxSwift/Scheduler/MainScheduler.swift +++ b/RxSwift/RxSwift/Scheduler/MainScheduler.swift @@ -13,7 +13,7 @@ public class MainScheduler : DispatchQueueScheduler { static let sharedInstance = MainScheduler() } - init() { + private init() { super.init(queue: dispatch_get_main_queue()) } diff --git a/RxSwift/RxSwiftTests/Info.plist b/RxSwift/RxSwiftTests/Info.plist deleted file mode 100644 index 7f80ab77..00000000 --- a/RxSwift/RxSwiftTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - Krunoslav-Zaher.$(PRODUCT_NAME:rfc1034identifier) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/Tests/RxCocoaTests/NSNotificationCenterTests.swift b/Tests/RxCocoaTests/NSNotificationCenterTests.swift new file mode 100644 index 00000000..2b77e08d --- /dev/null +++ b/Tests/RxCocoaTests/NSNotificationCenterTests.swift @@ -0,0 +1,91 @@ +// +// NSNotificationCenterTests.swift +// RxCocoa +// +// Created by Krunoslav Zaher on 5/2/15. +// Copyright (c) 2015 Krunoslav Zaher. All rights reserved. +// + +import Foundation +import XCTest +import RxSwift +import RxCocoa + +class NSNotificationCenterTests : RxTest { + func testNotificationCenterWithoutObject() { + let notificationCenter = NSNotificationCenter() + + var numberOfNotifications = 0 + + notificationCenter.postNotificationName("testNotification", object: nil) + + XCTAssertTrue(numberOfNotifications == 0) + + let subscription = notificationCenter.rx_notification("testNotification", object: nil) + >- subscribeNext { n in + numberOfNotifications++ + } + + XCTAssertTrue(numberOfNotifications == 0) + + notificationCenter.postNotificationName("testNotification", object: nil) + + XCTAssertTrue(numberOfNotifications == 1) + + notificationCenter.postNotificationName("testNotification", object: NSObject()) + + XCTAssertTrue(numberOfNotifications == 2) + + subscription.dispose() + + XCTAssertTrue(numberOfNotifications == 2) + + notificationCenter.postNotificationName("testNotification", object: nil) + + XCTAssertTrue(numberOfNotifications == 2) + } + + func testNotificationCenterWithObject() { + let notificationCenter = NSNotificationCenter() + + var numberOfNotifications = 0 + + let targetObject = NSObject() + + notificationCenter.postNotificationName("testNotification", object: targetObject) + notificationCenter.postNotificationName("testNotification", object: nil) + + XCTAssertTrue(numberOfNotifications == 0) + + let subscription = notificationCenter.rx_notification("testNotification", object: targetObject) + >- subscribeNext { n in + numberOfNotifications++ + } + + XCTAssertTrue(numberOfNotifications == 0) + + notificationCenter.postNotificationName("testNotification", object: targetObject) + + XCTAssertTrue(numberOfNotifications == 1) + + notificationCenter.postNotificationName("testNotification", object: nil) + + XCTAssertTrue(numberOfNotifications == 1) + + notificationCenter.postNotificationName("testNotification", object: NSObject()) + + XCTAssertTrue(numberOfNotifications == 1) + + notificationCenter.postNotificationName("testNotification", object: targetObject) + + XCTAssertTrue(numberOfNotifications == 2) + + subscription.dispose() + + XCTAssertTrue(numberOfNotifications == 2) + + notificationCenter.postNotificationName("testNotification", object: targetObject) + + XCTAssertTrue(numberOfNotifications == 2) + } +} \ No newline at end of file diff --git a/RxSwift/RxSwiftTests/TestImplementations/Mocks/ColdObservable.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/ColdObservable.swift similarity index 100% rename from RxSwift/RxSwiftTests/TestImplementations/Mocks/ColdObservable.swift rename to Tests/RxSwiftTests/TestImplementations/Mocks/ColdObservable.swift diff --git a/RxSwift/RxSwiftTests/TestImplementations/Mocks/ConnectableObservable.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/ConnectableObservable.swift similarity index 100% rename from RxSwift/RxSwiftTests/TestImplementations/Mocks/ConnectableObservable.swift rename to Tests/RxSwiftTests/TestImplementations/Mocks/ConnectableObservable.swift diff --git a/RxSwift/RxSwiftTests/TestImplementations/Mocks/HotObservable.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/HotObservable.swift similarity index 100% rename from RxSwift/RxSwiftTests/TestImplementations/Mocks/HotObservable.swift rename to Tests/RxSwiftTests/TestImplementations/Mocks/HotObservable.swift diff --git a/RxSwift/RxSwiftTests/TestImplementations/Mocks/MockObserver.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/MockObserver.swift similarity index 100% rename from RxSwift/RxSwiftTests/TestImplementations/Mocks/MockObserver.swift rename to Tests/RxSwiftTests/TestImplementations/Mocks/MockObserver.swift diff --git a/RxSwift/RxSwiftTests/TestImplementations/Mocks/MySubject.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift similarity index 100% rename from RxSwift/RxSwiftTests/TestImplementations/Mocks/MySubject.swift rename to Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift diff --git a/RxSwift/RxSwiftTests/TestImplementations/Mocks/Observable.Extensions.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/Observable.Extensions.swift similarity index 100% rename from RxSwift/RxSwiftTests/TestImplementations/Mocks/Observable.Extensions.swift rename to Tests/RxSwiftTests/TestImplementations/Mocks/Observable.Extensions.swift diff --git a/RxSwift/RxSwiftTests/TestImplementations/Mocks/TestObservable.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/TestObservable.swift similarity index 100% rename from RxSwift/RxSwiftTests/TestImplementations/Mocks/TestObservable.swift rename to Tests/RxSwiftTests/TestImplementations/Mocks/TestObservable.swift diff --git a/RxSwift/RxSwiftTests/TestImplementations/Mocks/TestObserver.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/TestObserver.swift similarity index 100% rename from RxSwift/RxSwiftTests/TestImplementations/Mocks/TestObserver.swift rename to Tests/RxSwiftTests/TestImplementations/Mocks/TestObserver.swift diff --git a/RxSwift/RxSwiftTests/TestImplementations/Recorded.swift b/Tests/RxSwiftTests/TestImplementations/Recorded.swift similarity index 100% rename from RxSwift/RxSwiftTests/TestImplementations/Recorded.swift rename to Tests/RxSwiftTests/TestImplementations/Recorded.swift diff --git a/RxSwift/RxSwiftTests/TestImplementations/Result+Equatable.swift b/Tests/RxSwiftTests/TestImplementations/Result+Equatable.swift similarity index 100% rename from RxSwift/RxSwiftTests/TestImplementations/Result+Equatable.swift rename to Tests/RxSwiftTests/TestImplementations/Result+Equatable.swift diff --git a/RxSwift/RxSwiftTests/TestImplementations/Schedulers/TestScheduler.swift b/Tests/RxSwiftTests/TestImplementations/Schedulers/TestScheduler.swift similarity index 100% rename from RxSwift/RxSwiftTests/TestImplementations/Schedulers/TestScheduler.swift rename to Tests/RxSwiftTests/TestImplementations/Schedulers/TestScheduler.swift diff --git a/RxSwift/RxSwiftTests/TestImplementations/Schedulers/VirtualTimeSchedulerBase.swift b/Tests/RxSwiftTests/TestImplementations/Schedulers/VirtualTimeSchedulerBase.swift similarity index 100% rename from RxSwift/RxSwiftTests/TestImplementations/Schedulers/VirtualTimeSchedulerBase.swift rename to Tests/RxSwiftTests/TestImplementations/Schedulers/VirtualTimeSchedulerBase.swift diff --git a/RxSwift/RxSwiftTests/TestImplementations/Subscription.swift b/Tests/RxSwiftTests/TestImplementations/Subscription.swift similarity index 100% rename from RxSwift/RxSwiftTests/TestImplementations/Subscription.swift rename to Tests/RxSwiftTests/TestImplementations/Subscription.swift diff --git a/RxSwift/RxSwiftTests/TestImplementations/TestExtensions.swift b/Tests/RxSwiftTests/TestImplementations/TestExtensions.swift similarity index 100% rename from RxSwift/RxSwiftTests/TestImplementations/TestExtensions.swift rename to Tests/RxSwiftTests/TestImplementations/TestExtensions.swift diff --git a/RxSwift/RxSwiftTests/Tests/AssumptionsTest.swift b/Tests/RxSwiftTests/Tests/AssumptionsTest.swift similarity index 100% rename from RxSwift/RxSwiftTests/Tests/AssumptionsTest.swift rename to Tests/RxSwiftTests/Tests/AssumptionsTest.swift diff --git a/RxSwift/RxSwiftTests/Tests/ConcurrencyTest.swift b/Tests/RxSwiftTests/Tests/ConcurrencyTest.swift similarity index 100% rename from RxSwift/RxSwiftTests/Tests/ConcurrencyTest.swift rename to Tests/RxSwiftTests/Tests/ConcurrencyTest.swift diff --git a/RxSwift/RxSwiftTests/Tests/DisposableTest.swift b/Tests/RxSwiftTests/Tests/DisposableTest.swift similarity index 100% rename from RxSwift/RxSwiftTests/Tests/DisposableTest.swift rename to Tests/RxSwiftTests/Tests/DisposableTest.swift diff --git a/RxSwift/RxSwiftTests/Tests/Observable+AggregateTest.swift b/Tests/RxSwiftTests/Tests/Observable+AggregateTest.swift similarity index 100% rename from RxSwift/RxSwiftTests/Tests/Observable+AggregateTest.swift rename to Tests/RxSwiftTests/Tests/Observable+AggregateTest.swift diff --git a/RxSwift/RxSwiftTests/Tests/Observable+BindingTest.swift b/Tests/RxSwiftTests/Tests/Observable+BindingTest.swift similarity index 100% rename from RxSwift/RxSwiftTests/Tests/Observable+BindingTest.swift rename to Tests/RxSwiftTests/Tests/Observable+BindingTest.swift diff --git a/RxSwift/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.swift b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.swift similarity index 100% rename from RxSwift/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.swift rename to Tests/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.swift diff --git a/RxSwift/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.tt b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.tt similarity index 100% rename from RxSwift/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.tt rename to Tests/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.tt diff --git a/RxSwift/RxSwiftTests/Tests/Observable+MultipleTest.swift b/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift similarity index 100% rename from RxSwift/RxSwiftTests/Tests/Observable+MultipleTest.swift rename to Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift diff --git a/RxSwift/RxSwiftTests/Tests/Observable+SingleTest.swift b/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift similarity index 100% rename from RxSwift/RxSwiftTests/Tests/Observable+SingleTest.swift rename to Tests/RxSwiftTests/Tests/Observable+SingleTest.swift diff --git a/RxSwift/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift b/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift similarity index 100% rename from RxSwift/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift rename to Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift diff --git a/RxSwift/RxSwiftTests/Tests/Observable+TimeTest.swift b/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift similarity index 100% rename from RxSwift/RxSwiftTests/Tests/Observable+TimeTest.swift rename to Tests/RxSwiftTests/Tests/Observable+TimeTest.swift diff --git a/RxSwift/RxSwiftTests/Tests/QueueTests.swift b/Tests/RxSwiftTests/Tests/QueueTests.swift similarity index 100% rename from RxSwift/RxSwiftTests/Tests/QueueTests.swift rename to Tests/RxSwiftTests/Tests/QueueTests.swift diff --git a/RxSwift/RxSwiftTests/Tests/RxTest.swift b/Tests/RxTest.swift similarity index 100% rename from RxSwift/RxSwiftTests/Tests/RxTest.swift rename to Tests/RxTest.swift diff --git a/Tests/Tests.xcodeproj/project.pbxproj b/Tests/Tests.xcodeproj/project.pbxproj new file mode 100644 index 00000000..749c0054 --- /dev/null +++ b/Tests/Tests.xcodeproj/project.pbxproj @@ -0,0 +1,431 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + C811084D1AF50E2A001C13E4 /* NSNotificationCenterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C811082B1AF50E2A001C13E4 /* NSNotificationCenterTests.swift */; }; + C811084F1AF50E2A001C13E4 /* ColdObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108301AF50E2A001C13E4 /* ColdObservable.swift */; }; + C81108501AF50E2A001C13E4 /* ConnectableObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108311AF50E2A001C13E4 /* ConnectableObservable.swift */; }; + C81108511AF50E2A001C13E4 /* HotObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108321AF50E2A001C13E4 /* HotObservable.swift */; }; + C81108521AF50E2A001C13E4 /* MockObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108331AF50E2A001C13E4 /* MockObserver.swift */; }; + C81108531AF50E2A001C13E4 /* MySubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108341AF50E2A001C13E4 /* MySubject.swift */; }; + C81108541AF50E2A001C13E4 /* Observable.Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108351AF50E2A001C13E4 /* Observable.Extensions.swift */; }; + C81108551AF50E2A001C13E4 /* TestObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108361AF50E2A001C13E4 /* TestObservable.swift */; }; + C81108561AF50E2A001C13E4 /* TestObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108371AF50E2A001C13E4 /* TestObserver.swift */; }; + C81108571AF50E2A001C13E4 /* Recorded.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108381AF50E2A001C13E4 /* Recorded.swift */; }; + C81108581AF50E2A001C13E4 /* Result+Equatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108391AF50E2A001C13E4 /* Result+Equatable.swift */; }; + C81108591AF50E2A001C13E4 /* TestScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C811083B1AF50E2A001C13E4 /* TestScheduler.swift */; }; + C811085A1AF50E2A001C13E4 /* VirtualTimeSchedulerBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C811083C1AF50E2A001C13E4 /* VirtualTimeSchedulerBase.swift */; }; + C811085B1AF50E2A001C13E4 /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = C811083D1AF50E2A001C13E4 /* Subscription.swift */; }; + C811085C1AF50E2A001C13E4 /* TestExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C811083E1AF50E2A001C13E4 /* TestExtensions.swift */; }; + C811085D1AF50E2A001C13E4 /* AssumptionsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108401AF50E2A001C13E4 /* AssumptionsTest.swift */; }; + C811085E1AF50E2A001C13E4 /* ConcurrencyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108411AF50E2A001C13E4 /* ConcurrencyTest.swift */; }; + C811085F1AF50E2A001C13E4 /* DisposableTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108421AF50E2A001C13E4 /* DisposableTest.swift */; }; + C81108601AF50E2A001C13E4 /* Observable+AggregateTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108431AF50E2A001C13E4 /* Observable+AggregateTest.swift */; }; + C81108611AF50E2A001C13E4 /* Observable+BindingTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108441AF50E2A001C13E4 /* Observable+BindingTest.swift */; }; + C81108621AF50E2A001C13E4 /* Observable+MultipleTest+CombineLatest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108451AF50E2A001C13E4 /* Observable+MultipleTest+CombineLatest.swift */; }; + C81108631AF50E2A001C13E4 /* Observable+MultipleTest+CombineLatest.tt in Resources */ = {isa = PBXBuildFile; fileRef = C81108461AF50E2A001C13E4 /* Observable+MultipleTest+CombineLatest.tt */; }; + C81108641AF50E2A001C13E4 /* Observable+MultipleTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108471AF50E2A001C13E4 /* Observable+MultipleTest.swift */; }; + C81108651AF50E2A001C13E4 /* Observable+SingleTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108481AF50E2A001C13E4 /* Observable+SingleTest.swift */; }; + C81108661AF50E2A001C13E4 /* Observable+StandardSequenceOperatorsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108491AF50E2A001C13E4 /* Observable+StandardSequenceOperatorsTest.swift */; }; + C81108671AF50E2A001C13E4 /* Observable+TimeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C811084A1AF50E2A001C13E4 /* Observable+TimeTest.swift */; }; + C81108681AF50E2A001C13E4 /* QueueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C811084B1AF50E2A001C13E4 /* QueueTests.swift */; }; + C81108691AF50E2A001C13E4 /* RxTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C811084C1AF50E2A001C13E4 /* RxTest.swift */; }; + C811086C1AF50E43001C13E4 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C811086A1AF50E43001C13E4 /* RxCocoa.framework */; }; + C811086D1AF50E43001C13E4 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C811086B1AF50E43001C13E4 /* RxSwift.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + C81108201AF50E11001C13E4 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + C81108241AF50E11001C13E4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + C811082B1AF50E2A001C13E4 /* NSNotificationCenterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSNotificationCenterTests.swift; sourceTree = ""; }; + C81108301AF50E2A001C13E4 /* ColdObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColdObservable.swift; sourceTree = ""; }; + C81108311AF50E2A001C13E4 /* ConnectableObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConnectableObservable.swift; sourceTree = ""; }; + C81108321AF50E2A001C13E4 /* HotObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HotObservable.swift; sourceTree = ""; }; + C81108331AF50E2A001C13E4 /* MockObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockObserver.swift; sourceTree = ""; }; + C81108341AF50E2A001C13E4 /* MySubject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MySubject.swift; sourceTree = ""; }; + C81108351AF50E2A001C13E4 /* Observable.Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Observable.Extensions.swift; sourceTree = ""; }; + C81108361AF50E2A001C13E4 /* TestObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestObservable.swift; sourceTree = ""; }; + C81108371AF50E2A001C13E4 /* TestObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestObserver.swift; sourceTree = ""; }; + C81108381AF50E2A001C13E4 /* Recorded.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Recorded.swift; sourceTree = ""; }; + C81108391AF50E2A001C13E4 /* Result+Equatable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Result+Equatable.swift"; sourceTree = ""; }; + C811083B1AF50E2A001C13E4 /* TestScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestScheduler.swift; sourceTree = ""; }; + C811083C1AF50E2A001C13E4 /* VirtualTimeSchedulerBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VirtualTimeSchedulerBase.swift; sourceTree = ""; }; + C811083D1AF50E2A001C13E4 /* Subscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Subscription.swift; sourceTree = ""; }; + C811083E1AF50E2A001C13E4 /* TestExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestExtensions.swift; sourceTree = ""; }; + C81108401AF50E2A001C13E4 /* AssumptionsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssumptionsTest.swift; sourceTree = ""; }; + C81108411AF50E2A001C13E4 /* ConcurrencyTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConcurrencyTest.swift; sourceTree = ""; }; + C81108421AF50E2A001C13E4 /* DisposableTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisposableTest.swift; sourceTree = ""; }; + C81108431AF50E2A001C13E4 /* Observable+AggregateTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+AggregateTest.swift"; sourceTree = ""; }; + C81108441AF50E2A001C13E4 /* Observable+BindingTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+BindingTest.swift"; sourceTree = ""; }; + C81108451AF50E2A001C13E4 /* Observable+MultipleTest+CombineLatest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+MultipleTest+CombineLatest.swift"; sourceTree = ""; }; + C81108461AF50E2A001C13E4 /* Observable+MultipleTest+CombineLatest.tt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Observable+MultipleTest+CombineLatest.tt"; sourceTree = ""; }; + C81108471AF50E2A001C13E4 /* Observable+MultipleTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+MultipleTest.swift"; sourceTree = ""; }; + C81108481AF50E2A001C13E4 /* Observable+SingleTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+SingleTest.swift"; sourceTree = ""; }; + C81108491AF50E2A001C13E4 /* Observable+StandardSequenceOperatorsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+StandardSequenceOperatorsTest.swift"; sourceTree = ""; }; + C811084A1AF50E2A001C13E4 /* Observable+TimeTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+TimeTest.swift"; sourceTree = ""; }; + C811084B1AF50E2A001C13E4 /* QueueTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueueTests.swift; sourceTree = ""; }; + C811084C1AF50E2A001C13E4 /* RxTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTest.swift; sourceTree = SOURCE_ROOT; }; + C811086A1AF50E43001C13E4 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = "../Debug-iphoneos/RxCocoa.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + C811086B1AF50E43001C13E4 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = "../Debug-iphoneos/RxSwift.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + C811081D1AF50E11001C13E4 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + C811086C1AF50E43001C13E4 /* RxCocoa.framework in Frameworks */, + C811086D1AF50E43001C13E4 /* RxSwift.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + C81108151AF50DDA001C13E4 = { + isa = PBXGroup; + children = ( + C811086A1AF50E43001C13E4 /* RxCocoa.framework */, + C811086B1AF50E43001C13E4 /* RxSwift.framework */, + C81108221AF50E11001C13E4 /* Tests */, + C81108211AF50E11001C13E4 /* Products */, + ); + sourceTree = ""; + }; + C81108211AF50E11001C13E4 /* Products */ = { + isa = PBXGroup; + children = ( + C81108201AF50E11001C13E4 /* Tests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + C81108221AF50E11001C13E4 /* Tests */ = { + isa = PBXGroup; + children = ( + C811082A1AF50E2A001C13E4 /* RxCocoaTests */, + C811082D1AF50E2A001C13E4 /* RxSwiftTests */, + C811084C1AF50E2A001C13E4 /* RxTest.swift */, + C81108231AF50E11001C13E4 /* Supporting Files */, + ); + path = Tests; + sourceTree = ""; + }; + C81108231AF50E11001C13E4 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + C81108241AF50E11001C13E4 /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + C811082A1AF50E2A001C13E4 /* RxCocoaTests */ = { + isa = PBXGroup; + children = ( + C811082B1AF50E2A001C13E4 /* NSNotificationCenterTests.swift */, + ); + path = RxCocoaTests; + sourceTree = SOURCE_ROOT; + }; + C811082D1AF50E2A001C13E4 /* RxSwiftTests */ = { + isa = PBXGroup; + children = ( + C811082E1AF50E2A001C13E4 /* TestImplementations */, + C811083F1AF50E2A001C13E4 /* Tests */, + ); + path = RxSwiftTests; + sourceTree = SOURCE_ROOT; + }; + C811082E1AF50E2A001C13E4 /* TestImplementations */ = { + isa = PBXGroup; + children = ( + C811082F1AF50E2A001C13E4 /* Mocks */, + C81108381AF50E2A001C13E4 /* Recorded.swift */, + C81108391AF50E2A001C13E4 /* Result+Equatable.swift */, + C811083A1AF50E2A001C13E4 /* Schedulers */, + C811083D1AF50E2A001C13E4 /* Subscription.swift */, + C811083E1AF50E2A001C13E4 /* TestExtensions.swift */, + ); + path = TestImplementations; + sourceTree = ""; + }; + C811082F1AF50E2A001C13E4 /* Mocks */ = { + isa = PBXGroup; + children = ( + C81108301AF50E2A001C13E4 /* ColdObservable.swift */, + C81108311AF50E2A001C13E4 /* ConnectableObservable.swift */, + C81108321AF50E2A001C13E4 /* HotObservable.swift */, + C81108331AF50E2A001C13E4 /* MockObserver.swift */, + C81108341AF50E2A001C13E4 /* MySubject.swift */, + C81108351AF50E2A001C13E4 /* Observable.Extensions.swift */, + C81108361AF50E2A001C13E4 /* TestObservable.swift */, + C81108371AF50E2A001C13E4 /* TestObserver.swift */, + ); + path = Mocks; + sourceTree = ""; + }; + C811083A1AF50E2A001C13E4 /* Schedulers */ = { + isa = PBXGroup; + children = ( + C811083B1AF50E2A001C13E4 /* TestScheduler.swift */, + C811083C1AF50E2A001C13E4 /* VirtualTimeSchedulerBase.swift */, + ); + path = Schedulers; + sourceTree = ""; + }; + C811083F1AF50E2A001C13E4 /* Tests */ = { + isa = PBXGroup; + children = ( + C81108401AF50E2A001C13E4 /* AssumptionsTest.swift */, + C81108411AF50E2A001C13E4 /* ConcurrencyTest.swift */, + C81108421AF50E2A001C13E4 /* DisposableTest.swift */, + C81108431AF50E2A001C13E4 /* Observable+AggregateTest.swift */, + C81108441AF50E2A001C13E4 /* Observable+BindingTest.swift */, + C81108451AF50E2A001C13E4 /* Observable+MultipleTest+CombineLatest.swift */, + C81108461AF50E2A001C13E4 /* Observable+MultipleTest+CombineLatest.tt */, + C81108471AF50E2A001C13E4 /* Observable+MultipleTest.swift */, + C81108481AF50E2A001C13E4 /* Observable+SingleTest.swift */, + C81108491AF50E2A001C13E4 /* Observable+StandardSequenceOperatorsTest.swift */, + C811084A1AF50E2A001C13E4 /* Observable+TimeTest.swift */, + C811084B1AF50E2A001C13E4 /* QueueTests.swift */, + ); + path = Tests; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + C811081F1AF50E11001C13E4 /* Tests */ = { + isa = PBXNativeTarget; + buildConfigurationList = C81108291AF50E11001C13E4 /* Build configuration list for PBXNativeTarget "Tests" */; + buildPhases = ( + C811081C1AF50E11001C13E4 /* Sources */, + C811081D1AF50E11001C13E4 /* Frameworks */, + C811081E1AF50E11001C13E4 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Tests; + productName = Tests; + productReference = C81108201AF50E11001C13E4 /* Tests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + C81108161AF50DDA001C13E4 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0630; + TargetAttributes = { + C811081F1AF50E11001C13E4 = { + CreatedOnToolsVersion = 6.3; + }; + }; + }; + buildConfigurationList = C81108191AF50DDA001C13E4 /* Build configuration list for PBXProject "Tests" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = C81108151AF50DDA001C13E4; + productRefGroup = C81108211AF50E11001C13E4 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + C811081F1AF50E11001C13E4 /* Tests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + C811081E1AF50E11001C13E4 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C81108631AF50E2A001C13E4 /* Observable+MultipleTest+CombineLatest.tt in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + C811081C1AF50E11001C13E4 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C81108691AF50E2A001C13E4 /* RxTest.swift in Sources */, + C81108581AF50E2A001C13E4 /* Result+Equatable.swift in Sources */, + C81108671AF50E2A001C13E4 /* Observable+TimeTest.swift in Sources */, + C81108551AF50E2A001C13E4 /* TestObservable.swift in Sources */, + C811085B1AF50E2A001C13E4 /* Subscription.swift in Sources */, + C81108531AF50E2A001C13E4 /* MySubject.swift in Sources */, + C81108611AF50E2A001C13E4 /* Observable+BindingTest.swift in Sources */, + C811084D1AF50E2A001C13E4 /* NSNotificationCenterTests.swift in Sources */, + C81108621AF50E2A001C13E4 /* Observable+MultipleTest+CombineLatest.swift in Sources */, + C811085E1AF50E2A001C13E4 /* ConcurrencyTest.swift in Sources */, + C81108561AF50E2A001C13E4 /* TestObserver.swift in Sources */, + C811085A1AF50E2A001C13E4 /* VirtualTimeSchedulerBase.swift in Sources */, + C811085F1AF50E2A001C13E4 /* DisposableTest.swift in Sources */, + C81108661AF50E2A001C13E4 /* Observable+StandardSequenceOperatorsTest.swift in Sources */, + C81108641AF50E2A001C13E4 /* Observable+MultipleTest.swift in Sources */, + C811084F1AF50E2A001C13E4 /* ColdObservable.swift in Sources */, + C81108511AF50E2A001C13E4 /* HotObservable.swift in Sources */, + C81108541AF50E2A001C13E4 /* Observable.Extensions.swift in Sources */, + C81108681AF50E2A001C13E4 /* QueueTests.swift in Sources */, + C81108651AF50E2A001C13E4 /* Observable+SingleTest.swift in Sources */, + C81108571AF50E2A001C13E4 /* Recorded.swift in Sources */, + C81108591AF50E2A001C13E4 /* TestScheduler.swift in Sources */, + C81108601AF50E2A001C13E4 /* Observable+AggregateTest.swift in Sources */, + C81108521AF50E2A001C13E4 /* MockObserver.swift in Sources */, + C811085C1AF50E2A001C13E4 /* TestExtensions.swift in Sources */, + C811085D1AF50E2A001C13E4 /* AssumptionsTest.swift in Sources */, + C81108501AF50E2A001C13E4 /* ConnectableObservable.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + C811081A1AF50DDA001C13E4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Debug; + }; + C811081B1AF50DDA001C13E4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Release; + }; + C81108271AF50E11001C13E4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/Rx-cfkyozdvlaegqibzixjokeysigeo/Build/Products/Debug-iphoneos", + ); + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = Tests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.3; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + OTHER_SWIFT_FLAGS = "-D DEBUG"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + C81108281AF50E11001C13E4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/Rx-cfkyozdvlaegqibzixjokeysigeo/Build/Products/Debug-iphoneos", + ); + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = Tests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.3; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + C81108191AF50DDA001C13E4 /* Build configuration list for PBXProject "Tests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C811081A1AF50DDA001C13E4 /* Debug */, + C811081B1AF50DDA001C13E4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C81108291AF50E11001C13E4 /* Build configuration list for PBXNativeTarget "Tests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C81108271AF50E11001C13E4 /* Debug */, + C81108281AF50E11001C13E4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = C81108161AF50DDA001C13E4 /* Project object */; +} diff --git a/Tests/Tests.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Tests/Tests.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..6c0ea849 --- /dev/null +++ b/Tests/Tests.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/RxCocoa/RxCocoaTests/Info.plist b/Tests/Tests/Info.plist similarity index 100% rename from RxCocoa/RxCocoaTests/Info.plist rename to Tests/Tests/Info.plist