Upgrade kokoro to Xcode 14 (#10732)

* Upgrade kokoro to Xcode 14 * Fix osx errors
protocolbuffers · Oct 10, 2022 · 0ee5525 · 0ee5525
1 parent 887d795
commit 0ee5525
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc
@@ -15,7 +15,7 @@ brew uninstall protobuf
 
 ##
 # Select Xcode version
-export DEVELOPER_DIR=/Applications/Xcode_13.3.1.app/Contents/Developer
+export DEVELOPER_DIR=/Applications/Xcode_14.app/Contents/Developer
 sudo xcode-select -s "${DEVELOPER_DIR}"
 
 ##

diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh
@@ -295,7 +295,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
           -disable-concurrent-destination-testing
       )
       ;;
-    11.* | 12.* | 13.*)
+    11.* | 12.* | 13.* | 14.*)
       # Dropped 32bit as Apple doesn't seem support the simulators either.
       XCODEBUILD_TEST_BASE_IOS+=(
           -destination "platform=iOS Simulator,name=iPhone 8,OS=latest" # 64bit
@@ -363,7 +363,7 @@ if [[ "${DO_XCODE_TVOS_TESTS}" == "yes" ]] ; then
         -destination "platform=tvOS Simulator,name=Apple TV 4K,OS=latest"
       )
       ;;
-    13.*)
+    13.* | 14.*)
       XCODEBUILD_TEST_BASE_TVOS+=(
         -destination "platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=latest"
       )