Merge pull request SlatherOrg#169 from ksuther/xcode73-fix

Updated profdata_coverage_dir to work with Xcode 7.3
keatongreve · Mar 23, 2016 · 92d7b25 · 92d7b25
1 parent 0550016
commit 92d7b25
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # CHANGELOG
 
 ## master
+* Xcode 7.3 compatibility (updated path returned by `profdata_coverage_dir`)
+  [Kent Sutherland](https://github.com/ksuther)
+  [#125](https://github.com/SlatherOrg/slather/issues/125), [#169](https://github.com/SlatherOrg/slather/pull/169)
+
 * Improve matching of xctest bundles when using `--binary-basename`
   [Kent Sutherland](https://github.com/ksuther)
   [#167](https://github.com/SlatherOrg/slather/pull/167)

diff --git a/lib/slather/project.rb b/lib/slather/project.rb
@@ -109,6 +109,11 @@ def profdata_coverage_dir
         dir = Dir["#{build_directory}/**/#{self.products.first.name}"].first
       end
 
+      if dir == nil
+        # Xcode 7.3 moved the location of Coverage.profdata
+        dir = Dir[File.join("#{build_directory}","/**/CodeCoverage")].first
+      end
+
       raise StandardError, "No coverage directory found. Are you sure your project is setup for generating coverage files? Try `slather setup your/project.xcodeproj`" unless dir != nil
       dir
     end