Find project version automatically with CFBundleShortVersionString in…

sample/sonar-project.properties

@@ -4,6 +4,7 @@
 
 sonar.projectKey=my-project
 sonar.projectName=My project
+# Number version (can be found automatically in plist, just comment this line)
 sonar.projectVersion=1.0
 sonar.language=objc
 

src/main/shell/run-sonar.sh

@@ -170,6 +170,11 @@ destinationSimulator=''; readParameter destinationSimulator 'sonar.objectivec.si
 workspaceFile=''; readParameter workspaceFile 'sonar.objectivec.workspace'
 projectFile=''; readParameter projectFile 'sonar.objectivec.project'
 
+# 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
+numVerionFromPlist=`defaults read ${plistFile} CFBundleShortVersionString`
+
 # Count projects
 projectCount=$(echo $projectFile | sed -n 1'p' | tr ',' '\n' | wc -l | tr -d '[[:space:]]')
 if [ "$vflag" = "on" ]; then
@@ -216,6 +221,7 @@ if [ "$vflag" = "on" ]; then
  	echo "Xcode workspace file is: $workspaceFile"
  	echo "Xcode project file is: $projectFile"
  	echo "Xcode application scheme is: $appScheme"
+	echo "Number version from plist is: $numVerionFromPlist"
  	echo "Xcode test scheme is: $testScheme"
  	echo "Excluded paths from coverage are: $excludedPathsFromCoverage"
 fi
@@ -433,20 +439,29 @@ else
  	echo 'Skipping Lizard (test purposes only!)'
 fi
 
+# The project version from properties file
+numVersionSonarRunner=''; readParameter numVersionSonarRunner 'sonar.projectVersion'
+if [ -z "$numVersionSonarRunner" -o "$numVersionSonarRunner" = " " ]; then
+	numVersionSonarRunner=" --define sonar.projectVersion=$numVerionFromPlist"
+else
+	#if we have version number in properties file, we don't overide numVersion for sonar-runner/sonar-scanner command
+	numVersionSonarRunner='';
+fi
+
 # SonarQube
 if [ "$sonarscanner" = "on" ]; then
     echo -n 'Running SonarQube using SonarQube Scanner'
     if hash /dev/stdout sonar-scanner 2>/dev/null; then
-        runCommand /dev/stdout sonar-scanner
+        runCommand /dev/stdout sonar-scanner $numVersionSonarRunner
     else
         echo 'Skipping sonar-scanner (not installed!)'
     fi
 else
     echo -n 'Running SonarQube using SonarQube Runner'
     if hash /dev/stdout sonar-runner 2>/dev/null; then
-        runCommand /dev/stdout sonar-runner 
+        runCommand /dev/stdout sonar-runner $numVersionSonarRunner
     else
-        runCommand /dev/stdout sonar-scanner
+        runCommand /dev/stdout sonar-scanner $numVersionSonarRunner
     fi
 fi