fix(rn): use plugin deploy commands and cap Android API at 35

abueide · claude · abueide · commit cbbd9dad49a0 · 2026-02-19T12:09:24.000-06:00
Replace npx react-native run-android/run-ios with android.sh deploy
and ios.sh build/deploy in all RN test suites. The npx commands don't
write state files (app-id.txt, emulator-serial.txt) needed by
android.sh app status and ios.sh app status for verification.

Cap React Native max device at API 35 since RN 0.83 doesn't support
API 36. Add ANDROID_COMPILE_SDK support to flake.nix so projects
can compile against a different API than their device targets.

Fix -e flag format in CI workflows and wrapper scripts to use
key=value format required by devbox.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/.github/workflows/e2e-full.yml b/.github/workflows/e2e-full.yml
@@ -66,7 +66,7 @@ jobs:
           TEST_TIMEOUT: 600
           ANDROID_DEFAULT_DEVICE: ${{ matrix.device }}
           TEST_TUI: false
-        run: devbox run --pure -e EMU_HEADLESS test:e2e
+        run: devbox run --pure -e EMU_HEADLESS="${EMU_HEADLESS}" test:e2e
 
       - name: Upload reports and logs
         if: always()
@@ -127,7 +127,7 @@ jobs:
           TEST_TIMEOUT: 600
           IOS_DEFAULT_DEVICE: ${{ matrix.device }}
           TEST_TUI: false
-        run: devbox run --pure -e SIM_HEADLESS test:e2e
+        run: devbox run --pure -e SIM_HEADLESS="${SIM_HEADLESS}" test:e2e
 
       - name: Upload reports and logs
         if: always()
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -74,7 +74,7 @@ jobs:
           TEST_TIMEOUT: 300
           ANDROID_DEFAULT_DEVICE: max
           TEST_TUI: false
-        run: devbox run --pure -e EMU_HEADLESS test:e2e
+        run: devbox run --pure -e EMU_HEADLESS="${EMU_HEADLESS}" test:e2e
 
       - name: Upload reports and logs
         if: always()
@@ -127,7 +127,7 @@ jobs:
           TEST_TIMEOUT: 300
           IOS_DEFAULT_DEVICE: max
           TEST_TUI: false
-        run: devbox run --pure -e SIM_HEADLESS test:e2e
+        run: devbox run --pure -e SIM_HEADLESS="${SIM_HEADLESS}" test:e2e
 
       - name: Upload reports and logs
         if: always()
diff --git a/examples/android/devbox.d/android/devices/devices.lock b/examples/android/devbox.d/android/devices/devices.lock
@@ -14,5 +14,5 @@
     }
   ],
   "checksum": "8df4d3393b61fbbb08e45cf8762f95c521316938e514527916e4fce88a849d57",
-  "generated_at": "2026-02-19T05:50:43Z"
+  "generated_at": "2026-02-19T18:07:54Z"
 }
diff --git a/examples/react-native/devbox.d/android/devices/devices.lock b/examples/react-native/devbox.d/android/devices/devices.lock
@@ -1,8 +1,8 @@
 {
   "devices": [
     {
-      "name": "medium_phone_api36",
-      "api": 36,
+      "name": "medium_phone_api35",
+      "api": 35,
       "device": "medium_phone",
       "tag": "google_apis"
     },
@@ -13,6 +13,6 @@
       "tag": "google_apis"
     }
   ],
-  "checksum": "8df4d3393b61fbbb08e45cf8762f95c521316938e514527916e4fce88a849d57",
-  "generated_at": "2026-02-19T03:42:00Z"
+  "checksum": "f5bfab3fdcbe8a23858954c18b1fa86d28a3316e801523aa6d4aa72ca9cf5ab7",
+  "generated_at": "2026-02-19T18:00:02Z"
 }
diff --git a/examples/react-native/devbox.d/android/devices/max.json b/examples/react-native/devbox.d/android/devices/max.json
@@ -1,6 +1,6 @@
 {
-  "name": "medium_phone_api36",
-  "api": 36,
+  "name": "medium_phone_api35",
+  "api": 35,
   "device": "medium_phone",
   "tag": "google_apis"
 }
