Skip to content

Commit 2d8d87c

Browse files
kzaherkzaher
committed
Merge per-platform frameworks into the single multi-platform framework.
1 parent 0547580 commit 2d8d87c

24 files changed

+307
-4311
lines changed

‎Rx.xcodeproj/project.pbxproj‎

Lines changed: 189 additions & 3381 deletions
Large diffs are not rendered by default.

‎Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-macOS.xcscheme‎ renamed to ‎Rx.xcodeproj/xcshareddata/xcschemes/AllTests-iOS.xcscheme‎

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8-
<BuildActionEntries>
9-
<BuildActionEntry
10-
buildForTesting = "YES"
11-
buildForRunning = "YES"
12-
buildForProfiling = "YES"
13-
buildForArchiving = "YES"
14-
buildForAnalyzing = "YES">
15-
<BuildableReference
16-
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "C809396F1B8A71840088E94D"
18-
BuildableName = "RxCocoa.framework"
19-
BlueprintName = "RxCocoa-macOS"
20-
ReferencedContainer = "container:Rx.xcodeproj">
21-
</BuildableReference>
22-
</BuildActionEntry>
23-
</BuildActionEntries>
248
</BuildAction>
259
<TestAction
2610
buildConfiguration = "Debug"
2711
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2812
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2913
shouldUseLaunchSchemeArgsEnv = "YES">
3014
<Testables>
15+
<TestableReference
16+
skipped = "NO"
17+
parallelizable = "YES"
18+
testExecutionOrdering = "random">
19+
<BuildableReference
20+
BuildableIdentifier = "primary"
21+
BlueprintIdentifier = "C83508C21C386F6F0027C24C"
22+
BuildableName = "AllTests-iOS.xctest"
23+
BlueprintName = "AllTests-iOS"
24+
ReferencedContainer = "container:Rx.xcodeproj">
25+
</BuildableReference>
26+
</TestableReference>
3127
</Testables>
3228
<AdditionalOptions>
3329
</AdditionalOptions>
@@ -42,15 +38,6 @@
4238
debugDocumentVersioning = "YES"
4339
debugServiceExtension = "internal"
4440
allowLocationSimulation = "YES">
45-
<MacroExpansion>
46-
<BuildableReference
47-
BuildableIdentifier = "primary"
48-
BlueprintIdentifier = "C809396F1B8A71840088E94D"
49-
BuildableName = "RxCocoa.framework"
50-
BlueprintName = "RxCocoa-macOS"
51-
ReferencedContainer = "container:Rx.xcodeproj">
52-
</BuildableReference>
53-
</MacroExpansion>
5441
<AdditionalOptions>
5542
</AdditionalOptions>
5643
</LaunchAction>
@@ -60,15 +47,6 @@
6047
savedToolIdentifier = ""
6148
useCustomWorkingDirectory = "NO"
6249
debugDocumentVersioning = "YES">
63-
<MacroExpansion>
64-
<BuildableReference
65-
BuildableIdentifier = "primary"
66-
BlueprintIdentifier = "C809396F1B8A71840088E94D"
67-
BuildableName = "RxCocoa.framework"
68-
BlueprintName = "RxCocoa-macOS"
69-
ReferencedContainer = "container:Rx.xcodeproj">
70-
</BuildableReference>
71-
</MacroExpansion>
7250
</ProfileAction>
7351
<AnalyzeAction
7452
buildConfiguration = "Debug">

