Skip to content

Commit bd82369

Browse files
author
Christoffer Winterkvist
committed
Merge branch 'master' of https://github.com/hyperoslo/Compass 
2 parents e13fb92 + f936962 commit bd82369

11 files changed

Lines changed: 580 additions & 402 deletions

File tree

‎Compass.xcodeproj/project.pbxproj‎

Lines changed: 403 additions & 0 deletions
Large diffs are not rendered by default.

Pod/Pod.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to Compass.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pod/Pod.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme renamed to Compass.xcodeproj/xcshareddata/xcschemes/Compass-iOS.xcscheme

Lines changed: 43 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0620"
3+
LastUpgradeVersion = "0720"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -9,80 +9,97 @@
99
<BuildActionEntry
1010
buildForTesting = "YES"
1111
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "D5DC59581C200D55003BD79B"
18+
BuildableName = "Compass.framework"
19+
BlueprintName = "Compass-iOS"
20+
ReferencedContainer = "container:Compass.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "NO"
1226
buildForProfiling = "NO"
1327
buildForArchiving = "NO"
14-
buildForAnalyzing = "YES">
28+
buildForAnalyzing = "NO">
1529
<BuildableReference
1630
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "146D72AB1AB782920058798C"
18-
BuildableName = "Tests.xctest"
19-
BlueprintName = "Tests"
20-
ReferencedContainer = "container:Pod.xcodeproj">
31+
BlueprintIdentifier = "D5DC59621C200D55003BD79B"
32+
BuildableName = "Compass-iOS-Tests.xctest"
33+
BlueprintName = "Compass-iOS-Tests"
34+
ReferencedContainer = "container:Compass.xcodeproj">
2135
</BuildableReference>
2236
</BuildActionEntry>
2337
</BuildActionEntries>
2438
</BuildAction>
2539
<TestAction
40+
buildConfiguration = "Debug"
2641
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2742
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
3044
<Testables>
3145
<TestableReference
3246
skipped = "NO">
3347
<BuildableReference
3448
BuildableIdentifier = "primary"
35-
BlueprintIdentifier = "146D72AB1AB782920058798C"
36-
BuildableName = "Tests.xctest"
37-
BlueprintName = "Tests"
38-
ReferencedContainer = "container:Pod.xcodeproj">
49+
BlueprintIdentifier = "D5DC59621C200D55003BD79B"
50+
BuildableName = "Compass-iOS-Tests.xctest"
51+
BlueprintName = "Compass-iOS-Tests"
52+
ReferencedContainer = "container:Compass.xcodeproj">
3953
</BuildableReference>
4054
</TestableReference>
4155
</Testables>
4256
<MacroExpansion>
4357
<BuildableReference
4458
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "146D72AB1AB782920058798C"
46-
BuildableName = "Tests.xctest"
47-
BlueprintName = "Tests"
48-
ReferencedContainer = "container:Pod.xcodeproj">
59+
BlueprintIdentifier = "D5DC59581C200D55003BD79B"
60+
BuildableName = "Compass.framework"
61+
BlueprintName = "Compass-iOS"
62+
ReferencedContainer = "container:Compass.xcodeproj">
4963
</BuildableReference>
5064
</MacroExpansion>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
5167
</TestAction>
5268
<LaunchAction
69+
buildConfiguration = "Debug"
5370
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5471
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
5572
launchStyle = "0"
5673
useCustomWorkingDirectory = "NO"
57-
buildConfiguration = "Debug"
5874
ignoresPersistentStateOnLaunch = "NO"
5975
debugDocumentVersioning = "YES"
76+
debugServiceExtension = "internal"
6077
allowLocationSimulation = "YES">
6178
<MacroExpansion>
6279
<BuildableReference
6380
BuildableIdentifier = "primary"
64-
BlueprintIdentifier = "146D72AB1AB782920058798C"
65-
BuildableName = "Tests.xctest"
66-
BlueprintName = "Tests"
67-
ReferencedContainer = "container:Pod.xcodeproj">
81+
BlueprintIdentifier = "D5DC59581C200D55003BD79B"
82+
BuildableName = "Compass.framework"
83+
BlueprintName = "Compass-iOS"
84+
ReferencedContainer = "container:Compass.xcodeproj">
6885
</BuildableReference>
6986
</MacroExpansion>
7087
<AdditionalOptions>
7188
</AdditionalOptions>
7289
</LaunchAction>
7390
<ProfileAction
91+
buildConfiguration = "Release"
7492
shouldUseLaunchSchemeArgsEnv = "YES"
7593
savedToolIdentifier = ""
7694
useCustomWorkingDirectory = "NO"
77-
buildConfiguration = "Release"
7895
debugDocumentVersioning = "YES">
7996
<MacroExpansion>
8097
<BuildableReference
8198
BuildableIdentifier = "primary"
82-
BlueprintIdentifier = "146D72AB1AB782920058798C"
83-
BuildableName = "Tests.xctest"
84-
BlueprintName = "Tests"
85-
ReferencedContainer = "container:Pod.xcodeproj">
99+
BlueprintIdentifier = "D5DC59581C200D55003BD79B"
100+
BuildableName = "Compass.framework"
101+
BlueprintName = "Compass-iOS"
102+
ReferencedContainer = "container:Compass.xcodeproj">
86103
</BuildableReference>
87104
</MacroExpansion>
88105
</ProfileAction>

0 commit comments

Comments
 (0)