Separated RxNimble into RxBlocking and RxTest versions

RxSwiftCommunity · Nov 8, 2018 · 9e25241 · 9e25241
1 parent 7d598f3
commit 9e25241
Show file tree

Hide file tree

Showing 10 changed files with 483 additions and 62 deletions.
diff --git 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
@@ -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
diff --git a/.../xcshareddata/xcschemes/RxNimble.xcscheme → ...ata/xcschemes/RxNimbleRxBlocking.xcscheme b/.../xcshareddata/xcschemes/RxNimble.xcscheme → ...ata/xcschemes/RxNimbleRxBlocking.xcscheme
@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "3AD16F7B21866AE7007FF6A8"
-               BuildableName = "RxNimble.framework"
-               BlueprintName = "RxNimble"
+               BuildableName = "RxNimbleRxBlocking.framework"
+               BlueprintName = "RxNimbleRxBlocking"
                ReferencedContainer = "container:RxNimble.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -33,8 +33,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "3AD16F8321866AE7007FF6A8"
-               BuildableName = "RxNimbleTests.xctest"
-               BlueprintName = "RxNimbleTests"
+               BuildableName = "RxNimbleRxBlockingTests.xctest"
+               BlueprintName = "RxNimbleRxBlockingTests"
                ReferencedContainer = "container:RxNimble.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -43,8 +43,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "3AD16F7B21866AE7007FF6A8"
-            BuildableName = "RxNimble.framework"
-            BlueprintName = "RxNimble"
+            BuildableName = "RxNimbleRxBlocking.framework"
+            BlueprintName = "RxNimbleRxBlocking"
             ReferencedContainer = "container:RxNimble.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -65,8 +65,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "3AD16F7B21866AE7007FF6A8"
-            BuildableName = "RxNimble.framework"
-            BlueprintName = "RxNimble"
+            BuildableName = "RxNimbleRxBlocking.framework"
+            BlueprintName = "RxNimbleRxBlocking"
             ReferencedContainer = "container:RxNimble.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -83,8 +83,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "3AD16F7B21866AE7007FF6A8"
-            BuildableName = "RxNimble.framework"
-            BlueprintName = "RxNimble"
+            BuildableName = "RxNimbleRxBlocking.framework"
+            BlueprintName = "RxNimbleRxBlocking"
             ReferencedContainer = "container:RxNimble.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/RxNimble.xcodeproj/xcshareddata/xcschemes/RxNimbleRxTest.xcscheme b/RxNimble.xcodeproj/xcshareddata/xcschemes/RxNimbleRxTest.xcscheme
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1000"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3A2CFEEA218DF97500E4F547"
+               BuildableName = "RxNimbleRxTest.framework"
+               BlueprintName = "RxNimbleRxTest"
+               ReferencedContainer = "container:RxNimble.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3A7FDBBB218E37A80065F6C6"
+               BuildableName = "RxNimbleRxTestTests.xctest"
+               BlueprintName = "RxNimbleRxTestTests"
+               ReferencedContainer = "container:RxNimble.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3A2CFEEA218DF97500E4F547"
+            BuildableName = "RxNimbleRxTest.framework"
+            BlueprintName = "RxNimbleRxTest"
+            ReferencedContainer = "container:RxNimble.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3A2CFEEA218DF97500E4F547"
+            BuildableName = "RxNimbleRxTest.framework"
+            BlueprintName = "RxNimbleRxTest"
+            ReferencedContainer = "container:RxNimble.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3A2CFEEA218DF97500E4F547"
+            BuildableName = "RxNimbleRxTest.framework"
+            BlueprintName = "RxNimbleRxTest"
+            ReferencedContainer = "container:RxNimble.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git 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
@@ -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
diff --git a/Source/RxNimbleRxBlocking.h b/Source/RxNimbleRxBlocking.h
@@ -0,0 +1,7 @@
+#import <Foundation/Foundation.h>
+
+//! 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
@@ -0,0 +1,7 @@
+#import <Foundation/Foundation.h>
+
+//! Project version number for RxNimbleRxTest.
+FOUNDATION_EXPORT double RxNimbleRxTestVersionNumber;
+
+//! Project version string for RxNimbleRxTest.
+FOUNDATION_EXPORT const unsigned char RxNimbleRxTestVersionString[];