Merge branch 'master' of https://github.com/babylonjs/BabylonReactNative

 into rnta071

# Conflicts:
#	.github/workflows/pr.yml

.github/workflows/bn_master_commit.yml

@@ -16,6 +16,8 @@ jobs:
         uses: actions/[email protected]
         with:
           submodules: 'recursive'
+      - name: Free space
+        uses: ./.github/workflows/macos_freespace
       - name: Setup Node 16
         uses: actions/setup-node@v3
         with:
@@ -55,6 +57,8 @@ jobs:
         uses: actions/[email protected]
         with:
           submodules: 'recursive'
+      - name: Free space
+        uses: ./.github/workflows/macos_freespace
       - name: Setup Node 16
         uses: actions/setup-node@v3
         with:

.github/workflows/ios_android.yml

@@ -11,7 +11,7 @@ on:
         type: string
       xcode-version:
         type: string
-        default: '15.0.1'
+        default: '15.4'
 
 jobs:
   Build:
@@ -21,6 +21,8 @@ jobs:
         uses: actions/[email protected]
         with:
           submodules: 'recursive'
+      - name: Free space
+        uses: ./.github/workflows/macos_freespace
       - name: Setup Node 16
         uses: actions/setup-node@v3
         with:
@@ -54,12 +56,12 @@ jobs:
         env:
           JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
       - name: Upload Assembled iOS Android Folder
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'Assembled-iOSAndroid${{ inputs.react-native-version }}'
           path: Package/Assembled-iOSAndroid
       - name: Upload Assembled iOS Android BaseKit Folder
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'Assembled-BaseKit-iOSAndroid${{ inputs.react-native-version }}'
           path: Package/Assembled-BaseKit-iOSAndroid

.github/workflows/macos_freespace/action.yml

