slather 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6388d4f62571f927f845978e5383f2508b98e7e3ba0205aaf546b5a54d465f5
-  data.tar.gz: 837f82512416a6f57cb9c4510dcc7bd9524a4aeeaa05f42bdd841f18cf4fa1d9
+  metadata.gz: 82acbc5ecfb8610c49f39cdea2ff67387d30b3c41bf78c34095a59c7b572e802
+  data.tar.gz: a1c830dddd4d52d8641665086ad6a63c294f00a7dd3370c7cd588c8c586db06e
 SHA512:
-  metadata.gz: 2b1af2387a7475860aeb3666883c5fd8d2e2b9be020680452140e71fa5bbb3ff057eb3b23b0ddb1c02d6fd55478aafceda18f5527ed2bd086b49d0d89a06e75b
-  data.tar.gz: 0b464fbffa5722ed27fa157e429427387889e9e5c641ed2d2d2663a90ccc6f815163e19687a21fac2078dbb6c9c8c8baf9745ff1b55266e38f220aed6258c66f
+  metadata.gz: 239d29e6e221b6119be23af3dc92a7f28d4608dd71acf3f7ed03530953878ab42942903ed3f505a81051c3aa6903ba2a167b37867274b24ab7fc948b9006f08c
+  data.tar.gz: c918c164b1da93699be34bef38291b3c43d3d43eb1d258919dc3de0bd84beb855a44318a8d6638d567543ddad7a2e647ca07a1fe12d14678b9c54bbde25a749a

data/.travis.yml

@@ -2,6 +2,8 @@ language: objective-c
 script: bundle exec rake
 osx_image: xcode12.2
 
+cache: bundler
+
 before_install:
   - curl http://curl.haxx.se/ca/cacert.pem -o /usr/local/share/cacert.pem
   - gem install bundler -v "~> 2.0" --no-document

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # CHANGELOG
 
