@capgo/capacitor-video-player 8.2.7 → 8.2.8

package/android/src/main/java/com/capgo/videoplayer/VideoPlayerPlugin.java

@@ -46,7 +46,7 @@ import org.json.JSONObject;
 )
 public class VideoPlayerPlugin extends Plugin {
 
-    private final String pluginVersion = "8.2.7";
+    private final String pluginVersion = "8.2.8";
 
     // Permission alias constants
     private static final String PERMISSION_DENIED_ERROR = "Unable to access media videos, user denied permission request";

package/ios/Sources/VideoPlayerPlugin/DismissObservingPlayerViewController.swift

@@ -5,15 +5,38 @@ final class DismissObservingPlayerViewController: AVPlayerViewController {
     var onDismiss: (() -> Void)?
     var shouldReportDismiss: (() -> Bool)?
     weak var adaptivePresentationDelegate: UIAdaptivePresentationControllerDelegate?
+    private var wasVisibleInHierarchy = false
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         presentationController?.delegate = adaptivePresentationDelegate
     }
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        wasVisibleInHierarchy = true
+    }
+
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
-        guard isBeingDismissed else { return }
+        reportDismissIfNeeded()
+    }
+
+    override func dismiss(animated: Bool, completion: (() -> Void)? = nil) {
+        super.dismiss(animated: animated) { [weak self] in
+            self?.reportDismissIfNeeded()
+            completion?()
+        }
+    }
+
+    private func reportDismissIfNeeded() {
+        guard wasVisibleInHierarchy else { return }
+        guard PlayerDismissExitDetection.shouldReportExit(
+            presentingViewController: presentingViewController,
+            viewWindow: view.window
+        ) else {
+            return
+        }
         guard shouldReportDismiss?() ?? true else { return }
         onDismiss?()
     }

package/ios/Sources/VideoPlayerPlugin/PlayerDismissExitDetection.swift

@@ -0,0 +1,16 @@
+import UIKit
+
+enum PlayerDismissExitDetection {
+    /// Returns true when a player view controller has left the visible hierarchy
+    /// because it was dismissed, not merely covered by another view controller.
+    static func shouldReportExit(
+        presentingViewController: UIViewController?,
+        viewWindow: UIWindow?
+    ) -> Bool {
+        // iOS 18+/26: AVKit Done/X can dismiss a modal AVPlayerViewController without
+        // setting isBeingDismissed or calling presentationControllerDidDismiss.
+        // Require both presenter and window to be nil so parent dismissals that only
+        // transiently set isBeingDismissed/isMovingFromParent do not emit exit.
+        presentingViewController == nil && viewWindow == nil
+    }
+}

package/ios/Sources/VideoPlayerPlugin/VideoPlayerPlugin.swift

@@ -8,7 +8,7 @@ import AVKit
  */
 @objc(VideoPlayerPlugin)
 public class VideoPlayerPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.2.7"
