Improve simulator discoverability

Author: markmur

sample/Gemfile

@@ -6,3 +6,4 @@ ruby ">= 2.6.10"
 gem 'cocoapods', '1.16.2'
 gem 'cocoapods-check', '1.1.0'
 gem 'activesupport', '>= 6.1.7.5', '< 7.3.0'
+gem 'xcpretty'

sample/Gemfile.lock

@@ -92,6 +92,7 @@ GEM
     nkf (0.2.0)
     public_suffix (4.0.7)
     rexml (3.4.1)
+    rouge (3.28.0)
     ruby-macho (2.5.1)
     securerandom (0.4.1)
     typhoeus (1.4.1)
@@ -105,6 +106,8 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.4.0)
       rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
 
 PLATFORMS
   ruby
@@ -113,6 +116,7 @@ DEPENDENCIES
   activesupport (>= 6.1.7.5, < 7.3.0)
   cocoapods (= 1.16.2)
   cocoapods-check (= 1.1.0)
+  xcpretty
 
 RUBY VERSION
    ruby 3.1.2p20

sample/ios/Podfile.lock

@@ -935,9 +935,9 @@ PODS:
   - React-Mapbuffer (0.74.1):
     - glog
     - React-debug
-  - react-native-config (1.5.3):
-    - react-native-config/App (= 1.5.3)
-  - react-native-config/App (1.5.3):
+  - react-native-config (1.5.5):
+    - react-native-config/App (= 1.5.5)
+  - react-native-config/App (1.5.5):
     - React-Core
   - react-native-safe-area-context (4.14.0):
     - React-Core
@@ -1170,8 +1170,27 @@ PODS:
     - React-logger (= 0.74.1)
     - React-perflogger (= 0.74.1)
     - React-utils (= 0.74.1)
-  - RNCMaskedView (0.3.1):
+  - RNCMaskedView (0.3.2):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Codegen
     - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
   - RNGestureHandler (2.15.0):
     - DoubleConversion
     - glog
@@ -1302,7 +1321,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNShopifyCheckoutSheetKit (3.1.2):
+  - RNShopifyCheckoutSheetKit (3.2.0):
     - React-Core
     - ShopifyCheckoutSheetKit (~> 3.1.2)
   - RNVectorIcons (10.2.0):
@@ -1562,7 +1581,7 @@ SPEC CHECKSUMS:
   React-jsitracing: dd0e541a34027b3ab668ad94cf268482ad6f82fb
   React-logger: 6070f362a1657bb53335eb1fc903d3f49fd79842
   React-Mapbuffer: 2c95cbabc3d75a17747452381e998c35208ea3ee
-  react-native-config: ea75335a7cca1d3326de1da384227e580a7c082e
+  react-native-config: 644074ab88db883fcfaa584f03520ec29589d7df
   react-native-safe-area-context: b13be9714d9771fbde0120bc519c963484de3a71
   React-nativeconfig: b0073a590774e8b35192fead188a36d1dca23dec
   React-NativeModulesApple: 61b07ab32af3ea4910ba553932c0a779e853c082
@@ -1587,11 +1606,11 @@ SPEC CHECKSUMS:
   React-runtimescheduler: 87b14969bb0b10538014fb8407d472f9904bc8cd
   React-utils: 67574b07bff4429fd6c4d43a7fad8254d814ee20
   ReactCommon: 64c64f4ae1f2debe3fab1800e00cb8466a4477b7
-  RNCMaskedView: de80352547bd4f0d607bf6bab363d826822bd126
+  RNCMaskedView: af7c1703f39cdef08a99275bfcadf324aa403403
   RNGestureHandler: 293aea360e79439e2272b8a5ffebd582a1e4c486
   RNReanimated: af5545657216ca1794252c132f9e6e8ceb475462
   RNScreens: 02747ebee17d2e322af4ee383877367cf82a3cd6
-  RNShopifyCheckoutSheetKit: 26cb201d8ef66263aaec45c2bfa9649606576a2a
+  RNShopifyCheckoutSheetKit: 3c10482e626a3e2579e729e61becef5cca3af859
   RNVectorIcons: 6c795cacc9276decc31d8e1a139b9cc6fc0479ca
   ShopifyCheckoutSheetKit: 5ae02dbed0047689b94c977bdcf6287752d17ce4
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
@@ -1600,4 +1619,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 9efd19a381198fb46f36acf3d269233039fb9dc5
 
-COCOAPODS: 1.16.1
+COCOAPODS: 1.16.2

sample/scripts/build_ios

@@ -3,11 +3,9 @@
 set -ex
 set -eo pipefail
 
-if [[ -n $CURRENT_SIMULATOR_UUID ]]; then
-    dest="id=$CURRENT_SIMULATOR_UUID"
-else
-    dest="platform=iOS Simulator,name=iPhone 15 Pro"
-fi
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/simulator"
+dest="$(get_sim_destination)"
 
 cd ios
 

sample/scripts/simulator

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+# Determine an iOS Simulator destination string for xcodebuild.
+get_sim_destination() {
+  if [[ -n "$CURRENT_SIMULATOR_UUID" ]]; then
+    echo "id=$CURRENT_SIMULATOR_UUID"
+    return
+  fi
+
+  # Prefer a currently booted iOS simulator (iPhone or iPad)
+  local udid
+  udid="$(xcrun simctl list devices booted \
+    | grep -E 'iPhone|iPad' \
+    | sed -n -E 's/.*\(([0-9A-Fa-f-]{36})\).*/\1/p' \
+    | head -n1)"
+
+  # If none booted, pick the first available iOS simulator (iPhone or iPad)
+  if [[ -z "$udid" ]]; then
+    udid="$(xcrun simctl list devices available \
+      | grep -E 'iPhone|iPad' \
+      | sed -n -E 's/.*\(([0-9A-Fa-f-]{36})\).*/\1/p' \
+      | head -n1)"
+  fi
+
+  if [[ -n "$udid" ]]; then
+    echo "id=$udid"
+  else
+    echo "platform=iOS Simulator,name=iPhone 15 Pro"
+  fi
+}
+
+

sample/scripts/test_ios

@@ -3,11 +3,9 @@
 set -ex
 set -eo pipefail
 
-if [[ -n $CURRENT_SIMULATOR_UUID ]]; then
-    dest="id=$CURRENT_SIMULATOR_UUID"
-else
-    dest="platform=iOS Simulator,name=iPhone 15 Pro"
-fi
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/simulator"
+dest="$(get_sim_destination)"
 
 cd ios