+## v2.7.1
+
+* Support generating coverage for framework targets
+  [onato](https://github.com/onato)
+  [#482](https://github.com/SlatherOrg/slather/pull/482)
+
+* Show number of lines in HTML report
+  [SiemianHS](https://github.com/SiemianHS)
+  [#494](https://github.com/SlatherOrg/slather/pull/494)
+
+* Fixed issues with HTML report generation
+  [fchiba](https://github.com/fchiba)
+  [#483](https://github.com/SlatherOrg/slather/pull/483)
+  [#484](https://github.com/SlatherOrg/slather/pull/484)
+
+* Don't fail if a source file doesn't exist
+  [chillpop](https://github.com/chillpop)
+  [#492](https://github.com/SlatherOrg/slather/pull/492)
+
 ## v2.7.0
 
 * Add Branch Coverage data for ProfData coverage files

data/lib/slather/coverage_service/html_output.rb

@@ -87,12 +87,22 @@ module Slather
             percentage = (total_tested_lines / total_relevant_lines.to_f) * 100.0
             cov.span "Total Coverage : "
             cov.span decimal_f(percentage) + '%', :class => class_for_coverage_percentage(percentage), :id => "total_coverage"
+            cov.span " ("
+            cov.span total_tested_lines, :id => "total_tested_lines"
+            cov.span " of "
+            cov.span total_relevant_lines, :id => "total_relevant_lines"
+            cov.span " lines)"
           }
 
           cov.h4 {
             percentage = (total_branches_tested / total_relevant_branches.to_f) * 100.0
             cov.span "Total Branch Coverage : "
             cov.span decimal_f(percentage) + '%', :class => class_for_coverage_percentage(percentage), :id => "total_coverage"
+            cov.span " ("
+            cov.span total_branches_tested, :id => "total_branches_tested"
+            cov.span " of "
+            cov.span total_relevant_branches, :id => "total_relevant_branches"
+            cov.span " lines)"
           }
 
           cov.input(:class => "search", :placeholder => "Search")
@@ -201,7 +211,7 @@ module Slather
                           end
                           current_line = line
                           regions.each do |region|
-                            covered, remainder = current_line.split(region)
+                            covered, remainder = current_line.split(region, 2)
                             cov.code(covered, :class => "objc")
                             cov.code(region, :class => "objc missed")
                             current_line = remainder

data/lib/slather/profdata_coverage_file.rb

@@ -221,7 +221,7 @@ module Slather
             # if the region wrapped to a new line before ending, put nil to indicate it didnt end on this line
             region_end = line == current_line ? col - region_start : nil
             if branch_region_data.key?(current_line)
-              branch_region_data[current_line] = branch_region_data[current_line] + [region_start, region_end]
+              branch_region_data[current_line] << [region_start, region_end]
             else
               branch_region_data[current_line] = [[region_start, region_end]]
             end

data/lib/slather/project.rb

@@ -135,7 +135,12 @@ module Slather
       coverage_json = JSON.parse(coverage_json_string)
       coverage_json["data"].reduce([]) do |result, chunk|
         result.concat(chunk["files"].map do |file|
-          {"filename" => Pathname(file["filename"]).realpath, "segments" => file["segments"]}
+          filename = file["filename"]
+          path = Pathname(filename)
+          # Don't crash if the file doesn't exist on disk.
+          # This may happen for autogenerated files that have been deleted.
+          filename = path.exist? ? path.realpath : filename
+          {"filename" => filename, "segments" => file["segments"]}
         end)
       end
     end
@@ -582,6 +587,19 @@ module Slather
     def find_buildable_names(xcscheme)
       found_buildable_names = []
 
+      # enumerate code coverage targets
+      begin
+        code_coverage_targets = xcscheme.test_action.xml_element.elements['CodeCoverageTargets']
+        targets = code_coverage_targets.map do |node|
+          Xcodeproj::XCScheme::BuildableReference.new(node) if node.is_a?(REXML::Element)
+        end.compact
+        buildable_names = targets.each do |target|
+          found_buildable_names.push(target.buildable_name)
+        end
+      rescue
+        # just in case if there are no entries in the test action
+      end
+
       # enumerate build action entries
       begin
         xcscheme.build_action.entries.each do |entry|

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = '2.7.0' unless defined?(Slather::VERSION)
+  VERSION = '2.7.1' unless defined?(Slather::VERSION)
 end

data/spec/fixtures/FixtureFramework/FixtureFramework.h

@@ -0,0 +1,19 @@
+//
+//  FixtureFramework.h
+//  FixtureFramework
+//
+//  Created by Stephen Williams on 11/03/21.
+//  Copyright © 2021 marklarr. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for FixtureFramework.
+FOUNDATION_EXPORT double FixtureFrameworkVersionNumber;
+
+//! Project version string for FixtureFramework.
+FOUNDATION_EXPORT const unsigned char FixtureFrameworkVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <FixtureFramework/PublicHeader.h>
+
+

data/spec/fixtures/FixtureFramework/FlashExperiment.swift

@@ -0,0 +1,7 @@
+import Foundation
+
+public struct FlashExperiment {
+    public let isAwesome = true
+    
+    public init() {}
+}

data/spec/fixtures/FixtureFramework/Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2021 marklarr. All rights reserved.</string>
+</dict>
+</plist>

data/spec/fixtures/FixtureFrameworkTests/FixtureFrameworkTests.swift

@@ -0,0 +1,34 @@
+//
+//  FixtureFrameworkTests.swift
+//  FixtureFrameworkTests
+//
+//  Created by Stephen Williams on 11/03/21.
+//  Copyright © 2021 marklarr. All rights reserved.
+//
+
+import XCTest
+@testable import FixtureFramework
+
+class FixtureFrameworkTests: XCTestCase {
+
+    override func setUpWithError() throws {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testExample() throws {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+    }
+
+    func testPerformanceExample() throws {
+        // This is an example of a performance test case.
+        self.measure {
+            // Put the code you want to measure the time of here.
+        }
+    }
+
+}

data/spec/fixtures/FixtureFrameworkTests/FlashExperimentTests.swift

@@ -0,0 +1,9 @@
+import XCTest
+import FixtureFramework
+
+class FlashExperimentTests: XCTestCase {
+    func testExample() throws {
+        let sut = FlashExperiment()
+        XCTAssertTrue(sut.isAwesome, "Your flash experiment isn't awesome!")
+    }
+}

data/spec/fixtures/FixtureFrameworkTests/Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

data/spec/fixtures/fixtures.xcodeproj/project.pbxproj

@@ -35,6 +35,8 @@
 		8C9A2046195965F10013B6B3 /* libfixtures.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C9A202D195965F10013B6B3 /* libfixtures.a */; };
 		8C9A204C195965F10013B6B3 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8C9A204A195965F10013B6B3 /* InfoPlist.strings */; };
 		8C9A204E195965F10013B6B3 /* fixturesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9A204D195965F10013B6B3 /* fixturesTests.m */; };
+		B1E6981225F96B680086A3E2 /* FixtureFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = B1E6980425F96B670086A3E2 /* FixtureFramework.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B1E6982025F96B930086A3E2 /* FlashExperiment.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1E6981F25F96B930086A3E2 /* FlashExperiment.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -52,6 +54,20 @@
 			remoteGlobalIDString = 8C9A202C195965F10013B6B3;
 			remoteInfo = fixtures;
 		};
+		B1E6982F25F96F490086A3E2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 8C9A2025195965F00013B6B3 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = B1E6980125F96B670086A3E2;
+			remoteInfo = FixtureFramework;
+		};
+		B1E6983725F970320086A3E2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 8C9A2025195965F00013B6B3 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = B1E6980125F96B670086A3E2;
+			remoteInfo = FixtureFramework;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -86,6 +102,13 @@
 		8C9A2049195965F10013B6B3 /* fixturesTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "fixturesTests-Info.plist"; sourceTree = "<group>"; };
 		8C9A204B195965F10013B6B3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		8C9A204D195965F10013B6B3 /* fixturesTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = fixturesTests.m; sourceTree = "<group>"; };
+		B1E6980225F96B670086A3E2 /* FixtureFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FixtureFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B1E6980425F96B670086A3E2 /* FixtureFramework.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FixtureFramework.h; sourceTree = "<group>"; };
+		B1E6980525F96B670086A3E2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B1E6980F25F96B680086A3E2 /* FixtureFrameworkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FixtureFrameworkTests.swift; sourceTree = "<group>"; };
+		B1E6981125F96B680086A3E2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B1E6981F25F96B930086A3E2 /* FlashExperiment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlashExperiment.swift; sourceTree = "<group>"; };
+		B1E6982725F96BD30086A3E2 /* FlashExperimentTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlashExperimentTests.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -124,6 +147,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		B1E697FF25F96B670086A3E2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -155,6 +185,8 @@
 				8C9A2036195965F10013B6B3 /* fixtures */,
 				3773307A1CC42A58005EAF65 /* fixturesTwo */,
 				8C9A2047195965F10013B6B3 /* fixturesTests */,
+				B1E6980325F96B670086A3E2 /* FixtureFramework */,
+				B1E6980E25F96B670086A3E2 /* FixtureFrameworkTests */,
 				8C9A202F195965F10013B6B3 /* Frameworks */,
 				8C9A202E195965F10013B6B3 /* Products */,
 			);
@@ -167,6 +199,7 @@
 				8C9A2040195965F10013B6B3 /* fixturesTests.xctest */,
 				377330791CC42A58005EAF65 /* libfixturesTwo.dylib */,
 				85AE690C1E45F0F900DA2D47 /* fixturesTestsSecond.xctest */,
+				B1E6980225F96B670086A3E2 /* FixtureFramework.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -236,6 +269,26 @@
 			path = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		B1E6980325F96B670086A3E2 /* FixtureFramework */ = {
+			isa = PBXGroup;
+			children = (
+				B1E6980425F96B670086A3E2 /* FixtureFramework.h */,
+				B1E6980525F96B670086A3E2 /* Info.plist */,
+				B1E6981F25F96B930086A3E2 /* FlashExperiment.swift */,
+			);
+			path = FixtureFramework;
+			sourceTree = "<group>";
+		};
+		B1E6980E25F96B670086A3E2 /* FixtureFrameworkTests */ = {
+			isa = PBXGroup;
+			children = (
+				B1E6980F25F96B680086A3E2 /* FixtureFrameworkTests.swift */,
+				B1E6981125F96B680086A3E2 /* Info.plist */,
+				B1E6982725F96BD30086A3E2 /* FlashExperimentTests.swift */,
+			);
+			path = FixtureFrameworkTests;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -260,6 +313,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		B1E697FD25F96B670086A3E2 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B1E6981225F96B680086A3E2 /* FixtureFramework.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
@@ -309,6 +370,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				B1E6983025F96F490086A3E2 /* PBXTargetDependency */,
 			);
 			name = fixtures;
 			productName = fixtures;
@@ -326,6 +388,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				B1E6983825F970320086A3E2 /* PBXTargetDependency */,
 				8C9A2045195965F10013B6B3 /* PBXTargetDependency */,
 			);
 			name = fixturesTests;
@@ -333,18 +396,42 @@
 			productReference = 8C9A2040195965F10013B6B3 /* fixturesTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
+		B1E6980125F96B670086A3E2 /* FixtureFramework */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = B1E6981725F96B680086A3E2 /* Build configuration list for PBXNativeTarget "FixtureFramework" */;
+			buildPhases = (
+				B1E697FD25F96B670086A3E2 /* Headers */,
+				B1E697FE25F96B670086A3E2 /* Sources */,
+				B1E697FF25F96B670086A3E2 /* Frameworks */,
+				B1E6980025F96B670086A3E2 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = FixtureFramework;
+			productName = FixtureFramework;
+			productReference = B1E6980225F96B670086A3E2 /* FixtureFramework.framework */;
+			productType = "com.apple.product-type.framework";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		8C9A2025195965F00013B6B3 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 1240;
 				LastUpgradeCheck = 0510;
 				ORGANIZATIONNAME = marklarr;
 				TargetAttributes = {
 					377330781CC42A58005EAF65 = {
 						CreatedOnToolsVersion = 7.3;
 					};
+					B1E6980125F96B670086A3E2 = {
+						CreatedOnToolsVersion = 12.4;
+						LastSwiftMigration = 1240;
+						ProvisioningStyle = Automatic;
+					};
 				};
 			};
 			buildConfigurationList = 8C9A2028195965F00013B6B3 /* Build configuration list for PBXProject "fixtures" */;
@@ -352,6 +439,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 8C9A2024195965F00013B6B3;
@@ -363,6 +451,7 @@
 				377330781CC42A58005EAF65 /* fixturesTwo */,
 				8C9A203F195965F10013B6B3 /* fixturesTests */,
 				85AE68FC1E45F0F900DA2D47 /* fixturesTestsSecond */,
+				B1E6980125F96B670086A3E2 /* FixtureFramework */,
 			);
 		};
 /* End PBXProject section */
@@ -384,6 +473,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		B1E6980025F96B670086A3E2 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -427,6 +523,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		B1E697FE25F96B670086A3E2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B1E6982025F96B930086A3E2 /* FlashExperiment.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
@@ -440,6 +544,16 @@
 			target = 8C9A202C195965F10013B6B3 /* fixtures */;
 			targetProxy = 8C9A2044195965F10013B6B3 /* PBXContainerItemProxy */;
 		};
+		B1E6983025F96F490086A3E2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = B1E6980125F96B670086A3E2 /* FixtureFramework */;
+			targetProxy = B1E6982F25F96F490086A3E2 /* PBXContainerItemProxy */;
+		};
+		B1E6983825F970320086A3E2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = B1E6980125F96B670086A3E2 /* FixtureFramework */;
+			targetProxy = B1E6983725F970320086A3E2 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -653,6 +767,105 @@
 			};
 			name = Release;
 		};
