Merge pull request #32 from SwiftRex/split-dependencies

Split dependencies

.gitignore

@@ -21,7 +21,6 @@
 **/derivedData
 **/Certificates
 **/xcuserdata
-**/Carthage
 
 .vscode
 

.slather.yml

@@ -1,6 +1,8 @@
 coverage_service: coveralls
+workspace: SwiftRex.xcworkspace
 xcodeproj: SwiftRex.xcodeproj
-scheme: SwiftRex macOS
+scheme: BuildAndTestAll
+arch: x86_64
+configuration: Debug
 ignore:
-  - "**/CodeGeneration/*.abstract.swift"
   - UnitTests/*

.swiftlint.yml

@@ -35,6 +35,7 @@ cyclomatic_complexity:
 disabled_rules:
   - force_try
   - force_cast
+  - large_tuple
 excluded:
   - Sources/Common/CodeGeneration
   - Sources/SwiftRex RxSwift

.travis.yml

@@ -1,7 +1,7 @@
 osx_image: xcode10.2
 language: objective-c
 xcode_project: SwiftRex.xcodeproj
-xcode_scheme: SwiftRex macOS RxSwift
+xcode_scheme: BuildAndTestAll
 cache:
   directories:
     - bundler

Configuration/SwiftRex-Common-iOS.xcconfig

@@ -4,3 +4,5 @@ INFOPLIST_FILE = Sources/Metadata/Info-iOS.plist
 SDKROOT = iphoneos
 TARGETED_DEVICE_FAMILY = 1,2
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
+
+#include? "Developer.xcconfig"

Configuration/SwiftRex-Debug-iOS.xcconfig

@@ -0,0 +1,2 @@
+#include "SwiftRex-Common-iOS.xcconfig"
+#include? "Developer.xcconfig"

Configuration/SwiftRex-Debug-macOS.xcconfig

@@ -0,0 +1,2 @@
+#include "SwiftRex-Common-macOS.xcconfig"
+#include? "Developer.xcconfig"

Configuration/SwiftRex-Debug-tvOS.xcconfig

@@ -0,0 +1,2 @@
+#include "SwiftRex-Common-tvOS.xcconfig"
+#include? "Developer.xcconfig"

Configuration/SwiftRex-Debug-watchOS.xcconfig

@@ -0,0 +1,2 @@
+#include "SwiftRex-Common-watchOS.xcconfig"
+#include? "Developer.xcconfig"

Configuration/SwiftRex-ReactiveSwift-Debug-iOS.xcconfig

@@ -1,3 +1,3 @@
-#include "SwiftRex-Common-iOS.xcconfig"
-#include? "Developer.xcconfig"
+#include "SwiftRex-Debug-iOS.xcconfig"
+#include "SwiftRex-ReactiveSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex iOS ReactiveSwift/Pods-SwiftRex iOS ReactiveSwift.debug.xcconfig"

Configuration/SwiftRex-ReactiveSwift-Debug-macOS.xcconfig

@@ -1,3 +1,3 @@
-#include "SwiftRex-Common-macOS.xcconfig"
-#include? "Developer.xcconfig"
+#include "SwiftRex-Debug-macOS.xcconfig"
+#include "SwiftRex-ReactiveSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex macOS ReactiveSwift/Pods-SwiftRex macOS ReactiveSwift.debug.xcconfig"

Configuration/SwiftRex-ReactiveSwift-Debug-tvOS.xcconfig

@@ -1,3 +1,3 @@
-#include "SwiftRex-Common-tvOS.xcconfig"
-#include? "Developer.xcconfig"
+#include "SwiftRex-Debug-tvOS.xcconfig"
+#include "SwiftRex-ReactiveSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex tvOS ReactiveSwift/Pods-SwiftRex tvOS ReactiveSwift.debug.xcconfig"

Configuration/SwiftRex-ReactiveSwift-Debug-watchOS.xcconfig

@@ -1,3 +1,3 @@
-#include "SwiftRex-Common-watchOS.xcconfig"
-#include? "Developer.xcconfig"
+#include "SwiftRex-Debug-watchOS.xcconfig"
+#include "SwiftRex-ReactiveSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex watchOS ReactiveSwift/Pods-SwiftRex watchOS ReactiveSwift.debug.xcconfig"

Configuration/SwiftRex-ReactiveSwift-Release-iOS.xcconfig

@@ -1,2 +1,3 @@
-#include "SwiftRex-Common-iOS.xcconfig"
+#include "SwiftRex-Release-iOS.xcconfig"
+#include "SwiftRex-ReactiveSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex iOS ReactiveSwift/Pods-SwiftRex iOS ReactiveSwift.release.xcconfig"

Configuration/SwiftRex-ReactiveSwift-Release-macOS.xcconfig

@@ -1,2 +1,3 @@
-#include "SwiftRex-Common-macOS.xcconfig"
+#include "SwiftRex-Release-macOS.xcconfig"
+#include "SwiftRex-ReactiveSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex macOS ReactiveSwift/Pods-SwiftRex macOS ReactiveSwift.release.xcconfig"

Configuration/SwiftRex-ReactiveSwift-Release-tvOS.xcconfig

@@ -1,2 +1,3 @@
-#include "SwiftRex-Common-tvOS.xcconfig"
+#include "SwiftRex-Release-tvOS.xcconfig"
+#include "SwiftRex-ReactiveSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex tvOS ReactiveSwift/Pods-SwiftRex tvOS ReactiveSwift.release.xcconfig"

Configuration/SwiftRex-ReactiveSwift-Release-watchOS.xcconfig

@@ -1,2 +1,5 @@
-#include "SwiftRex-Common-watchOS.xcconfig"
+#include "SwiftRex-Release-watchOS.xcconfig"
+#include "SwiftRex-ReactiveSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex watchOS ReactiveSwift/Pods-SwiftRex watchOS ReactiveSwift.release.xcconfig"
+
+PRODUCT_NAME = SwiftRexForRac

Configuration/SwiftRex-ReactiveSwift.xcconfig

@@ -0,0 +1,2 @@
+PRODUCT_NAME = SwiftRexForRac
+PRODUCT_BUNDLE_IDENTIFIER = de.developercity.SwiftRex.ReactiveSwift

Configuration/SwiftRex-Release-iOS.xcconfig

@@ -0,0 +1 @@
+#include "SwiftRex-Common-iOS.xcconfig"

Configuration/SwiftRex-Release-macOS.xcconfig

@@ -0,0 +1 @@
+#include "SwiftRex-Common-macOS.xcconfig"

Configuration/SwiftRex-Release-tvOS.xcconfig

@@ -0,0 +1 @@
+#include "SwiftRex-Common-tvOS.xcconfig"

Configuration/SwiftRex-Release-watchOS.xcconfig

@@ -0,0 +1 @@
+#include "SwiftRex-Common-watchOS.xcconfig"

Configuration/SwiftRex-RxSwift-Debug-iOS.xcconfig

@@ -1,3 +1,3 @@
-#include "SwiftRex-Common-iOS.xcconfig"
-#include? "Developer.xcconfig"
+#include "SwiftRex-Debug-iOS.xcconfig"
+#include "SwiftRex-RxSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex iOS RxSwift/Pods-SwiftRex iOS RxSwift.debug.xcconfig"

Configuration/SwiftRex-RxSwift-Debug-macOS.xcconfig

@@ -1,3 +1,3 @@
-#include "SwiftRex-Common-macOS.xcconfig"
-#include? "Developer.xcconfig"
+#include "SwiftRex-Debug-macOS.xcconfig"
+#include "SwiftRex-RxSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex macOS RxSwift/Pods-SwiftRex macOS RxSwift.debug.xcconfig"

Configuration/SwiftRex-RxSwift-Debug-tvOS.xcconfig

@@ -1,3 +1,3 @@
-#include "SwiftRex-Common-tvOS.xcconfig"
-#include? "Developer.xcconfig"
+#include "SwiftRex-Debug-tvOS.xcconfig"
+#include "SwiftRex-RxSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex tvOS RxSwift/Pods-SwiftRex tvOS RxSwift.debug.xcconfig"

Configuration/SwiftRex-RxSwift-Debug-watchOS.xcconfig

@@ -1,3 +1,3 @@
-#include "SwiftRex-Common-watchOS.xcconfig"
-#include? "Developer.xcconfig"
+#include "SwiftRex-Debug-watchOS.xcconfig"
+#include "SwiftRex-RxSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex watchOS RxSwift/Pods-SwiftRex watchOS RxSwift.debug.xcconfig"

Configuration/SwiftRex-RxSwift-Release-iOS.xcconfig

@@ -1,2 +1,3 @@
-#include "SwiftRex-Common-iOS.xcconfig"
+#include "SwiftRex-Release-iOS.xcconfig"
+#include "SwiftRex-RxSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex iOS RxSwift/Pods-SwiftRex iOS RxSwift.release.xcconfig"

Configuration/SwiftRex-RxSwift-Release-macOS.xcconfig

@@ -1,2 +1,3 @@
-#include "SwiftRex-Common-macOS.xcconfig"
+#include "SwiftRex-Release-macOS.xcconfig"
+#include "SwiftRex-RxSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex macOS RxSwift/Pods-SwiftRex macOS RxSwift.release.xcconfig"

Configuration/SwiftRex-RxSwift-Release-tvOS.xcconfig

@@ -1,2 +1,3 @@
-#include "SwiftRex-Common-tvOS.xcconfig"
+#include "SwiftRex-Release-tvOS.xcconfig"
+#include "SwiftRex-RxSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex tvOS RxSwift/Pods-SwiftRex tvOS RxSwift.release.xcconfig"

Configuration/SwiftRex-RxSwift-Release-watchOS.xcconfig

@@ -1,2 +1,3 @@
-#include "SwiftRex-Common-watchOS.xcconfig"
+#include "SwiftRex-Release-watchOS.xcconfig"
+#include "SwiftRex-RxSwift.xcconfig"
 #include "Pods/Target Support Files/Pods-SwiftRex watchOS RxSwift/Pods-SwiftRex watchOS RxSwift.release.xcconfig"

Configuration/SwiftRex-RxSwift.xcconfig

@@ -0,0 +1,2 @@
+PRODUCT_NAME = SwiftRexForRx
+PRODUCT_BUNDLE_IDENTIFIER = de.developercity.SwiftRex.RxSwift

Configuration/UnitTests-SwiftRex-Debug.xcconfig

@@ -0,0 +1,2 @@
+#include "UnitTests.xcconfig"
+#include "Pods/Target Support Files/Pods-UnitTests SwiftRex/Pods-UnitTests SwiftRex.debug.xcconfig"

Configuration/UnitTests-SwiftRex-Release.xcconfig

@@ -0,0 +1,2 @@
+#include "UnitTests.xcconfig"
+#include "Pods/Target Support Files/Pods-UnitTests SwiftRex/Pods-UnitTests SwiftRex.release.xcconfig"

Configuration/UnitTests.xcconfig

@@ -15,7 +15,7 @@ APPLICATION_EXTENSION_API_ONLY = NO
 COPY_PHASE_STRIP = NO
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/../Frameworks' '@loader_path/../Frameworks'
 COMBINE_HIDPI_IMAGES = YES
-INFOPLIST_FILE = UnitTests/Info.plist
+INFOPLIST_FILE = UnitTests/Metadata/Info.plist
 MTL_ENABLE_DEBUG_INFO = YES
 PRODUCT_BUNDLE_IDENTIFIER = de.developercity.SwiftRex.UnitTests
 PRODUCT_NAME = $(TARGET_NAME)

Gemfile.lock

@@ -10,11 +10,11 @@ GEM
     atomos (0.1.3)
     claide (1.0.2)
     clamp (1.3.0)
-    cocoapods (1.6.1)
+    cocoapods (1.7.2)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.6.1)
-      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.7.2)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
@@ -23,13 +23,13 @@ GEM
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (>= 2.2.0, < 3.0)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.8.1, < 2.0)
-    cocoapods-core (1.6.1)
+      xcodeproj (>= 1.10.0, < 2.0)
+    cocoapods-core (1.7.2)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -51,10 +51,10 @@ GEM
       term-ansicolor (~> 1.3)
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    docile (1.3.1)
+    docile (1.3.2)
     escape (0.0.4)
-    ffi (1.10.0)
-    fourflusher (2.2.0)
+    ffi (1.11.1)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     i18n (0.9.5)
@@ -107,12 +107,12 @@ GEM
       tins (~> 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tins (1.20.2)
+    tins (1.20.3)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.9.0)
+    xcodeproj (1.10.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

Makefile

@@ -20,6 +20,30 @@ xcodeproj:
 
 # Unit Test
 
+test-all:
+	set -o pipefail && \
+		xcodebuild clean test \
+		-workspace SwiftRex.xcworkspace \
+		-scheme BuildAndTestAll \
+		-destination platform="macOS" \
+		CODE_SIGN_IDENTITY="" \
+		CODE_SIGNING_REQUIRED=NO \
+		ONLY_ACTIVE_ARCH=YES \
+		VALID_ARCHS=x86_64 \
+		| bundle exec xcpretty
+
+test-common:
+	set -o pipefail && \
+		xcodebuild clean test \
+		-workspace SwiftRex.xcworkspace \
+		-scheme SwiftRex\ macOS \
+		-destination platform="macOS" \
+		CODE_SIGN_IDENTITY="" \
+		CODE_SIGNING_REQUIRED=NO \
+		ONLY_ACTIVE_ARCH=YES \
+		VALID_ARCHS=x86_64 \
+		| bundle exec xcpretty
+
 test-reactiveswift:
 	set -o pipefail && \
 		xcodebuild clean test \
@@ -44,8 +68,6 @@ test-rxswift:
 		VALID_ARCHS=x86_64 \
 		| bundle exec xcpretty
 
-test-all: test-reactiveswift test-rxswift
-
 # Lint
 
 lint-check:
@@ -93,6 +115,9 @@ help:
 	@echo make xcodeproj
 	@echo -- creates xcodeproj for those using Swift Package Manager
 	@echo
+	@echo make test-common
+	@echo -- runs the unit tests for the macOS target common for any framework
+	@echo
 	@echo make test-reactiveswift
 	@echo -- runs the unit tests for the macOS target using ReactiveSwift dependency
 	@echo

Package.resolved

@@ -1,6 +1,33 @@
 {
   "object": {
     "pins": [
+      {
+        "package": "Nimble",
+        "repositoryURL": "https://github.com/Quick/Nimble.git",
+        "state": {
+          "branch": null,
+          "revision": "f8657642dfdec9973efc79cc68bcef43a653a2bc",
+          "version": "8.0.2"
+        }
+      },
+      {
+        "package": "Quick",
+        "repositoryURL": "https://github.com/Quick/Quick.git",
+        "state": {
+          "branch": null,
+          "revision": "94df9b449508344667e5afc7e80f8bcbff1e4c37",
+          "version": "2.1.0"
+        }
+      },
+      {
+        "package": "ReactiveSwift",
+        "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
+        "state": {
+          "branch": null,
+          "revision": "3eba2b48ee80f87058de5ae8bb41e585bde5c997",
+          "version": "6.0.0"
+        }
+      },
       {
         "package": "RxSwift",
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",

Package.swift

@@ -4,13 +4,18 @@ import PackageDescription
 let package = Package(
     name: "SwiftRex",
     products: [
-        .library(name: "SwiftRex", targets: ["SwiftRex"])
+        .library(name: "SwiftRex", targets: ["SwiftRex"]),
+        .library(name: "SwiftRexForRac", targets: ["SwiftRexForRac"]),
+        .library(name: "SwiftRexForRx", targets: ["SwiftRexForRx"])
     ],
     dependencies: [
+        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .exact("6.0.0")),
         .package(url: "https://github.com/ReactiveX/RxSwift.git", .exact("5.0.0"))
     ],
     targets: [
-        .target(name: "SwiftRex", dependencies: ["RxSwift"], path: "Sources")
+        .target(name: "SwiftRex", dependencies: [], path: "Sources/Common"),
+        .target(name: "SwiftRexForRac", dependencies: ["SwiftRex", "ReactiveSwift"], path: "Sources/ReactiveSwift"),
+        .target(name: "SwiftRexForRx", dependencies: ["SwiftRex", "RxSwift"], path: "Sources/RxSwift")
     ],
     swiftLanguageVersions: [.v5]
 )

Podfile

@@ -17,6 +17,10 @@ def reactiveswift
   pod 'ReactiveSwift', '6.0.0', :inhibit_warnings => true
 end
 
+def tests
+  pod 'Nimble', '8.0.2'
+end
+
 ###################
 # RxSwift Targets #
 ###################
@@ -44,6 +48,7 @@ end
 target 'UnitTests RxSwift' do
   platform :macos, macos_version
   rxswift
+  tests
   pod 'RxBlocking', '5.0.0'
   pod 'RxTest', '5.0.0'
 end
@@ -75,6 +80,16 @@ end
 target 'UnitTests ReactiveSwift' do
   platform :macos, macos_version
   reactiveswift
+  tests
+end
+
+##################
+# Common Targets #
+##################
+
+target 'UnitTests SwiftRex' do
+  platform :macos, macos_version
+  tests
 end
 
 post_install do |installer|