+    private let pluginVersion: String = "8.2.8"
     public let identifier = "VideoPlayerPlugin"
     public let jsName = "VideoPlayer"
     public let pluginMethods: [CAPPluginMethod] = [

package/ios/Tests/VideoPlayerPluginTests/PlayerDismissExitDetectionTests.swift

@@ -0,0 +1,49 @@
+import XCTest
+@testable import VideoPlayerPlugin
+
+final class PlayerDismissExitDetectionTests: XCTestCase {
+    func testReportsExitWhenModalHierarchyIsGone() {
+        XCTAssertTrue(
+            PlayerDismissExitDetection.shouldReportExit(
+                presentingViewController: nil,
+                viewWindow: nil
+            )
+        )
+    }
+
+    func testDoesNotReportExitWhenBeingDismissedButStillInHierarchy() {
+        XCTAssertFalse(
+            PlayerDismissExitDetection.shouldReportExit(
+                presentingViewController: UIViewController(),
+                viewWindow: UIWindow()
+            )
+        )
+    }
+
+    func testDoesNotReportExitWhenCoveredByAnotherViewController() {
+        XCTAssertFalse(
+            PlayerDismissExitDetection.shouldReportExit(
+                presentingViewController: UIViewController(),
+                viewWindow: UIWindow()
+            )
+        )
+    }
+
+    func testDoesNotReportExitWhenOnlyPresenterIsNil() {
+        XCTAssertFalse(
+            PlayerDismissExitDetection.shouldReportExit(
+                presentingViewController: nil,
+                viewWindow: UIWindow()
+            )
+        )
+    }
+
+    func testDoesNotReportExitWhenOnlyWindowIsNil() {
+        XCTAssertFalse(
+            PlayerDismissExitDetection.shouldReportExit(
+                presentingViewController: UIViewController(),
+                viewWindow: nil
+            )
+        )
+    }
+}

package/ios/Tests/VideoPlayerPluginTests/VideoPlayerPluginTests.swift

@@ -2,13 +2,6 @@ import XCTest
 @testable import VideoPlayerPlugin
 
 class VideoPlayerTests: XCTestCase {
-    func testEcho() {
-        let implementation = VideoPlayer()
-        let value = "Hello, World!"
-        let result = implementation.echo(value)
-        XCTAssertEqual(value, result)
-    }
-
     func testSubtitleTrackParserPrefersSubtitlesArray() {
         let tracks = VideoSubtitleTrackParser.parse(
             from: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-video-player",
-  "version": "8.2.7",
+  "version": "8.2.8",
   "description": "Capacitor plugin to play video in native player",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -12,6 +12,7 @@
     "dist/",
     "ios/Sources",
     "ios/Tests",
+    "scripts/",
     "Package.swift",
     "CapgoCapacitorVideoPlayer.podspec"
   ],
@@ -33,8 +34,9 @@
     "player"
   ],
   "scripts": {
-    "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
+    "verify": "npm run verify:ios && npm run test:ios && npm run verify:android && npm run verify:web",
     "verify:ios": "xcodebuild -scheme CapgoCapacitorVideoPlayer -destination generic/platform=iOS",
+    "test:ios": "./scripts/test-ios.sh",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "npm run build",
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",

package/scripts/check-capacitor-plugin-wiring.mjs

@@ -0,0 +1,254 @@
+#!/usr/bin/env node
+/**
+ * Capacitor plugin wiring/name checker.
+ *
+ * Enforces that runtime plugin name matches across:
+ * - JS: registerPlugin('Name')
+ * - Android: @CapacitorPlugin(name = "Name")
+ * - iOS: CAPBridgedPlugin jsName = "Name"
+ *
+ * And (when iOS is declared in package.json capacitor config):
+ * - CocoaPods podspec s.name matches SwiftPM Package(name: ...) and .library(name: ...)
+ *
+ * Usage:
+ *   node scripts/check-capacitor-plugin-wiring.mjs            # checks current working dir
+ *   node scripts/check-capacitor-plugin-wiring.mjs --dir path # checks given plugin dir
+ */
+
+import fs from "node:fs";
+import path from "node:path";
+
+const SKIP_DIRS = new Set([
+  "node_modules",
+  "dist",
+  "build",
+  ".build",
+  ".gradle",
+  "Pods",
+  "DerivedData",
+  ".swiftpm",
+  ".git",
+]);
+
+function readText(p) {
+  try {
+    return fs.readFileSync(p, "utf8");
+  } catch {
+    return "";
+  }
+}
+
+function exists(p) {
+  try {
+    fs.accessSync(p);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function walkFiles(rootDir, exts) {
+  const out = [];
+  const stack = [rootDir];
+  while (stack.length) {
+    const dir = stack.pop();
+    let entries;
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const e of entries) {
+      if (e.isDirectory()) {
+        if (SKIP_DIRS.has(e.name)) continue;
+        stack.push(path.join(dir, e.name));
+        continue;
+      }
+      if (!e.isFile()) continue;
+      for (const ext of exts) {
+        if (e.name.endsWith(ext)) {
+          out.push(path.join(dir, e.name));
+          break;
+        }
+      }
+    }
+  }
+  out.sort();
+  return out;
+}
+
+function uniq(arr) {
+  const out = [];
+  for (const x of arr) {
+    if (!x) continue;
+    if (!out.includes(x)) out.push(x);
+  }
+  return out;
+}
+
+function parseArgs(argv) {
+  const out = { dir: process.cwd() };
+  for (let i = 2; i < argv.length; i++) {
+    const a = argv[i];
+    if (a === "--dir" || a === "--pluginDir") {
+      out.dir = path.resolve(argv[++i] || ".");
+      continue;
+    }
+  }
+  return out;
+}
+
+const args = parseArgs(process.argv);
+const pluginDir = args.dir;
+const pkgPath = path.join(pluginDir, "package.json");
+
+if (!exists(pkgPath)) {
+  console.error(`[wiring] ERROR: missing package.json in ${pluginDir}`);
+  process.exit(2);
+}
+
+let pkg;
+try {
+  pkg = JSON.parse(readText(pkgPath));
+} catch (e) {
+  console.error(`[wiring] ERROR: invalid package.json (${pkgPath}): ${e?.message || e}`);
+  process.exit(2);
+}
+
+const cap = typeof pkg.capacitor === "object" && pkg.capacitor ? pkg.capacitor : {};
+const supportsAndroid = typeof cap.android === "object" && cap.android;
+const supportsIos = typeof cap.ios === "object" && cap.ios;
+
+// Not a Capacitor plugin package (e.g. meta/workspace package).
+// We only enforce wiring rules for actual plugin packages declaring a `capacitor` config.
+if (!supportsAndroid && !supportsIos) {
+  process.exit(0);
+}
+
+// ---------------- JS (registerPlugin) ----------------
+const jsSrcDir = path.join(pluginDir, "src");
+let jsName = "";
+if (exists(jsSrcDir)) {
+  const jsFiles = walkFiles(jsSrcDir, [".ts", ".js"]);
+  const reRegister = /registerPlugin(?:<[^>]*>)?\(\s*['"]([^'"]+)['"]/;
+  for (const f of jsFiles) {
+    const m = reRegister.exec(readText(f));
+    if (m) {
+      jsName = m[1];
+      break;
+    }
+  }
+}
+
+// ---------------- Android (@CapacitorPlugin) ----------------
+let androidNames = [];
+if (supportsAndroid) {
+  const androidMain = path.join(pluginDir, "android", "src", "main");
+  const files = walkFiles(androidMain, [".java", ".kt"]);
+  const foundAnnotations = [];
+  for (const f of files) {
+    const txt = readText(f);
+    if (!txt.includes("@CapacitorPlugin")) continue;
+    foundAnnotations.push(f);
+    const m =
+      /@CapacitorPlugin\(\s*name\s*=\s*"([^"]+)"/.exec(txt) ||
+      /@CapacitorPlugin\(\s*name\s*=\s*([A-Za-z0-9_]+)\b/.exec(txt);
+    if (m) androidNames.push(m[1]);
+  }
+  androidNames = uniq(androidNames);
+
+  // Enforce explicit name attribute to prevent silent class-name drift.
+  if (foundAnnotations.length && !androidNames.length) {
+    console.error(
+      `[wiring] ERROR: Android has @CapacitorPlugin but none specify name = \"...\". Add an explicit name to the plugin class.`
+    );
+    process.exit(1);
+  }
+}
+
+// ---------------- iOS (jsName) ----------------
+let iosJsNames = [];
+if (supportsIos) {
+  const iosDir = path.join(pluginDir, "ios");
+  const scanRoot = exists(path.join(iosDir, "Sources")) ? path.join(iosDir, "Sources") : iosDir;
+  const swiftFiles = walkFiles(scanRoot, [".swift"]);
+  const reJsName = /\bjsName\s*=\s*"([^"]+)"/g;
+  for (const f of swiftFiles) {
+    const txt = readText(f);
+    if (!txt.includes("jsName")) continue;
+    let m;
+    while ((m = reJsName.exec(txt))) iosJsNames.push(m[1]);
+  }
+  iosJsNames = uniq(iosJsNames);
+}
+
+// ---------------- Podspec/SPM ----------------
+function parsePodspecName(podspecPath) {
+  const txt = readText(podspecPath);
+  const m = /\bs\.name\s*=\s*'([^']+)'/.exec(txt);
+  return m ? m[1] : "";
+}
+
+function parseSpmNames(packageSwiftPath) {
+  const txt = readText(packageSwiftPath);
+  const pkg = /Package\(\s*name\s*:\s*"([^"]+)"/.exec(txt)?.[1] || "";
+  const libs = [];
+  const reLib = /\.library\(\s*name\s*:\s*"([^"]+)"/g;
+  let m;
+  while ((m = reLib.exec(txt))) libs.push(m[1]);
+  return { pkgName: pkg, libNames: uniq(libs) };
+}
+
+// ---------------- Validate ----------------
+const errors = [];
+
+if (!jsName) {
+  errors.push("JS: no registerPlugin('...') found under src/");
+}
+
+if (supportsAndroid) {
+  if (!androidNames.length) errors.push("Android: missing @CapacitorPlugin(name = \"...\")");
+  if (jsName && androidNames.length && androidNames.some((n) => n !== jsName)) {
+    errors.push(`Android: @CapacitorPlugin(name)=${JSON.stringify(androidNames)} != JS registerPlugin=${jsName}`);
+  }
+}
+
+if (supportsIos) {
+  if (!iosJsNames.length) errors.push('iOS: missing jsName = "..." in Swift sources');
+  if (jsName && iosJsNames.length && iosJsNames.some((n) => n !== jsName)) {
+    errors.push(`iOS: jsName=${JSON.stringify(iosJsNames)} != JS registerPlugin=${jsName}`);
+  }
+
+  const podspecs = fs
+    .readdirSync(pluginDir, { withFileTypes: true })
+    .filter((e) => e.isFile() && e.name.endsWith(".podspec"))
+    .map((e) => path.join(pluginDir, e.name))
+    .sort();
+  if (!podspecs.length) errors.push("iOS: missing *.podspec at plugin root");
+  if (podspecs.length > 1) errors.push(`iOS: multiple podspecs at plugin root: ${podspecs.map((p) => path.basename(p))}`);
+
+  const pkgSwift = path.join(pluginDir, "Package.swift");
+  if (!exists(pkgSwift)) {
+    errors.push("iOS: missing Package.swift at plugin root");
+  } else if (podspecs.length) {
+    const podName = parsePodspecName(podspecs[0]);
+    const { pkgName, libNames } = parseSpmNames(pkgSwift);
+    if (!podName) errors.push("Podspec: missing s.name = '...'");
+    if (!pkgName) errors.push('SPM: missing Package(name: "...")');
+    if (podName && pkgName && podName !== pkgName) {
+      errors.push(`Podspec: s.name=${podName} != Package(name)=${pkgName}`);
+    }
+    if (pkgName && libNames.length && !libNames.includes(pkgName)) {
+      errors.push(`SPM: Package(name)=${pkgName} not present in .library(name) list ${JSON.stringify(libNames)}`);
+    }
+  }
+}
+
+if (errors.length) {
+  const relDir = path.relative(process.cwd(), pluginDir) || ".";
+  console.error(`[wiring] FAIL in ${relDir}`);
+  for (const e of errors) console.error(`- ${e}`);
+  process.exit(1);
+}
+
+process.exit(0);