+		B1E6981325F96B680086A3E2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CODE_SIGN_STYLE = Automatic;
+				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = FixtureFramework/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 11.1;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = com.onato.FixtureFramework;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		B1E6981425F96B680086A3E2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CODE_SIGN_STYLE = Automatic;
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = FixtureFramework/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 11.1;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = com.onato.FixtureFramework;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -701,6 +914,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		B1E6981725F96B680086A3E2 /* Build configuration list for PBXNativeTarget "FixtureFramework" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				B1E6981325F96B680086A3E2 /* Debug */,
+				B1E6981425F96B680086A3E2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 8C9A2025195965F00013B6B3 /* Project object */;

data/spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixtures.xcscheme

@@ -26,7 +26,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B1E6980125F96B670086A3E2"
+            BuildableName = "FixtureFramework.framework"
+            BlueprintName = "FixtureFramework"
+            ReferencedContainer = "container:fixtures.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,8 +50,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +70,6 @@
             ReferencedContainer = "container:fixtures.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -70,6 +77,15 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8C9A202C195965F10013B6B3"
+            BuildableName = "libfixtures.a"
+            BlueprintName = "fixtures"
+            ReferencedContainer = "container:fixtures.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

data/spec/fixtures/fixtures.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

data/spec/slather/profdata_coverage_spec.rb