‎Rx.xcodeproj/xcshareddata/xcschemes/RxCocoa-watchOS.xcscheme‎ renamed to ‎Rx.xcodeproj/xcshareddata/xcschemes/AllTests-macOS.xcscheme‎

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8-
<BuildActionEntries>
9-
<BuildActionEntry
10-
buildForTesting = "YES"
11-
buildForRunning = "YES"
12-
buildForProfiling = "YES"
13-
buildForArchiving = "YES"
14-
buildForAnalyzing = "YES">
15-
<BuildableReference
16-
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "C8F0C0041BBBFBB9001B112F"
18-
BuildableName = "RxCocoa.framework"
19-
BlueprintName = "RxCocoa-watchOS"
20-
ReferencedContainer = "container:Rx.xcodeproj">
21-
</BuildableReference>
22-
</BuildActionEntry>
23-
</BuildActionEntries>
248
</BuildAction>
259
<TestAction
2610
buildConfiguration = "Debug"
2711
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2812
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2913
shouldUseLaunchSchemeArgsEnv = "YES">
3014
<Testables>
15+
<TestableReference
16+
skipped = "NO"
17+
parallelizable = "YES"
18+
testExecutionOrdering = "random">
19+
<BuildableReference
20+
BuildableIdentifier = "primary"
21+
BlueprintIdentifier = "C83509931C38742C0027C24C"
22+
BuildableName = "AllTests-macOS.xctest"
23+
BlueprintName = "AllTests-macOS"
24+
ReferencedContainer = "container:Rx.xcodeproj">
25+
</BuildableReference>
26+
</TestableReference>
3127
</Testables>
3228
<AdditionalOptions>
3329
</AdditionalOptions>
@@ -42,15 +38,6 @@
4238
debugDocumentVersioning = "YES"
4339
debugServiceExtension = "internal"
4440
allowLocationSimulation = "YES">
45-
<MacroExpansion>
46-
<BuildableReference
47-
BuildableIdentifier = "primary"
48-
BlueprintIdentifier = "C8F0C0041BBBFBB9001B112F"
49-
BuildableName = "RxCocoa.framework"
50-
BlueprintName = "RxCocoa-watchOS"
51-
ReferencedContainer = "container:Rx.xcodeproj">
52-
</BuildableReference>
53-
</MacroExpansion>
5441
<AdditionalOptions>
5542
</AdditionalOptions>
5643
</LaunchAction>
@@ -60,15 +47,6 @@
6047
savedToolIdentifier = ""
6148
useCustomWorkingDirectory = "NO"
6249
debugDocumentVersioning = "YES">
63-
<MacroExpansion>
64-
<BuildableReference
65-
BuildableIdentifier = "primary"
66-
BlueprintIdentifier = "C8F0C0041BBBFBB9001B112F"
67-
BuildableName = "RxCocoa.framework"
68-
BlueprintName = "RxCocoa-watchOS"
69-
ReferencedContainer = "container:Rx.xcodeproj">
70-
</BuildableReference>
71-
</MacroExpansion>
7250
</ProfileAction>
7351
<AnalyzeAction
7452
buildConfiguration = "Debug">

‎Rx.xcodeproj/xcshareddata/xcschemes/AllTests-tvOS.xcscheme‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1010"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
buildConfiguration = "Debug"
11+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
12+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
shouldUseLaunchSchemeArgsEnv = "YES">
14+
<Testables>
15+
<TestableReference
16+
skipped = "NO"
17+
parallelizable = "YES"
18+
testExecutionOrdering = "random">
19+
<BuildableReference
20+
BuildableIdentifier = "primary"
21+
BlueprintIdentifier = "C83509831C38740E0027C24C"
22+
BuildableName = "AllTests-tvOS.xctest"
23+
BlueprintName = "AllTests-tvOS"
24+
ReferencedContainer = "container:Rx.xcodeproj">
25+
</BuildableReference>
26+
</TestableReference>
27+
</Testables>
28+
<AdditionalOptions>
29+
</AdditionalOptions>
30+
</TestAction>
31+
<LaunchAction
32+
buildConfiguration = "Debug"
33+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
34+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
35+
launchStyle = "0"
36+
useCustomWorkingDirectory = "NO"
37+
ignoresPersistentStateOnLaunch = "NO"
38+
debugDocumentVersioning = "YES"
39+
debugServiceExtension = "internal"
40+
allowLocationSimulation = "YES">
41+
<AdditionalOptions>
42+
</AdditionalOptions>
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
</ProfileAction>
51+
<AnalyzeAction
52+
buildConfiguration = "Debug">
53+
</AnalyzeAction>
54+
<ArchiveAction
55+
buildConfiguration = "Release"
56+
revealArchiveInOrganizer = "YES">
57+
</ArchiveAction>
58+
</Scheme>

‎Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-macOS.xcscheme‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

‎Rx.xcodeproj/xcshareddata/xcschemes/RxBlocking-tvOS.xcscheme‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)