feat: remove sonar.swift.appName and sonar.coverage.otherBinaryNames and replced by sonar.coverage.binaryNames

Author: David Yang

sonar-project.properties

@@ -20,35 +20,41 @@ sonar.projectKey=prjKey
 sonar.projectName=prjName
 # Number version (can be found automatically in plist, just comment this line)
 sonar.projectVersion=1.0
+
 # Comment if you have a project with mixed ObjC / Swift
 sonar.language=swift
+
 # Project description
 sonar.projectDescription=prjDescription
+
 # Path to source directories
 sonar.sources=SourceDir
 # Path to test directories (comment if no test)
 sonar.tests=TestDir
+
 # Destination Simulator to run surefire
 # As string expected in destination argument of xcodebuild command
 # Example = sonar.swift.simulator=platform=iOS Simulator,name=iPhone 6,OS=9.2
-sonar.swift.simulator=platform=iOS Simulator,name=iPhone 6,OS=9.2
+sonar.swift.simulator=platform=iOS Simulator,name=iPhone X,OS=latest
+
 # Xcode project configuration (.xcodeproj)
 # and use the later to specify which project(s) to include in the analysis (comma separated list)
 # Specify either xcodeproj or xcodeproj + xcworkspace
 #sonar.swift.project=MyPrj.xcodeproj
 #sonar.swift.workspace=MyWrkSpc.xcworkspace
-# Specify your appname.
-# This will be something like "myApp"
-# Use when basename is different from targeted scheme.
-# Or when slather fails with 'No product binary found'
-# sonar.swift.appName=myApp
+
 # Scheme to build your application
 sonar.swift.appScheme=MyScheme
-# Specify a list of framework names.
-# Use if you want to measure code coverage with slather on them.
-# sonar.coverage.otherBinaryNames=myFramework,myOtherFramework
+
+# Specify your appname when different from targeted scheme.
+# Or when slather fails with 'No product binary found'
+# You can also provide a list of framework names to analyse for coverage.
+# This will be something like "myApp" or "myApp,myFramework"
+# sonar.coverage.binaryNames=myApp,myFramework
+
 # Configuration to use for your scheme. if you do not specify that the default will be Debug
 sonar.swift.appConfiguration=MyConfiguration
+
 ##########################
 # Optional configuration #
 ##########################
@@ -57,21 +63,27 @@ sonar.sourceEncoding=UTF-8
 # SCM
 # sonar.scm.enabled=true
 # sonar.scm.url=scm:git:http://xxx
+
 # JUnit report generated by run-sonar.sh is stored in sonar-reports/TEST-report.xml
 # Change it only if you generate the file on your own
 # The XML files have to be prefixed by TEST- otherwise they are not processed
 # sonar.junit.reportsPath=sonar-reports/
+
 # Lizard report generated by run-sonar.sh is stored in sonar-reports/lizard-report.xml
 # Change it only if you generate the file on your own
 # sonar.swift.lizard.report=sonar-reports/lizard-report.xml
+
 # Cobertura report generated by run-sonar.sh is stored in sonar-reports/coverage-swift.xml
 # Change it only if you generate the file on your own
 # sonar.swift.coverage.reportPattern=sonar-reports/coverage-swift*.xml
+
 # OCLint report generated by run-sonar.sh is stored in sonar-reports/oclint.xml
 # Change it only if you generate the file on your own
 # sonar.swift.swiftlint.report=sonar-reports/*swiftlint.txt
+
 # Change it only if you generate the file on your own
 # sonar.swift.tailor.report=sonar-reports/*tailor.txt
+
 # Paths to exclude from coverage report (surefire, 3rd party libraries etc.)
 # sonar.swift.excludedPathsFromCoverage=pattern1,pattern2
 sonar.swift.excludedPathsFromCoverage=.*Tests.*

sonar-swift-plugin/src/main/shell/run-sonar-swift.sh

