Set up CI for bob / rn compatibility matrix and handle non-standard codegen output dirs

.github/workflows/compat.yml

@@ -0,0 +1,59 @@
+name: Compat
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+  pull_request:
+    branches: ["main"]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  integration-tests-generation:
+    strategy:
+      matrix:
+        runner:
+          - macos-latest
+          - ubuntu-latest
+        bob-version:
+          - 0.42.2
+          - 0.42.3
+          - latest
+        rn-version:
+          - 0.76.0
+          - latest
+
+    runs-on: ${{ matrix.runner }}
+    name: "bob ${{ matrix.bob-version }} / rn ${{ matrix.rn-version }} / ${{ matrix.runner == 'macos-latest' && 'ios' || 'android' }}"
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install cargo-ndk
+        if: ${{ matrix.runner != 'macos-latest' }}
+        run: |
+          cargo install cargo-ndk
+
+      - name: Install JDK
+        if: ${{ matrix.runner != 'macos-latest' }}
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: "17"
+
+      - name: Install Rust toolchains
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.runner == 'macos-latest' && 'aarch64-apple-ios-sim' || 'aarch64-linux-android' }}
+
+      - name: Generate & build turbo module
+        run: |
+          ./scripts/test-turbo-modules.sh \
+            --slug '@my-org/my-lib' \
+            --ubrn-config integration/fixtures/compat/ubrn.config.yaml \
+            --builder-bob-version ${{ matrix.bob-version }} \
+            --rn-version ${{ matrix.rn-version }} \
+            --packgage-json-mixin integration/fixtures/compat/package.json \
+            --${{ matrix.runner == 'macos-latest' && 'ios' || 'android' }} \
+            ../turbo-module

README.md

