cleanup

Author: CedricGuillemet

.github/workflows/pr.yml

@@ -34,7 +34,7 @@ jobs:
       - name: NPM Install (Playground)
         run: npm install
         working-directory: ./Apps/Playground
-      - name: Build Windows Bundle
+      - name: Build Android Bundle
         run: npm run build:android
         working-directory: ./Apps/Playground
 
@@ -83,7 +83,7 @@ jobs:
       - name: Cache XCFrameworks
         uses: actions/cache@v4
         with:
-          path: Modules/@babylonjs/react-native-iosandroid/ios/libs
+          path: Modules/@babylonjs/react-native/ios/libs
           key: ${{ runner.os }}-xcframeworks-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-xcframeworks

Apps/Playground/metro.config.js

@@ -12,7 +12,5 @@ module.exports = makeMetroConfig({
   },
   watchFolders: [
     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/Playground/package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "BRNPlayground",
+  "name": "Playground",
   "version": "0.0.1",
   "private": true,
   "scripts": {
@@ -10,10 +10,10 @@
     "build:windows": "mkdirp dist && react-native bundle --entry-file index.js --platform windows --dev true --bundle-output dist/main.windows.bundle --assets-dest dist",
     "ios": "react-native run-ios",
     "lint": "eslint .",
-    "macos": "react-native run-macos --scheme BRNPlayground",
+    "macos": "react-native run-macos --scheme Playground",
     "start": "react-native start",
     "test": "jest",
-    "windows": "react-native run-windows --sln windows/BRNPlayground.sln",
+    "windows": "react-native run-windows --sln windows/Playground.sln",
     "postinstall": "node ./postinstall.js"
   },
   "dependencies": {

Apps/Playground/package.json

@@ -28,7 +28,6 @@
     <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == '' And Exists('$(ProjectDir)..\..\..\..\..\Apps\Playground\node_modules\react-native-windows\package.json')">$(ProjectDir)\..\..\..\..\..\Apps\Playground\node_modules\react-native-windows\</ReactNativeWindowsDir>
   </PropertyGroup>
   <PropertyGroup Label="BabylonReactNativeProps">
-    <BabylonNativeIOSAndroidProjDir Condition="'$(BabylonReactNativeDir)' == '' And Exists('$(ProjectDir)\..\..\..\react-native-iosandroid')">$(ProjectDir)..\..\..\react-native-iosandroid\</BabylonNativeIOSAndroidProjDir>
     <BabylonReactNativeDir Condition="'$(BabylonReactNativeDir)' == '' And Exists('$(ProjectDir)\..\..\..\react-native')">$(ProjectDir)..\..\..\react-native\</BabylonReactNativeDir>
     <BabylonNativeDir Condition="Exists('$(BabylonReactNativeDir)Build')">$(BabylonReactNativeDir)Build\</BabylonNativeDir>
     <BabylonNativeBuildDir Condition="'$(Platform)'=='x64' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)uwp_x64\</BabylonNativeBuildDir>
@@ -168,7 +167,6 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <!-- Include project headers when building in the repo -->
       <AdditionalIncludeDirectories Condition="Exists('$(BabylonReactNativeDir)shared')">$(BabylonReactNativeDir)shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="Exists('$(BabylonNativeIOSAndroidProjDir)shared')">$(BabylonNativeIOSAndroidProjDir)shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -218,7 +216,6 @@
     <ClCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="Exists('$(BabylonReactNativeDir)shared')">$(BabylonReactNativeDir)shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="Exists('$(BabylonNativeIOSAndroidProjDir)shared')">$(BabylonNativeIOSAndroidProjDir)shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

Modules/@babylonjs/react-native/windows/BabylonReactNative/BabylonReactNative.vcxproj

@@ -9,7 +9,6 @@ set(BABYLON_NATIVE_PLUGIN_NATIVEENGINE_WEBP OFF CACHE BOOL "Disable Babylon Nati
 set(CMAKE_CXX_STANDARD 17)
 
 set(BABYLON_REACT_NATIVE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../react-native")
-set(BABYLON_REACT_NATIVE_IOSANDROID "${CMAKE_CURRENT_LIST_DIR}/../../react-native-iosandroid")
 
 include(${BABYLON_REACT_NATIVE_DIR}/shared/CMakeLists.txt)