@@ -201,10 +201,8 @@ appScheme=''; readParameter appScheme 'sonar.swift.appScheme'
 appConfiguration=''; readParameter appConfiguration 'sonar.swift.appConfiguration'
 # The name of your test scheme in Xcode
 testScheme=''; readParameter testScheme 'sonar.swift.testScheme'
-# The name of your binary file (application)
-binaryName=''; readParameter binaryName 'sonar.swift.appName'
 # The name of your other binary files (frameworks)
-otherBinaryNames=''; readParameter otherBinaryNames 'sonar.coverage.otherBinaryNames'
+binaryNames=''; readParameter binaryNames 'sonar.coverage.binaryNames'
 # Get the path of plist file
 plistFile=`xcodebuild -showBuildSettings -project "${projectFile}" | grep -i 'PRODUCT_SETTINGS_PATH' -m 1 | sed 's/[ ]*PRODUCT_SETTINGS_PATH = //'`
 # Number version from plist if no sonar.projectVersion
@@ -336,39 +334,34 @@ if [ "$unittests" = "on" ]; then
 
     echo '\nComputing coverage report\n'
 
-    # Build the --exclude flags
-    excludedCommandLineFlags=""
-    if [ ! -z "$excludedPathsFromCoverage" -a "$excludedPathsFromCoverage" != " " ]; then
-	      echo $excludedPathsFromCoverage | sed -n 1'p' | tr ',' '\n' > tmpFileRunSonarSh2
-	      while read word; do
-		        excludedCommandLineFlags+=" -i $word"
-	      done < tmpFileRunSonarSh2
-	      rm -rf tmpFileRunSonarSh2
-    fi
-    if [ "$vflag" = "on" ]; then
-	      echo "Command line exclusion flags for slather is:$excludedCommandLineFlags"
-    fi
-
 	firstProject=$(echo $projectFile | sed -n 1'p' | tr ',' '\n' | head -n 1)
 
     slatherCmd=($SLATHER_CMD coverage)
-    if [[ ! -z "$binaryName" ]]; then
-    	slatherCmd+=( --binary-basename "$binaryName")
-    fi
-    if [[ ! -z "$otherBinaryNames" ]]; then
-      echo $otherBinaryNames | sed -n 1'p' | tr ',' '\n' > tmpFileRunSonarSh3
+
+    # Build the --binary-basename
+    if [[ ! -z "$binaryNames" ]]; then
+      echo $binaryNames | sed -n 1'p' | tr ',' '\n' > tmpFileRunSonarSh3
       while read word; do
-        slatherCmd+=( --binary-basename "$word")
+        slatherCmd+=(--binary-basename "$word")
       done < tmpFileRunSonarSh3
       rm -rf tmpFileRunSonarSh3
     fi
 
-    slatherCmd+=( --input-format profdata $excludedCommandLineFlags --cobertura-xml --output-directory sonar-reports)
+    # Build the --exclude flags
+    if [ ! -z "$excludedPathsFromCoverage" -a "$excludedPathsFromCoverage" != " " ]; then
+	      echo $excludedPathsFromCoverage | sed -n 1'p' | tr ',' '\n' > tmpFileRunSonarSh2
+	      while read word; do
+		        slatherCmd+=(-i "$word")
+	      done < tmpFileRunSonarSh2
+	      rm -rf tmpFileRunSonarSh2
+    fi
+
+    slatherCmd+=(--input-format profdata --cobertura-xml --output-directory sonar-reports)
 
     if [[ ! -z "$workspaceFile" ]]; then
-        slatherCmd+=( --workspace "$workspaceFile")
+        slatherCmd+=(--workspace "$workspaceFile")
     fi
-    slatherCmd+=( --scheme "$appScheme" "$firstProject")
+    slatherCmd+=(--scheme "$appScheme" "$firstProject")
 
     echo "${slatherCmd[@]}"