@@ -1,4 +1,5 @@
 [![CI](https://github.com/jhugman/uniffi-bindgen-react-native/actions/workflows/ci.yml/badge.svg)](https://github.com/jhugman/uniffi-bindgen-react-native/actions/workflows/ci.yml)
+[![build-bob compatibility](https://github.com/jhugman/uniffi-bindgen-react-native/actions/workflows/compat.yml/badge.svg)](https://github.com/jhugman/uniffi-bindgen-react-native/actions/workflows/compat.yml)
 
 # uniffi-bindgen-react-native
 [UniFFI](https://mozilla.github.io/uniffi-rs/latest/) is a multi-language bindings generator for Rust.

integration/fixtures/compat/package.json

@@ -0,0 +1,8 @@
+{
+  "codegenConfig": {
+    "outputDir": {
+      "ios": "ios/tmp",
+      "android": "android/tmp"
+    }
+  }
+}

integration/fixtures/compat/ubrn.config.yaml

@@ -0,0 +1,4 @@
+rust:
+  repo: https://github.com/ianthetechie/uniffi-starter
+  branch: main
+  manifestPath: rust/foobar/Cargo.toml

scripts/test-turbo-modules.sh

@@ -11,10 +11,10 @@ reset_args() {
   RN_VERSION=latest
   PROJECT_SLUG=my-test-library
   FORCE_NEW_DIR=false
-  IOS_NAME=MyTestLibrary
   SKIP_IOS=true
   SKIP_ANDROID=true
   UBRN_CONFIG=
+  PKG_JSON_MIXIN=
   APP_TSX=
 }
 
@@ -25,10 +25,10 @@ usage() {
   echo "  -A, --android                      Build for Android."
   echo "  -I, --ios                          Build for iOS."
   echo "  -C, --ubrn-config                  Use a ubrn config file."
+  echo "  -P, --packgage-json-mixin          Merge another JSON file into package.json"
   echo "  -T, --app-tsx                      Use a App.tsx file."
   echo
   echo "  -s, --slug PROJECT_SLUG            Specify the project slug (default: my-test-library)."
-  echo "  -i, --ios-name IOS_NAME            Specify the iOS project name (default: MyTestLibrary)."
   echo
   echo "  -u, --builder-bob-version VERSION  Specify the version of builder-bob to use (default: latest)."
   echo "  -r, --rn-version VERSION           Specify the version of React Native to use (default: latest)."
@@ -49,7 +49,6 @@ cleanup() {
 diagnostics() {
   echo "-- PROJECT_DIR = $PROJECT_DIR"
   echo "-- PROJECT_SLUG = $PROJECT_SLUG"
-  echo "-- IOS_NAME = $IOS_NAME"
 }
 
 error() {
@@ -98,14 +97,14 @@ parse_cli_options() {
         PROJECT_SLUG="$2"
         shift
         ;;
-      -i|--ios-name)
-        IOS_NAME="$2"
-        shift
-        ;;
       -C|--ubrn-config)
         UBRN_CONFIG=$(join_paths "$PWD" "$2")
         shift
         ;;
+      -P|--packgage-json-mixin)
+        PKG_JSON_MIXIN=$(join_paths "$PWD" "$2")
+        shift
+        ;;
       -T|--app-tsx)
         APP_TSX=$(join_paths "$PWD" "$2")
         shift
@@ -169,10 +168,6 @@ create_library() {
     rm -rf "$base" || error "Failed to remove existing directory $base"
   fi
 
-  local example_type
-  if [ "$BOB_VERSION" == "latest" ] ; then
-    example_type=vanilla
-  fi
   echo "-- Creating library $PROJECT_SLUG with create-react-native-library@$BOB_VERSION"
   npm_config_yes=true npx "create-react-native-library@$BOB_VERSION" \
     --react-native-version "$RN_VERSION" \
@@ -184,7 +179,7 @@ create_library() {
     --repo-url "https://github.com/jhugman/$PROJECT_SLUG" \
     --languages cpp \
     --type module-new \
-    --example $example_type \
+    --example vanilla \
     --local false \
     "$base"
   exit_dir
@@ -193,15 +188,15 @@ create_library() {
 install_dependencies() {
   enter_dir "$PROJECT_DIR"
   # touch yarn.lock
-  yarn || error "Failed to install dependencies"
+  yarn --no-immutable || error "Failed to install dependencies"
   # rm yarn.lock
   exit_dir
 }
 
 install_example_dependencies() {
   enter_dir "$PROJECT_DIR/example"
   # touch yarn.lock
-  yarn || error "Failed to install example dependencies"
+  yarn --no-immutable || error "Failed to install example dependencies"
   # rm yarn.lock
   # rm -Rf .yarn
   exit_dir
@@ -303,6 +298,10 @@ generate_turbo_module_for_compiling() {
   clean_turbo_modules
   "$UBRN_BIN" checkout      --config "$UBRN_CONFIG"
   cp "$UBRN_CONFIG" ./ubrn.config.yaml
+  if [ -f "$PKG_JSON_MIXIN" ] ; then
+    jq -s '.[0] * .[1]' ./package.json "$PKG_JSON_MIXIN" > ./package.json.new
+    mv ./package.json.new ./package.json
+  fi
   if [ -f "$APP_TSX" ] ; then
     cp "$APP_TSX" ./example/src/App.tsx
   fi
@@ -329,8 +328,8 @@ build_android_example() {
   echo "-- Running ubrn build android"
   "$UBRN_BIN" build android --config "$UBRN_CONFIG" --and-generate --targets aarch64-linux-android
   exit_dir
-  enter_dir "$PROJECT_DIR/example/android"
-  ./gradlew build || error "Failed to build Android example"
+  enter_dir "$PROJECT_DIR/example"
+  yarn build:android || error "Failed to build Android example"
   exit_dir
 }
 
@@ -342,19 +341,9 @@ build_ios_example() {
   enter_dir "$PROJECT_DIR/example/ios"
   echo "pod 'uniffi-bindgen-react-native', :path => '../../node_modules/uniffi-bindgen-react-native'" >> Podfile
   pod install || error "Cannot run Podfile"
-
-  # Find the UDID of the first booted device, or fall back to the first available device
-  udid=$(xcrun simctl list --json devices | jq -r '.devices[][] | select(.state == "Booted") | .udid')
-  if [ "$udid" == "null" ]; then
-    udid=$(xcrun simctl list --json devices | jq -r '.devices[][] | select(.isAvailable == true) | .udid' | head -n 1)
-    xcrun simctl boot "$udid"
-  fi
-
-  if [ "$udid" == "null" ]; then
-    error "No available iOS simulator found"
-  fi
-
-  xcodebuild -workspace "${IOS_NAME}Example.xcworkspace" -scheme "${IOS_NAME}Example" -configuration Debug -destination "id=$udid" || error "Failed to build iOS example"
+  exit_dir
+  enter_dir "$PROJECT_DIR/example"
+  yarn build:ios --extra-params "ARCHS=$(uname -m)" || error "Failed to build iOS example"
   exit_dir
 }
 
@@ -479,7 +468,6 @@ run_for_builder_bob() {
       --builder-bob-version "$builder_bob_version" \
       --slug react-native-dummy-lib-for-ios \
       --ios \
-      --ios-name DummyLibForIos \
       "$working_dir/react-native-dummy-lib-for-ios"
   fi
 
@@ -502,7 +490,6 @@ run_for_builder_bob() {
       --builder-bob-version "$builder_bob_version" \
       --ios \
       --app-tsx "$app_tsx" \
-      --ios-name ReactNativeDummyLibForIos \
       --slug @my-org/react-native-dummy-lib-for-ios \
       "$working_dir/@my-org/react-native-dummy-lib-for-ios"
   fi