package/scripts/generate-ai-changelog.mjs

@@ -0,0 +1,135 @@
+#!/usr/bin/env node
+/**
+ * Generate a release changelog with Cloudflare Workers AI in CI.
+ * Invoked from build.yml on tag releases via `bun run changelog:ai`.
+ */
+
+import { execFileSync } from 'node:child_process';
+import { appendFileSync } from 'node:fs';
+
+const DEFAULT_MODEL = '@cf/moonshotai/kimi-k2.7-code';
+
+function parseArgs(argv) {
+  const args = { fromTag: process.env.FROM_TAG, toTag: process.env.TO_TAG };
+  for (let i = 0; i < argv.length; i++) {
+    if (argv[i] === '--from-tag') args.fromTag = argv[++i];
+    if (argv[i] === '--to-tag') args.toTag = argv[++i];
+    if (argv[i] === '--model') args.model = argv[++i];
+  }
+  return args;
+}
+
+function git(args) {
+  return execFileSync('/usr/bin/git', args, { encoding: 'utf8' }).trim();
+}
+
+function resolveTags({ fromTag, toTag }) {
+  const currentTag =
+    toTag ??
+    (process.env.GITHUB_REF?.startsWith('refs/tags/') ? process.env.GITHUB_REF.replace('refs/tags/', '') : null);
+
+  if (!currentTag) {
+    throw new Error('Missing target tag. Set GITHUB_REF to refs/tags/<tag> or pass --to-tag.');
+  }
+
+  const previousTag = fromTag ?? git(['describe', '--tags', '--abbrev=0', `${currentTag}^`]);
+  return { previousTag, currentTag };
+}
+
+function buildPrompt(previousTag, currentTag) {
+  const commits = git(['log', `${previousTag}..${currentTag}`, '--pretty=format:%s']);
+  const diffLines = git(['diff', '--stat', `${previousTag}..${currentTag}`]).split('\n');
+  const diffStat = diffLines.at(-1)?.trim() ?? '';
+
+  return `You are a technical writer creating a changelog for a software project.
+
+There are changes in the git repository between two points:
+- From tag: ${previousTag}
+- To tag: ${currentTag}
+- Commits:
+${commits || '(none)'}
+- Diff summary: ${diffStat || '(no file changes)'}
+
+## Instructions:
+1. **Categorize changes** using standard changelog categories:
+   - **Added**: New features
+   - **Changed**: Changes in existing functionality
+   - **Deprecated**: Soon-to-be removed features
+   - **Removed**: Removed features
+   - **Fixed**: Bug fixes
+   - **Security**: Security improvements
+
+2. **Write clear, user-focused descriptions** that explain:
+   - What changed from a user's perspective
+   - Why it matters
+   - Any breaking changes or migration notes
+
+3. **Use consistent formatting**:
+   - Each item should be a concise bullet point
+   - Start with an action verb when possible
+   - Group related changes together
+
+4. **Focus on semantic meaning** rather than technical implementation details
+
+Output ONLY the changelog content in markdown format. Do NOT include any explanatory text, metadata, introductory phrases like "Based on the git analysis" or "Here's the changelog", or concluding remarks. Start IMMEDIATELY with the changelog categories and items (e.g., "## Added"). Do not include version numbers or dates. Do not preface your response with any text whatsoever.`;
+}
+
+async function generateChangelog(prompt, model) {
+  const accountId = process.env.CLOUDFLARE_ACCOUNT_ID;
+  const apiToken = process.env.CLOUDFLARE_API_TOKEN;
+
+  if (!accountId || !apiToken) {
+    throw new Error('CLOUDFLARE_ACCOUNT_ID and CLOUDFLARE_API_TOKEN are required.');
+  }
+
+  const url = `https://api.cloudflare.com/client/v4/accounts/${accountId}/ai/run/${model}`;
+  const response = await fetch(url, {
+    method: 'POST',
+    headers: {
+      Authorization: `Bearer ${apiToken}`,
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({
+      messages: [{ role: 'user', content: prompt }],
+    }),
+  });
+
+  const payload = await response.json();
+  if (!response.ok || !payload.success) {
+    throw new Error(`Cloudflare AI request failed with status ${response.status}`);
+  }
+
+  const content = payload.result?.choices?.[0]?.message?.content ?? payload.result?.response;
+  if (!content || typeof content !== 'string') {
+    throw new Error('Cloudflare AI returned an empty changelog response');
+  }
+
+  return content.trim();
+}
+
+function writeGithubOutput({ result, fromTag, toTag }) {
+  const outputFile = process.env.GITHUB_OUTPUT;
+  if (!outputFile) return;
+
+  const delimiter = `changelog_${Date.now()}`;
+  appendFileSync(outputFile, `result<<${delimiter}\n${result}\n${delimiter}\n`);
+  appendFileSync(outputFile, `from_tag=${fromTag}\n`);
+  appendFileSync(outputFile, `to_tag=${toTag}\n`);
+}
+
+const args = parseArgs(process.argv.slice(2));
+const model = args.model ?? process.env.CLOUDFLARE_AI_MODEL ?? DEFAULT_MODEL;
+const { previousTag, currentTag } = resolveTags(args);
+const prompt = buildPrompt(previousTag, currentTag);
+
+console.error(`Generating changelog with ${model}`);
+console.error(`Range: ${previousTag}..${currentTag}`);
+
+try {
+  const result = await generateChangelog(prompt, model);
+  writeGithubOutput({ result, fromTag: previousTag, toTag: currentTag });
+} catch (error) {
+  const message = error instanceof Error ? error.message : 'Unknown error';
+  console.error(`Changelog generation failed: ${message}`);
+  process.exit(1);
+}

package/scripts/test-ios.sh

@@ -0,0 +1,109 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$ROOT_DIR"
+
+SIMULATOR_ID=$(xcrun simctl list devices available | awk -F '[()]' '/iPhone/{print $2; exit}')
+
+if [[ -z "${SIMULATOR_ID:-}" ]]; then
+  echo "No available iPhone simulator found. Please install one via Xcode." >&2
+  exit 1
+fi
+
+DESTINATION="id=${SIMULATOR_ID}"
+SCHEME="CapgoCapacitorVideoPlayer"
+SCRIPT_TIMEOUT_SECONDS=600
+DEADLINE=$((SECONDS + SCRIPT_TIMEOUT_SECONDS))
+
+BUILD_ARGS=()
+TEST_ARGS=()
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    -only-testing|-skip-testing|-resultBundlePath)
+      TEST_ARGS+=("$1")
+      shift
+      if [[ $# -gt 0 ]]; then
+        TEST_ARGS+=("$1")
+        shift
+      fi
+      ;;
+    -testPlan)
+      BUILD_ARGS+=("$1")
+      TEST_ARGS+=("$1")
+      shift
+      if [[ $# -gt 0 ]]; then
+        BUILD_ARGS+=("$1")
+        TEST_ARGS+=("$1")
+        shift
+      fi
+      ;;
+    -only-testing:*|-skip-testing:*|-resultBundlePath=*)
+      TEST_ARGS+=("$1")
+      shift
+      ;;
+    -testPlan=*)
+      BUILD_ARGS+=("$1")
+      TEST_ARGS+=("$1")
+      shift
+      ;;
+    *)
+      BUILD_ARGS+=("$1")
+      TEST_ARGS+=("$1")
+      shift
+      ;;
+  esac
+done
+
+timeout_dir=$(mktemp -d "${TMPDIR:-/tmp}/test-ios-timeout.XXXXXX")
+timeout_marker="${timeout_dir}/timed-out"
+trap 'rm -rf "$timeout_dir"' EXIT
+
+run_with_timeout() {
+  local remaining=$((DEADLINE - SECONDS))
+  if [[ "$remaining" -le 0 ]]; then
+    echo "error: xcodebuild timed out after ${SCRIPT_TIMEOUT_SECONDS}s" >&2
+    : >"$timeout_marker"
+    return 124
+  fi
+
+  set +e
+  (
+    set -m
+    "$@" &
+    local pid=$!
+    (
+      sleep "$remaining"
+      if kill -0 "$pid" 2>/dev/null; then
+        echo "error: xcodebuild timed out after ${SCRIPT_TIMEOUT_SECONDS}s" >&2
+        : >"$timeout_marker"
+        kill -TERM -"$pid" 2>/dev/null || kill -TERM "$pid" 2>/dev/null
+        sleep 2
+        kill -KILL -"$pid" 2>/dev/null || kill -KILL "$pid" 2>/dev/null
+      fi
+    ) &
+    local watchdog=$!
+    wait "$pid"
+    local status=$?
+    kill "$watchdog" 2>/dev/null || true
+    wait "$watchdog" 2>/dev/null || true
+    exit "$status"
+  )
+  local status=$?
+  set -e
+
+  if [[ -f "$timeout_marker" ]]; then
+    return 124
+  fi
+  return "$status"
+}
+
+run_with_timeout xcodebuild build-for-testing \
+  -scheme "$SCHEME" \
+  -destination "$DESTINATION" \
+  "${BUILD_ARGS[@]}"
+
+run_with_timeout xcodebuild test-without-building \
+  -scheme "$SCHEME" \
+  -destination "$DESTINATION" \
+  "${TEST_ARGS[@]}"