simplify build script

Author: fadi-george

examples/demo/Assets/Scripts/Editor/BuildScript.cs

@@ -68,29 +68,18 @@ public static void BuildAndroidEmulator()
 
     /// <summary>
     /// Builds an Xcode project for the iOS Simulator.
+    /// The OneSignal SDK post-processor automatically adds push capabilities,
+    /// the NSE target, and CocoaPods entries during the build.
     /// </summary>
     public static void BuildiOSSimulator()
-    {
-        BuildiOS(iOSSdkVersion.SimulatorSDK);
-    }
-
-    /// <summary>
-    /// Builds an Xcode project for a physical iOS device.
-    /// </summary>
-    public static void BuildiOSDevice()
-    {
-        BuildiOS(iOSSdkVersion.DeviceSDK);
-    }
-
-    private static void BuildiOS(iOSSdkVersion sdkVersion)
     {
         Directory.CreateDirectory(IOSOutputDir);
 
         PlayerSettings.SetScriptingBackend(
             NamedBuildTarget.iOS,
             ScriptingImplementation.IL2CPP
         );
-        PlayerSettings.iOS.sdkVersion = sdkVersion;
+        PlayerSettings.iOS.sdkVersion = iOSSdkVersion.SimulatorSDK;
 
         Debug.Log(
             $"[BuildScript] iOS sdk={PlayerSettings.iOS.sdkVersion} backend={PlayerSettings.GetScriptingBackend(NamedBuildTarget.iOS)}"

examples/demo/build_ios.sh

@@ -1,11 +1,8 @@
 #!/bin/sh
-# Build the OneSignal Unity demo for iOS simulator or device.
+# Build the OneSignal Unity demo for iOS simulator.
 #
 # Usage:
-#   ./build_ios.sh [--device] [--no-install] [--install-only] [--open]
-#
-# By default targets the iOS Simulator. Pass --device to build for a
-# connected physical device instead.
+#   ./build_ios.sh [--no-install] [--install-only] [--open]
 set -eu
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
@@ -18,11 +15,9 @@ APP_BUNDLE_ID="com.onesignal.example"
 INSTALL=true
 SKIP_BUILD=false
 OPEN_XCODE=false
-DEVICE_BUILD=false
 
 for arg in "$@"; do
   case "$arg" in
-    --device)       DEVICE_BUILD=true ;;
     --no-install)   INSTALL=false ;;
     --install-only) SKIP_BUILD=true ;;
     --open)         OPEN_XCODE=true; INSTALL=false; SKIP_BUILD=true ;;
@@ -58,63 +53,9 @@ for r,devs in d['devices'].items():
   SIM_NAME=$(echo "$LINE" | cut -d'|' -f2)
 }
 
