Fix code coverage generation.

Static Library.xcodeproj/xcshareddata/xcschemes/Typhoon.xcscheme → Static Library.xcodeproj/xcshareddata/xcschemes/Typhoon OS X.xcscheme

@@ -15,9 +15,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "6B3F39C016ABFAC3001A601C"
-               BuildableName = "libTyphoon.a"
-               BlueprintName = "Typhoon"
-               ReferencedContainer = "container:Typhoon.xcodeproj">
+               BuildableName = "libTyphoon-OSX.a"
+               BlueprintName = "Typhoon-OSX"
+               ReferencedContainer = "container:Static Library.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -28,6 +28,16 @@
       shouldUseLaunchSchemeArgsEnv = "YES"
       buildConfiguration = "Debug">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4B841486179B0E5200916BF5"
+               BuildableName = "OS X Tests (Cocoapods).octest"
+               BlueprintName = "OS X Tests (Cocoapods)"
+               ReferencedContainer = "container:Tests/Tests.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

Static Library.xcodeproj/xcshareddata/xcschemes/Typhoon iOS.xcscheme

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0460"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4BC648F717A20BD7007F0463"
+               BuildableName = "libTyphoon-iOS.a"
+               BlueprintName = "Typhoon-iOS"
+               ReferencedContainer = "container:Static Library.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4B84146B179B0E3900916BF5"
+               BuildableName = "iOS Tests (Cocoapods).octest"
+               BlueprintName = "iOS Tests (Cocoapods)"
+               ReferencedContainer = "container:Tests/Tests.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Tests/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem 'cocoapods'

Tests/Gemfile.lock

@@ -0,0 +1,38 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    claide (0.3.2)
+    cocoapods (0.22.3)
+      activesupport (~> 3.2.13)
+      claide (~> 0.3.2)
+      cocoapods-core (= 0.22.3)
+      cocoapods-downloader (~> 0.1.1)
+      colored (~> 1.2)
+      escape (~> 0.0.4)
+      json (~> 1.8.0)
+      open4 (~> 1.3.0)
+      xcodeproj (~> 0.8.1)
+    cocoapods-core (0.22.3)
+      activesupport (~> 3.2.13)
+      json (~> 1.8.0)
+      nap (~> 0.5.1)
+    cocoapods-downloader (0.1.1)
+    colored (1.2)
+    escape (0.0.4)
+    i18n (0.6.4)
+    json (1.8.0)
+    multi_json (1.7.7)
+    nap (0.5.1)
+    open4 (1.3.0)
+    xcodeproj (0.8.1)
+      activesupport (~> 3.2.13)
+      colored (~> 1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cocoapods

Tests/Podfile

@@ -1,20 +1,41 @@
 xcodeproj 'Tests'
 workspace '../Typhoon'
 
-def import_pods
-  pod 'Typhoon', :path => '../'
+def import_test_pods
   pod 'OCHamcrest', '~> 1.9'
   pod 'OCMockito', '~> 0.2'
 end
 
+def import_typhoon_pod
+  pod 'Typhoon', :path => '../'
+end
+
 target :ios do
   platform :ios, '5.0'
-  link_with 'iOS Tests'
-  import_pods
+  import_test_pods
+  link_with 'iOS Tests (Static Library)'
+
+
+end
+
+target 'iOS Tests (Cocoapods)' do
+    platform :ios, '5.0'
+    import_test_pods
+    import_typhoon_pod
 end
 
 target :osx do
   platform :osx, '10.7'
-  link_with 'OS X Tests'
-  import_pods
+  import_test_pods
+
+  # until such time as we start generating os x coverage. then, use the commented out lines below.
+  link_with 'OS X Tests (Cocoapods)'
+  import_typhoon_pod
+
+
+  # link_with 'OS X Tests (Static Library)'
+
+  # target 'OS X Tests (Cocoapods)' do
+  #   import_typhoon_pod
+  # end
 end

Tests/Podfile.lock

@@ -2,7 +2,7 @@ PODS:
   - OCHamcrest (1.9)
   - OCMockito (0.23):
     - OCHamcrest (= 1.9)
-  - Typhoon (1.2.2)
+  - Typhoon (1.2.3)
 
 DEPENDENCIES:
   - OCHamcrest (~> 1.9)
@@ -16,6 +16,6 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   OCHamcrest: f8393efd5a49d91879be573635d6183effacc0ab
   OCMockito: 2223021dd82697fc536c403d6850d2ed8ffae578
-  Typhoon: f72943ad1f806e4ef45a708869caa4af637db891
+  Typhoon: a67357cf00e85afdd0e4a305a45a4c821ad22eea
 
-COCOAPODS: 0.22.2
+COCOAPODS: 0.22.3