Merge branch 'master' into bugfix/zeveisenberg/252-IB-target-action

Rightpoint · Jan 13, 2017 · 258e83b · 258e83b
2 parents 9161a2e + 7180991
commit 258e83b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/scripts/iOS.sh b/scripts/iOS.sh
@@ -1,15 +1,11 @@
 #!/bin/sh
 
-## Currently hardcoding the destination id while circle's OS X image is messed up
-## https://discuss.circleci.com/t/multiple-ios-simulators-available-for-single-os-device-configurations/7854
-## Once fixed replace "id=$ID" with "platform=iOS Simulator,name=iPhone 6S,OS=10.0"
-
 set -o pipefail && \
   xcodebuild clean build test \
   -project BonMot.xcodeproj \
   -scheme BonMot-iOS \
   -sdk iphonesimulator \
-  -destination "id=55CA63D0-DBF6-4F35-A5B6-31AA93F6A3E7" \
+  -destination "platform=iOS Simulator,name=iPhone 6S,OS=10.1" \
   CODE_SIGNING_REQUIRED=NO \
   CODE_SIGN_IDENTITY= \
   | xcpretty
@@ -19,7 +15,7 @@ set -o pipefail && TOOLCHAINS=com.apple.dt.toolchain.Swift_2_3 \
   -project BonMot.xcodeproj \
   -scheme BonMot-iOS \
   -sdk iphonesimulator \
-  -destination "id=55CA63D0-DBF6-4F35-A5B6-31AA93F6A3E7" \
+  -destination "platform=iOS Simulator,name=iPhone 6S,OS=10.1" \
   CODE_SIGNING_REQUIRED=NO \
   CODE_SIGN_IDENTITY= \
   | xcpretty \
diff --git a/scripts/tvOS.sh b/scripts/tvOS.sh
@@ -1,15 +1,11 @@
 #!/bin/sh
 
-## Currently hardcoding the destination id while circle's OS X image is messed up
-## https://discuss.circleci.com/t/multiple-ios-simulators-available-for-single-os-device-configurations/7854
-## Once fixed replace "id=$ID" with "platform=tvOS Simulator,name=Apple TV 1080pm,OS=10.0"
-
 set -o pipefail && \
   xcodebuild clean build test \
   -project BonMot.xcodeproj \
   -scheme BonMot-tvOS \
   -sdk appletvsimulator \
-  -destination "id=48B0E1AB-F5EB-40FB-9372-A16B93349B12" \
+  -destination "platform=tvOS Simulator,name=Apple TV 1080p,OS=10.0" \
   CODE_SIGNING_REQUIRED=NO \
   CODE_SIGN_IDENTITY= \
   | xcpretty
@@ -19,7 +15,7 @@ set -o pipefail && TOOLCHAINS=com.apple.dt.toolchain.Swift_2_3 \
   -project BonMot.xcodeproj \
   -scheme BonMot-tvOS \
   -sdk appletvsimulator \
-  -destination "id=48B0E1AB-F5EB-40FB-9372-A16B93349B12" \
+  -destination "platform=tvOS Simulator,name=Apple TV 1080p,OS=10.0" \
   CODE_SIGNING_REQUIRED=NO \
   CODE_SIGN_IDENTITY= \
   | xcpretty
diff --git a/scripts/watchOS.sh b/scripts/watchOS.sh
@@ -1,17 +1,11 @@
 #!/bin/sh
 
-## Circle's OS X image is messed up
-## https://discuss.circleci.com/t/multiple-ios-simulators-available-for-single-os-device-configurations/7854
-## If you are getting an error "Unable to find a destination matching the provided destination specifier:"
-## replace platform=watchOS Simulator,name=Apple Watch - 38mm,OS=10.0 with id=$ID where $ID is one of
-## of the ones provided
-
 set -o pipefail && \
   xcodebuild clean build \
   -project BonMot.xcodeproj \
   -scheme BonMot-watchOS \
   -sdk watchsimulator \
-  -destination "id=8B69EEB7-101D-46FA-AB3C-A8B7BCCF004B" \
+  -destination "platform=watchOS Simulator,name=Apple Watch - 38mm,OS=3.1" \
   CODE_SIGNING_REQUIRED=NO \
   CODE_SIGN_IDENTITY= \
   | xcpretty
@@ -21,7 +15,7 @@ set -o pipefail && TOOLCHAINS=com.apple.dt.toolchain.Swift_2_3 \
   -project BonMot.xcodeproj \
   -scheme BonMot-watchOS \
   -sdk watchsimulator \
-  -destination "id=8B69EEB7-101D-46FA-AB3C-A8B7BCCF004B" \
+  -destination "platform=watchOS Simulator,name=Apple Watch - 38mm,OS=3.1" \
   CODE_SIGNING_REQUIRED=NO \
   CODE_SIGN_IDENTITY= \
   | xcpretty \