refactor ios env

Author: abueide

CLAUDE.md

@@ -708,11 +708,13 @@ examples/{platform}/
 │       └── devices/     # User device definitions
 │           ├── *.json
 │           └── devices.lock
-├── devbox.json          # Includes plugin
+├── devbox.json          # Includes plugin via path: (local development)
 └── README.md            # Usage guide
-# Note: <plugin-dir> is "{platform}" for local includes (plugin:../plugins/{platform}),
-# but for GitHub includes it uses the full dotted path
-# (e.g., "segment-integrations.devbox-plugins.android").
+# Note: Examples use local path includes (path:../../plugins/{platform}/plugin.json)
+# so PR checks test against the current plugin source. User-facing docs show the
+# GitHub URL format (github:segment-integrations/devbox-plugins?dir=plugins/{platform}).
+# <plugin-dir> is "{platform}" for local/path includes, but for GitHub includes it
+# uses the full dotted path (e.g., "segment-integrations.devbox-plugins.android").
 ```
 
 **Test Directory Layout:**

examples/android/devbox.json

@@ -1,5 +1,5 @@
 {
-  "include": ["github:segment-integrations/devbox-plugins/main?dir=plugins/android"],
+  "include": ["path:../../plugins/android/plugin.json"],
   "packages": {
     "jdk17": "latest",
     "gradle": "latest"
@@ -11,14 +11,10 @@
   "shell": {
     "scripts": {
       "build": [
-        "echo 'Building Android app...'",
-        "gradle assembleDebug --info"
+        "android.sh build"
       ],
-      "start:emu": [
-        "android.sh emulator start ${1:-${ANDROID_DEFAULT_DEVICE:-max}}"
-      ],
-      "stop:emu": [
-        "android.sh emulator stop"
+      "build:release": [
+        "android.sh build --config Release"
       ],
       "start:app": [
         "android.sh run ${1:-${ANDROID_DEFAULT_DEVICE:-max}}"
@@ -28,9 +24,6 @@
       ],
       "test:e2e": [
         "process-compose -f tests/test-suite.yaml --no-server --tui=${TEST_TUI:-false}"
-      ],
-      "test:e2e:debug": [
-        "ANDROID_DEBUG_SETUP=1 process-compose -f tests/test-suite.yaml --no-server --tui=false --log-level=debug"
       ]
     }
   }

examples/ios/devbox.json

@@ -1,29 +1,21 @@
 {
-  "include": ["github:segment-integrations/devbox-plugins/main?dir=plugins/ios"],
+  "include": ["path:../../plugins/ios/plugin.json"],
   "packages": {
     "process-compose": "latest"
   },
   "shell": {
     "scripts": {
-      "build:ios": [
-        "echo 'Building iOS app...'",
-        "env -u LD -u LDFLAGS -u NIX_LDFLAGS -u NIX_CFLAGS_COMPILE -u NIX_CFLAGS_LINK xcodebuild -project ios.xcodeproj -scheme ios -configuration Debug -destination 'generic/platform=iOS Simulator' -derivedDataPath .devbox/virtenv/ios/DerivedData build"
+      "build": [
+        "ios.sh build"
       ],
-      "start:sim": [
-        "ios.sh simulator start ${1:-${IOS_DEFAULT_DEVICE:-max}}"
-      ],
-      "stop:sim": [
-        "ios.sh simulator stop"
+      "build:release": [
+        "ios.sh build --config Release"
       ],
       "start:app": [
         "ios.sh run ${1:-}"
       ],
-      "deploy": [
-        "devbox run build:ios",
-        "devbox run start:app"
-      ],
       "test": [
-        "env -u LD -u LDFLAGS -u NIX_LDFLAGS -u NIX_CFLAGS_COMPILE -u NIX_CFLAGS_LINK xcodebuild -project ios.xcodeproj -scheme ios -configuration Debug -destination 'generic/platform=iOS Simulator' -derivedDataPath .devbox/virtenv/ios/DerivedData test"
+        "ios.sh build --action test"
       ],
       "test:e2e": [
         "process-compose -f tests/test-suite.yaml --no-server --tui=${TEST_TUI:-false}"

examples/react-native/devbox.json

@@ -1,16 +1,14 @@
 {
-  "include": ["github:segment-integrations/devbox-plugins/main?dir=plugins/react-native"],
+  "include": ["path:../../plugins/react-native/plugin.json"],
   "packages": [
     "nodejs@20",
     "watchman@latest",
     "jdk17@latest",
     "gradle@latest"
   ],
   "env": {
-    "IOS_APP_PROJECT": "ReactNativeExample.xcodeproj",
     "IOS_APP_SCHEME": "ReactNativeExample",
     "IOS_APP_BUNDLE_ID": "org.reactjs.native.example.ReactNativeExample",
-    "IOS_APP_ARTIFACT": ".devbox/virtenv/ios/DerivedData/Build/Products/Debug-iphonesimulator/ReactNativeExample.app",
     "ANDROID_APP_ID": "com.reactnativeexample",
     "ANDROID_APP_APK": "android/app/build/outputs/apk/debug/app-debug.apk",
     "ANDROID_MAX_API": "35",
@@ -27,12 +25,21 @@
       ],
       "build:android": [
         "devbox run install",
-        "cd android && gradle assembleDebug"
+        "android.sh build"
+      ],
+      "build:android:release": [
+        "devbox run install",
+        "android.sh build --config Release"
       ],
       "build:ios": [
         "devbox run install",
         "cd ios && pod install --repo-update",
-        "cd ios && env -u LD -u LDFLAGS -u NIX_LDFLAGS -u NIX_CFLAGS_COMPILE -u NIX_CFLAGS_LINK xcodebuild -workspace ReactNativeExample.xcworkspace -scheme ${IOS_APP_SCHEME} -configuration Debug -destination 'generic/platform=iOS Simulator' -derivedDataPath ${DEVBOX_PROJECT_ROOT}/.devbox/virtenv/ios/DerivedData -quiet build"
+        "ios.sh build --quiet"
+      ],
+      "build:ios:release": [
+        "devbox run install",
+        "cd ios && pod install --repo-update",
+        "ios.sh build --config Release --quiet"
       ],
       "build:web": [
         "devbox run install",
@@ -43,12 +50,26 @@
         "devbox run build:ios",
         "devbox run build:web"
       ],
+      "build:debug": [
+        "devbox run build:android",
+        "devbox run build:ios"
+      ],
+      "build:release": [
+        "devbox run build:android:release",
+        "devbox run build:ios:release"
+      ],
       "start:android": [
         "process-compose -f tests/dev-android.yaml --tui=${DEVBOX_TUI:-false}"
       ],
+      "start:android:release": [
+        "ANDROID_BUILD_CONFIG=Release process-compose -f tests/dev-android.yaml --tui=${DEVBOX_TUI:-false}"
+      ],
       "start:ios": [
         "process-compose -f tests/dev-ios.yaml --tui=${DEVBOX_TUI:-false}"
       ],
+      "start:ios:release": [
+        "IOS_BUILD_CONFIG=Release process-compose -f tests/dev-ios.yaml --tui=${DEVBOX_TUI:-false}"
+      ],
       "start:web": [
         "process-compose -f tests/dev-web.yaml --tui=${DEVBOX_TUI:-false}"
       ],

examples/react-native/tests/dev-android.yaml

@@ -38,9 +38,9 @@ processes:
   # Phase 2: Build Android app (Debug)
   build-android:
     command: |
-      . ${ANDROID_RUNTIME_DIR}/scripts/init/setup.sh
-      echo '📦 Building Android app (Debug)...'
-      cd android && gradle assembleDebug
+      BUILD_CONFIG="${ANDROID_BUILD_CONFIG:-Debug}"
+      echo "📦 Building Android app (${BUILD_CONFIG})..."
+      android.sh build --config "$BUILD_CONFIG"
       echo '✓ Build complete'
     depends_on:
       build-node:

examples/react-native/tests/dev-ios.yaml

@@ -119,12 +119,8 @@ processes:
     command: |
       set -e
 
-      # Use Debug build for fast compilation
-      BUILD_CONFIG="Debug"
-
-      PROJECT_ROOT="${DEVBOX_PROJECT_ROOT:-$(pwd)}"
-      echo "📲 Building React Native app (Debug)"
-      echo "Build configuration: $BUILD_CONFIG"
+      BUILD_CONFIG="${IOS_BUILD_CONFIG:-Debug}"
+      echo "📲 Building React Native app (${BUILD_CONFIG})"
 
       . ${REACT_NATIVE_VIRTENV}/metro/env-ios.sh
       echo "Metro port: $METRO_PORT"
@@ -149,28 +145,13 @@ processes:
 
       echo "Building for simulator: $DEVICE_UDID"
 
-      DERIVED_DATA_PATH="$PROJECT_ROOT/.devbox/virtenv/ios/DerivedData"
-      mkdir -p "$DERIVED_DATA_PATH"
-
-      # Build with xcodebuild (Debug for fast iteration)
-      (
-        cd ios
-        env -u LD -u LDFLAGS -u NIX_LDFLAGS -u NIX_CFLAGS_COMPILE -u NIX_CFLAGS_LINK \
-          NODE_BINARY="$NODE_BINARY" \
-          RCT_METRO_PORT="$METRO_PORT" \
-          xcodebuild \
-          -workspace ReactNativeExample.xcworkspace \
-          -scheme ${IOS_APP_SCHEME} \
-          -configuration "$BUILD_CONFIG" \
-          -destination "id=$DEVICE_UDID" \
-          -derivedDataPath "$DERIVED_DATA_PATH" \
-          -quiet \
-          build
-      )
+      # Build with ios.sh build
+      NODE_BINARY="$NODE_BINARY" RCT_METRO_PORT="$METRO_PORT" \
+        ios.sh build --config "$BUILD_CONFIG" --quiet
 
       # Install the built app
       echo "Installing app to simulator..."
-      APP_PATH="${DEVBOX_PROJECT_ROOT}/.devbox/virtenv/ios/DerivedData/Build/Products/Debug-iphonesimulator/ReactNativeExample.app"
+      APP_PATH="${IOS_DERIVED_DATA_PATH:-${DEVBOX_PROJECT_ROOT}/.devbox/virtenv/ios/DerivedData}/Build/Products/${BUILD_CONFIG}-iphonesimulator/ReactNativeExample.app"
 
       if [ ! -d "$APP_PATH" ]; then
         echo "ERROR: App bundle not found at $APP_PATH"

examples/react-native/tests/test-suite-android-e2e.yaml

@@ -39,10 +39,9 @@ processes:
   # Phase 2: Build Android app
   build-android:
     command: |
-      # Source Android environment
-      . ${ANDROID_RUNTIME_DIR}/scripts/init/setup.sh
-      echo '📦 Building Android app...'
-      cd android && gradle assembleDebug
+      BUILD_CONFIG="${ANDROID_BUILD_CONFIG:-Debug}"
+      echo "📦 Building Android app (${BUILD_CONFIG})..."
+      android.sh build --config "$BUILD_CONFIG"
       echo '✓ Build complete'
     depends_on:
       build-node:

examples/react-native/tests/test-suite-ios-e2e.yaml

@@ -135,26 +135,13 @@ processes:
       timeout_seconds: 60
       success_threshold: 1
 
-  # Phase 6: Build and deploy app with xcodebuild
+  # Phase 6: Build and deploy app
   deploy-ios:
     command: |
       set -e
 
-      # Set build configuration (default to Release for E2E tests)
-      BUILD_CONFIG="Release"
-      test -n "${IOS_BUILD_CONFIG:-}" && BUILD_CONFIG="$IOS_BUILD_CONFIG"
-
-      # Get absolute project root path
-      PROJECT_ROOT="${DEVBOX_PROJECT_ROOT:-}"
-      test -z "$PROJECT_ROOT" && PROJECT_ROOT="$(pwd)"
-
-      echo "📲 Building React Native app"
-      echo "Build configuration: $BUILD_CONFIG"
-      echo "Project root: $PROJECT_ROOT"
-
-      # Validate critical variables early
-      test -z "$BUILD_CONFIG" && { echo "ERROR: BUILD_CONFIG is empty!" >&2; exit 1; }
-      test -z "$PROJECT_ROOT" && { echo "ERROR: PROJECT_ROOT is empty!" >&2; exit 1; }
+      BUILD_CONFIG="${IOS_BUILD_CONFIG:-Release}"
+      echo "📲 Building React Native app (${BUILD_CONFIG})"
 
       # Source Metro environment so React Native uses correct port
       . ${REACT_NATIVE_VIRTENV}/metro/env-ios.sh
@@ -181,56 +168,29 @@ processes:
 
       if [ -z "$DEVICE_UDID" ]; then
         echo "ERROR: No booted simulator found after $max_attempts attempts" >&2
-        echo "Available devices:" >&2
         xcrun simctl list devices >&2
         exit 1
       fi
 
       echo "Building for simulator: $DEVICE_UDID"
 
-      # Build with xcodebuild
-      # Remove Nix-specific flags that interfere with Apple toolchain
-      # NODE_BINARY is set by React Native plugin init hook
-      # Pass RCT_METRO_PORT so the app connects to the correct Metro instance
-
-      DERIVED_DATA_PATH="$PROJECT_ROOT/.devbox/virtenv/ios/DerivedData"
-      echo "Derived data path: $DERIVED_DATA_PATH"
-
-      # Ensure the derived data directory exists
-      mkdir -p "$DERIVED_DATA_PATH"
-
-      # Build with xcodebuild in a subshell to preserve variables
-      (
-        cd ios
-        env -u LD -u LDFLAGS -u NIX_LDFLAGS -u NIX_CFLAGS_COMPILE -u NIX_CFLAGS_LINK \
-          NODE_BINARY="$NODE_BINARY" \
-          RCT_METRO_PORT="$METRO_PORT" \
-          xcodebuild \
-          -workspace ReactNativeExample.xcworkspace \
-          -scheme ${IOS_APP_SCHEME} \
-          -configuration "$BUILD_CONFIG" \
-          -destination "id=$DEVICE_UDID" \
-          -derivedDataPath "$DERIVED_DATA_PATH" \
-          -quiet \
-          build
-      )
+      # Build with ios.sh build
+      NODE_BINARY="$NODE_BINARY" RCT_METRO_PORT="$METRO_PORT" \
+        ios.sh build --config "$BUILD_CONFIG" --quiet
 
       # Install the built app
       echo "Installing app to simulator..."
-
-      # Use Release build for E2E tests
-      APP_PATH="${DEVBOX_PROJECT_ROOT}/.devbox/virtenv/ios/DerivedData/Build/Products/Release-iphonesimulator/ReactNativeExample.app"
+      APP_PATH="${IOS_DERIVED_DATA_PATH:-${DEVBOX_PROJECT_ROOT}/.devbox/virtenv/ios/DerivedData}/Build/Products/${BUILD_CONFIG}-iphonesimulator/ReactNativeExample.app"
 
       if [ ! -d "$APP_PATH" ]; then
         echo "ERROR: App bundle not found at $APP_PATH" >&2
-        echo "ERROR: Contents of Products directory:" >&2
-        ls -la "${DEVBOX_PROJECT_ROOT}/.devbox/virtenv/ios/DerivedData/Build/Products/" >&2 || true
+        ls -la "${IOS_DERIVED_DATA_PATH:-${DEVBOX_PROJECT_ROOT}/.devbox/virtenv/ios/DerivedData}/Build/Products/" >&2 || true
         exit 1
       fi
 
       xcrun simctl install "$DEVICE_UDID" "$APP_PATH"
 
-      # Launch app with Metro port environment variable
+      # Launch app with Metro port
       echo "Launching app with Metro on port $METRO_PORT..."
       xcrun simctl launch "$DEVICE_UDID" "${IOS_APP_BUNDLE_ID}" \
         RCT_METRO_PORT="$METRO_PORT"

plugins/android/REFERENCE.md

@@ -28,6 +28,8 @@ Configure the plugin by setting environment variables in `plugin.json`. These ar
 - `ANDROID_DEFAULT_DEVICE` — Default device name when none specified
 - `ANDROID_SYSTEM_IMAGE_TAG` — System image tag (e.g., "google_apis", "google_apis_playstore")
 - `ANDROID_APP_APK` — Path or glob pattern for APK (relative to project root)
+- `ANDROID_BUILD_CONFIG` — Build configuration: Debug or Release (default: "Debug")
+- `ANDROID_BUILD_TASK` — Gradle task override (empty = auto-derive from config, e.g., assembleDebug)
 - `ANDROID_BUILD_TOOLS_VERSION` — Build tools version (e.g., "36.1.0")
 - `ANDROID_INCLUDE_NDK` — Include Android NDK in SDK (true/false, default: false)
 - `ANDROID_NDK_VERSION` — NDK version when enabled (e.g., "27.0.12077973")
@@ -43,6 +45,49 @@ Configure the plugin by setting environment variables in `plugin.json`. These ar
 
 ## Commands
 
+### Build
+
+```bash
+android.sh build [--config Debug|Release] [--task gradle_task] [--quiet]
+                  [-- extra_gradle_args...]
+```
+- Auto-detects Gradle project by looking for `build.gradle`, `build.gradle.kts`, or `settings.gradle`
+- Default: runs `gradle assembleDebug` (or `assembleRelease` if `--config Release`)
+- Uses `gradlew` if present in the project, otherwise falls back to system `gradle`
+
+**Project detection order:**
+1. Current working directory
+2. `$DEVBOX_PROJECT_ROOT` (if different)
+3. `$PWD/android/` (React Native convention)
+4. `$DEVBOX_PROJECT_ROOT/android/` (if different)
+
+**Examples:**
+```bash
+# Build with defaults (assembleDebug)
+android.sh build
+
+# Build Release
+android.sh build --config Release
+
+# Custom Gradle task
+android.sh build --task bundleRelease
+
+# Pass extra Gradle flags
+android.sh build -- --info --stacktrace
+```
+
+Use in `devbox.json`:
+```json
+{
+  "shell": {
+    "scripts": {
+      "build": ["android.sh build"],
+      "build:release": ["android.sh build --config Release"]
+    }
+  }
+}
+```
+
 ### Emulator
 
 - `devbox run --pure android.sh emulator start [--pure] [device]`
@@ -72,7 +117,7 @@ Configure the plugin by setting environment variables in `plugin.json`. These ar
 2. Recursive search of project root for `*.apk` files (excludes .gradle/, build/intermediates/, node_modules/, .devbox/)
 3. Recursive search of `$PWD` if different from project root (same exclusions)
 
-**Build script detection:** Tries `build:android` first, then falls back to `build`.
+**Build script detection:** Tries `build:android` first, then falls back to `build`. If neither script exists, it runs `android.sh build` to auto-detect and build the Gradle project.
 
 ### Device management