Fix iPhone SDK version detection in Xcode 7

phatblat · phatblat · commit 768f033f0bf9 · 2015-08-08T22:51:14.000-06:00
diff --git a/script/xcode_functions.sh b/script/xcode_functions.sh
@@ -20,7 +20,7 @@ function ios_sdk_version ()
 {
     # This relies on the fact that the latest iPhone SDK
     # is the last thing listed before the Xcode version.
-    /usr/bin/xcodebuild -version -sdk 2> /dev/null | grep SDKVersion | tail -n 1 |  awk '{ print $2 }' 
+    /usr/bin/xcodebuild -version -sdk 2> /dev/null | grep -A 1 '^iPhone' | tail -n 1 |  awk '{ print $2 }' 
 }
 
 # Returns the path to the specified iOS SDK name

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ function ios_sdk_version ()`
`20`	`20`	`{`
`21`	`21`	`# This relies on the fact that the latest iPhone SDK`
`22`	`22`	`# is the last thing listed before the Xcode version.`
`23`		`- /usr/bin/xcodebuild -version -sdk 2> /dev/null \| grep SDKVersion \| tail -n 1 \| awk '{ print $2 }'`
	`23`	`+ /usr/bin/xcodebuild -version -sdk 2> /dev/null \| grep -A 1 '^iPhone' \| tail -n 1 \| awk '{ print $2 }'`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`# Returns the path to the specified iOS SDK name`