-pick_device() {
-  LIST=$(python3 -c "
-import subprocess,json,sys,tempfile,os
-tmp = tempfile.mktemp(suffix='.json')
-subprocess.run(['xcrun','devicectl','list','devices','--json-output',tmp],
-               capture_output=True, text=True)
-try:
-    with open(tmp) as f: data = json.load(f)
-finally:
-    try: os.unlink(tmp)
-    except: pass
-for d in data.get('result',{}).get('devices',[]):
-    identifier = d.get('identifier','')
-    name = d.get('deviceProperties',{}).get('name','')
-    platform = d.get('hardwareProperties',{}).get('platform','')
-    if identifier and name and platform in ('iOS','iPadOS'):
-        print(identifier + '|' + name)
-" 2>/dev/null || true)
-  COUNT=$(printf '%s\n' "$LIST" | grep -c . || true)
-
-  [ "$COUNT" -eq 0 ] && echo "No connected devices found. Plug in a device or check Xcode." && exit 1
-  [ "$COUNT" -eq 1 ] && DEV_UDID=$(echo "$LIST" | cut -d'|' -f1) && DEV_NAME=$(echo "$LIST" | cut -d'|' -f2) && return
-
-  echo "Multiple devices found — pick one:"
-  i=1
-  printf '%s\n' "$LIST" | while IFS='|' read -r UDID NAME; do
-    printf "  [%d] %s  (%s)\n" "$i" "$NAME" "$UDID"
-    i=$((i + 1))
-  done
-  printf "Choice [1-%d]: " "$COUNT"
-  read -r CHOICE
-  LINE=$(printf '%s\n' "$LIST" | sed -n "${CHOICE}p")
-  [ -z "$LINE" ] && echo "Invalid choice." && exit 1
-  DEV_UDID=$(echo "$LINE" | cut -d'|' -f1)
-  DEV_NAME=$(echo "$LINE" | cut -d'|' -f2)
-}
-
-TARGET_UDID=""
-TARGET_NAME=""
-
-if [ "$INSTALL" = true ]; then
-  if [ "$DEVICE_BUILD" = true ]; then
-    DEV_UDID=""
-    DEV_NAME=""
-    pick_device
-    TARGET_UDID="$DEV_UDID"
-    TARGET_NAME="$DEV_NAME"
-  else
-    SIM_UDID=""
-    SIM_NAME=""
-    pick_simulator
-    TARGET_UDID="$SIM_UDID"
-    TARGET_NAME="$SIM_NAME"
-  fi
-  echo "Target: $TARGET_NAME ($TARGET_UDID)"
-  echo ""
-fi
+SIM_UDID=""
+SIM_NAME=""
+[ "$INSTALL" = true ] && pick_simulator && echo "Target: $SIM_NAME ($SIM_UDID)" && echo ""
 
 if [ "$OPEN_XCODE" = true ]; then
   WS="$XCODE_DIR/Unity-iPhone.xcworkspace"
@@ -130,20 +71,13 @@ if [ "$SKIP_BUILD" = true ]; then
 else
   [ ! -x "$UNITY" ] && echo "Unity not found at $UNITY — set UNITY_PATH" && exit 1
   mkdir -p "$XCODE_DIR"
-
-  if [ "$DEVICE_BUILD" = true ]; then
-    BUILD_METHOD="BuildScript.BuildiOSDevice"
-    echo "Generating Xcode project (IL2CPP / Device)..."
-  else
-    BUILD_METHOD="BuildScript.BuildiOSSimulator"
-    echo "Generating Xcode project (IL2CPP / Simulator)..."
-  fi
+  echo "Generating Xcode project (IL2CPP / Simulator)..."
   echo "Log: $LOG"
   echo ""
 
   START=$(date +%s)
   "$UNITY" -batchmode -nographics -quit -buildTarget iOS \
-    -projectPath "$SCRIPT_DIR" -executeMethod "$BUILD_METHOD" \
+    -projectPath "$SCRIPT_DIR" -executeMethod BuildScript.BuildiOSSimulator \
     -logFile "$LOG"
   ELAPSED=$(( $(date +%s) - START ))
 
@@ -156,28 +90,22 @@ if [ -f "$XCODE_DIR/Podfile" ]; then
   (cd "$XCODE_DIR" && pod install --repo-update)
 fi
 
-if [ "$INSTALL" = true ] && [ -n "$TARGET_UDID" ]; then
+if [ "$INSTALL" = true ] && [ -n "$SIM_UDID" ]; then
   echo ""
-  echo "Building with xcodebuild..."
+  echo "Building with xcodebuild for simulator..."
   WS="$XCODE_DIR/Unity-iPhone.xcworkspace"
   [ ! -d "$WS" ] && WS=""
 
-  if [ "$DEVICE_BUILD" = true ]; then
-    DESTINATION="generic/platform=iOS"
-  else
-    DESTINATION="id=$TARGET_UDID"
-  fi
-
   BUILD_START=$(date +%s)
   if [ -n "$WS" ]; then
     xcodebuild -workspace "$WS" -scheme "$SCHEME" \
-      -destination "$DESTINATION" \
+      -destination "id=$SIM_UDID" \
       -derivedDataPath "$DERIVED" \
       -quiet \
       build
   else
     xcodebuild -project "$XCODE_DIR/Unity-iPhone.xcodeproj" -scheme "$SCHEME" \
-      -destination "$DESTINATION" \
+      -destination "id=$SIM_UDID" \
       -derivedDataPath "$DERIVED" \
       -quiet \
       build
@@ -188,13 +116,7 @@ if [ "$INSTALL" = true ] && [ -n "$TARGET_UDID" ]; then
   APP_PATH=$(find "$DERIVED" -name "*.app" -path "*/Build/Products/*" | head -1)
   [ -z "$APP_PATH" ] && echo "Could not find .app bundle in derived data." && exit 1
 
-  if [ "$DEVICE_BUILD" = true ]; then
-    echo "Installing on $TARGET_NAME..."
-    xcrun devicectl device install app --device "$TARGET_UDID" "$APP_PATH"
-    xcrun devicectl device process launch --device "$TARGET_UDID" "$APP_BUNDLE_ID"
-  else
-    echo "Installing on $TARGET_NAME..."
-    xcrun simctl install "$TARGET_UDID" "$APP_PATH"
-    xcrun simctl launch "$TARGET_UDID" "$APP_BUNDLE_ID"
-  fi
+  echo "Installing on $SIM_NAME..."
+  xcrun simctl install "$SIM_UDID" "$APP_PATH"
+  xcrun simctl launch "$SIM_UDID" "$APP_BUNDLE_ID"
 fi