@@ -167,6 +167,10 @@ describe Slather::ProfdataCoverageFile do
       profdata_coverage_file.segments = [[19, 9, 0, true, false], [19, 20, 1, true, false]]
       expect(profdata_coverage_file.branch_region_data[19]).to eq([[8,11]])
     end
+    it "should have two missing region data for line 19" do
+      profdata_coverage_file.segments = [[19, 9, 0, true, false], [19, 20, 1, true, false], [19, 30, 0, true, false], [19, 40, 1, true, true]]
+      expect(profdata_coverage_file.branch_region_data[19]).to eq([[8,11], [29,10]])
+    end
   end
 
   describe "#ignored" do

data/spec/slather/project_spec.rb

@@ -243,8 +243,9 @@ describe Slather::Project do
       allow(fixtures_project).to receive(:scheme).and_return("fixtures")
       fixtures_project.send(:configure_binary_file)
       binary_file_location = fixtures_project.send(:binary_file)
-      expect(binary_file_location.count).to eq(1)
-      expect(binary_file_location.first).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
+      expect(binary_file_location.count).to eq(2)
+      expect(binary_file_location.first).to end_with("Debug/FixtureFramework.framework/Versions/A/FixtureFramework")
+      expect(binary_file_location.last).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
     end
 
     it "should find the product path provided a workspace and scheme" do
