Update sonarqube lane to work with Xcode11 coverage report format (airsidemobile#193)

* Use xcresult files and update conversion script

* Add newline

Author: Daniel

fastlane/Fastfile

@@ -132,8 +132,8 @@ lane :sonarqube do |options|
   sq_coverage_report = "#{TEST_OUTPUT}/sonarqube-coverage.xml"
   Dir.chdir("..") do
     sh "rm  #{sq_coverage_report}"
-    xccov_reports = Dir["#{DERIVED_DATA_PATH}/Logs/Test/**/*.xccovarchive"].join(" ")
-    sh "scripts/xccov-to-sonarqube.sh #{xccov_reports} > #{sq_coverage_report}"
+    cov_reports = Dir["#{DERIVED_DATA_PATH}/Logs/Test/**/*.xcresult"].join(" ")
+    sh "scripts/xccov-to-sonarqube.sh #{cov_reports} > #{sq_coverage_report}"
   end
 
   # Run Sonarqube analysis

scripts/xccov-to-sonarqube.sh

@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# See
+# Adapted from
 # https://docs.sonarqube.org/display/PLUG/Swift+Coverage+Results+Import
 # https://github.com/SonarSource/sonar-scanning-examples/blob/master/swift-coverage/swift-coverage-example/xccov-to-sonarqube-generic.sh
 
 function convert_file {
-  local xccovarchive_file="$1"
+  local xcresult_bundle="$1"
   local file_name="$2"
   echo "  <file path=\"$file_name\">"
-  xcrun xccov view --file "$file_name" "$xccovarchive_file" | \
+  xcrun xccov view --archive --file "$file_name" "$xcresult_bundle" | \
     sed -n '
     s/^ *\([0-9][0-9]*\): 0.*$/    <lineToCover lineNumber="\1" covered="false"\/>/p;
     s/^ *\([0-9][0-9]*\): [1-9].*$/    <lineToCover lineNumber="\1" covered="true"\/>/p
@@ -19,9 +19,9 @@ function convert_file {
 
 function xccov_to_generic {
   echo '<coverage version="1">'
-  for xccovarchive_file in "$@"; do
-    xcrun xccov view --file-list "$xccovarchive_file" | while read -r file_name; do
-      convert_file "$xccovarchive_file" "$file_name"
+  for xcresult_bundle in "$@"; do
+    xcrun xccov view --archive --file-list "$xcresult_bundle" | while read -r file_name; do
+      convert_file "$xcresult_bundle" "$file_name"
     done
   done
   echo '</coverage>'