Permalink
Browse files

Merge per-platform frameworks into the single multi-platform framework.

  • Loading branch information...
kzaher committed Oct 30, 2018
1 parent 0547580 commit ba4d74c44abd59ad910507c44a048f9db71bc741
Showing with 307 additions and 4,323 deletions.
  1. +189 −3,393 Rx.xcodeproj/project.pbxproj
  2. +13 −35 Rx.xcodeproj/xcshareddata/xcschemes/{RxCocoa-macOS.xcscheme → AllTests-iOS.xcscheme}
  3. +13 −35 Rx.xcodeproj/xcshareddata/xcschemes/{RxCocoa-watchOS.xcscheme → AllTests-macOS.xcscheme}
  4. +58 −0 Rx.xcodeproj/xcshareddata/xcschemes/AllTests-tvOS.xcscheme
  5. +0 −80 Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-macOS.xcscheme
  6. +0 −80 Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-tvOS.xcscheme
  7. +0 −80 Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-watchOS.xcscheme
  8. +4 −4 Rx.xcodeproj/xcshareddata/xcschemes/{RxBlocking-iOS.xcscheme → RxBlocking.xcscheme}
  9. +4 −4 Rx.xcodeproj/xcshareddata/xcschemes/{RxCocoa-iOS.xcscheme → RxCocoa.xcscheme}
  10. +0 −99 Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-macOS.xcscheme
  11. +0 −99 Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-tvOS.xcscheme
  12. +0 −80 Rx.xcodeproj/xcshareddata/xcschemes/RxSwift-watchOS.xcscheme
  13. +6 −17 Rx.xcodeproj/xcshareddata/xcschemes/{RxSwift-iOS.xcscheme → RxSwift.xcscheme}
  14. +10 −10 Rx.xcodeproj/xcshareddata/xcschemes/{RxCocoa-tvOS.xcscheme → RxTest.xcscheme}
  15. +0 −99 Rx.xcodeproj/xcshareddata/xcschemes/RxTests-iOS.xcscheme
  16. +0 −99 Rx.xcodeproj/xcshareddata/xcschemes/RxTests-macOS.xcscheme
  17. +0 −99 Rx.xcodeproj/xcshareddata/xcschemes/RxTests-tvOS.xcscheme
  18. +1 −1 RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOS.xcscheme
  19. +1 −1 RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOSTests.xcscheme
  20. +1 −1 RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOSUITests.xcscheme
  21. +1 −1 RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-macOS.xcscheme
  22. +1 −1 RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-macOSUITests.xcscheme
  23. +4 −4 scripts/all-tests.sh
  24. +1 −1 scripts/validate-playgrounds.sh

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,33 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C809396F1B8A71840088E94D"
BuildableName = "RxCocoa.framework"
BlueprintName = "RxCocoa-macOS"
ReferencedContainer = "container:Rx.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO"
parallelizable = "YES"
testExecutionOrdering = "random">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C83508C21C386F6F0027C24C"
BuildableName = "AllTests-iOS.xctest"
BlueprintName = "AllTests-iOS"
ReferencedContainer = "container:Rx.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
@@ -42,15 +38,6 @@
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C809396F1B8A71840088E94D"
BuildableName = "RxCocoa.framework"
BlueprintName = "RxCocoa-macOS"
ReferencedContainer = "container:Rx.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
@@ -60,15 +47,6 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C809396F1B8A71840088E94D"
BuildableName = "RxCocoa.framework"
BlueprintName = "RxCocoa-macOS"
ReferencedContainer = "container:Rx.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
@@ -1,33 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C8F0C0041BBBFBB9001B112F"
BuildableName = "RxCocoa.framework"
BlueprintName = "RxCocoa-watchOS"
ReferencedContainer = "container:Rx.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO"
parallelizable = "YES"
testExecutionOrdering = "random">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C83509931C38742C0027C24C"
BuildableName = "AllTests-macOS.xctest"
BlueprintName = "AllTests-macOS"
ReferencedContainer = "container:Rx.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
@@ -42,15 +38,6 @@
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C8F0C0041BBBFBB9001B112F"
BuildableName = "RxCocoa.framework"
BlueprintName = "RxCocoa-watchOS"
ReferencedContainer = "container:Rx.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
@@ -60,15 +47,6 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C8F0C0041BBBFBB9001B112F"
BuildableName = "RxCocoa.framework"
BlueprintName = "RxCocoa-watchOS"
ReferencedContainer = "container:Rx.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO"
parallelizable = "YES"
testExecutionOrdering = "random">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C83509831C38740E0027C24C"
BuildableName = "AllTests-tvOS.xctest"
BlueprintName = "AllTests-tvOS"
ReferencedContainer = "container:Rx.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<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">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit ba4d74c

Please sign in to comment.