obfuscate_project tool using simulator SDK when using SDK >= 8 or Xco…

…de >= 6; pull request comments related modification;

contrib/obfuscate_project

@@ -13,6 +13,9 @@ SDK=7.1
 XCODEBUILD_OPTS=""
 CLASS_GUARD_OPTS="-i IgnoredSymbol -F !ExcludedClass"
 
+# In case of using Xcode >= 6 and SDK >= 8
+CLASS_GUARD_OPTS_SDK="--sdk-root /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$SDK.sdk"
+
 ####################################################
 # BUILD SCRIPT STARTS HERE
 ####################################################
@@ -49,7 +52,15 @@ rm -rf build/
 [[ -n "$PROJECT" ]] && XCODEBUILD_OPTS="$XCODEBUILD_OPTS -project $PROJECT"
 [[ -n "$SCHEME" ]] && XCODEBUILD_OPTS="$XCODEBUILD_OPTS -scheme $SCHEME"
 [[ -n "$CONFIGURATION" ]] && XCODEBUILD_OPTS="$XCODEBUILD_OPTS -configuration $CONFIGURATION"
-[[ -n "$SDK" ]] && XCODEBUILD_OPTS="$XCODEBUILD_OPTS -sdk iphoneos$SDK"
+
+xcodeversion=`xcodebuild -version | grep -oE '^Xcode\s+\d+' | grep -oE '\d+'`
+if ((xcodeversion > 5)) || ((SDK >= 8.0))
+then
+    [[ -n "$SDK" ]] && XCODEBUILD_OPTS="$XCODEBUILD_OPTS -sdk iphonesimulator$SDK"
+else
+    [[ -n "$SDK" ]] && XCODEBUILD_OPTS="$XCODEBUILD_OPTS -sdk iphoneos$SDK"
+    [[ -n "$SDK" ]] && CLASS_GUARD_OPTS_SDK="--sdk-ios $SDK"
+fi
 
 echo_and_run xcodebuild $XCODEBUILD_OPTS \
     clean build \
@@ -73,14 +84,14 @@ do
         echo "You cannot use this tool when there is more than one .app file in products. Otherwise, only the first one will be used for obfuscation."
         echo ""
         echo ""
-        exit
+        exit 1
     fi
     ((appsNumber+=1))
 
     TARGET=$(basename "$app" .app)
     echo "Obfuscating $TARGET in $app..."
     echo_and_run ios-class-guard \
-        --sdk-ios "$SDK" \
+        $CLASS_GUARD_OPTS_SDK \
         $CLASS_GUARD_OPTS \
         -O "$SYMBOLS_FILE" \
         "$app/$TARGET"