Skip to content

Commit

Permalink
Merge branch 'feature/add-carthage-support'
Browse files Browse the repository at this point in the history
  • Loading branch information
twittemb committed Apr 13, 2020
2 parents 87cc6cb + 196935c commit 21ac1f5
Show file tree
Hide file tree
Showing 142 changed files with 4,287 additions and 268 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
###############
/.build
/Packages
/*.xcodeproj
#/*.xcodeproj
xcuserdata/

###############
Expand Down
110 changes: 27 additions & 83 deletions .swiftpm/xcode/xcshareddata/xcschemes/Spin.Swift-Package.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.Swift"
BuildableName = "Spin.Swift"
BlueprintName = "Spin.Swift"
BlueprintIdentifier = "SpinCommon"
BuildableName = "SpinCommon"
BlueprintName = "SpinCommon"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -28,9 +28,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.Combine"
BuildableName = "Spin.Combine"
BlueprintName = "Spin.Combine"
BlueprintIdentifier = "SpinCombine"
BuildableName = "SpinCombine"
BlueprintName = "SpinCombine"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -42,9 +42,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.ReactiveSwift"
BuildableName = "Spin.ReactiveSwift"
BlueprintName = "Spin.ReactiveSwift"
BlueprintIdentifier = "SpinReactiveSwift"
BuildableName = "SpinReactiveSwift"
BlueprintName = "SpinReactiveSwift"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -56,65 +56,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.RxSwift"
BuildableName = "Spin.RxSwift"
BlueprintName = "Spin.RxSwift"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.CombineTests"
BuildableName = "Spin.CombineTests"
BlueprintName = "Spin.CombineTests"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.SwiftTests"
BuildableName = "Spin.SwiftTests"
BlueprintName = "Spin.SwiftTests"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.ReactiveSwiftTests"
BuildableName = "Spin.ReactiveSwiftTests"
BlueprintName = "Spin.ReactiveSwiftTests"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.RxSwiftTests"
BuildableName = "Spin.RxSwiftTests"
BlueprintName = "Spin.RxSwiftTests"
BlueprintIdentifier = "SpinRxSwift"
BuildableName = "SpinRxSwift"
BlueprintName = "SpinRxSwift"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
Expand Down Expand Up @@ -189,39 +133,39 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.CombineTests"
BuildableName = "Spin.CombineTests"
BlueprintName = "Spin.CombineTests"
BlueprintIdentifier = "SpinReactiveSwiftTests"
BuildableName = "SpinReactiveSwiftTests"
BlueprintName = "SpinReactiveSwiftTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.SwiftTests"
BuildableName = "Spin.SwiftTests"
BlueprintName = "Spin.SwiftTests"
BlueprintIdentifier = "SpinCommonTests"
BuildableName = "SpinCommonTests"
BlueprintName = "SpinCommonTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.ReactiveSwiftTests"
BuildableName = "Spin.ReactiveSwiftTests"
BlueprintName = "Spin.ReactiveSwiftTests"
BlueprintIdentifier = "SpinCombineTests"
BuildableName = "SpinCombineTests"
BlueprintName = "SpinCombineTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.RxSwiftTests"
BuildableName = "Spin.RxSwiftTests"
BlueprintName = "Spin.RxSwiftTests"
BlueprintIdentifier = "SpinRxSwiftTests"
BuildableName = "SpinRxSwiftTests"
BlueprintName = "SpinRxSwiftTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
Expand All @@ -247,9 +191,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.Swift"
BuildableName = "Spin.Swift"
BlueprintName = "Spin.Swift"
BlueprintIdentifier = "SpinCommon"
BuildableName = "SpinCommon"
BlueprintName = "SpinCommon"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1120"
LastUpgradeVersion = "1140"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,23 +14,23 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.Combine"
BuildableName = "Spin.Combine"
BlueprintName = "Spin.Combine"
BlueprintIdentifier = "SpinCombine"
BuildableName = "SpinCombine"
BlueprintName = "SpinCombine"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.CombineTests"
BuildableName = "Spin.CombineTests"
BlueprintName = "Spin.CombineTests"
BlueprintIdentifier = "SpinCombineTests"
BuildableName = "SpinCombineTests"
BlueprintName = "SpinCombineTests"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -46,9 +46,9 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.CombineTests"
BuildableName = "Spin.CombineTests"
BlueprintName = "Spin.CombineTests"
BlueprintIdentifier = "SpinCombineTests"
BuildableName = "SpinCombineTests"
BlueprintName = "SpinCombineTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
Expand All @@ -74,9 +74,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.Combine"
BuildableName = "Spin.Combine"
BlueprintName = "Spin.Combine"
BlueprintIdentifier = "SpinCombine"
BuildableName = "SpinCombine"
BlueprintName = "SpinCombine"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1120"
LastUpgradeVersion = "1140"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,23 +14,23 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.RxSwift"
BuildableName = "Spin.RxSwift"
BlueprintName = "Spin.RxSwift"
BlueprintIdentifier = "SpinCommon"
BuildableName = "SpinCommon"
BlueprintName = "SpinCommon"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.RxSwiftTests"
BuildableName = "Spin.RxSwiftTests"
BlueprintName = "Spin.RxSwiftTests"
BlueprintIdentifier = "SpinCommonTests"
BuildableName = "SpinCommonTests"
BlueprintName = "SpinCommonTests"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -40,16 +40,15 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.RxSwiftTests"
BuildableName = "Spin.RxSwiftTests"
BlueprintName = "Spin.RxSwiftTests"
BlueprintIdentifier = "SpinCommonTests"
BuildableName = "SpinCommonTests"
BlueprintName = "SpinCommonTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
Expand All @@ -75,9 +74,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.RxSwift"
BuildableName = "Spin.RxSwift"
BlueprintName = "Spin.RxSwift"
BlueprintIdentifier = "SpinCommon"
BuildableName = "SpinCommon"
BlueprintName = "SpinCommon"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1120"
LastUpgradeVersion = "1140"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,23 +14,23 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.ReactiveSwift"
BuildableName = "Spin.ReactiveSwift"
BlueprintName = "Spin.ReactiveSwift"
BlueprintIdentifier = "SpinReactiveSwift"
BuildableName = "SpinReactiveSwift"
BlueprintName = "SpinReactiveSwift"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.ReactiveSwiftTests"
BuildableName = "Spin.ReactiveSwiftTests"
BlueprintName = "Spin.ReactiveSwiftTests"
BlueprintIdentifier = "SpinReactiveSwiftTests"
BuildableName = "SpinReactiveSwiftTests"
BlueprintName = "SpinReactiveSwiftTests"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -40,16 +40,15 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.ReactiveSwiftTests"
BuildableName = "Spin.ReactiveSwiftTests"
BlueprintName = "Spin.ReactiveSwiftTests"
BlueprintIdentifier = "SpinReactiveSwiftTests"
BuildableName = "SpinReactiveSwiftTests"
BlueprintName = "SpinReactiveSwiftTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
Expand All @@ -75,9 +74,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Spin.ReactiveSwift"
BuildableName = "Spin.ReactiveSwift"
BlueprintName = "Spin.ReactiveSwift"
BlueprintIdentifier = "SpinReactiveSwift"
BuildableName = "SpinReactiveSwift"
BlueprintName = "SpinReactiveSwift"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
Expand Down
Loading

0 comments on commit 21ac1f5

Please sign in to comment.