diff --git a/examples/react-native/devbox.d/ios/devices/devices.lock b/examples/react-native/devbox.d/ios/devices/devices.lock
@@ -10,5 +10,5 @@
     }
   ],
   "checksum": "4d5276f203d7ad62860bfc067f76194df53be449d4aa8a3b2d069855ec1f3232",
-  "generated_at": "2026-02-19T03:42:21Z"
+  "generated_at": "2026-02-19T18:01:57Z"
 }
diff --git a/examples/react-native/devbox.d/segment-integrations.devbox-plugins.android/devices/max.json b/examples/react-native/devbox.d/segment-integrations.devbox-plugins.android/devices/max.json
@@ -1,6 +1,6 @@
 {
-  "name": "medium_phone_api36",
-  "api": 36,
+  "name": "medium_phone_api35",
+  "api": 35,
   "device": "medium_phone",
   "tag": "google_apis"
 }
diff --git a/examples/react-native/tests/dev-android.yaml b/examples/react-native/tests/dev-android.yaml
@@ -88,7 +88,10 @@ processes:
     command: |
       . ${REACT_NATIVE_VIRTENV}/metro/env-android.sh
       echo "Deploying React Native app (Debug, Metro port: $METRO_PORT)..."
-      npx react-native run-android --no-packager
+
+      # Deploy using android.sh (APK already built by build-android)
+      android.sh deploy
+
       echo ""
       echo "App deployed!"
       echo "  Metro: http://localhost:$METRO_PORT"
diff --git a/examples/react-native/tests/run-android-tests.sh b/examples/react-native/tests/run-android-tests.sh
@@ -8,4 +8,4 @@ cd "$(dirname "$0")/.."
 
 # Skip iOS setup for Android-only testing
 # Use -e flag to pass environment variable through --pure mode
-exec devbox run --pure -e IOS_SKIP_SETUP=1 -e EMU_HEADLESS -e TEST_TUI="${TEST_TUI:-false}" bash -c 'process-compose -f tests/test-suite-android-e2e.yaml --no-server --tui="${TEST_TUI:-false}"'
+exec devbox run --pure -e IOS_SKIP_SETUP=1 -e EMU_HEADLESS="${EMU_HEADLESS:-}" -e TEST_TUI="${TEST_TUI:-false}" bash -c 'process-compose -f tests/test-suite-android-e2e.yaml --no-server --tui="${TEST_TUI:-false}"'
diff --git a/examples/react-native/tests/run-ios-tests.sh b/examples/react-native/tests/run-ios-tests.sh
@@ -8,4 +8,4 @@ cd "$(dirname "$0")/.."
 
 # Skip Android SDK downloads/evaluation for iOS-only testing
 # Use -e flag to pass environment variable through --pure mode
-exec devbox run --pure -e ANDROID_SKIP_SETUP=1 -e SIM_HEADLESS -e TEST_TUI="${TEST_TUI:-false}" bash -c 'process-compose -f tests/test-suite-ios-e2e.yaml --no-server --tui="${TEST_TUI:-false}"'
+exec devbox run --pure -e ANDROID_SKIP_SETUP=1 -e SIM_HEADLESS="${SIM_HEADLESS:-}" -e TEST_TUI="${TEST_TUI:-false}" bash -c 'process-compose -f tests/test-suite-ios-e2e.yaml --no-server --tui="${TEST_TUI:-false}"'
diff --git a/examples/react-native/tests/test-suite-all-e2e.yaml b/examples/react-native/tests/test-suite-all-e2e.yaml
@@ -21,8 +21,9 @@ processes:
   # Phase 2a: Android build
   build-android:
     command: |
-      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:
@@ -136,9 +137,10 @@ processes:
     command: |
       # Source Metro environment so React Native uses correct port
       . ${REACT_NATIVE_VIRTENV}/metro/env-all.sh
+      echo "Metro port: $METRO_PORT"
 
-      echo "Deploying React Native app to Android (Metro port: $METRO_PORT)..."
-      npx react-native run-android --no-packager
+      # Deploy using android.sh (APK already built by build-android)
+      android.sh deploy
     depends_on:
       build-android:
         condition: process_completed_successfully
@@ -154,15 +156,21 @@ processes:
     command: |
       set -e
 
