From 9e25241ddc0b62c38a821ffcfd27d5ae43c929a3 Mon Sep 17 00:00:00 2001 From: Marcelo Gobetti Date: Sat, 3 Nov 2018 12:15:51 -0300 Subject: [PATCH] Separated RxNimble into RxBlocking and RxTest versions --- .travis.yml | 4 +- README.md | 5 +- RxNimble.xcodeproj/project.pbxproj | 392 ++++++++++++++++-- ...e.xcscheme => RxNimbleRxBlocking.xcscheme} | 20 +- .../xcschemes/RxNimbleRxTest.xcscheme | 99 +++++ RxNimbleTests/RxNimbleRxBlockingTests.swift | 2 +- RxNimbleTests/RxNimbleRxTestTests.swift | 2 +- Source/RxNimble.h | 7 - Source/RxNimbleRxBlocking.h | 7 + Source/RxNimbleRxTest.h | 7 + 10 files changed, 483 insertions(+), 62 deletions(-) rename RxNimble.xcodeproj/xcshareddata/xcschemes/{RxNimble.xcscheme => RxNimbleRxBlocking.xcscheme} (85%) create mode 100644 RxNimble.xcodeproj/xcshareddata/xcschemes/RxNimbleRxTest.xcscheme delete mode 100644 Source/RxNimble.h create mode 100644 Source/RxNimbleRxBlocking.h create mode 100644 Source/RxNimbleRxTest.h diff --git a/.travis.yml b/.travis.yml index 0d14e60..3679f12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,9 @@ osx_image: xcode10 language: objective-c xcode_project: RxNimble.xcodeproj -xcode_scheme: RxNimble +xcode_scheme: + - RxNimbleRxBlocking + - RxNimbleRxTest cache: directories: diff --git a/README.md b/README.md index ca4f2b2..d7c505f 100644 --- a/README.md +++ b/README.md @@ -79,9 +79,10 @@ Add to your Cartfile.private: github 'RxSwiftCommunity/RxNimble' ``` -Run `carthage update --cache-builds` then drag & drop RxNimble.framework from the Carthage/Builds folder into your project. +Run `carthage update --cache-builds` then drag & drop from the Carthage/Builds folder into your project either or both of: -One also needs to import RxBlocking and RxTest built frameworks. +- `RxNimbleRxBlocking.framework` and `RxBlocking.framework` +- `RxNimbleRxTest.framework` and `RxTest.framework` ## Known Issues diff --git a/RxNimble.xcodeproj/project.pbxproj b/RxNimble.xcodeproj/project.pbxproj index 7ee8981..58e438c 100644 --- a/RxNimble.xcodeproj/project.pbxproj +++ b/RxNimble.xcodeproj/project.pbxproj @@ -7,30 +7,43 @@ objects = { /* Begin PBXBuildFile section */ - 3A2CFEE9218DF8A800E4F547 /* RxNimble.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AD16EF721866404007FF6A8 /* RxNimble.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3A632182218CE18000F190FD /* RxNimbleRxTestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A63217F218CE18000F190FD /* RxNimbleRxTestTests.swift */; }; + 3A2CFEEF218DF97500E4F547 /* ThrowError+RxTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A63218F218CE1CE00F190FD /* ThrowError+RxTest.swift */; }; + 3A2CFEF0218DF97500E4F547 /* Expectation+RxTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A63218E218CE1CE00F190FD /* Expectation+RxTest.swift */; }; + 3A2CFEF2218DF97500E4F547 /* Equal+RxTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A632190218CE1CE00F190FD /* Equal+RxTest.swift */; }; + 3A2CFEF3218DF97500E4F547 /* Expectation+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A6321A2218CE1DF00F190FD /* Expectation+Ext.swift */; }; + 3A2CFEFF218DFA7900E4F547 /* RxNimbleRxTest.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A2CFEFE218DFA7400E4F547 /* RxNimbleRxTest.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3A56F53F218DEFA200705676 /* RxNimbleRxBlocking.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AD16EF721866404007FF6A8 /* RxNimbleRxBlocking.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3A632185218CE18000F190FD /* AnyError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A632180218CE18000F190FD /* AnyError.swift */; }; 3A632188218CE18000F190FD /* RxNimbleRxBlockingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A632181218CE18000F190FD /* RxNimbleRxBlockingTests.swift */; }; 3A63219C218CE1D900F190FD /* RxNimble.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A63219A218CE1D900F190FD /* RxNimble.swift */; }; 3A63219F218CE1D900F190FD /* Expectation+Blocking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A63219B218CE1D900F190FD /* Expectation+Blocking.swift */; }; 3A6321A3218CE1DF00F190FD /* Expectation+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A6321A2218CE1DF00F190FD /* Expectation+Ext.swift */; }; - 3A6321AC218CE1E200F190FD /* Equal+RxTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A632190218CE1CE00F190FD /* Equal+RxTest.swift */; }; - 3A6321AD218CE1E200F190FD /* Expectation+RxTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A63218E218CE1CE00F190FD /* Expectation+RxTest.swift */; }; - 3A6321AE218CE1E200F190FD /* ThrowError+RxTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A63218F218CE1CE00F190FD /* ThrowError+RxTest.swift */; }; - 3AD16F8521866AE7007FF6A8 /* RxNimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AD16F7C21866AE7007FF6A8 /* RxNimble.framework */; }; + 3A7FDBC2218E37A80065F6C6 /* RxNimbleRxTestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A63217F218CE18000F190FD /* RxNimbleRxTestTests.swift */; }; + 3A7FDBC3218E37A80065F6C6 /* AnyError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A632180218CE18000F190FD /* AnyError.swift */; }; + 3A7FDBC6218E37A80065F6C6 /* RxNimbleRxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A2CFEF9218DF97500E4F547 /* RxNimbleRxTest.framework */; }; + 3AD16F8521866AE7007FF6A8 /* RxNimbleRxBlocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AD16F7C21866AE7007FF6A8 /* RxNimbleRxBlocking.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 3A7FDBBF218E37A80065F6C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3AD16EEB21866404007FF6A8 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3A2CFEEA218DF97500E4F547; + remoteInfo = RxNimbleRxTest; + }; 3AD16F8621866AE7007FF6A8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 3AD16EEB21866404007FF6A8 /* Project object */; proxyType = 1; remoteGlobalIDString = 3AD16F7B21866AE7007FF6A8; - remoteInfo = "RxNimble"; + remoteInfo = RxNimble; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 3A2CFEF9218DF97500E4F547 /* RxNimbleRxTest.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxNimbleRxTest.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3A2CFEFE218DFA7400E4F547 /* RxNimbleRxTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxNimbleRxTest.h; sourceTree = ""; }; 3A63217F218CE18000F190FD /* RxNimbleRxTestTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxNimbleRxTestTests.swift; sourceTree = ""; }; 3A632180218CE18000F190FD /* AnyError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnyError.swift; sourceTree = ""; }; 3A632181218CE18000F190FD /* RxNimbleRxBlockingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxNimbleRxBlockingTests.swift; sourceTree = ""; }; @@ -40,14 +53,30 @@ 3A63219A218CE1D900F190FD /* RxNimble.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxNimble.swift; sourceTree = ""; }; 3A63219B218CE1D900F190FD /* Expectation+Blocking.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Expectation+Blocking.swift"; sourceTree = ""; }; 3A6321A2218CE1DF00F190FD /* Expectation+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Expectation+Ext.swift"; sourceTree = ""; }; - 3AD16EF721866404007FF6A8 /* RxNimble.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxNimble.h; sourceTree = ""; }; + 3A7FDBCB218E37A80065F6C6 /* RxNimbleRxTestTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RxNimbleRxTestTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3AD16EF721866404007FF6A8 /* RxNimbleRxBlocking.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxNimbleRxBlocking.h; sourceTree = ""; }; 3AD16EF821866404007FF6A8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3AD16F0421866404007FF6A8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 3AD16F7C21866AE7007FF6A8 /* RxNimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxNimble.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 3AD16F8421866AE7007FF6A8 /* RxNimbleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RxNimbleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3AD16F7C21866AE7007FF6A8 /* RxNimbleRxBlocking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxNimbleRxBlocking.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3AD16F8421866AE7007FF6A8 /* RxNimbleRxBlockingTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RxNimbleRxBlockingTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 3A2CFEF4218DF97500E4F547 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3A7FDBC4218E37A80065F6C6 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 3A7FDBC6218E37A80065F6C6 /* RxNimbleRxTest.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 3AD16F7921866AE7007FF6A8 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -59,7 +88,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3AD16F8521866AE7007FF6A8 /* RxNimble.framework in Frameworks */, + 3AD16F8521866AE7007FF6A8 /* RxNimbleRxBlocking.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -106,8 +135,10 @@ 3AD16EF521866404007FF6A8 /* Products */ = { isa = PBXGroup; children = ( - 3AD16F7C21866AE7007FF6A8 /* RxNimble.framework */, - 3AD16F8421866AE7007FF6A8 /* RxNimbleTests.xctest */, + 3AD16F7C21866AE7007FF6A8 /* RxNimbleRxBlocking.framework */, + 3AD16F8421866AE7007FF6A8 /* RxNimbleRxBlockingTests.xctest */, + 3A2CFEF9218DF97500E4F547 /* RxNimbleRxTest.framework */, + 3A7FDBCB218E37A80065F6C6 /* RxNimbleRxTestTests.xctest */, ); name = Products; sourceTree = ""; @@ -118,7 +149,8 @@ 3A63218B218CE1AA00F190FD /* Core */, 3A63218C218CE1B600F190FD /* RxBlocking */, 3A63218D218CE1BF00F190FD /* RxTest */, - 3AD16EF721866404007FF6A8 /* RxNimble.h */, + 3AD16EF721866404007FF6A8 /* RxNimbleRxBlocking.h */, + 3A2CFEFE218DFA7400E4F547 /* RxNimbleRxTest.h */, 3AD16EF821866404007FF6A8 /* Info.plist */, ); path = Source; @@ -145,20 +177,64 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 3A2CFEEB218DF97500E4F547 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 3A2CFEFF218DFA7900E4F547 /* RxNimbleRxTest.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 3AD16F7721866AE7007FF6A8 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 3A2CFEE9218DF8A800E4F547 /* RxNimble.h in Headers */, + 3A56F53F218DEFA200705676 /* RxNimbleRxBlocking.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 3AD16F7B21866AE7007FF6A8 /* RxNimble */ = { + 3A2CFEEA218DF97500E4F547 /* RxNimbleRxTest */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3A2CFEF6218DF97500E4F547 /* Build configuration list for PBXNativeTarget "RxNimbleRxTest" */; + buildPhases = ( + 3A2CFEEB218DF97500E4F547 /* Headers */, + 3A2CFEED218DF97500E4F547 /* Sources */, + 3A2CFEF4218DF97500E4F547 /* Frameworks */, + 3A2CFEF5218DF97500E4F547 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = RxNimbleRxTest; + productName = "RxNimble-iOS"; + productReference = 3A2CFEF9218DF97500E4F547 /* RxNimbleRxTest.framework */; + productType = "com.apple.product-type.framework"; + }; + 3A7FDBBB218E37A80065F6C6 /* RxNimbleRxTestTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 3AD16F8D21866AE7007FF6A8 /* Build configuration list for PBXNativeTarget "RxNimble" */; + buildConfigurationList = 3A7FDBC8218E37A80065F6C6 /* Build configuration list for PBXNativeTarget "RxNimbleRxTestTests" */; + buildPhases = ( + 3A7FDBC0218E37A80065F6C6 /* Sources */, + 3A7FDBC4218E37A80065F6C6 /* Frameworks */, + 3A7FDBC7218E37A80065F6C6 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 3A7FDBBE218E37A80065F6C6 /* PBXTargetDependency */, + ); + name = RxNimbleRxTestTests; + productName = RxNimbleTests; + productReference = 3A7FDBCB218E37A80065F6C6 /* RxNimbleRxTestTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 3AD16F7B21866AE7007FF6A8 /* RxNimbleRxBlocking */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3AD16F8D21866AE7007FF6A8 /* Build configuration list for PBXNativeTarget "RxNimbleRxBlocking" */; buildPhases = ( 3AD16F7721866AE7007FF6A8 /* Headers */, 3AD16F7821866AE7007FF6A8 /* Sources */, @@ -169,14 +245,14 @@ ); dependencies = ( ); - name = RxNimble; - productName = "RxNimble"; - productReference = 3AD16F7C21866AE7007FF6A8 /* RxNimble.framework */; + name = RxNimbleRxBlocking; + productName = RxNimble; + productReference = 3AD16F7C21866AE7007FF6A8 /* RxNimbleRxBlocking.framework */; productType = "com.apple.product-type.framework"; }; - 3AD16F8321866AE7007FF6A8 /* RxNimbleTests */ = { + 3AD16F8321866AE7007FF6A8 /* RxNimbleRxBlockingTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 3AD16F9021866AE7007FF6A8 /* Build configuration list for PBXNativeTarget "RxNimbleTests" */; + buildConfigurationList = 3AD16F9021866AE7007FF6A8 /* Build configuration list for PBXNativeTarget "RxNimbleRxBlockingTests" */; buildPhases = ( 3AD16F8021866AE7007FF6A8 /* Sources */, 3AD16F8121866AE7007FF6A8 /* Frameworks */, @@ -187,9 +263,9 @@ dependencies = ( 3AD16F8721866AE7007FF6A8 /* PBXTargetDependency */, ); - name = RxNimbleTests; - productName = "RxNimbleTests"; - productReference = 3AD16F8421866AE7007FF6A8 /* RxNimbleTests.xctest */; + name = RxNimbleRxBlockingTests; + productName = RxNimbleTests; + productReference = 3AD16F8421866AE7007FF6A8 /* RxNimbleRxBlockingTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -223,13 +299,29 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 3AD16F7B21866AE7007FF6A8 /* RxNimble */, - 3AD16F8321866AE7007FF6A8 /* RxNimbleTests */, + 3AD16F7B21866AE7007FF6A8 /* RxNimbleRxBlocking */, + 3A2CFEEA218DF97500E4F547 /* RxNimbleRxTest */, + 3AD16F8321866AE7007FF6A8 /* RxNimbleRxBlockingTests */, + 3A7FDBBB218E37A80065F6C6 /* RxNimbleRxTestTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 3A2CFEF5218DF97500E4F547 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3A7FDBC7218E37A80065F6C6 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 3AD16F7A21866AE7007FF6A8 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -247,15 +339,32 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 3A2CFEED218DF97500E4F547 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3A2CFEEF218DF97500E4F547 /* ThrowError+RxTest.swift in Sources */, + 3A2CFEF0218DF97500E4F547 /* Expectation+RxTest.swift in Sources */, + 3A2CFEF2218DF97500E4F547 /* Equal+RxTest.swift in Sources */, + 3A2CFEF3218DF97500E4F547 /* Expectation+Ext.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3A7FDBC0218E37A80065F6C6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3A7FDBC2218E37A80065F6C6 /* RxNimbleRxTestTests.swift in Sources */, + 3A7FDBC3218E37A80065F6C6 /* AnyError.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 3AD16F7821866AE7007FF6A8 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( 3A63219C218CE1D900F190FD /* RxNimble.swift in Sources */, - 3A6321AE218CE1E200F190FD /* ThrowError+RxTest.swift in Sources */, - 3A6321AD218CE1E200F190FD /* Expectation+RxTest.swift in Sources */, 3A63219F218CE1D900F190FD /* Expectation+Blocking.swift in Sources */, - 3A6321AC218CE1E200F190FD /* Equal+RxTest.swift in Sources */, 3A6321A3218CE1DF00F190FD /* Expectation+Ext.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -265,7 +374,6 @@ buildActionMask = 2147483647; files = ( 3A632188218CE18000F190FD /* RxNimbleRxBlockingTests.swift in Sources */, - 3A632182218CE18000F190FD /* RxNimbleRxTestTests.swift in Sources */, 3A632185218CE18000F190FD /* AnyError.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -273,14 +381,200 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 3A7FDBBE218E37A80065F6C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3A2CFEEA218DF97500E4F547 /* RxNimbleRxTest */; + targetProxy = 3A7FDBBF218E37A80065F6C6 /* PBXContainerItemProxy */; + }; 3AD16F8721866AE7007FF6A8 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 3AD16F7B21866AE7007FF6A8 /* RxNimble */; + target = 3AD16F7B21866AE7007FF6A8 /* RxNimbleRxBlocking */; targetProxy = 3AD16F8621866AE7007FF6A8 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 3A2CFEF7218DF97500E4F547 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; + COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_BITCODE = NO; + "FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = ( + "$(SRCROOT)/Carthage/Build/tvOS/", + "$(inherited)", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = ( + "$(SRCROOT)/Carthage/Build/iOS/", + "$(inherited)", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = ( + "$(SRCROOT)/Carthage/Build/Mac/", + "$(inherited)", + ); + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = Source/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 10.10; + PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxNimbleRxTest; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2,3"; + TVOS_DEPLOYMENT_TARGET = 9.0; + }; + name = Debug; + }; + 3A2CFEF8218DF97500E4F547 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_BITCODE = NO; + "FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = ( + "$(SRCROOT)/Carthage/Build/tvOS/", + "$(inherited)", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = ( + "$(SRCROOT)/Carthage/Build/iOS/", + "$(inherited)", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = ( + "$(SRCROOT)/Carthage/Build/Mac/", + "$(inherited)", + ); + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = Source/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 10.10; + PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxNimbleRxTest; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2,3"; + TVOS_DEPLOYMENT_TARGET = 9.0; + }; + name = Release; + }; + 3A7FDBC9218E37A80065F6C6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + COMBINE_HIDPI_IMAGES = YES; + "FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = ( + "$(SRCROOT)/Carthage/Build/tvOS/", + "$(inherited)", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = ( + "$(SRCROOT)/Carthage/Build/iOS/", + "$(inherited)", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = ( + "$(SRCROOT)/Carthage/Build/Mac/", + "$(inherited)", + ); + INFOPLIST_FILE = RxNimbleTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + "$(FRAMEWORK_SEARCH_PATHS)", + ); + "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + "$(FRAMEWORK_SEARCH_PATHS)", + ); + MACOSX_DEPLOYMENT_TARGET = 10.10; + PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxNimbleRxTestTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2,3"; + TVOS_DEPLOYMENT_TARGET = 9.0; + }; + name = Debug; + }; + 3A7FDBCA218E37A80065F6C6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; + COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = ""; + "FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = ( + "$(SRCROOT)/Carthage/Build/tvOS/", + "$(inherited)", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = ( + "$(SRCROOT)/Carthage/Build/iOS/", + "$(inherited)", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = ( + "$(SRCROOT)/Carthage/Build/Mac/", + "$(inherited)", + ); + INFOPLIST_FILE = RxNimbleTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + "$(FRAMEWORK_SEARCH_PATHS)", + ); + "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + "$(FRAMEWORK_SEARCH_PATHS)", + ); + MACOSX_DEPLOYMENT_TARGET = 10.10; + PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxNimbleRxTestTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2,3"; + TVOS_DEPLOYMENT_TARGET = 9.0; + }; + name = Release; + }; 3AD16F0621866404007FF6A8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -437,8 +731,8 @@ "@loader_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.10; - PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxNimble; - PRODUCT_NAME = RxNimble; + PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxNimbleRxBlocking; + PRODUCT_NAME = RxNimbleRxBlocking; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; @@ -482,8 +776,8 @@ "@loader_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.10; - PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxNimble; - PRODUCT_NAME = RxNimble; + PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxNimbleRxBlocking; + PRODUCT_NAME = RxNimbleRxBlocking; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; @@ -527,7 +821,7 @@ "$(FRAMEWORK_SEARCH_PATHS)", ); MACOSX_DEPLOYMENT_TARGET = 10.10; - PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxNimbleTests; + PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxNimbleRxBlockingTests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; @@ -573,7 +867,7 @@ "$(FRAMEWORK_SEARCH_PATHS)", ); MACOSX_DEPLOYMENT_TARGET = 10.10; - PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxNimbleTests; + PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxNimbleRxBlockingTests; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; SWIFT_VERSION = 4.2; @@ -585,6 +879,24 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 3A2CFEF6218DF97500E4F547 /* Build configuration list for PBXNativeTarget "RxNimbleRxTest" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3A2CFEF7218DF97500E4F547 /* Debug */, + 3A2CFEF8218DF97500E4F547 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 3A7FDBC8218E37A80065F6C6 /* Build configuration list for PBXNativeTarget "RxNimbleRxTestTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3A7FDBC9218E37A80065F6C6 /* Debug */, + 3A7FDBCA218E37A80065F6C6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 3AD16EEE21866404007FF6A8 /* Build configuration list for PBXProject "RxNimble" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -594,7 +906,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3AD16F8D21866AE7007FF6A8 /* Build configuration list for PBXNativeTarget "RxNimble" */ = { + 3AD16F8D21866AE7007FF6A8 /* Build configuration list for PBXNativeTarget "RxNimbleRxBlocking" */ = { isa = XCConfigurationList; buildConfigurations = ( 3AD16F8E21866AE7007FF6A8 /* Debug */, @@ -603,7 +915,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3AD16F9021866AE7007FF6A8 /* Build configuration list for PBXNativeTarget "RxNimbleTests" */ = { + 3AD16F9021866AE7007FF6A8 /* Build configuration list for PBXNativeTarget "RxNimbleRxBlockingTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 3AD16F9121866AE7007FF6A8 /* Debug */, diff --git a/RxNimble.xcodeproj/xcshareddata/xcschemes/RxNimble.xcscheme b/RxNimble.xcodeproj/xcshareddata/xcschemes/RxNimbleRxBlocking.xcscheme similarity index 85% rename from RxNimble.xcodeproj/xcshareddata/xcschemes/RxNimble.xcscheme rename to RxNimble.xcodeproj/xcshareddata/xcschemes/RxNimbleRxBlocking.xcscheme index 5a0bd86..f91c0de 100644 --- a/RxNimble.xcodeproj/xcshareddata/xcschemes/RxNimble.xcscheme +++ b/RxNimble.xcodeproj/xcshareddata/xcschemes/RxNimbleRxBlocking.xcscheme @@ -15,8 +15,8 @@ @@ -33,8 +33,8 @@ @@ -43,8 +43,8 @@ @@ -65,8 +65,8 @@ @@ -83,8 +83,8 @@ diff --git a/RxNimble.xcodeproj/xcshareddata/xcschemes/RxNimbleRxTest.xcscheme b/RxNimble.xcodeproj/xcshareddata/xcschemes/RxNimbleRxTest.xcscheme new file mode 100644 index 0000000..4d68160 --- /dev/null +++ b/RxNimble.xcodeproj/xcshareddata/xcschemes/RxNimbleRxTest.xcscheme @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RxNimbleTests/RxNimbleRxBlockingTests.swift b/RxNimbleTests/RxNimbleRxBlockingTests.swift index a911f50..8a9b7a9 100644 --- a/RxNimbleTests/RxNimbleRxBlockingTests.swift +++ b/RxNimbleTests/RxNimbleRxBlockingTests.swift @@ -1,7 +1,7 @@ import Quick import Nimble import RxSwift -import RxNimble +import RxNimbleRxBlocking class RxNimbleRxBlockingTests: QuickSpec { override func spec() { diff --git a/RxNimbleTests/RxNimbleRxTestTests.swift b/RxNimbleTests/RxNimbleRxTestTests.swift index c205c8c..3bc6381 100644 --- a/RxNimbleTests/RxNimbleRxTestTests.swift +++ b/RxNimbleTests/RxNimbleRxTestTests.swift @@ -2,7 +2,7 @@ import Quick import Nimble import RxSwift import RxTest -import RxNimble +import RxNimbleRxTest class RxNimbleRxTestTests: QuickSpec { override func spec() { diff --git a/Source/RxNimble.h b/Source/RxNimble.h deleted file mode 100644 index 5a35d6b..0000000 --- a/Source/RxNimble.h +++ /dev/null @@ -1,7 +0,0 @@ -#import - -//! Project version number for RxNimble. -FOUNDATION_EXPORT double RxNimbleVersionNumber; - -//! Project version string for RxNimble. -FOUNDATION_EXPORT const unsigned char RxNimbleVersionString[]; diff --git a/Source/RxNimbleRxBlocking.h b/Source/RxNimbleRxBlocking.h new file mode 100644 index 0000000..da5bdda --- /dev/null +++ b/Source/RxNimbleRxBlocking.h @@ -0,0 +1,7 @@ +#import + +//! Project version number for RxNimbleRxBlocking. +FOUNDATION_EXPORT double RxNimbleRxBlockingVersionNumber; + +//! Project version string for RxNimbleRxBlocking. +FOUNDATION_EXPORT const unsigned char RxNimbleRxBlockingVersionString[]; diff --git a/Source/RxNimbleRxTest.h b/Source/RxNimbleRxTest.h new file mode 100644 index 0000000..a5d208d --- /dev/null +++ b/Source/RxNimbleRxTest.h @@ -0,0 +1,7 @@ +#import + +//! Project version number for RxNimbleRxTest. +FOUNDATION_EXPORT double RxNimbleRxTestVersionNumber; + +//! Project version string for RxNimbleRxTest. +FOUNDATION_EXPORT const unsigned char RxNimbleRxTestVersionString[];