Merge branch 'master' of https://github.com/hyperoslo/Compass

hyperoslo · Dec 15, 2015 · bd82369 · bd82369
2 parents e13fb92 + f936962
commit bd82369
Show file tree

Hide file tree

Showing 11 changed files with 580 additions and 402 deletions.
diff --git a/Compass.xcodeproj/project.pbxproj b/Compass.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...roj/xcshareddata/xcschemes/Tests.xcscheme → ...shareddata/xcschemes/Compass-iOS.xcscheme b/...roj/xcshareddata/xcschemes/Tests.xcscheme → ...shareddata/xcschemes/Compass-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -9,80 +9,97 @@
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D5DC59581C200D55003BD79B"
+               BuildableName = "Compass.framework"
+               BlueprintName = "Compass-iOS"
+               ReferencedContainer = "container:Compass.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
+            buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "146D72AB1AB782920058798C"
-               BuildableName = "Tests.xctest"
-               BlueprintName = "Tests"
-               ReferencedContainer = "container:Pod.xcodeproj">
+               BlueprintIdentifier = "D5DC59621C200D55003BD79B"
+               BuildableName = "Compass-iOS-Tests.xctest"
+               BlueprintName = "Compass-iOS-Tests"
+               ReferencedContainer = "container:Compass.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "146D72AB1AB782920058798C"
-               BuildableName = "Tests.xctest"
-               BlueprintName = "Tests"
-               ReferencedContainer = "container:Pod.xcodeproj">
+               BlueprintIdentifier = "D5DC59621C200D55003BD79B"
+               BuildableName = "Compass-iOS-Tests.xctest"
+               BlueprintName = "Compass-iOS-Tests"
+               ReferencedContainer = "container:Compass.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "146D72AB1AB782920058798C"
-            BuildableName = "Tests.xctest"
-            BlueprintName = "Tests"
-            ReferencedContainer = "container:Pod.xcodeproj">
+            BlueprintIdentifier = "D5DC59581C200D55003BD79B"
+            BuildableName = "Compass.framework"
+            BlueprintName = "Compass-iOS"
+            ReferencedContainer = "container:Compass.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "146D72AB1AB782920058798C"
-            BuildableName = "Tests.xctest"
-            BlueprintName = "Tests"
-            ReferencedContainer = "container:Pod.xcodeproj">
+            BlueprintIdentifier = "D5DC59581C200D55003BD79B"
+            BuildableName = "Compass.framework"
+            BlueprintName = "Compass-iOS"
+            ReferencedContainer = "container:Compass.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "146D72AB1AB782920058798C"
-            BuildableName = "Tests.xctest"
-            BlueprintName = "Tests"
-            ReferencedContainer = "container:Pod.xcodeproj">
+            BlueprintIdentifier = "D5DC59581C200D55003BD79B"
+            BuildableName = "Compass.framework"
+            BlueprintName = "Compass-iOS"
+            ReferencedContainer = "container:Compass.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>