@@ -252,8 +253,9 @@ describe Slather::Project do
       allow(fixtures_project).to receive(:scheme).and_return("fixtures")
       fixtures_project.send(:configure_binary_file)
       binary_file_location = fixtures_project.send(:binary_file)
-      expect(binary_file_location.count).to eq(1)
-      expect(binary_file_location.first).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
+      expect(binary_file_location.count).to eq(2)
+      expect(binary_file_location.first).to end_with("Debug/FixtureFramework.framework/Versions/A/FixtureFramework")
+      expect(binary_file_location.last).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
     end
 
     it "should find the product path for a scheme with no buildable products" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Mark Larsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -255,6 +255,12 @@ files:
 - lib/slather/project.rb
 - lib/slather/version.rb
 - slather.gemspec
+- spec/fixtures/FixtureFramework/FixtureFramework.h
+- spec/fixtures/FixtureFramework/FlashExperiment.swift
+- spec/fixtures/FixtureFramework/Info.plist
+- spec/fixtures/FixtureFrameworkTests/FixtureFrameworkTests.swift
+- spec/fixtures/FixtureFrameworkTests/FlashExperimentTests.swift
+- spec/fixtures/FixtureFrameworkTests/Info.plist
 - spec/fixtures/cobertura.xml
 - spec/fixtures/fixtures.xcodeproj/project.pbxproj
 - spec/fixtures/fixtures.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -264,6 +270,7 @@ files:
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTestsSecond.xcscheme
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTwo.xcscheme
 - spec/fixtures/fixtures.xcworkspace/contents.xcworkspacedata
+- spec/fixtures/fixtures.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 - spec/fixtures/fixtures.xcworkspace/xcshareddata/xcschemes/fixturesTestsWorkspace.xcscheme
 - spec/fixtures/fixtures/Fixtures.swift
 - spec/fixtures/fixtures/Supporting Files/fixtures-Prefix.pch
@@ -339,6 +346,12 @@ signing_key:
 specification_version: 4
 summary: Test coverage reports for Xcode projects
 test_files:
+- spec/fixtures/FixtureFramework/FixtureFramework.h
+- spec/fixtures/FixtureFramework/FlashExperiment.swift
+- spec/fixtures/FixtureFramework/Info.plist
+- spec/fixtures/FixtureFrameworkTests/FixtureFrameworkTests.swift
+- spec/fixtures/FixtureFrameworkTests/FlashExperimentTests.swift
+- spec/fixtures/FixtureFrameworkTests/Info.plist
 - spec/fixtures/cobertura.xml
 - spec/fixtures/fixtures.xcodeproj/project.pbxproj
 - spec/fixtures/fixtures.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -348,6 +361,7 @@ test_files:
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTestsSecond.xcscheme
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTwo.xcscheme
 - spec/fixtures/fixtures.xcworkspace/contents.xcworkspacedata
+- spec/fixtures/fixtures.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 - spec/fixtures/fixtures.xcworkspace/xcshareddata/xcschemes/fixturesTestsWorkspace.xcscheme
 - spec/fixtures/fixtures/Fixtures.swift
 - spec/fixtures/fixtures/Supporting Files/fixtures-Prefix.pch