+      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-all.sh
+      echo "Metro port: $METRO_PORT"
+
+      # Build with ios.sh build
+      NODE_BINARY="$NODE_BINARY" RCT_METRO_PORT="$METRO_PORT" \
+        ios.sh build --config "$BUILD_CONFIG" --quiet
 
-      echo "Deploying React Native app to iOS (Metro port: $METRO_PORT)..."
-      echo "Build configuration: Release"
-      npx react-native run-ios --no-packager --configuration Release
+      # Deploy to simulator
+      ios.sh deploy
 
-      # Deploy to save state for app status/stop
-      ios.sh deploy || true
+      echo "App deployed and launched successfully"
     depends_on:
       install-pods:
         condition: process_completed_successfully
diff --git a/examples/react-native/tests/test-suite-android-e2e.yaml b/examples/react-native/tests/test-suite-android-e2e.yaml
@@ -93,9 +93,10 @@ processes:
     command: |
       # Source Metro environment so React Native uses correct port
       . ${REACT_NATIVE_VIRTENV}/metro/env-android.sh
+      echo "Metro port: $METRO_PORT"
 
-      echo "Deploying React Native app (Metro port: $METRO_PORT)..."
-      npx react-native run-android --no-packager
+      # Deploy using android.sh (APK already built by build-android)
+      android.sh deploy
     depends_on:
       build-android:
         condition: process_completed_successfully
diff --git a/plugins/android/virtenv/flake.nix b/plugins/android/virtenv/flake.nix
@@ -51,8 +51,15 @@
         then map (device: device.api) lockData.devices
         else [ 36 ]; # Default to latest stable API
 
+      # Include ANDROID_COMPILE_SDK in platform versions if set (for projects
+      # that compile against a different API than the emulator/device targets)
+      compileSdkApis =
+        if builtins.hasAttr "ANDROID_COMPILE_SDK" defaultsData
+        then [ (toString defaultsData.ANDROID_COMPILE_SDK) ]
+        else [];
+
       androidSdkConfig = {
-        platformVersions = unique (map toString deviceApis);
+        platformVersions = unique ((map toString deviceApis) ++ compileSdkApis);
         buildToolsVersion = getVar "ANDROID_BUILD_TOOLS_VERSION";
         cmdLineToolsVersion = getVar "ANDROID_CMDLINE_TOOLS_VERSION";
         systemImageTypes = [ (getVar "ANDROID_SYSTEM_IMAGE_TAG") ];

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@`
`14`	`14`	`}`
`15`	`15`	`],`
`16`	`16`	`"checksum": "8df4d3393b61fbbb08e45cf8762f95c521316938e514527916e4fce88a849d57",`
`17`		`- "generated_at": "2026-02-19T05:50:43Z"`
	`17`	`+ "generated_at": "2026-02-19T18:07:54Z"`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"devices": [`
`3`	`3`	`{`
`4`		`- "name": "medium_phone_api36",`
`5`		`- "api": 36,`
	`4`	`+ "name": "medium_phone_api35",`
	`5`	`+ "api": 35,`
`6`	`6`	`"device": "medium_phone",`
`7`	`7`	`"tag": "google_apis"`
`8`	`8`	`},`
`@@ -13,6 +13,6 @@`
`13`	`13`	`"tag": "google_apis"`
`14`	`14`	`}`
`15`	`15`	`],`
`16`		`- "checksum": "8df4d3393b61fbbb08e45cf8762f95c521316938e514527916e4fce88a849d57",`
`17`		`- "generated_at": "2026-02-19T03:42:00Z"`
	`16`	`+ "checksum": "f5bfab3fdcbe8a23858954c18b1fa86d28a3316e801523aa6d4aa72ca9cf5ab7",`
	`17`	`+ "generated_at": "2026-02-19T18:00:02Z"`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "name": "medium_phone_api36",`
`3`		`- "api": 36,`
	`2`	`+ "name": "medium_phone_api35",`
	`3`	`+ "api": 35,`
`4`	`4`	`"device": "medium_phone",`
`5`	`5`	`"tag": "google_apis"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,5 @@`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"checksum": "4d5276f203d7ad62860bfc067f76194df53be449d4aa8a3b2d069855ec1f3232",`
`13`		`- "generated_at": "2026-02-19T03:42:21Z"`
	`13`	`+ "generated_at": "2026-02-19T18:01:57Z"`
`14`	`14`	`}`