@@ -0,0 +1,15 @@
+name: Free up disk space
+description: Free up disk space see https://github.com/actions/runner-images/issues/10511
+runs:
+  using: "composite"
+  steps:
+    - name: Free up disk space
+      shell: bash
+      run: |
+        xcrun simctl delete all
+        sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/*
+        sudo rm -rf /Applications/Xcode_14.3.1.app
+        sudo rm -rf /Applications/Xcode_15.0.1.app
+        sudo rm -rf /Applications/Xcode_15.1.app
+        sudo rm -rf /Applications/Xcode_15.2.app
+        sudo rm -rf /Applications/Xcode_15.3.app

.github/workflows/pr.yml

@@ -3,16 +3,14 @@ on:
   pull_request:
     branches:
       - master
-env:
-  BRN_Version: '0.64'
 
 jobs:
   build-android-rnta:
     runs-on: macos-latest
     strategy:
       matrix:
         platform: [ios, android]
-        react-native-version: ['0.69', '0.70', '0.71']
+        react-native-version: ['0.69', '0.70', '0.71', '0.74']
     steps:
       - name: Checkout Repo
         uses: actions/[email protected]
@@ -24,6 +22,8 @@ jobs:
         run: brew install ninja
       - name: Setup Watchman
         run: brew install watchman
+      - name: Free space
+        uses: ./.github/workflows/macos_freespace
       - name: Set React-Native version ${{ matrix.react-native-version }}
         run: npm run set-react-version -- ${{ matrix.react-native-version }}
         working-directory: ./Apps/BRNPlayground
@@ -49,4 +49,4 @@ jobs:
         working-directory: ./Package
         env:
           JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
-
+

.github/workflows/test_version.yml

@@ -57,7 +57,7 @@ jobs:
           msbuild.exe /p:Configuration="Release" /p:Platform="x64" /m "./windows/Playground.sln"
 
       - name: Upload UWP x64
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'WindowsAppx'
           path: Playground/windows/AppPackages/Playground/Playground_1.0.0.0_x64_Test/ #Playground_1.0.0.0_x64.appx
@@ -94,7 +94,7 @@ jobs:
           ./gradlew app:assembleRelease --stacktrace --info
 
       - name: Upload APK
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'AndroidAPK'
           path: Playground/android/app/build/outputs/apk/release/app-release.apk
@@ -128,7 +128,7 @@ jobs:
           xcodebuild -sdk iphonesimulator -arch x86_64 -configuration Release -workspace Playground.xcworkspace -scheme Playground build CODE_SIGNING_ALLOWED=NO -archivePath ./playgroundSimulator.xcarchive archive
 
       - name: Upload iOS App
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'iOSApp'
           path: Playground/ios/playgroundSimulator.xcarchive
@@ -164,7 +164,7 @@ jobs:
           ./gradlew app:assembleRelease --stacktrace --info
 
       - name: Upload APK
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'AndroidBasekitAPK'
           path: Playground/android/app/build/outputs/apk/release/app-release.apk
@@ -197,7 +197,7 @@ jobs:
           xcodebuild -sdk iphonesimulator -arch x86_64 -configuration Release -workspace Playground.xcworkspace -scheme Playground build CODE_SIGNING_ALLOWED=NO -archivePath ./playgroundSimulator.xcarchive archive
 
       - name: Upload iOS App
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'iOSBasekitApp'
           path: Playground/ios/playgroundSimulator.xcarchive
@@ -207,7 +207,7 @@ jobs:
 #   runs-on: macos-latest
 #   steps:
 #   - name: Download APK
-#     uses: actions/download-artifact@v2
+#     uses: actions/download-artifact@v4
 #     with:
 #       name: 'AndroidAPK'
 #       path: ./

.github/workflows/typescript.yml

@@ -31,7 +31,7 @@ jobs:
         run: npx gulp buildTS --releaseVersion ${{ inputs.release-version }}
         working-directory: ./Package
       - name: Upload Assembled Folder
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'Assembled'
           path: Package/Assembled

.github/workflows/windows.yml

@@ -41,12 +41,12 @@ jobs:
         run: npx gulp buildUWPPublish --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ inputs.release-version }}
         working-directory: ./Package
       - name: Upload Assembled-Windows Folder
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'Assembled-Windows${{ inputs.react-native-version }}'
           path: Package/Assembled-Windows
       - name: Upload Assembled-BaseKit-Windows Folder
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'Assembled-BaseKit-Windows${{ inputs.react-native-version }}'
           path: Package/Assembled-BaseKit-Windows

Apps/BRNPlayground/metro.config.js

@@ -11,8 +11,8 @@ module.exports = makeMetroConfig({
     }),
   },
   watchFolders: [
-    path.join(__dirname, "node_modules", "@babylonjs/react-native"),
-    path.join(__dirname, "node_modules", "@babylonjs/react-native-iosandroid"),
-    path.join(__dirname, "node_modules", "@babylonjs/react-native-windows"),
+    path.dirname(require.resolve("@babylonjs/react-native/package.json")),
+    path.dirname(require.resolve("@babylonjs/react-native-iosandroid/package.json")),
+    path.dirname(require.resolve("@babylonjs/react-native-windows/package.json")),
   ],
 });

Apps/BRNPlayground/package.json

@@ -46,7 +46,7 @@
     "jest": "^29.6.3",
     "mkdirp": "^1.0.0",
     "prettier": "2.8.8",
-    "react-native-test-app": "^3.4.2",
+    "react-native-test-app": "^3.10.3",
     "react-test-renderer": "18.2.0",
     "typescript": "5.0.4"
   },

Modules/@babylonjs/react-native/shared/CMakeLists.txt

@@ -2,7 +2,7 @@ include(FetchContent)
 
 FetchContent_Declare(babylonnative
     GIT_REPOSITORY https://github.com/BabylonJS/BabylonNative.git
-    GIT_TAG 4cf5677903bac3be7a4b18547cc2caa5c23bac67)
+    GIT_TAG d0c97077d07da3a4f07d92473155db11c2e5a6c3)
 
 set(SHARED_INCLUDES
     "${CMAKE_CURRENT_LIST_DIR}")

README.md

@@ -29,6 +29,10 @@ Babylon React Native relies heavily on newer React Native constructs including J
 
 See the [package usage](Modules/@babylonjs/react-native/README.md) for installation instructions and/or the Playground app's [App.tsx](Apps/Playground/App.tsx) for example usage. You can also clone [this sample repo](https://github.com/BabylonJS/BabylonReactNativeSample) to quickly get started.
 
+## Frameworks (Expo, ...)
+
+Note: Official support for React Native frameworks, like Expo, is not provided by BabylonReactNative. While BabylonReactNative may work with these frameworks, we do not conduct testing, bug fixes, or feature development to ensure compatibility.
+
 ## Contributing
 
 This quick overview will help you get started developing in the Babylon React Native repository. We support development on Windows and MacOS, but assume the use of [PowerShell](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell) in the instructions below (unless otherwise noted).
@@ -91,7 +95,7 @@ export JAVA_HOME=$(/usr/libexec/java_home -v 13)
 
 ### **Configuring a Windows Dev Environment**
 
-**Required Tools:** [Android Studio](https://developer.android.com/studio/) (including NDK 21.4.7075529), [CMake](https://cmake.org/), [Ninja](https://ninja-build.org/), [Visual Studio 2019](https://visualstudio.microsoft.com/vs/)
+**Required Tools:** [Android Studio](https://developer.android.com/studio/) (including NDK 21.4.7075529), [CMake](https://cmake.org/), [Ninja](https://ninja-build.org/), [Visual Studio 2022](https://visualstudio.microsoft.com/vs/)
 
 - The `PATH` environment variable must include the path to adb (typically %LOCALAPPDATA%/Android/sdk/platform-tools/).
 - The `PATH` environment variable must include the path to Ninja, or Ninja must be [installed via a package manager](https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages).  
@@ -228,11 +232,11 @@ For iOS the XCode project needs to be generated with `CMake` as described [above
 
 | React Native | Babylon React Native |
 |---|---|
-| 0.64 | 1.4.0, 1.4.1, 1.4.2, 1.4.3, 1.4.4, 1.5.0, 1.5.1, 1.6.0, 1.6.1, 1.6.3, 1.8.1 |
-| 0.65 -> 0.68 | 1.4.0, 1.4.1, 1.4.2, 1.4.3, 1.4.4, 1.5.0, 1.5.1, 1.6.0, 1.6.1, 1.6.3, 1.8.1 |
-| 0.69 | 1.4.0, 1.4.1, 1.4.2, 1.4.3, 1.4.4, 1.5.0, 1.5.1, 1.6.0, 1.6.1, 1.6.3, 1.8.1 |
-| 0.70 | 1.5.0, 1.5.1, 1.6.0, 1.6.1, 1.6.3, 1.8.1 |
-| 0.71 -> 0.73 | 1.6.0, 1.6.1, 1.6.3, 1.8.1 |
+| 0.64 | 1.4.0, 1.4.1, 1.4.2, 1.4.3, 1.4.4, 1.5.0, 1.5.1, 1.6.0, 1.6.1, 1.6.3, 1.8.1, 1.8.2, 1.8.5 |
+| 0.65 -> 0.68 | 1.4.0, 1.4.1, 1.4.2, 1.4.3, 1.4.4, 1.5.0, 1.5.1, 1.6.0, 1.6.1, 1.6.3, 1.8.1, 1.8.2, 1.8.5 |
+| 0.69 | 1.4.0, 1.4.1, 1.4.2, 1.4.3, 1.4.4, 1.5.0, 1.5.1, 1.6.0, 1.6.1, 1.6.3, 1.8.1, 1.8.2, 1.8.5 |
+| 0.70 | 1.5.0, 1.5.1, 1.6.0, 1.6.1, 1.6.3, 1.8.1, 1.8.2, 1.8.5 |
+| 0.71 -> 0.73 | 1.6.0, 1.6.1, 1.6.3, 1.8.1, 1.8.2, 1.8.5 |
 
 Here are the package names for Android/iOS and Windows:
 
@@ -262,7 +266,7 @@ Depending on the Babylon React Native NPM package version, some Babylon.js NPM d
 | 1.6.0 | 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.45.0, 5.45.1, 5.45.2, 5.46.0, 5.47.0, 5.48.0, 5.48.1, 5.49.1 |
 | 1.6.1 | 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.45.0, 5.45.1, 5.45.2, 5.46.0, 5.47.0, 5.48.0, 5.48.1, 5.49.1 |
 | 1.6.3 | 5.53.1, 5.54.0, 5.55.0, 5.56.0, 5.57.0, 5.57.1, 6.0.0, 6.1.0, 6.2.0, 6.3.0, 6.3.1, 6.4.0, 6.4.1, 6.5.0, 6.5.1, 6.6.0, 6.6.1, 6.7.0, 6.8.1, 6.9.0, 6.11.2, 6.12.0, 6.12.1,6.12.2, 6.12.3, 6.14.0 |
-| 1.8.1 | 5.53.1, 5.54.0, 5.55.0, 5.56.0, 5.57.0, 5.57.1, 6.0.0, 6.1.0, 6.2.0, 6.3.0, 6.3.1, 6.4.0, 6.4.1, 6.5.0, 6.5.1, 6.6.0, 6.6.1, 6.7.0, 6.8.1, 6.9.0, 6.11.2, 6.12.0, 6.12.1,6.12.2, 6.12.3, 6.14.0 |
+| 1.8.1,1.8.2, 1.8.5 | 5.53.1, 5.54.0, 5.55.0, 5.56.0, 5.57.0, 5.57.1, 6.0.0, 6.1.0, 6.2.0, 6.3.0, 6.3.1, 6.4.0, 6.4.1, 6.5.0, 6.5.1, 6.6.0, 6.6.1, 6.7.0, 6.8.1, 6.9.0, 6.11.2, 6.12.0, 6.12.1,6.12.2, 6.12.3, 6.14.0 |
 
 ## Security