From ea78d74b018d76a9e925cb73d42aa682b0202687 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Wed, 14 May 2025 17:51:24 +0200 Subject: [PATCH 01/43] Test build --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a1ce7e490..ea25531fa 100644 --- a/README.md +++ b/README.md @@ -271,3 +271,4 @@ Depending on the Babylon React Native NPM package version, some Babylon.js NPM d ## Security If you believe you have found a security vulnerability in this repository, please see [SECURITY.md](SECURITY.md). + From d0270146ef5ff1e40dab6e4a26a8cf039d1ddf35 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Wed, 14 May 2025 17:54:55 +0200 Subject: [PATCH 02/43] no rnta --- .github/workflows/pr.yml | 222 +++++++++++++++++++-------------------- 1 file changed, 111 insertions(+), 111 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 756b946a3..1fe0f56cb 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -47,45 +47,45 @@ jobs: env: JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }} - build-android-rnta: - runs-on: macos-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v2.3.3 - with: - submodules: 'recursive' - - name: Free space - uses: ./.github/workflows/macos_freespace - - name: Setup CMake - uses: jwlawson/actions-setup-cmake@v1.8 - with: - cmake-version: '3.26.3' - - name: Setup Ninja - run: brew install ninja - - name: Setup Watchman - run: brew install watchman - - name: NPM Install (Playground) - run: npm install - working-directory: ./Apps/BRNPlayground + # build-android-rnta: + # runs-on: macos-latest + # steps: + # - name: Checkout Repo + # uses: actions/checkout@v2.3.3 + # with: + # submodules: 'recursive' + # - name: Free space + # uses: ./.github/workflows/macos_freespace + # - name: Setup CMake + # uses: jwlawson/actions-setup-cmake@v1.8 + # with: + # cmake-version: '3.26.3' + # - name: Setup Ninja + # run: brew install ninja + # - name: Setup Watchman + # run: brew install watchman + # - name: NPM Install (Playground) + # run: npm install + # working-directory: ./Apps/BRNPlayground - - name: Build Windows Bundle - run: npm run build:android - working-directory: ./Apps/BRNPlayground + # - name: Build Windows Bundle + # run: npm run build:android + # working-directory: ./Apps/BRNPlayground - - name: NPM Install (Binary Package) - run: npm install - working-directory: ./Package - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '17' - check-latest: true - - name: Gulp (Android) - run: npx gulp buildAndroidRNTA - working-directory: ./Package - env: - JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }} + # - name: NPM Install (Binary Package) + # run: npm install + # working-directory: ./Package + # - name: Setup Java + # uses: actions/setup-java@v3 + # with: + # distribution: 'temurin' + # java-version: '17' + # check-latest: true + # - name: Gulp (Android) + # run: npx gulp buildAndroidRNTA + # working-directory: ./Package + # env: + # JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }} build-iOS: runs-on: macos-latest @@ -113,40 +113,40 @@ jobs: run: npx gulp buildIOS working-directory: ./Package - build-iOS-rnta: - runs-on: macos-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v2.3.3 - with: - submodules: 'recursive' - - name: Free space - uses: ./.github/workflows/macos_freespace - - name: Setup Watchman - run: brew install watchman + # build-iOS-rnta: + # runs-on: macos-latest + # steps: + # - name: Checkout Repo + # uses: actions/checkout@v2.3.3 + # with: + # submodules: 'recursive' + # - name: Free space + # uses: ./.github/workflows/macos_freespace + # - name: Setup Watchman + # run: brew install watchman - - name: NPM Install (Playground) - run: npm install - working-directory: ./Apps/BRNPlayground + # - name: NPM Install (Playground) + # run: npm install + # working-directory: ./Apps/BRNPlayground - - name: Build iOS Bundle - run: npm run build:ios - working-directory: ./Apps/BRNPlayground + # - name: Build iOS Bundle + # run: npm run build:ios + # working-directory: ./Apps/BRNPlayground - - name: NPM Install (Binary Package) - run: npm install - working-directory: ./Package - - name: Gulp (iOS) - run: npx gulp buildIOSRNTA - working-directory: ./Package + # - name: NPM Install (Binary Package) + # run: npm install + # working-directory: ./Package + # - name: Gulp (iOS) + # run: npx gulp buildIOSRNTA + # working-directory: ./Package - - name: Cache XCFrameworks - uses: actions/cache@v2 - with: - path: Modules/@babylonjs/react-native-iosandroid/ios/libs - key: ${{ runner.os }}-xcframeworks-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-xcframeworks + # - name: Cache XCFrameworks + # uses: actions/cache@v2 + # with: + # path: Modules/@babylonjs/react-native-iosandroid/ios/libs + # key: ${{ runner.os }}-xcframeworks-${{ github.sha }} + # restore-keys: | + # ${{ runner.os }}-xcframeworks test-publish-android-ios: runs-on: macos-latest @@ -233,60 +233,60 @@ jobs: run: npx gulp buildUWPPlayground${{ matrix.platform }}${{ matrix.config }} working-directory: ./Package - build-windows-rnta: - runs-on: windows-2019 - steps: - - name: Support longpaths - run: git config --system core.longpaths true - - name: Checkout Repo - uses: actions/checkout@v2.3.3 - with: - submodules: 'true' - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.0.2 - - name: Setup Node 20 - uses: actions/setup-node@v3 - with: - node-version: 20 + # build-windows-rnta: + # runs-on: windows-2019 + # steps: + # - name: Support longpaths + # run: git config --system core.longpaths true + # - name: Checkout Repo + # uses: actions/checkout@v2.3.3 + # with: + # submodules: 'true' + # - name: Setup MSBuild + # uses: microsoft/setup-msbuild@v1.0.2 + # - name: Setup Node 20 + # uses: actions/setup-node@v3 + # with: + # node-version: 20 - - name: Install watchman - run: choco install watchman - working-directory: ./Apps/BRNPlayground + # - name: Install watchman + # run: choco install watchman + # working-directory: ./Apps/BRNPlayground - - name: NPM Install RNTA - run: npm install - working-directory: ./Apps/BRNPlayground + # - name: NPM Install RNTA + # run: npm install + # working-directory: ./Apps/BRNPlayground - - name: Build Windows Bundle - run: npm run build:windows - working-directory: ./Apps/BRNPlayground + # - name: Build Windows Bundle + # run: npm run build:windows + # working-directory: ./Apps/BRNPlayground - - name: NPM Install Package - run: npm install - working-directory: ./Package + # - name: NPM Install Package + # run: npm install + # working-directory: ./Package - - name: NPM Generate Windows Project - run: npx install-windows-test-app - working-directory: ./Apps/BRNPlayground + # - name: NPM Generate Windows Project + # run: npx install-windows-test-app + # working-directory: ./Apps/BRNPlayground - - name: BabylonNative build directory - run: mkdir @babylonjs/react-native/Build/uwp_x64 - working-directory: ./Modules + # - name: BabylonNative build directory + # run: mkdir @babylonjs/react-native/Build/uwp_x64 + # working-directory: ./Modules - - name: CMake BabylonNative - run: cmake -G "Visual Studio 16 2019" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0.19041.0 -DCMAKE_UNITY_BUILD=true -D CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM=10.0.19041.0 -A x64 ./../../../react-native-windows/windows - working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64 + # - name: CMake BabylonNative + # run: cmake -G "Visual Studio 16 2019" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0.19041.0 -DCMAKE_UNITY_BUILD=true -D CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM=10.0.19041.0 -A x64 ./../../../react-native-windows/windows + # working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64 - - name: Nuget restore - run: nuget restore BRNPlayground.sln - working-directory: ./Apps/BRNPlayground/windows + # - name: Nuget restore + # run: nuget restore BRNPlayground.sln + # working-directory: ./Apps/BRNPlayground/windows - - name: Windows build BN - run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m ReactNativeBabylon.sln - working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64 + # - name: Windows build BN + # run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m ReactNativeBabylon.sln + # working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64 - - name: Windows build BRN - run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m BRNPlayground.sln + # - name: Windows build BRN + # run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m BRNPlayground.sln working-directory: ./Apps/BRNPlayground/windows # Test packages From 9aac684c3003c637a62108437ca0e741b77d6322 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Wed, 14 May 2025 18:04:37 +0200 Subject: [PATCH 03/43] typo --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 1fe0f56cb..d73600757 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -287,7 +287,7 @@ jobs: # - name: Windows build BRN # run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m BRNPlayground.sln - working-directory: ./Apps/BRNPlayground/windows + #working-directory: ./Apps/BRNPlayground/windows # Test packages build-android-ios-065: From 9f06763ae9b40b9e514b18a586a660d2770ba80c Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Wed, 14 May 2025 19:37:35 +0200 Subject: [PATCH 04/43] BN update --- Modules/@babylonjs/react-native/shared/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native/shared/CMakeLists.txt b/Modules/@babylonjs/react-native/shared/CMakeLists.txt index 69f8e1e61..4a9869be7 100644 --- a/Modules/@babylonjs/react-native/shared/CMakeLists.txt +++ b/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 d0c97077d07da3a4f07d92473155db11c2e5a6c3) + GIT_TAG fc7c7c2f8dd272be4938a62af04ae452b89d9eae) set(SHARED_INCLUDES "${CMAKE_CURRENT_LIST_DIR}") From 24e9b3d8991423d5bcb96df14bd918c5da05dcfd Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Thu, 15 May 2025 10:00:22 +0200 Subject: [PATCH 05/43] update libraries after bgfx update --- .../BabylonReactNative.vcxproj | 22 ++++--------------- Package/BaseKit/react-native-babylon.podspec | 10 ++------- Package/gulpfile.js | 11 ++-------- Package/iOS/CMakeLists.txt | 12 ++-------- 4 files changed, 10 insertions(+), 45 deletions(-) diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index dec1f250c..20aaf925d 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -174,21 +174,17 @@ arcana.lib; - astc-encoder.lib; BabylonNative.lib; bgfx.lib; bimg.lib; - tinyexr.lib; + bimg_encode.lib; + bimg_decode.lib; bx.lib; Canvas.lib; - edtaa3.lib; - etc1.lib; - etc2.lib; GenericCodeGend.lib; glslangd.lib; glslang-default-resource-limitsd.lib; Graphics.lib; - iqa.lib; jsi.lib; JsRuntime.lib; MachineIndependentd.lib; @@ -200,15 +196,12 @@ NativeOptimizations.lib; NativeTracing.lib; NativeXr.lib; - nvtt.lib; OGLCompilerd.lib; openxr_loaderd.lib; OSDependentd.lib; - pvrtc.lib; spirv-cross-cored.lib; spirv-cross-hlsld.lib; SPIRVd.lib; - squish.lib; UrlLib.lib; Window.lib; XMLHttpRequest.lib; @@ -235,21 +228,17 @@ arcana.lib; - astc-encoder.lib; BabylonNative.lib; bgfx.lib; bimg.lib; - tinyexr.lib; + bimg_encode.lib; + bimg_decode.lib; bx.lib; Canvas.lib; - edtaa3.lib; - etc1.lib; - etc2.lib; GenericCodeGen.lib; glslang.lib; glslang-default-resource-limits.lib; Graphics.lib; - iqa.lib; jsi.lib; JsRuntime.lib; MachineIndependent.lib; @@ -261,15 +250,12 @@ NativeOptimizations.lib; NativeTracing.lib; NativeXr.lib; - nvtt.lib; OGLCompiler.lib; openxr_loader.lib; OSDependent.lib; - pvrtc.lib; spirv-cross-core.lib; spirv-cross-hlsl.lib; SPIRV.lib; - squish.lib; UrlLib.lib; Window.lib; XMLHttpRequest.lib; diff --git a/Package/BaseKit/react-native-babylon.podspec b/Package/BaseKit/react-native-babylon.podspec index c279b0d34..635fb6f92 100644 --- a/Package/BaseKit/react-native-babylon.podspec +++ b/Package/BaseKit/react-native-babylon.podspec @@ -21,16 +21,14 @@ Pod::Spec.new do |s| 'ios/libs/libBabylonNative.a', 'ios/libs/libbgfx.a', 'ios/libs/libbimg.a', + 'ios/libs/libbimg_encode.a', + 'ios/libs/libbimg_decode.a', 'ios/libs/libbx.a', 'ios/libs/libCanvas.a', - 'ios/libs/libedtaa3.a', - 'ios/libs/libetc1.a', - 'ios/libs/libetc2.a', 'ios/libs/libGenericCodeGen.a', 'ios/libs/libglslang-default-resource-limits.a', 'ios/libs/libglslang.a', 'ios/libs/libGraphics.a', - 'ios/libs/libiqa.a', 'ios/libs/libJsRuntime.a', 'ios/libs/libMachineIndependent.a', 'ios/libs/libnapi.a', @@ -39,15 +37,11 @@ Pod::Spec.new do |s| 'ios/libs/libNativeInput.a', 'ios/libs/libNativeOptimizations.a', 'ios/libs/libNativeTracing.a', - 'ios/libs/libnvtt.a', 'ios/libs/libOGLCompiler.a', 'ios/libs/libOSDependent.a', - 'ios/libs/libpvrtc.a', 'ios/libs/libspirv-cross-core.a', 'ios/libs/libspirv-cross-msl.a', 'ios/libs/libSPIRV.a', - 'ios/libs/libsquish.a', - 'ios/libs/libtinyexr.a', 'ios/libs/libUrlLib.a', 'ios/libs/libWindow.a', 'ios/libs/libXMLHttpRequest.a' diff --git a/Package/gulpfile.js b/Package/gulpfile.js index 5397fbbfd..8630b4fb4 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -529,7 +529,6 @@ const validateAssemblediOSAndroid = async () => { `${assemblediOSAndroidDir}/ios/EngineViewManager.mm`, `${assemblediOSAndroidDir}/ios/include`, `${assemblediOSAndroidDir}/ios/libs`, - `${assemblediOSAndroidDir}/ios/libs/libastc-encoder.a`, `${assemblediOSAndroidDir}/ios/libs/libBabylonNative.a`, `${assemblediOSAndroidDir}/ios/libs/libbgfx.a`, `${assemblediOSAndroidDir}/ios/libs/libbimg.a`, @@ -553,14 +552,8 @@ const validateAssemblediOSAndroid = async () => { `${assemblediOSAndroidDir}/ios/libs/libspirv-cross-core.a`, `${assemblediOSAndroidDir}/ios/libs/libspirv-cross-msl.a`, `${assemblediOSAndroidDir}/ios/libs/libSPIRV.a`, - `${assemblediOSAndroidDir}/ios/libs/libtinyexr.a`, - `${assemblediOSAndroidDir}/ios/libs/libetc1.a`, - `${assemblediOSAndroidDir}/ios/libs/libetc2.a`, - `${assemblediOSAndroidDir}/ios/libs/libnvtt.a`, - `${assemblediOSAndroidDir}/ios/libs/libsquish.a`, - `${assemblediOSAndroidDir}/ios/libs/libpvrtc.a`, - `${assemblediOSAndroidDir}/ios/libs/libiqa.a`, - `${assemblediOSAndroidDir}/ios/libs/libedtaa3.a`, + `${assemblediOSAndroidDir}/ios/libs/libbimg_encode.a`, + `${assemblediOSAndroidDir}/ios/libs/libbimg_decode.a`, `${assemblediOSAndroidDir}/ios/libs/libUrlLib.a`, `${assemblediOSAndroidDir}/ios/libs/libWindow.a`, `${assemblediOSAndroidDir}/ios/libs/libXMLHttpRequest.a`, diff --git a/Package/iOS/CMakeLists.txt b/Package/iOS/CMakeLists.txt index 1196a05ab..151e42500 100644 --- a/Package/iOS/CMakeLists.txt +++ b/Package/iOS/CMakeLists.txt @@ -23,15 +23,8 @@ project(ReactNativeBabylon) include(${CMAKE_CURRENT_SOURCE_DIR}/../../Apps/${BUILD_RNAPP_DIR}/node_modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt) set(PACKAGED_LIBS - astc-encoder - etc1 - etc2 - nvtt - squish - pvrtc - iqa - edtaa3 - tinyexr + bimg_encode + bimg_decode bgfx bimg bx @@ -55,7 +48,6 @@ set(PACKAGED_LIBS SPIRV spirv-cross-core spirv-cross-msl - tinyexr UrlLib Window XMLHttpRequest From 4a90ea99b61b7d39341333d50d9cb354ece39974 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Thu, 15 May 2025 10:41:27 +0200 Subject: [PATCH 06/43] graphics warnings --- Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt index bbe043098..dcc4f7813 100644 --- a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt +++ b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt @@ -46,6 +46,8 @@ endif() target_include_directories(BabylonNative PRIVATE ${SHARED_INCLUDES}) +disable_warnings(Graphics) + target_link_libraries(BabylonNative arcana GraphicsDevice From 8c142f1fd867d48e9eb50cf5f76ec38858e53684 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Thu, 15 May 2025 11:19:08 +0200 Subject: [PATCH 07/43] disable warnings for Windows build --- .../react-native-windows/windows/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt index dcc4f7813..26b74b521 100644 --- a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt +++ b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt @@ -46,7 +46,16 @@ endif() target_include_directories(BabylonNative PRIVATE ${SHARED_INCLUDES}) +# because of warning C5030: attribute 'msvc::intrinsic' is not recognized +# solution is to update VS version but this might bring more issues disable_warnings(Graphics) +disable_warnings(NativeEngine) +disable_warnings(NativeCamera) +disable_warnings(NativeInput) +disable_warnings(NativeCapture) +disable_warnings(Canvas) +disable_warnings(Window) +disable_warnings(NativeXr) target_link_libraries(BabylonNative arcana From cc177773b77a0e205a7f5746bbd1be366ce988cb Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Fri, 16 May 2025 15:27:53 +0200 Subject: [PATCH 08/43] xcode scheme --- Modules/@babylonjs/react-native/shared/CMakeLists.txt | 2 +- Package/iOS/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native/shared/CMakeLists.txt b/Modules/@babylonjs/react-native/shared/CMakeLists.txt index 4a9869be7..a120ab4fe 100644 --- a/Modules/@babylonjs/react-native/shared/CMakeLists.txt +++ b/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 fc7c7c2f8dd272be4938a62af04ae452b89d9eae) + GIT_TAG 7f82d72f22e9789b9b66cb837aec0c9bc8ff65ee) set(SHARED_INCLUDES "${CMAKE_CURRENT_LIST_DIR}") diff --git a/Package/iOS/CMakeLists.txt b/Package/iOS/CMakeLists.txt index 151e42500..807c41143 100644 --- a/Package/iOS/CMakeLists.txt +++ b/Package/iOS/CMakeLists.txt @@ -22,6 +22,8 @@ project(ReactNativeBabylon) include(${CMAKE_CURRENT_SOURCE_DIR}/../../Apps/${BUILD_RNAPP_DIR}/node_modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt) +set_property(TARGET BabylonNative PROPERTY XCODE_GENERATE_SCHEME YES) + set(PACKAGED_LIBS bimg_encode bimg_decode From d7d00b9b6d2cc4a226b408c525d0225abd2f21db Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Fri, 16 May 2025 16:24:35 +0200 Subject: [PATCH 09/43] no nativexr for Windows, add schemes for iOS in validation step --- .../windows/CMakeLists.txt | 1 - Package/gulpfile.js | 51 +++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt index 26b74b521..4d203100f 100644 --- a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt +++ b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt @@ -55,7 +55,6 @@ disable_warnings(NativeInput) disable_warnings(NativeCapture) disable_warnings(Canvas) disable_warnings(Window) -disable_warnings(NativeXr) target_link_libraries(BabylonNative arcana diff --git a/Package/gulpfile.js b/Package/gulpfile.js index 8630b4fb4..19991883e 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -565,6 +565,57 @@ const validateAssemblediOSAndroid = async () => { `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/project.xcworkspace`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/project.xcworkspace/xcshareddata`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/AbortController.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/AppRuntime.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/BabylonNative.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/bgfx.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/bimg_decode.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/bimg_encode.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/bimg.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/bx.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/Canvas.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/Console.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/ExternalTexture.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/Foundation.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/GenericCodeGen.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/glslang-default-resource-limits.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/glslang.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/Graphics.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/JsRuntime.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/MachineIndependent.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/napi.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/NativeCamera.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/NativeCapture.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/NativeEngine.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/NativeInput.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/NativeOptimizations.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/NativeTracing.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/NativeXr.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/OGLCompiler.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/OSDependent.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/Scheduling.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/ScriptLoader.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/sharpyuv.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/spirv-cross-core.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/spirv-cross-msl.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/SPIRV.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/TestUtils.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/URL.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/UrlLib.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webp.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webpdecode.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webpdecoder.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webpdemux.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webpdsp.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webpdspdecode.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webpencode.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webputils.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webputilsdecode.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/WebSocket.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/Window.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/XMLHttpRequest.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/xr.xcscheme`, `${assemblediOSAndroidDir}/package.json`, `${assemblediOSAndroidDir}/react-native-babylon.podspec`, `${assemblediOSAndroidDir}/README.md`, From c2e7660b268022d6ed73542fd334c81f29456fe4 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Fri, 16 May 2025 16:49:24 +0200 Subject: [PATCH 10/43] no xr for msvc --- Modules/@babylonjs/react-native/shared/BabylonNative.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp index ac06316a9..51e2d63cc 100644 --- a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp +++ b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp @@ -4,8 +4,10 @@ #include #ifndef BASEKIT_BUILD #include +#if !defined(_MSC_VER) #include #endif +#endif #include #include #include @@ -50,7 +52,7 @@ namespace BabylonNative Babylon::JsRuntime::CreateForJavaScript(m_env, Babylon::CreateJsRuntimeDispatcher(m_env, jsiRuntime, m_jsDispatcher, m_isRunning)); // Initialize Babylon Native plugins -#ifndef BASEKIT_BUILD +#if !defined(BASEKIT_BUILD) && !defined(_MSC_VER) m_nativeXr.emplace(Babylon::Plugins::NativeXr::Initialize(m_env)); m_nativeXr->SetSessionStateChangedCallback([isXRActive{ m_isXRActive }](bool isSessionActive) { *isXRActive = isSessionActive; }); Babylon::Plugins::NativeCamera::Initialize(m_env); @@ -215,7 +217,7 @@ namespace BabylonNative #if defined(__APPLE__) || defined(ANDROID) void UpdateXRView(WindowType window) { -#ifndef BASEKIT_BUILD +#if !defined(BASEKIT_BUILD) && !defined(_MSC_VER) m_nativeXr->UpdateWindow(window); #endif } @@ -268,7 +270,7 @@ namespace BabylonNative bool m_isRenderingEnabled{}; std::once_flag m_isGraphicsInitialized{}; Babylon::Plugins::NativeInput* m_nativeInput{}; -#ifndef BASEKIT_BUILD +#if !defined(BASEKIT_BUILD) && !defined(WIN32) std::optional m_nativeXr{}; #endif Babylon::Graphics::Configuration m_graphicsConfig{}; From b3af731cd4f35ec8b7938042443d204d78539705 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Fri, 16 May 2025 17:46:55 +0200 Subject: [PATCH 11/43] removed Windows XR support --- Package/gulpfile.js | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/Package/gulpfile.js b/Package/gulpfile.js index 19991883e..74cda32cf 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -345,8 +345,6 @@ const createUWPDirectories = async () => { shelljs.mkdir('-p', `${assembledWindowsDir}/windows/libs/x64/Release`); shelljs.mkdir('-p', `${assembledWindowsDir}/windows/BabylonReactNative`); shelljs.mkdir('-p', `${assembledWindowsDir}/windows/include`); - shelljs.mkdir('-p', `${assembledWindowsDir}/windows/OpenXR-MixedReality/include/openxr`); - shelljs.mkdir('-p', `${assembledWindowsDir}/windows/OpenXR-MixedReality/include/XrUtility`); } const copyCommonFilesUWP = () => { @@ -399,28 +397,6 @@ const copyVCXProjUWPFiles = () => { .pipe(gulp.dest(`${assembledWindowsDir}/windows/BabylonReactNative`)); } -const copyOpenXRInfoFiles = () => { - return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_x64/_deps/openxr-mixedreality-src/LICENSE') - .pipe(gulp.src('../Modules/@babylonjs/react-native/Build/uwp_x64/_deps/openxr-mixedreality-src/README.md')) - .pipe(gulp.dest(`${assembledWindowsDir}/windows/OpenXR-MixedReality`)); -} - -const copyOpenXRPreviewHeaders = () => { - return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_x64/_deps/openxr-mixedreality-src/openxr_preview/include/openxr/*') - .pipe(gulp.dest(`${assembledWindowsDir}/windows/OpenXR-MixedReality/include/openxr`)); -} - -const copyOpenXRUtilityHeaders = () => { - return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_x64/_deps/openxr-mixedreality-src/shared/XrUtility/*') - .pipe(gulp.dest(`${assembledWindowsDir}/windows/OpenXR-MixedReality/include/XrUtility`)); -} - -const copyOpenXRHelperHeaders = () => { - return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_x64/_deps/babylonnative-src/Dependencies/xr/Source/OpenXR/Include/*') - .pipe(gulp.src('../Modules/@babylonjs/react-native-windows/windows/include/*')) - .pipe(gulp.dest(`${assembledWindowsDir}/windows/include`)); -} - const copyUWPFiles = gulp.series( createUWPDirectories, basekitBuild ? @@ -442,11 +418,7 @@ const copyUWPFiles = gulp.series( copyx64ReleaseUWPFiles, copyARM64DebugUWPFiles, copyARM64ReleaseUWPFiles, - copyVCXProjUWPFiles, - copyOpenXRInfoFiles, - copyOpenXRPreviewHeaders, - copyOpenXRUtilityHeaders, - copyOpenXRHelperHeaders)); + copyVCXProjUWPFiles)); const validateAssembled = async () => { // When the package contents are updated *and validated*, update the expected below from the output of the failed validation console output (run `gulp validateAssembled`). From a049ac832e1060e1b04b4435e18191cf847f3a09 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Fri, 16 May 2025 17:52:12 +0200 Subject: [PATCH 12/43] NDK min is 23.1.7779620 --- Apps/PackageTest/0.63.1/android/build.gradle | 2 +- Apps/PackageTest/0.64.0/android/build.gradle | 2 +- Apps/PackageTest/0.65.0/android/build.gradle | 2 +- Apps/PackageTest/0.69.0/android/build.gradle | 2 +- Apps/Playground/0.64/android/build.gradle | 2 +- Apps/Playground/0.65/android/build.gradle | 2 +- Apps/Playground/0.69/android/build.gradle | 2 +- Apps/Playground/0.70/android/build.gradle | 2 +- .../@babylonjs/react-native-iosandroid/android/build.gradle | 6 +----- README.md | 6 +++--- 10 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Apps/PackageTest/0.63.1/android/build.gradle b/Apps/PackageTest/0.63.1/android/build.gradle index 4ed7aa24c..1e14279c0 100644 --- a/Apps/PackageTest/0.63.1/android/build.gradle +++ b/Apps/PackageTest/0.63.1/android/build.gradle @@ -6,7 +6,7 @@ buildscript { minSdkVersion = 21 compileSdkVersion = 33 targetSdkVersion = 33 - ndkVersion = "21.4.7075529" + ndkVersion = "23.1.7779620" } repositories { google() diff --git a/Apps/PackageTest/0.64.0/android/build.gradle b/Apps/PackageTest/0.64.0/android/build.gradle index 4ed7aa24c..1e14279c0 100644 --- a/Apps/PackageTest/0.64.0/android/build.gradle +++ b/Apps/PackageTest/0.64.0/android/build.gradle @@ -6,7 +6,7 @@ buildscript { minSdkVersion = 21 compileSdkVersion = 33 targetSdkVersion = 33 - ndkVersion = "21.4.7075529" + ndkVersion = "23.1.7779620" } repositories { google() diff --git a/Apps/PackageTest/0.65.0/android/build.gradle b/Apps/PackageTest/0.65.0/android/build.gradle index 1dcab657e..9234666eb 100644 --- a/Apps/PackageTest/0.65.0/android/build.gradle +++ b/Apps/PackageTest/0.65.0/android/build.gradle @@ -6,7 +6,7 @@ buildscript { minSdkVersion = 21 compileSdkVersion = 33 targetSdkVersion = 33 - ndkVersion = "21.4.7075529" + ndkVersion = "23.1.7779620" } repositories { google() diff --git a/Apps/PackageTest/0.69.0/android/build.gradle b/Apps/PackageTest/0.69.0/android/build.gradle index c0ef0a842..f3afde8a6 100644 --- a/Apps/PackageTest/0.69.0/android/build.gradle +++ b/Apps/PackageTest/0.69.0/android/build.gradle @@ -13,7 +13,7 @@ buildscript { ndkVersion = "24.0.8215888" } else { // Otherwise we default to the side-by-side NDK version from AGP. - ndkVersion = "21.4.7075529" + ndkVersion = "23.1.7779620" } } repositories { diff --git a/Apps/Playground/0.64/android/build.gradle b/Apps/Playground/0.64/android/build.gradle index 4ed7aa24c..1e14279c0 100644 --- a/Apps/Playground/0.64/android/build.gradle +++ b/Apps/Playground/0.64/android/build.gradle @@ -6,7 +6,7 @@ buildscript { minSdkVersion = 21 compileSdkVersion = 33 targetSdkVersion = 33 - ndkVersion = "21.4.7075529" + ndkVersion = "23.1.7779620" } repositories { google() diff --git a/Apps/Playground/0.65/android/build.gradle b/Apps/Playground/0.65/android/build.gradle index 1dcab657e..9234666eb 100644 --- a/Apps/Playground/0.65/android/build.gradle +++ b/Apps/Playground/0.65/android/build.gradle @@ -6,7 +6,7 @@ buildscript { minSdkVersion = 21 compileSdkVersion = 33 targetSdkVersion = 33 - ndkVersion = "21.4.7075529" + ndkVersion = "23.1.7779620" } repositories { google() diff --git a/Apps/Playground/0.69/android/build.gradle b/Apps/Playground/0.69/android/build.gradle index b0e2d1626..bc6969ad2 100644 --- a/Apps/Playground/0.69/android/build.gradle +++ b/Apps/Playground/0.69/android/build.gradle @@ -13,7 +13,7 @@ buildscript { ndkVersion = "24.0.8215888" } else { // Otherwise we default to the side-by-side NDK version from AGP. - ndkVersion = "21.4.7075529" + ndkVersion = "23.1.7779620" } } repositories { diff --git a/Apps/Playground/0.70/android/build.gradle b/Apps/Playground/0.70/android/build.gradle index 54c496777..64aaca8d2 100644 --- a/Apps/Playground/0.70/android/build.gradle +++ b/Apps/Playground/0.70/android/build.gradle @@ -12,7 +12,7 @@ buildscript { ndkVersion = "24.0.8215888" } else { // Otherwise we default to the side-by-side NDK version from AGP. - ndkVersion = "21.4.7075529" + ndkVersion = "23.1.7779620" } } repositories { diff --git a/Modules/@babylonjs/react-native-iosandroid/android/build.gradle b/Modules/@babylonjs/react-native-iosandroid/android/build.gradle index 5fb2e30df..b9c5c72a2 100644 --- a/Modules/@babylonjs/react-native-iosandroid/android/build.gradle +++ b/Modules/@babylonjs/react-native-iosandroid/android/build.gradle @@ -14,7 +14,7 @@ def DEFAULT_COMPILE_SDK_VERSION = 30 def DEFAULT_BUILD_TOOLS_VERSION = '30.0.2' def DEFAULT_MIN_SDK_VERSION = 21 def DEFAULT_TARGET_SDK_VERSION = 30 -def DEFAULT_NDK_VERSION = '21.4.7075529' +def DEFAULT_NDK_VERSION = '23.1.7779620' def safeExtGet(prop, fallback) { rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback @@ -41,10 +41,6 @@ if (project.hasProperty("BASEKIT_BUILD")) { basekitBuild = project.getProperty("BASEKIT_BUILD") } -if (REACT_VERSION >= 71) { - DEFAULT_NDK_VERSION = '23.1.7779620' -} - buildscript { // The Android Gradle plugin is only required when opening the android folder stand-alone. // This avoids unnecessary downloads and potential conflicts when the library is included as a diff --git a/README.md b/README.md index ea25531fa..63d02d6f5 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ After merging upstream changes in the future, you will need to either run `npm i ### **Configuring a Mac 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/), [JDK 13](https://www.oracle.com/java/technologies/javase-jdk13-downloads.html) +**Required Tools:** [Android Studio](https://developer.android.com/studio/) (including NDK 23.1.7779620), [CMake](https://cmake.org/), [Ninja](https://ninja-build.org/), [JDK 13](https://www.oracle.com/java/technologies/javase-jdk13-downloads.html) - The `PATH` environment variable must include the path to adb (typically ~/Library/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). @@ -95,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 2022](https://visualstudio.microsoft.com/vs/) +**Required Tools:** [Android Studio](https://developer.android.com/studio/) (including NDK 23.1.7779620), [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). @@ -104,7 +104,7 @@ export JAVA_HOME=$(/usr/libexec/java_home -v 13) ### **Configuring a Linux Dev Environment** -**Required Tools:** [Android Studio](https://developer.android.com/studio/) (including NDK 21.4.7075529) +**Required Tools:** [Android Studio](https://developer.android.com/studio/) (including NDK 23.1.7779620) With Ubuntu, you can install needed packages by this command: From dc72a591173c2500a8ba284390562913bff7ca1f Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Fri, 16 May 2025 18:27:42 +0200 Subject: [PATCH 13/43] disable warnings xr android --- .../@babylonjs/react-native-iosandroid/android/CMakeLists.txt | 2 ++ Package/gulpfile.js | 1 + 2 files changed, 3 insertions(+) diff --git a/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt index 937729188..1a34e2279 100644 --- a/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt +++ b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt @@ -38,6 +38,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/src/") set(BABYLON_NATIVE_BUILD_APPS OFF CACHE BOOL "") add_subdirectory(${babylonnative_SOURCE_DIR} ${babylonnative_SOURCE_DIR}/build/Android_${CMAKE_ANDROID_ARCH_ABI}/) +disable_warnings(NativeXr) + set(BABYLON_REACT_NATIVE_SHARED_DIR "${CMAKE_CURRENT_LIST_DIR}/../../react-native/shared") add_subdirectory(${BABYLON_REACT_NATIVE_SHARED_DIR} ${CMAKE_CURRENT_BINARY_DIR}/shared) diff --git a/Package/gulpfile.js b/Package/gulpfile.js index 74cda32cf..6edfb66aa 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -537,6 +537,7 @@ const validateAssemblediOSAndroid = async () => { `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/project.xcworkspace`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/project.xcworkspace/xcshareddata`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/AbortController.xcscheme`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/AppRuntime.xcscheme`, From 6b4527ac9059b8da169873b1a93ddba05a594335 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Fri, 16 May 2025 19:38:10 +0200 Subject: [PATCH 14/43] no warning nativeCamera Android --- .../@babylonjs/react-native-iosandroid/android/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt index 1a34e2279..f3560be40 100644 --- a/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt +++ b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt @@ -39,6 +39,7 @@ set(BABYLON_NATIVE_BUILD_APPS OFF CACHE BOOL "") add_subdirectory(${babylonnative_SOURCE_DIR} ${babylonnative_SOURCE_DIR}/build/Android_${CMAKE_ANDROID_ARCH_ABI}/) disable_warnings(NativeXr) +disable_warnings(NativeCamera) set(BABYLON_REACT_NATIVE_SHARED_DIR "${CMAKE_CURRENT_LIST_DIR}/../../react-native/shared") add_subdirectory(${BABYLON_REACT_NATIVE_SHARED_DIR} ${CMAKE_CURRENT_BINARY_DIR}/shared) From 492d4753d1ca21ad523ef435c0ae07f40c575100 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Fri, 16 May 2025 20:10:04 +0200 Subject: [PATCH 15/43] disable XMLHttpRequest warnings --- .../@babylonjs/react-native-iosandroid/android/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt index f3560be40..2b18f09a8 100644 --- a/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt +++ b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt @@ -40,6 +40,7 @@ add_subdirectory(${babylonnative_SOURCE_DIR} ${babylonnative_SOURCE_DIR}/build/A disable_warnings(NativeXr) disable_warnings(NativeCamera) +disable_warnings(XMLHttpRequest) set(BABYLON_REACT_NATIVE_SHARED_DIR "${CMAKE_CURRENT_LIST_DIR}/../../react-native/shared") add_subdirectory(${BABYLON_REACT_NATIVE_SHARED_DIR} ${CMAKE_CURRENT_BINARY_DIR}/shared) From 43ad6c0633f54c23647dc39e135a16ba74e5fc64 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Fri, 16 May 2025 21:12:19 +0200 Subject: [PATCH 16/43] even less warnings --- .../react-native-iosandroid/android/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt index 2b18f09a8..f5d2f5de0 100644 --- a/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt +++ b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt @@ -41,6 +41,12 @@ add_subdirectory(${babylonnative_SOURCE_DIR} ${babylonnative_SOURCE_DIR}/build/A disable_warnings(NativeXr) disable_warnings(NativeCamera) disable_warnings(XMLHttpRequest) +disable_warnings(Graphics) +disable_warnings(NativeEngine) +disable_warnings(NativeInput) +disable_warnings(NativeCapture) +disable_warnings(Canvas) +disable_warnings(Window) set(BABYLON_REACT_NATIVE_SHARED_DIR "${CMAKE_CURRENT_LIST_DIR}/../../react-native/shared") add_subdirectory(${BABYLON_REACT_NATIVE_SHARED_DIR} ${CMAKE_CURRENT_BINARY_DIR}/shared) From 4b0b399d88fec4f71e80f0e47214bf2b2fcc984b Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Sat, 17 May 2025 09:37:18 +0200 Subject: [PATCH 17/43] brings back rnta --- .github/workflows/pr.yml | 134 +++++++++--------- .../android/CMakeLists.txt | 6 +- 2 files changed, 71 insertions(+), 69 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d73600757..409806228 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -47,45 +47,45 @@ jobs: env: JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }} - # build-android-rnta: - # runs-on: macos-latest - # steps: - # - name: Checkout Repo - # uses: actions/checkout@v2.3.3 - # with: - # submodules: 'recursive' - # - name: Free space - # uses: ./.github/workflows/macos_freespace - # - name: Setup CMake - # uses: jwlawson/actions-setup-cmake@v1.8 - # with: - # cmake-version: '3.26.3' - # - name: Setup Ninja - # run: brew install ninja - # - name: Setup Watchman - # run: brew install watchman - # - name: NPM Install (Playground) - # run: npm install - # working-directory: ./Apps/BRNPlayground + build-android-rnta: + runs-on: macos-latest + steps: + - name: Checkout Repo + uses: actions/checkout@v2.3.3 + with: + submodules: 'recursive' + - name: Free space + uses: ./.github/workflows/macos_freespace + - name: Setup CMake + uses: jwlawson/actions-setup-cmake@v1.8 + with: + cmake-version: '3.26.3' + - name: Setup Ninja + run: brew install ninja + - name: Setup Watchman + run: brew install watchman + - name: NPM Install (Playground) + run: npm install + working-directory: ./Apps/BRNPlayground - # - name: Build Windows Bundle - # run: npm run build:android - # working-directory: ./Apps/BRNPlayground + - name: Build Windows Bundle + run: npm run build:android + working-directory: ./Apps/BRNPlayground - # - name: NPM Install (Binary Package) - # run: npm install - # working-directory: ./Package - # - name: Setup Java - # uses: actions/setup-java@v3 - # with: - # distribution: 'temurin' - # java-version: '17' - # check-latest: true - # - name: Gulp (Android) - # run: npx gulp buildAndroidRNTA - # working-directory: ./Package - # env: - # JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }} + - name: NPM Install (Binary Package) + run: npm install + working-directory: ./Package + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' + check-latest: true + - name: Gulp (Android) + run: npx gulp buildAndroidRNTA + working-directory: ./Package + env: + JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }} build-iOS: runs-on: macos-latest @@ -113,40 +113,40 @@ jobs: run: npx gulp buildIOS working-directory: ./Package - # build-iOS-rnta: - # runs-on: macos-latest - # steps: - # - name: Checkout Repo - # uses: actions/checkout@v2.3.3 - # with: - # submodules: 'recursive' - # - name: Free space - # uses: ./.github/workflows/macos_freespace - # - name: Setup Watchman - # run: brew install watchman + build-iOS-rnta: + runs-on: macos-latest + steps: + - name: Checkout Repo + uses: actions/checkout@v2.3.3 + with: + submodules: 'recursive' + - name: Free space + uses: ./.github/workflows/macos_freespace + - name: Setup Watchman + run: brew install watchman - # - name: NPM Install (Playground) - # run: npm install - # working-directory: ./Apps/BRNPlayground + - name: NPM Install (Playground) + run: npm install + working-directory: ./Apps/BRNPlayground - # - name: Build iOS Bundle - # run: npm run build:ios - # working-directory: ./Apps/BRNPlayground + - name: Build iOS Bundle + run: npm run build:ios + working-directory: ./Apps/BRNPlayground - # - name: NPM Install (Binary Package) - # run: npm install - # working-directory: ./Package - # - name: Gulp (iOS) - # run: npx gulp buildIOSRNTA - # working-directory: ./Package + - name: NPM Install (Binary Package) + run: npm install + working-directory: ./Package + - name: Gulp (iOS) + run: npx gulp buildIOSRNTA + working-directory: ./Package - # - name: Cache XCFrameworks - # uses: actions/cache@v2 - # with: - # path: Modules/@babylonjs/react-native-iosandroid/ios/libs - # key: ${{ runner.os }}-xcframeworks-${{ github.sha }} - # restore-keys: | - # ${{ runner.os }}-xcframeworks + - name: Cache XCFrameworks + uses: actions/cache@v2 + with: + path: Modules/@babylonjs/react-native-iosandroid/ios/libs + key: ${{ runner.os }}-xcframeworks-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-xcframeworks test-publish-android-ios: runs-on: macos-latest diff --git a/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt index f5d2f5de0..40849be4f 100644 --- a/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt +++ b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt @@ -38,8 +38,10 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/src/") set(BABYLON_NATIVE_BUILD_APPS OFF CACHE BOOL "") add_subdirectory(${babylonnative_SOURCE_DIR} ${babylonnative_SOURCE_DIR}/build/Android_${CMAKE_ANDROID_ARCH_ABI}/) -disable_warnings(NativeXr) -disable_warnings(NativeCamera) +if (NOT ${BASEKIT_BUILD}) + disable_warnings(NativeXr) + disable_warnings(NativeCamera) +endif() disable_warnings(XMLHttpRequest) disable_warnings(Graphics) disable_warnings(NativeEngine) From 28b72f891e784de6c70f1cb7ede8f43b5c60d14d Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Sat, 17 May 2025 10:25:15 +0200 Subject: [PATCH 18/43] windows rnta --- .github/workflows/pr.yml | 90 ++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 409806228..756b946a3 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -233,61 +233,61 @@ jobs: run: npx gulp buildUWPPlayground${{ matrix.platform }}${{ matrix.config }} working-directory: ./Package - # build-windows-rnta: - # runs-on: windows-2019 - # steps: - # - name: Support longpaths - # run: git config --system core.longpaths true - # - name: Checkout Repo - # uses: actions/checkout@v2.3.3 - # with: - # submodules: 'true' - # - name: Setup MSBuild - # uses: microsoft/setup-msbuild@v1.0.2 - # - name: Setup Node 20 - # uses: actions/setup-node@v3 - # with: - # node-version: 20 + build-windows-rnta: + runs-on: windows-2019 + steps: + - name: Support longpaths + run: git config --system core.longpaths true + - name: Checkout Repo + uses: actions/checkout@v2.3.3 + with: + submodules: 'true' + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v1.0.2 + - name: Setup Node 20 + uses: actions/setup-node@v3 + with: + node-version: 20 - # - name: Install watchman - # run: choco install watchman - # working-directory: ./Apps/BRNPlayground + - name: Install watchman + run: choco install watchman + working-directory: ./Apps/BRNPlayground - # - name: NPM Install RNTA - # run: npm install - # working-directory: ./Apps/BRNPlayground + - name: NPM Install RNTA + run: npm install + working-directory: ./Apps/BRNPlayground - # - name: Build Windows Bundle - # run: npm run build:windows - # working-directory: ./Apps/BRNPlayground + - name: Build Windows Bundle + run: npm run build:windows + working-directory: ./Apps/BRNPlayground - # - name: NPM Install Package - # run: npm install - # working-directory: ./Package + - name: NPM Install Package + run: npm install + working-directory: ./Package - # - name: NPM Generate Windows Project - # run: npx install-windows-test-app - # working-directory: ./Apps/BRNPlayground + - name: NPM Generate Windows Project + run: npx install-windows-test-app + working-directory: ./Apps/BRNPlayground - # - name: BabylonNative build directory - # run: mkdir @babylonjs/react-native/Build/uwp_x64 - # working-directory: ./Modules + - name: BabylonNative build directory + run: mkdir @babylonjs/react-native/Build/uwp_x64 + working-directory: ./Modules - # - name: CMake BabylonNative - # run: cmake -G "Visual Studio 16 2019" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0.19041.0 -DCMAKE_UNITY_BUILD=true -D CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM=10.0.19041.0 -A x64 ./../../../react-native-windows/windows - # working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64 + - name: CMake BabylonNative + run: cmake -G "Visual Studio 16 2019" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0.19041.0 -DCMAKE_UNITY_BUILD=true -D CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM=10.0.19041.0 -A x64 ./../../../react-native-windows/windows + working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64 - # - name: Nuget restore - # run: nuget restore BRNPlayground.sln - # working-directory: ./Apps/BRNPlayground/windows + - name: Nuget restore + run: nuget restore BRNPlayground.sln + working-directory: ./Apps/BRNPlayground/windows - # - name: Windows build BN - # run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m ReactNativeBabylon.sln - # working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64 + - name: Windows build BN + run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m ReactNativeBabylon.sln + working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64 - # - name: Windows build BRN - # run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m BRNPlayground.sln - #working-directory: ./Apps/BRNPlayground/windows + - name: Windows build BRN + run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m BRNPlayground.sln + working-directory: ./Apps/BRNPlayground/windows # Test packages build-android-ios-065: From 7cd091ae1dbf895dd596cb04d45e85cf3a4d2909 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Sat, 17 May 2025 12:07:08 +0200 Subject: [PATCH 19/43] action cache version --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 756b946a3..fd1145056 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -141,7 +141,7 @@ jobs: working-directory: ./Package - name: Cache XCFrameworks - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: Modules/@babylonjs/react-native-iosandroid/ios/libs key: ${{ runner.os }}-xcframeworks-${{ github.sha }} From c02b9edd77dccf4a2e0961e648416890b9e9f812 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Sat, 17 May 2025 22:32:16 +0200 Subject: [PATCH 20/43] windows build link path --- .../windows/BabylonReactNative/BabylonReactNative.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index 20aaf925d..606d19d53 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -146,7 +146,7 @@ $(BabylonNativeBuildDir)_deps\jsruntimehost-build\Core\Node-API-JSI\$(Configuration); $(BabylonNativeBuildDir)_deps\jsruntimehost-build\Polyfills\XMLHttpRequest\$(Configuration); $(BabylonNativeBuildDir)_deps\urllib-build\$(Configuration); - $(BabylonNativeBuildDir)_deps\bgfx.cmake-build\$(Configuration); + $(BabylonNativeBuildDir)_deps\bgfx.cmake-build\cmake\bgfx\$(Configuration); $(BabylonNativeBuildDir)_deps\glslang-build\glslang\$(Configuration); $(BabylonNativeBuildDir)_deps\glslang-build\glslang\OSDependent\Windows\$(Configuration); $(BabylonNativeBuildDir)_deps\glslang-build\OGLCompilersDLL\$(Configuration); From 78082f652cb83532ec0aa3031317616dd2a0d29f Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Sat, 17 May 2025 23:00:33 +0200 Subject: [PATCH 21/43] bimg and bx path --- .../windows/BabylonReactNative/BabylonReactNative.vcxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index 606d19d53..1eb240c5b 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -147,6 +147,8 @@ $(BabylonNativeBuildDir)_deps\jsruntimehost-build\Polyfills\XMLHttpRequest\$(Configuration); $(BabylonNativeBuildDir)_deps\urllib-build\$(Configuration); $(BabylonNativeBuildDir)_deps\bgfx.cmake-build\cmake\bgfx\$(Configuration); + $(BabylonNativeBuildDir)_deps\bgfx.cmake-build\cmake\bx\$(Configuration); + $(BabylonNativeBuildDir)_deps\bgfx.cmake-build\cmake\bimg\$(Configuration); $(BabylonNativeBuildDir)_deps\glslang-build\glslang\$(Configuration); $(BabylonNativeBuildDir)_deps\glslang-build\glslang\OSDependent\Windows\$(Configuration); $(BabylonNativeBuildDir)_deps\glslang-build\OGLCompilersDLL\$(Configuration); From fa9b729badd9f642a097605b79f85950118e8518 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Sat, 17 May 2025 23:33:51 +0200 Subject: [PATCH 22/43] removed nativexr from linking --- .../windows/BabylonReactNative/BabylonReactNative.vcxproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index 1eb240c5b..5ee65893e 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -136,7 +136,6 @@ $(BabylonNativeBuildDir)babylonnative\Plugins\NativeInput\$(Configuration); $(BabylonNativeBuildDir)babylonnative\Plugins\NativeOptimizations\$(Configuration); $(BabylonNativeBuildDir)babylonnative\Plugins\NativeTracing\$(Configuration); - $(BabylonNativeBuildDir)babylonnative\Plugins\NativeXr\$(Configuration); $(BabylonNativeBuildDir)babylonnative\Polyfills\Window\$(Configuration); $(BabylonNativeBuildDir)babylonnative\Polyfills\Canvas\$(Configuration); $(BabylonNativeBuildDir)jsi\$(Configuration); @@ -197,7 +196,6 @@ NativeInput.lib; NativeOptimizations.lib; NativeTracing.lib; - NativeXr.lib; OGLCompilerd.lib; openxr_loaderd.lib; OSDependentd.lib; @@ -251,7 +249,6 @@ NativeInput.lib; NativeOptimizations.lib; NativeTracing.lib; - NativeXr.lib; OGLCompiler.lib; openxr_loader.lib; OSDependent.lib; From f96c6dcfef94c5493384c4042c167b9ff84c7773 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Sun, 18 May 2025 09:09:26 +0200 Subject: [PATCH 23/43] xr leftovers --- .../windows/BabylonReactNative/BabylonReactNative.vcxproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index 5ee65893e..e6397556c 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -197,7 +197,6 @@ NativeOptimizations.lib; NativeTracing.lib; OGLCompilerd.lib; - openxr_loaderd.lib; OSDependentd.lib; spirv-cross-cored.lib; spirv-cross-hlsld.lib; @@ -205,7 +204,6 @@ UrlLib.lib; Window.lib; XMLHttpRequest.lib; - xr.lib; WindowsApp.lib; %(AdditionalDependencies); @@ -250,7 +248,6 @@ NativeOptimizations.lib; NativeTracing.lib; OGLCompiler.lib; - openxr_loader.lib; OSDependent.lib; spirv-cross-core.lib; spirv-cross-hlsl.lib; @@ -258,7 +255,6 @@ UrlLib.lib; Window.lib; XMLHttpRequest.lib; - xr.lib; WindowsApp.lib; %(AdditionalDependencies); From b35ebe79a8d61638539c88f98e4665007eb54ad1 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Sun, 18 May 2025 10:07:47 +0200 Subject: [PATCH 24/43] lib webp windows --- .../BabylonReactNative/BabylonReactNative.vcxproj | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index e6397556c..3beb177ef 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -154,6 +154,7 @@ $(BabylonNativeBuildDir)_deps\glslang-build\SPIRV\$(Configuration); $(BabylonNativeBuildDir)_deps\spirv-cross-build\$(Configuration); $(BabylonNativeBuildDir)_deps\openxr-sdk-build\src\loader\$(Configuration); + $(BabylonNativeBuildDir)_deps\libwebp-build\$(Configuration); %(AdditionalLibraryDirectories); @@ -205,6 +206,10 @@ Window.lib; XMLHttpRequest.lib; WindowsApp.lib; + libsharpyuv.lib; + libwebp.lib; + libwebpdecoder.lib; + libwebpdemux.lib; %(AdditionalDependencies); %(AdditionalOptions) @@ -256,6 +261,10 @@ Window.lib; XMLHttpRequest.lib; WindowsApp.lib; + libsharpyuv.lib; + libwebp.lib; + libwebpdecoder.lib; + libwebpdemux.lib; %(AdditionalDependencies); %(AdditionalOptions) From 980b5f61a5c890c0b374ec31a45eff6ce7a15d26 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Sun, 18 May 2025 17:48:03 +0200 Subject: [PATCH 25/43] disable webp windows --- .../BabylonReactNative/BabylonReactNative.vcxproj | 9 --------- .../react-native-windows/windows/CMakeLists.txt | 3 +++ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index 3beb177ef..e6397556c 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -154,7 +154,6 @@ $(BabylonNativeBuildDir)_deps\glslang-build\SPIRV\$(Configuration); $(BabylonNativeBuildDir)_deps\spirv-cross-build\$(Configuration); $(BabylonNativeBuildDir)_deps\openxr-sdk-build\src\loader\$(Configuration); - $(BabylonNativeBuildDir)_deps\libwebp-build\$(Configuration); %(AdditionalLibraryDirectories); @@ -206,10 +205,6 @@ Window.lib; XMLHttpRequest.lib; WindowsApp.lib; - libsharpyuv.lib; - libwebp.lib; - libwebpdecoder.lib; - libwebpdemux.lib; %(AdditionalDependencies); %(AdditionalOptions) @@ -261,10 +256,6 @@ Window.lib; XMLHttpRequest.lib; WindowsApp.lib; - libsharpyuv.lib; - libwebp.lib; - libwebpdecoder.lib; - libwebpdemux.lib; %(AdditionalDependencies); %(AdditionalOptions) diff --git a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt index 4d203100f..9d93a0fb9 100644 --- a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt +++ b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt @@ -35,6 +35,9 @@ add_subdirectory(${babylonnative_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/Babylon # Disable Unity build for UrlLib because of conflict in header between windows.h and winrt set_property(TARGET UrlLib PROPERTY UNITY_BUILD false) +# Disable the WebP plugin option +set(BABYLON_NATIVE_PLUGIN_NATIVEENGINE_WEBP OFF CACHE BOOL "Disable Babylon Native WebP Support") + add_library(BabylonNative ${SHARED_SOURCES}) From 2a2fbe60205c634971552d9a738ad5471932ae5e Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Sun, 18 May 2025 18:23:21 +0200 Subject: [PATCH 26/43] Scheduling --- .../windows/BabylonReactNative/BabylonReactNative.vcxproj | 2 ++ .../@babylonjs/react-native-windows/windows/CMakeLists.txt | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index e6397556c..59fe43caa 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -203,6 +203,7 @@ SPIRVd.lib; UrlLib.lib; Window.lib; + Scheduling.lib; XMLHttpRequest.lib; WindowsApp.lib; %(AdditionalDependencies); @@ -254,6 +255,7 @@ SPIRV.lib; UrlLib.lib; Window.lib; + Scheduling.lib; XMLHttpRequest.lib; WindowsApp.lib; %(AdditionalDependencies); diff --git a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt index 9d93a0fb9..73b1a0b2d 100644 --- a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt +++ b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt @@ -3,6 +3,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) project(ReactNativeBabylon) +# Disable the WebP plugin option +set(BABYLON_NATIVE_PLUGIN_NATIVEENGINE_WEBP OFF CACHE BOOL "Disable Babylon Native WebP Support") + set(CMAKE_CXX_STANDARD 17) set(BABYLON_REACT_NATIVE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../react-native") @@ -35,9 +38,6 @@ add_subdirectory(${babylonnative_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/Babylon # Disable Unity build for UrlLib because of conflict in header between windows.h and winrt set_property(TARGET UrlLib PROPERTY UNITY_BUILD false) -# Disable the WebP plugin option -set(BABYLON_NATIVE_PLUGIN_NATIVEENGINE_WEBP OFF CACHE BOOL "Disable Babylon Native WebP Support") - add_library(BabylonNative ${SHARED_SOURCES}) @@ -70,6 +70,7 @@ target_link_libraries(BabylonNative NativeOptimizations NativeTracing Window + Scheduling XMLHttpRequest Canvas ${ADDITIONAL_LIBRARIES}) From f4a09ecc82e503fb63c2be35b603b9c47cb77006 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Sun, 18 May 2025 19:15:23 +0200 Subject: [PATCH 27/43] scheduling path --- .../windows/BabylonReactNative/BabylonReactNative.vcxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index 59fe43caa..d64bfe47b 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -141,6 +141,7 @@ $(BabylonNativeBuildDir)jsi\$(Configuration); $(BabylonNativeBuildDir)$(Configuration); $(BabylonNativeBuildDir)_deps\arcana.cpp-build\$(Configuration); + $(BabylonNativeBuildDir)_deps\jsruntimehost-build\Polyfills\Scheduling\$(Configuration); $(BabylonNativeBuildDir)_deps\jsruntimehost-build\Core\JsRuntime\$(Configuration); $(BabylonNativeBuildDir)_deps\jsruntimehost-build\Core\Node-API-JSI\$(Configuration); $(BabylonNativeBuildDir)_deps\jsruntimehost-build\Polyfills\XMLHttpRequest\$(Configuration); From 2f76dd1c2b779b49f637949895b02292c0a9efe0 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Mon, 19 May 2025 10:28:20 +0200 Subject: [PATCH 28/43] actions/download-artifact version --- .github/workflows/publish.yml | 34 +++++++++++++-------------- .github/workflows/publish_preview.yml | 34 +++++++++++++-------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d4d0f478d..6cc091e0e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -78,88 +78,88 @@ jobs: run: npm install working-directory: ./Package - name: Download Assembled Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled' path: Package/Assembled - name: Download Assembled-iOSAndroid 0.64 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-iOSAndroid0.64' path: Package/Assembled-iOSAndroid0.64 - name: Download Assembled-iOSAndroid 0.65 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-iOSAndroid0.65' path: Package/Assembled-iOSAndroid0.65 - name: Download Assembled-iOSAndroid 0.69 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-iOSAndroid0.69' path: Package/Assembled-iOSAndroid0.69 - name: Download Assembled-iOSAndroid 0.70 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-iOSAndroid0.70' path: Package/Assembled-iOSAndroid0.70 - name: Download Assembled-iOSAndroid 0.71 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-iOSAndroid0.71' path: Package/Assembled-iOSAndroid0.71 - name: Download Assembled-Windows 0.64 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-Windows0.64' path: Package/Assembled-Windows0.64 - name: Download Assembled-Windows 0.65 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-Windows0.65' path: Package/Assembled-Windows0.65 - name: Download Assembled-Windows 0.69 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-Windows0.69' path: Package/Assembled-Windows0.69 - name: Download Assembled-Windows 0.70 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-Windows0.70' path: Package/Assembled-Windows0.70 - name: Download Assembled-Windows 0.71 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-Windows0.71' path: Package/Assembled-Windows0.71 #BaseKit - name: Download Assembled-BaseKit-iOSAndroid 0.69 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-BaseKit-iOSAndroid0.69' path: Package/Assembled-BaseKit-iOSAndroid0.69 - name: Download Assembled-BaseKit-iOSAndroid 0.70 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-BaseKit-iOSAndroid0.70' path: Package/Assembled-BaseKit-iOSAndroid0.70 - name: Download Assembled-BaseKit-iOSAndroid 0.71 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-BaseKit-iOSAndroid0.71' path: Package/Assembled-BaseKit-iOSAndroid0.71 - name: Download Assembled-BaseKit-Windows 0.69 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-BaseKit-Windows0.69' path: Package/Assembled-BaseKit-Windows0.69 - name: Download Assembled-BaseKit-Windows 0.70 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-BaseKit-Windows0.70' path: Package/Assembled-BaseKit-Windows0.70 - name: Download Assembled-BaseKit-Windows 0.71 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-BaseKit-Windows0.71' path: Package/Assembled-BaseKit-Windows0.71 diff --git a/.github/workflows/publish_preview.yml b/.github/workflows/publish_preview.yml index f8f609030..50f207f50 100644 --- a/.github/workflows/publish_preview.yml +++ b/.github/workflows/publish_preview.yml @@ -94,88 +94,88 @@ jobs: run: npm install working-directory: ./Package - name: Download Assembled Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled' path: Package/Assembled - name: Download Assembled-iOSAndroid 0.64 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-iOSAndroid0.64' path: Package/Assembled-iOSAndroid0.64 - name: Download Assembled-iOSAndroid 0.65 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-iOSAndroid0.65' path: Package/Assembled-iOSAndroid0.65 - name: Download Assembled-iOSAndroid 0.69 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-iOSAndroid0.69' path: Package/Assembled-iOSAndroid0.69 - name: Download Assembled-iOSAndroid 0.70 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-iOSAndroid0.70' path: Package/Assembled-iOSAndroid0.70 - name: Download Assembled-iOSAndroid 0.71 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-iOSAndroid0.71' path: Package/Assembled-iOSAndroid0.71 - name: Download Assembled-Windows 0.64 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-Windows0.64' path: Package/Assembled-Windows0.64 - name: Download Assembled-Windows 0.65 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-Windows0.65' path: Package/Assembled-Windows0.65 - name: Download Assembled-Windows 0.69 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-Windows0.69' path: Package/Assembled-Windows0.69 - name: Download Assembled-Windows 0.70 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-Windows0.70' path: Package/Assembled-Windows0.70 - name: Download Assembled-Windows 0.71 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-Windows0.71' path: Package/Assembled-Windows0.71 #BaseKit - name: Download Assembled-BaseKit-iOSAndroid 0.69 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-BaseKit-iOSAndroid0.69' path: Package/Assembled-BaseKit-iOSAndroid0.69 - name: Download Assembled-BaseKit-iOSAndroid 0.70 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-BaseKit-iOSAndroid0.70' path: Package/Assembled-BaseKit-iOSAndroid0.70 - name: Download Assembled-BaseKit-iOSAndroid 0.71 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-BaseKit-iOSAndroid0.71' path: Package/Assembled-BaseKit-iOSAndroid0.71 - name: Download Assembled-BaseKit-Windows 0.69 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-BaseKit-Windows0.69' path: Package/Assembled-BaseKit-Windows0.69 - name: Download Assembled-BaseKit-Windows 0.70 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-BaseKit-Windows0.70' path: Package/Assembled-BaseKit-Windows0.70 - name: Download Assembled-BaseKit-Windows 0.71 Folder - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: 'Assembled-BaseKit-Windows0.71' path: Package/Assembled-BaseKit-Windows0.71 From ed1cd5dadba357d87ce2b906a07eb9f9fab4db46 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Wed, 21 May 2025 10:09:24 +0200 Subject: [PATCH 29/43] test Xcode 16.2 --- .github/workflows/ios_android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios_android.yml b/.github/workflows/ios_android.yml index 12c8be556..3f17854b0 100644 --- a/.github/workflows/ios_android.yml +++ b/.github/workflows/ios_android.yml @@ -11,7 +11,7 @@ on: type: string xcode-version: type: string - default: '15.4' + default: '16.2' jobs: Build: From b3d9298b5413851fe102498d5a4c440728ce90ed Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Wed, 21 May 2025 11:10:24 +0200 Subject: [PATCH 30/43] Test Node 18 --- .github/workflows/bn_master_commit.yml | 12 ++++++------ .github/workflows/ios_android.yml | 4 ++-- .github/workflows/pr.yml | 16 ++++++++-------- .github/workflows/typescript.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/bn_master_commit.yml b/.github/workflows/bn_master_commit.yml index 91e4f70c1..feb9d9529 100644 --- a/.github/workflows/bn_master_commit.yml +++ b/.github/workflows/bn_master_commit.yml @@ -18,10 +18,10 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 16 + - name: Setup Node 18 uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: @@ -59,10 +59,10 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 16 + - name: Setup Node 18 uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground @@ -90,10 +90,10 @@ jobs: submodules: 'true' - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.0.2 - - name: Setup Node 16 + - name: Setup Node 18 uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: Setup NuGet uses: nuget/setup-nuget@v1 with: diff --git a/.github/workflows/ios_android.yml b/.github/workflows/ios_android.yml index 3f17854b0..048ff28ba 100644 --- a/.github/workflows/ios_android.yml +++ b/.github/workflows/ios_android.yml @@ -23,10 +23,10 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 16 + - name: Setup Node 18 uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index fd1145056..ac694815e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -16,10 +16,10 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 16 + - name: Setup Node 18 uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: @@ -96,10 +96,10 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 16 + - name: Setup Node 18 uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground @@ -157,10 +157,10 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 16 + - name: Setup Node 18 uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: @@ -203,10 +203,10 @@ jobs: submodules: 'true' - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.0.2 - - name: Setup Node 16 + - name: Setup Node 18 uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: Setup NuGet uses: nuget/setup-nuget@v1 with: diff --git a/.github/workflows/typescript.yml b/.github/workflows/typescript.yml index 72b46384b..021d3662c 100644 --- a/.github/workflows/typescript.yml +++ b/.github/workflows/typescript.yml @@ -14,10 +14,10 @@ jobs: uses: actions/checkout@v2.3.3 with: submodules: 'recursive' - - name: Setup Node 16 + - name: Setup Node 18 uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f07803716..ab9ccc167 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,10 +20,10 @@ jobs: submodules: 'true' - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.0.2 - - name: Setup Node 16 + - name: Setup Node 18 uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: Setup NuGet uses: nuget/setup-nuget@v1 with: From a01a58c19018f3b829a624030dbbf2c431dcb1c7 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Wed, 21 May 2025 11:54:24 +0200 Subject: [PATCH 31/43] up cmake version --- .github/workflows/bn_master_commit.yml | 2 +- .github/workflows/ios_android.yml | 2 +- .github/workflows/pr.yml | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bn_master_commit.yml b/.github/workflows/bn_master_commit.yml index feb9d9529..0c329da8b 100644 --- a/.github/workflows/bn_master_commit.yml +++ b/.github/workflows/bn_master_commit.yml @@ -25,7 +25,7 @@ jobs: - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: - cmake-version: '3.26.3' + cmake-version: '3.30.3' - name: Setup Ninja run: brew install ninja - name: NPM Install (Playground) diff --git a/.github/workflows/ios_android.yml b/.github/workflows/ios_android.yml index 048ff28ba..a2437507d 100644 --- a/.github/workflows/ios_android.yml +++ b/.github/workflows/ios_android.yml @@ -30,7 +30,7 @@ jobs: - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: - cmake-version: '3.26.3' + cmake-version: '3.30.3' - name: Setup Ninja run: brew install ninja - name: 'Select XCode ${{ inputs.xcode-version }}' diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ac694815e..c3b0ad804 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -23,7 +23,7 @@ jobs: - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: - cmake-version: '3.26.3' + cmake-version: '3.30.3' - name: Setup Ninja run: brew install ninja - name: NPM Install (Playground) @@ -59,7 +59,7 @@ jobs: - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: - cmake-version: '3.26.3' + cmake-version: '3.30.3' - name: Setup Ninja run: brew install ninja - name: Setup Watchman @@ -164,7 +164,7 @@ jobs: - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: - cmake-version: '3.26.3' + cmake-version: '3.30.3' - name: Setup Ninja run: brew install ninja - name: Setup Java @@ -224,7 +224,9 @@ jobs: run: npx gulp makeUWPProject${{ matrix.platform }} working-directory: ./Package - name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} (Windows) - run: npx gulp buildUWP${{ matrix.platform }}${{ matrix.config }} + run: | + $env:NODE_OPTIONS="--openssl-legacy-provider" + npx gulp buildUWP${{ matrix.platform }}${{ matrix.config }} working-directory: ./Package - name: Gulp NuGet Restore Playground run: npx gulp nugetRestoreUWPPlayground From 271b27d90582bed1424b7e1920cdc00aeb308839 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Wed, 21 May 2025 15:07:27 +0200 Subject: [PATCH 32/43] bump to 0.71 --- .github/workflows/pr.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index c3b0ad804..2ad676259 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -4,7 +4,7 @@ on: branches: - master env: - BRN_Version: '0.64' + BRN_Version: '0.71' jobs: build-android: @@ -225,7 +225,6 @@ jobs: working-directory: ./Package - name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} (Windows) run: | - $env:NODE_OPTIONS="--openssl-legacy-provider" npx gulp buildUWP${{ matrix.platform }}${{ matrix.config }} working-directory: ./Package - name: Gulp NuGet Restore Playground From 9ec4d7399f4cb4200935cf1ab8cece96492423a9 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Thu, 22 May 2025 14:49:14 +0200 Subject: [PATCH 33/43] no webp --- .github/workflows/pr.yml | 2 +- Apps/BRNPlayground/package.json | 4 ++-- Apps/Playground/0.71/package.json | 4 ++-- .../@babylonjs/react-native-iosandroid/android/CMakeLists.txt | 3 +++ Modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt | 3 +++ Package/iOS/CMakeLists.txt | 4 ++++ 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2ad676259..da101a292 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -4,7 +4,7 @@ on: branches: - master env: - BRN_Version: '0.71' + BRN_Version: '0.69' jobs: build-android: diff --git a/Apps/BRNPlayground/package.json b/Apps/BRNPlayground/package.json index af9e5f435..4d104f65c 100644 --- a/Apps/BRNPlayground/package.json +++ b/Apps/BRNPlayground/package.json @@ -17,8 +17,8 @@ "postinstall": "node ./postinstall.js" }, "dependencies": { - "@babylonjs/core": ">=5.53.1", - "@babylonjs/loaders": ">=5.53.1", + "@babylonjs/core": "8.3.1", + "@babylonjs/loaders": "8.3.1", "@babylonjs/react-native": "file:../../Modules/@babylonjs/react-native", "@babylonjs/react-native-iosandroid": "file:../../Modules/@babylonjs/react-native-iosandroid", "@babylonjs/react-native-windows": "file:../../Modules/@babylonjs/react-native-windows", diff --git a/Apps/Playground/0.71/package.json b/Apps/Playground/0.71/package.json index f759134fe..8815079fe 100644 --- a/Apps/Playground/0.71/package.json +++ b/Apps/Playground/0.71/package.json @@ -13,8 +13,8 @@ "iosCMake": "node scripts/tools.js iosCMake" }, "dependencies": { - "@babylonjs/core": ">=5.53.1", - "@babylonjs/loaders": ">=5.53.1", + "@babylonjs/core": "8.3.1", + "@babylonjs/loaders": "8.3.1", "@babylonjs/react-native": "file:../../../Modules/@babylonjs/react-native", "@babylonjs/react-native-iosandroid": "file:../../../Modules/@babylonjs/react-native-iosandroid", "@babylonjs/react-native-windows": "file:../../../Modules/@babylonjs/react-native-windows", diff --git a/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt index 40849be4f..d4c162bac 100644 --- a/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt +++ b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt @@ -20,6 +20,9 @@ cmake_minimum_required(VERSION 3.13.2) # [24, infinite) ES2 & ES3 & Vulkan project(ReactNativeBabylon) +# Disable the WebP plugin option +set(BABYLON_NATIVE_PLUGIN_NATIVEENGINE_WEBP OFF CACHE BOOL "Disable Babylon Native WebP Support") + set(THIS_LIBRARY BabylonNative) include(${CMAKE_CURRENT_LIST_DIR}/../../react-native/shared/CMakeLists.txt) diff --git a/Modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt b/Modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt index 0e76dc304..59a2b154e 100644 --- a/Modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt +++ b/Modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt @@ -15,6 +15,9 @@ set(ENABLE_PCH OFF CACHE STRING "Enables or disables precompiled headers.") project(ReactNativeBabylon) +# Disable the WebP plugin option +set(BABYLON_NATIVE_PLUGIN_NATIVEENGINE_WEBP OFF CACHE BOOL "Disable Babylon Native WebP Support") + include(${CMAKE_CURRENT_LIST_DIR}/../../react-native/shared/CMakeLists.txt) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") diff --git a/Package/iOS/CMakeLists.txt b/Package/iOS/CMakeLists.txt index 807c41143..3dcc88f3e 100644 --- a/Package/iOS/CMakeLists.txt +++ b/Package/iOS/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.13.2) include(FetchContent) +# Disable the WebP plugin option +set(BABYLON_NATIVE_PLUGIN_NATIVEENGINE_WEBP OFF CACHE BOOL "Disable Babylon Native WebP Support") + FetchContent_Declare(ios-cmake GIT_REPOSITORY https://github.com/leetal/ios-cmake.git GIT_TAG 4.4.1) @@ -53,6 +56,7 @@ set(PACKAGED_LIBS UrlLib Window XMLHttpRequest + Scheduling xr ) From e2bcae5e335cdafcbb9ef875377ab06a5ababe2f Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Thu, 22 May 2025 19:06:06 +0200 Subject: [PATCH 34/43] removed webp --- Package/gulpfile.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Package/gulpfile.js b/Package/gulpfile.js index 6edfb66aa..640c45146 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -569,22 +569,12 @@ const validateAssemblediOSAndroid = async () => { `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/OSDependent.xcscheme`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/Scheduling.xcscheme`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/ScriptLoader.xcscheme`, - `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/sharpyuv.xcscheme`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/spirv-cross-core.xcscheme`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/spirv-cross-msl.xcscheme`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/SPIRV.xcscheme`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/TestUtils.xcscheme`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/URL.xcscheme`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/UrlLib.xcscheme`, - `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webp.xcscheme`, - `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webpdecode.xcscheme`, - `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webpdecoder.xcscheme`, - `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webpdemux.xcscheme`, - `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webpdsp.xcscheme`, - `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webpdspdecode.xcscheme`, - `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webpencode.xcscheme`, - `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webputils.xcscheme`, - `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/webputilsdecode.xcscheme`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/WebSocket.xcscheme`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/Window.xcscheme`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/XMLHttpRequest.xcscheme`, From 22cabfa5358d020f500f61eef158dc24a3e6af3e Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Tue, 17 Jun 2025 19:37:01 +0200 Subject: [PATCH 35/43] moved back to a version that should build --- .github/workflows/bn_master_commit.yml | 14 +++++++------- .github/workflows/ios_android.yml | 8 ++++---- .github/workflows/pr.yml | 24 ++++++++++++------------ .github/workflows/typescript.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- Apps/BRNPlayground/package.json | 4 ++-- Apps/Playground/0.71/package.json | 4 ++-- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/bn_master_commit.yml b/.github/workflows/bn_master_commit.yml index 0c329da8b..91e4f70c1 100644 --- a/.github/workflows/bn_master_commit.yml +++ b/.github/workflows/bn_master_commit.yml @@ -18,14 +18,14 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 18 + - name: Setup Node 16 uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 16 - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: - cmake-version: '3.30.3' + cmake-version: '3.26.3' - name: Setup Ninja run: brew install ninja - name: NPM Install (Playground) @@ -59,10 +59,10 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 18 + - name: Setup Node 16 uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 16 - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground @@ -90,10 +90,10 @@ jobs: submodules: 'true' - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.0.2 - - name: Setup Node 18 + - name: Setup Node 16 uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 16 - name: Setup NuGet uses: nuget/setup-nuget@v1 with: diff --git a/.github/workflows/ios_android.yml b/.github/workflows/ios_android.yml index a2437507d..12c8be556 100644 --- a/.github/workflows/ios_android.yml +++ b/.github/workflows/ios_android.yml @@ -11,7 +11,7 @@ on: type: string xcode-version: type: string - default: '16.2' + default: '15.4' jobs: Build: @@ -23,14 +23,14 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 18 + - name: Setup Node 16 uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 16 - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: - cmake-version: '3.30.3' + cmake-version: '3.26.3' - name: Setup Ninja run: brew install ninja - name: 'Select XCode ${{ inputs.xcode-version }}' diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index da101a292..1e104b4b4 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -4,7 +4,7 @@ on: branches: - master env: - BRN_Version: '0.69' + BRN_Version: '0.64' jobs: build-android: @@ -16,14 +16,14 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 18 + - name: Setup Node 16 uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 16 - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: - cmake-version: '3.30.3' + cmake-version: '3.26.3' - name: Setup Ninja run: brew install ninja - name: NPM Install (Playground) @@ -59,7 +59,7 @@ jobs: - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: - cmake-version: '3.30.3' + cmake-version: '3.26.3' - name: Setup Ninja run: brew install ninja - name: Setup Watchman @@ -96,10 +96,10 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 18 + - name: Setup Node 16 uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 16 - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground @@ -157,14 +157,14 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 18 + - name: Setup Node 16 uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 16 - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: - cmake-version: '3.30.3' + cmake-version: '3.26.3' - name: Setup Ninja run: brew install ninja - name: Setup Java @@ -203,10 +203,10 @@ jobs: submodules: 'true' - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.0.2 - - name: Setup Node 18 + - name: Setup Node 16 uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 16 - name: Setup NuGet uses: nuget/setup-nuget@v1 with: diff --git a/.github/workflows/typescript.yml b/.github/workflows/typescript.yml index 021d3662c..72b46384b 100644 --- a/.github/workflows/typescript.yml +++ b/.github/workflows/typescript.yml @@ -14,10 +14,10 @@ jobs: uses: actions/checkout@v2.3.3 with: submodules: 'recursive' - - name: Setup Node 18 + - name: Setup Node 16 uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 16 - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ab9ccc167..f07803716 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,10 +20,10 @@ jobs: submodules: 'true' - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.0.2 - - name: Setup Node 18 + - name: Setup Node 16 uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 16 - name: Setup NuGet uses: nuget/setup-nuget@v1 with: diff --git a/Apps/BRNPlayground/package.json b/Apps/BRNPlayground/package.json index 4d104f65c..af9e5f435 100644 --- a/Apps/BRNPlayground/package.json +++ b/Apps/BRNPlayground/package.json @@ -17,8 +17,8 @@ "postinstall": "node ./postinstall.js" }, "dependencies": { - "@babylonjs/core": "8.3.1", - "@babylonjs/loaders": "8.3.1", + "@babylonjs/core": ">=5.53.1", + "@babylonjs/loaders": ">=5.53.1", "@babylonjs/react-native": "file:../../Modules/@babylonjs/react-native", "@babylonjs/react-native-iosandroid": "file:../../Modules/@babylonjs/react-native-iosandroid", "@babylonjs/react-native-windows": "file:../../Modules/@babylonjs/react-native-windows", diff --git a/Apps/Playground/0.71/package.json b/Apps/Playground/0.71/package.json index 8815079fe..f759134fe 100644 --- a/Apps/Playground/0.71/package.json +++ b/Apps/Playground/0.71/package.json @@ -13,8 +13,8 @@ "iosCMake": "node scripts/tools.js iosCMake" }, "dependencies": { - "@babylonjs/core": "8.3.1", - "@babylonjs/loaders": "8.3.1", + "@babylonjs/core": ">=5.53.1", + "@babylonjs/loaders": ">=5.53.1", "@babylonjs/react-native": "file:../../../Modules/@babylonjs/react-native", "@babylonjs/react-native-iosandroid": "file:../../../Modules/@babylonjs/react-native-iosandroid", "@babylonjs/react-native-windows": "file:../../../Modules/@babylonjs/react-native-windows", From 2832d92f4faaa57ab07c93f759fb949955440aa3 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Tue, 17 Jun 2025 19:42:06 +0200 Subject: [PATCH 36/43] windows 2019 is deprecated --- .github/workflows/bn_master_commit.yml | 2 +- .github/workflows/pr.yml | 4 ++-- .github/workflows/test_version.yml | 2 +- .github/workflows/windows.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bn_master_commit.yml b/.github/workflows/bn_master_commit.yml index 91e4f70c1..fd1f8379a 100644 --- a/.github/workflows/bn_master_commit.yml +++ b/.github/workflows/bn_master_commit.yml @@ -78,7 +78,7 @@ jobs: build-windows: name: Build Windows ${{ matrix.platform }} ${{ matrix.config }} - BabylonNative ${{ github.event.client_payload.sha }} - runs-on: windows-2019 + runs-on: windows-latest strategy: matrix: platform: [x86, x64, ARM64] diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 1e104b4b4..89f1eb6b6 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -189,7 +189,7 @@ jobs: JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }} build-windows: - runs-on: windows-2019 + runs-on: windows-latest strategy: matrix: platform: [x86, x64, ARM64] @@ -235,7 +235,7 @@ jobs: working-directory: ./Package build-windows-rnta: - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Support longpaths run: git config --system core.longpaths true diff --git a/.github/workflows/test_version.yml b/.github/workflows/test_version.yml index 978e48ece..2f37af26a 100644 --- a/.github/workflows/test_version.yml +++ b/.github/workflows/test_version.yml @@ -30,7 +30,7 @@ on: jobs: build-windows: - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Checkout Repo uses: actions/checkout@v2.3.3 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f07803716..f0936af96 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -12,7 +12,7 @@ on: jobs: Build: - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Checkout Repo uses: actions/checkout@v2.3.3 From ee35f80726ccc6dde1d42f670d8e69346a243316 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Tue, 17 Jun 2025 19:56:26 +0200 Subject: [PATCH 37/43] vs 2022 --- .github/workflows/pr.yml | 2 +- .../@babylonjs/react-native-windows/windows/scripts/Utils.psm1 | 2 +- Package/gulpfile.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 89f1eb6b6..ea8958b80 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -275,7 +275,7 @@ jobs: working-directory: ./Modules - name: CMake BabylonNative - run: cmake -G "Visual Studio 16 2019" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0.19041.0 -DCMAKE_UNITY_BUILD=true -D CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM=10.0.19041.0 -A x64 ./../../../react-native-windows/windows + run: cmake -G "Visual Studio 17 2022" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0.19041.0 -DCMAKE_UNITY_BUILD=true -D CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM=10.0.19041.0 -A x64 ./../../../react-native-windows/windows working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64 - name: Nuget restore diff --git a/Modules/@babylonjs/react-native-windows/windows/scripts/Utils.psm1 b/Modules/@babylonjs/react-native-windows/windows/scripts/Utils.psm1 index be6d2ab41..b62fdcc37 100644 --- a/Modules/@babylonjs/react-native-windows/windows/scripts/Utils.psm1 +++ b/Modules/@babylonjs/react-native-windows/windows/scripts/Utils.psm1 @@ -47,7 +47,7 @@ function Restore-CMakeProject { } cd $BuildDir - cmake -G "Visual Studio 16 2019" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -A $Arch ..\..\..\windows + cmake -G "Visual Studio 17 2022" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -A $Arch ..\..\..\windows if ($? -Eq $False) { Write-Error "cmake failed. Make sure cmake is added to your PATH variable" diff --git a/Package/gulpfile.js b/Package/gulpfile.js index 640c45146..b34b66ce4 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -104,7 +104,7 @@ const buildAndroidRNTA = async () => { const makeUWPProjectPlatform = async (name, arch) => { shelljs.mkdir('-p', `./../Modules/@babylonjs/react-native/Build/uwp_${name}`); - exec(`cmake -G "Visual Studio 16 2019" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -DCMAKE_UNITY_BUILD=true ${cmakeBasekitBuildDefinition} -A ${arch} ./../../../react-native-windows/windows`, `./../Modules/@babylonjs/react-native/Build/uwp_${name}`); + exec(`cmake -G "Visual Studio 17 2022" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -DCMAKE_UNITY_BUILD=true ${cmakeBasekitBuildDefinition} -A ${arch} ./../../../react-native-windows/windows`, `./../Modules/@babylonjs/react-native/Build/uwp_${name}`); }; const makeUWPProjectx86 = async () => makeUWPProjectPlatform('x86', 'Win32'); From c668234297a9a85d3f95814f33b30c5ef2e11022 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Wed, 18 Jun 2025 09:47:36 +0200 Subject: [PATCH 38/43] windows sdk version --- Apps/PackageTest/0.64.0/windows/PackageTest/PackageTest.vcxproj | 2 +- Apps/PackageTest/0.65.0/windows/PackageTest/PackageTest.vcxproj | 2 +- Apps/Playground/0.64/windows/Playground/Playground.vcxproj | 2 +- .../windows/BabylonReactNative/BabylonReactNative.vcxproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Apps/PackageTest/0.64.0/windows/PackageTest/PackageTest.vcxproj b/Apps/PackageTest/0.64.0/windows/PackageTest/PackageTest.vcxproj index 574cff5d9..35cac86fa 100644 --- a/Apps/PackageTest/0.64.0/windows/PackageTest/PackageTest.vcxproj +++ b/Apps/PackageTest/0.64.0/windows/PackageTest/PackageTest.vcxproj @@ -14,7 +14,7 @@ true Windows Store 10.0 - 10.0.18362.0 + 10.0.22000.0 10.0.16299.0 PackageTest_TemporaryKey.pfx A724C0B39DF6D4D923FA3D6DEF15066217B05FB0 diff --git a/Apps/PackageTest/0.65.0/windows/PackageTest/PackageTest.vcxproj b/Apps/PackageTest/0.65.0/windows/PackageTest/PackageTest.vcxproj index efd6152fb..df729c7c2 100644 --- a/Apps/PackageTest/0.65.0/windows/PackageTest/PackageTest.vcxproj +++ b/Apps/PackageTest/0.65.0/windows/PackageTest/PackageTest.vcxproj @@ -14,7 +14,7 @@ true Windows Store 10.0 - 10.0.18362.0 + 10.0.22000.0 10.0.16299.0 PackageTest_TemporaryKey.pfx 8E351EEE801BB0FFC314FABBBF4A4F0339D3EB35 diff --git a/Apps/Playground/0.64/windows/Playground/Playground.vcxproj b/Apps/Playground/0.64/windows/Playground/Playground.vcxproj index c4966d6a5..3cef732af 100644 --- a/Apps/Playground/0.64/windows/Playground/Playground.vcxproj +++ b/Apps/Playground/0.64/windows/Playground/Playground.vcxproj @@ -13,7 +13,7 @@ true Windows Store 10.0 - 10.0.18362.0 + 10.0.22000.0 10.0.16299.0 Playground_TemporaryKey.pfx 0E45A8FBD75BFD704669AC72E616CA1E23B21882 diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index d64bfe47b..8abb96923 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -16,7 +16,7 @@ Windows Store 10.0 10.0 - 10.0.18362.0 + 10.0.22000.0 From a719001eaf4741e5b174ec18c20fa0bf5bcf0700 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Wed, 18 Jun 2025 10:51:11 +0200 Subject: [PATCH 39/43] missing scheduling lib --- Package/BaseKit/react-native-babylon.podspec | 1 + Package/gulpfile.js | 1 + 2 files changed, 2 insertions(+) diff --git a/Package/BaseKit/react-native-babylon.podspec b/Package/BaseKit/react-native-babylon.podspec index 635fb6f92..699dc73b5 100644 --- a/Package/BaseKit/react-native-babylon.podspec +++ b/Package/BaseKit/react-native-babylon.podspec @@ -39,6 +39,7 @@ Pod::Spec.new do |s| 'ios/libs/libNativeTracing.a', 'ios/libs/libOGLCompiler.a', 'ios/libs/libOSDependent.a', + 'ios/libs/libScheduling.a', 'ios/libs/libspirv-cross-core.a', 'ios/libs/libspirv-cross-msl.a', 'ios/libs/libSPIRV.a', diff --git a/Package/gulpfile.js b/Package/gulpfile.js index b34b66ce4..e4ab1f4e3 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -521,6 +521,7 @@ const validateAssemblediOSAndroid = async () => { `${assemblediOSAndroidDir}/ios/libs/libNativeXr.a`, `${assemblediOSAndroidDir}/ios/libs/libOGLCompiler.a`, `${assemblediOSAndroidDir}/ios/libs/libOSDependent.a`, + `${assemblediOSAndroidDir}/ios/libs/libScheduling.a`, `${assemblediOSAndroidDir}/ios/libs/libspirv-cross-core.a`, `${assemblediOSAndroidDir}/ios/libs/libspirv-cross-msl.a`, `${assemblediOSAndroidDir}/ios/libs/libSPIRV.a`, From 59cb04b149c26b16921fa373f203d346482771f2 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Wed, 18 Jun 2025 11:51:35 +0200 Subject: [PATCH 40/43] WindowsTargetPlatformVersion test --- .github/workflows/pr.yml | 4 ++-- .../react-native-windows/windows/scripts/Utils.psm1 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ea8958b80..9adb073c5 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -283,11 +283,11 @@ jobs: working-directory: ./Apps/BRNPlayground/windows - name: Windows build BN - run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m ReactNativeBabylon.sln + run: MSBuild /p:Platform="x64" /p:Configuration="Release" /p:WindowsTargetPlatformVersion=10.0.19041.0 /m ReactNativeBabylon.sln working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64 - name: Windows build BRN - run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m BRNPlayground.sln + run: MSBuild /p:Platform="x64" /p:Configuration="Release" /p:WindowsTargetPlatformVersion=10.0.19041.0 /m BRNPlayground.sln working-directory: ./Apps/BRNPlayground/windows # Test packages diff --git a/Modules/@babylonjs/react-native-windows/windows/scripts/Utils.psm1 b/Modules/@babylonjs/react-native-windows/windows/scripts/Utils.psm1 index b62fdcc37..734a4994a 100644 --- a/Modules/@babylonjs/react-native-windows/windows/scripts/Utils.psm1 +++ b/Modules/@babylonjs/react-native-windows/windows/scripts/Utils.psm1 @@ -65,7 +65,7 @@ function Compile-Solution { ) $MSBuild = Get-MSBuildPath - & "$MSBuild" /p:Configuration="$Configuration" /p:Platform="$Platform" /m $Solution + & "$MSBuild" /p:Configuration="$Configuration" /p:Platform="$Platform" /p:WindowsTargetPlatformVersion=10.0.19041.0 /m $Solution if ($? -Eq $False) { Write-Error "$Platform $Configuration Build failed." exit 1 From f75fd027ac489e6ea27b5de07c82e86d879f78fc Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Wed, 18 Jun 2025 18:01:22 +0200 Subject: [PATCH 41/43] disable windows --- .github/workflows/bn_master_commit.yml | 86 ++++----- .github/workflows/pr.yml | 220 +++++++++++----------- .github/workflows/publish.yml | 244 ++++++++++++------------- .github/workflows/publish_preview.yml | 244 ++++++++++++------------- .github/workflows/test_version.yml | 62 +++---- 5 files changed, 428 insertions(+), 428 deletions(-) diff --git a/.github/workflows/bn_master_commit.yml b/.github/workflows/bn_master_commit.yml index fd1f8379a..4e15c2501 100644 --- a/.github/workflows/bn_master_commit.yml +++ b/.github/workflows/bn_master_commit.yml @@ -76,46 +76,46 @@ jobs: run: npx gulp buildIOS working-directory: ./Package - build-windows: - name: Build Windows ${{ matrix.platform }} ${{ matrix.config }} - BabylonNative ${{ github.event.client_payload.sha }} - runs-on: windows-latest - strategy: - matrix: - platform: [x86, x64, ARM64] - config: [Debug, Release] - steps: - - name: Checkout Repo - uses: actions/checkout@v2.3.3 - with: - submodules: 'true' - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.0.2 - - name: Setup Node 16 - uses: actions/setup-node@v3 - with: - node-version: 16 - - name: Setup NuGet - uses: nuget/setup-nuget@v1 - with: - nuget-version: '5.x' - - name: NPM Install (Playground) - run: npm install - working-directory: ./Apps/Playground - - name: NPM Install (React Native ${{ env.BRN_Version }}) - run: npm run select --reactNative ${{ env.BRN_Version }} - working-directory: ./Apps/Playground - - name: NPM Install (Binary Package) - run: npm install - working-directory: ./Package - - name: Gulp Setup Project ${{ matrix.platform }} (Windows) - run: npx gulp makeUWPProject${{ matrix.platform }} - working-directory: ./Package - - name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} (Windows) - run: npx gulp buildUWP${{ matrix.platform }}${{ matrix.config }} - working-directory: ./Package - - name: Gulp NuGet Restore Playground - run: npx gulp nugetRestoreUWPPlayground - working-directory: ./Package - - name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} Playground (Windows) - run: npx gulp buildUWPPlayground${{ matrix.platform }}${{ matrix.config }} - working-directory: ./Package + # build-windows: + # name: Build Windows ${{ matrix.platform }} ${{ matrix.config }} - BabylonNative ${{ github.event.client_payload.sha }} + # runs-on: windows-latest + # strategy: + # matrix: + # platform: [x86, x64, ARM64] + # config: [Debug, Release] + # steps: + # - name: Checkout Repo + # uses: actions/checkout@v2.3.3 + # with: + # submodules: 'true' + # - name: Setup MSBuild + # uses: microsoft/setup-msbuild@v1.0.2 + # - name: Setup Node 16 + # uses: actions/setup-node@v3 + # with: + # node-version: 16 + # - name: Setup NuGet + # uses: nuget/setup-nuget@v1 + # with: + # nuget-version: '5.x' + # - name: NPM Install (Playground) + # run: npm install + # working-directory: ./Apps/Playground + # - name: NPM Install (React Native ${{ env.BRN_Version }}) + # run: npm run select --reactNative ${{ env.BRN_Version }} + # working-directory: ./Apps/Playground + # - name: NPM Install (Binary Package) + # run: npm install + # working-directory: ./Package + # - name: Gulp Setup Project ${{ matrix.platform }} (Windows) + # run: npx gulp makeUWPProject${{ matrix.platform }} + # working-directory: ./Package + # - name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} (Windows) + # run: npx gulp buildUWP${{ matrix.platform }}${{ matrix.config }} + # working-directory: ./Package + # - name: Gulp NuGet Restore Playground + # run: npx gulp nugetRestoreUWPPlayground + # working-directory: ./Package + # - name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} Playground (Windows) + # run: npx gulp buildUWPPlayground${{ matrix.platform }}${{ matrix.config }} + # working-directory: ./Package diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 9adb073c5..4c4292932 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -188,107 +188,107 @@ jobs: env: JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }} - build-windows: - runs-on: windows-latest - strategy: - matrix: - platform: [x86, x64, ARM64] - config: [Debug, Release] - steps: - - name: Support longpaths - run: git config --system core.longpaths true - - name: Checkout Repo - uses: actions/checkout@v2.3.3 - with: - submodules: 'true' - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.0.2 - - name: Setup Node 16 - uses: actions/setup-node@v3 - with: - node-version: 16 - - name: Setup NuGet - uses: nuget/setup-nuget@v1 - with: - nuget-version: '5.x' - - name: NPM Install (Playground) - run: npm install - working-directory: ./Apps/Playground - - name: NPM Install (React Native ${{ env.BRN_Version }}) - run: npm run select ${{ env.BRN_Version }} - working-directory: ./Apps/Playground - - name: NPM Install (Binary Package) - run: npm install - working-directory: ./Package - - name: Gulp Setup Project ${{ matrix.platform }} (Windows) - run: npx gulp makeUWPProject${{ matrix.platform }} - working-directory: ./Package - - name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} (Windows) - run: | - npx gulp buildUWP${{ matrix.platform }}${{ matrix.config }} - working-directory: ./Package - - name: Gulp NuGet Restore Playground - run: npx gulp nugetRestoreUWPPlayground - working-directory: ./Package - - name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} Playground (Windows) - run: npx gulp buildUWPPlayground${{ matrix.platform }}${{ matrix.config }} - working-directory: ./Package + # build-windows: + # runs-on: windows-latest + # strategy: + # matrix: + # platform: [x86, x64, ARM64] + # config: [Debug, Release] + # steps: + # - name: Support longpaths + # run: git config --system core.longpaths true + # - name: Checkout Repo + # uses: actions/checkout@v2.3.3 + # with: + # submodules: 'true' + # - name: Setup MSBuild + # uses: microsoft/setup-msbuild@v1.0.2 + # - name: Setup Node 16 + # uses: actions/setup-node@v3 + # with: + # node-version: 16 + # - name: Setup NuGet + # uses: nuget/setup-nuget@v1 + # with: + # nuget-version: '5.x' + # - name: NPM Install (Playground) + # run: npm install + # working-directory: ./Apps/Playground + # - name: NPM Install (React Native ${{ env.BRN_Version }}) + # run: npm run select ${{ env.BRN_Version }} + # working-directory: ./Apps/Playground + # - name: NPM Install (Binary Package) + # run: npm install + # working-directory: ./Package + # - name: Gulp Setup Project ${{ matrix.platform }} (Windows) + # run: npx gulp makeUWPProject${{ matrix.platform }} + # working-directory: ./Package + # - name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} (Windows) + # run: | + # npx gulp buildUWP${{ matrix.platform }}${{ matrix.config }} + # working-directory: ./Package + # - name: Gulp NuGet Restore Playground + # run: npx gulp nugetRestoreUWPPlayground + # working-directory: ./Package + # - name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} Playground (Windows) + # run: npx gulp buildUWPPlayground${{ matrix.platform }}${{ matrix.config }} + # working-directory: ./Package - build-windows-rnta: - runs-on: windows-latest - steps: - - name: Support longpaths - run: git config --system core.longpaths true - - name: Checkout Repo - uses: actions/checkout@v2.3.3 - with: - submodules: 'true' - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.0.2 - - name: Setup Node 20 - uses: actions/setup-node@v3 - with: - node-version: 20 + # build-windows-rnta: + # runs-on: windows-latest + # steps: + # - name: Support longpaths + # run: git config --system core.longpaths true + # - name: Checkout Repo + # uses: actions/checkout@v2.3.3 + # with: + # submodules: 'true' + # - name: Setup MSBuild + # uses: microsoft/setup-msbuild@v1.0.2 + # - name: Setup Node 20 + # uses: actions/setup-node@v3 + # with: + # node-version: 20 - - name: Install watchman - run: choco install watchman - working-directory: ./Apps/BRNPlayground + # - name: Install watchman + # run: choco install watchman + # working-directory: ./Apps/BRNPlayground - - name: NPM Install RNTA - run: npm install - working-directory: ./Apps/BRNPlayground + # - name: NPM Install RNTA + # run: npm install + # working-directory: ./Apps/BRNPlayground - - name: Build Windows Bundle - run: npm run build:windows - working-directory: ./Apps/BRNPlayground + # - name: Build Windows Bundle + # run: npm run build:windows + # working-directory: ./Apps/BRNPlayground - - name: NPM Install Package - run: npm install - working-directory: ./Package + # - name: NPM Install Package + # run: npm install + # working-directory: ./Package - - name: NPM Generate Windows Project - run: npx install-windows-test-app - working-directory: ./Apps/BRNPlayground + # - name: NPM Generate Windows Project + # run: npx install-windows-test-app + # working-directory: ./Apps/BRNPlayground - - name: BabylonNative build directory - run: mkdir @babylonjs/react-native/Build/uwp_x64 - working-directory: ./Modules + # - name: BabylonNative build directory + # run: mkdir @babylonjs/react-native/Build/uwp_x64 + # working-directory: ./Modules - - name: CMake BabylonNative - run: cmake -G "Visual Studio 17 2022" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0.19041.0 -DCMAKE_UNITY_BUILD=true -D CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM=10.0.19041.0 -A x64 ./../../../react-native-windows/windows - working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64 + # - name: CMake BabylonNative + # run: cmake -G "Visual Studio 17 2022" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0.19041.0 -DCMAKE_UNITY_BUILD=true -D CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM=10.0.19041.0 -A x64 ./../../../react-native-windows/windows + # working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64 - - name: Nuget restore - run: nuget restore BRNPlayground.sln - working-directory: ./Apps/BRNPlayground/windows + # - name: Nuget restore + # run: nuget restore BRNPlayground.sln + # working-directory: ./Apps/BRNPlayground/windows - - name: Windows build BN - run: MSBuild /p:Platform="x64" /p:Configuration="Release" /p:WindowsTargetPlatformVersion=10.0.19041.0 /m ReactNativeBabylon.sln - working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64 + # - name: Windows build BN + # run: MSBuild /p:Platform="x64" /p:Configuration="Release" /p:WindowsTargetPlatformVersion=10.0.19041.0 /m ReactNativeBabylon.sln + # working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64 - - name: Windows build BRN - run: MSBuild /p:Platform="x64" /p:Configuration="Release" /p:WindowsTargetPlatformVersion=10.0.19041.0 /m BRNPlayground.sln - working-directory: ./Apps/BRNPlayground/windows + # - name: Windows build BRN + # run: MSBuild /p:Platform="x64" /p:Configuration="Release" /p:WindowsTargetPlatformVersion=10.0.19041.0 /m BRNPlayground.sln + # working-directory: ./Apps/BRNPlayground/windows # Test packages build-android-ios-065: @@ -315,29 +315,29 @@ jobs: react-native-version: '0.71' release-version: 0.0.${GITHUB_SHA::8} - build-windows-065: - uses: ./.github/workflows/windows.yml - with: - react-native-version: '0.65' - release-version: 0.0.${GITHUB_SHA::8} + # build-windows-065: + # uses: ./.github/workflows/windows.yml + # with: + # react-native-version: '0.65' + # release-version: 0.0.${GITHUB_SHA::8} - build-windows-069: - uses: ./.github/workflows/windows.yml - with: - react-native-version: '0.69' - release-version: 0.0.${GITHUB_SHA::8} + # build-windows-069: + # uses: ./.github/workflows/windows.yml + # with: + # react-native-version: '0.69' + # release-version: 0.0.${GITHUB_SHA::8} - build-windows-070: - uses: ./.github/workflows/windows.yml - with: - react-native-version: '0.70' - release-version: 0.0.${GITHUB_SHA::8} + # build-windows-070: + # uses: ./.github/workflows/windows.yml + # with: + # react-native-version: '0.70' + # release-version: 0.0.${GITHUB_SHA::8} - build-windows-071: - uses: ./.github/workflows/windows.yml - with: - react-native-version: '0.71' - release-version: 0.0.${GITHUB_SHA::8} + # build-windows-071: + # uses: ./.github/workflows/windows.yml + # with: + # react-native-version: '0.71' + # release-version: 0.0.${GITHUB_SHA::8} build-typescript: uses: ./.github/workflows/typescript.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6cc091e0e..b2823e9fc 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -34,34 +34,34 @@ jobs: react-native-version: '0.71' release-version: ${GITHUB_REF/refs\/tags\//} - build-windows-064: - uses: ./.github/workflows/windows.yml - with: - react-native-version: '0.64' - release-version: ${GITHUB_REF/refs\/tags\//} - build-windows-065: - uses: ./.github/workflows/windows.yml - with: - react-native-version: '0.65' - release-version: ${GITHUB_REF/refs\/tags\//} + # build-windows-064: + # uses: ./.github/workflows/windows.yml + # with: + # react-native-version: '0.64' + # release-version: ${GITHUB_REF/refs\/tags\//} + # build-windows-065: + # uses: ./.github/workflows/windows.yml + # with: + # react-native-version: '0.65' + # release-version: ${GITHUB_REF/refs\/tags\//} - build-windows-069: - uses: ./.github/workflows/windows.yml - with: - react-native-version: '0.69' - release-version: ${GITHUB_REF/refs\/tags\//} + # build-windows-069: + # uses: ./.github/workflows/windows.yml + # with: + # react-native-version: '0.69' + # release-version: ${GITHUB_REF/refs\/tags\//} - build-windows-070: - uses: ./.github/workflows/windows.yml - with: - react-native-version: '0.70' - release-version: ${GITHUB_REF/refs\/tags\//} + # build-windows-070: + # uses: ./.github/workflows/windows.yml + # with: + # react-native-version: '0.70' + # release-version: ${GITHUB_REF/refs\/tags\//} - build-windows-071: - uses: ./.github/workflows/windows.yml - with: - react-native-version: '0.71' - release-version: ${GITHUB_REF/refs\/tags\//} + # build-windows-071: + # uses: ./.github/workflows/windows.yml + # with: + # react-native-version: '0.71' + # release-version: ${GITHUB_REF/refs\/tags\//} build-typescript: uses: ./.github/workflows/typescript.yml @@ -69,7 +69,7 @@ jobs: release-version: ${GITHUB_REF/refs\/tags\//} package: - needs: [build-typescript, build-android-ios-064, build-android-ios-065, build-android-ios-069, build-android-ios-070, build-android-ios-071, build-windows-064, build-windows-065, build-windows-069, build-windows-070, build-windows-071] + needs: [build-typescript, build-android-ios-064, build-android-ios-065, build-android-ios-069, build-android-ios-070, build-android-ios-071] #, build-windows-064, build-windows-065, build-windows-069, build-windows-070, build-windows-071] runs-on: macos-latest steps: - name: Checkout Repo @@ -107,31 +107,31 @@ jobs: with: name: 'Assembled-iOSAndroid0.71' path: Package/Assembled-iOSAndroid0.71 - - name: Download Assembled-Windows 0.64 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-Windows0.64' - path: Package/Assembled-Windows0.64 - - name: Download Assembled-Windows 0.65 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-Windows0.65' - path: Package/Assembled-Windows0.65 - - name: Download Assembled-Windows 0.69 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-Windows0.69' - path: Package/Assembled-Windows0.69 - - name: Download Assembled-Windows 0.70 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-Windows0.70' - path: Package/Assembled-Windows0.70 - - name: Download Assembled-Windows 0.71 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-Windows0.71' - path: Package/Assembled-Windows0.71 + # - name: Download Assembled-Windows 0.64 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-Windows0.64' + # path: Package/Assembled-Windows0.64 + # - name: Download Assembled-Windows 0.65 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-Windows0.65' + # path: Package/Assembled-Windows0.65 + # - name: Download Assembled-Windows 0.69 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-Windows0.69' + # path: Package/Assembled-Windows0.69 + # - name: Download Assembled-Windows 0.70 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-Windows0.70' + # path: Package/Assembled-Windows0.70 + # - name: Download Assembled-Windows 0.71 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-Windows0.71' + # path: Package/Assembled-Windows0.71 #BaseKit - name: Download Assembled-BaseKit-iOSAndroid 0.69 Folder uses: actions/download-artifact@v4 @@ -148,21 +148,21 @@ jobs: with: name: 'Assembled-BaseKit-iOSAndroid0.71' path: Package/Assembled-BaseKit-iOSAndroid0.71 - - name: Download Assembled-BaseKit-Windows 0.69 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-BaseKit-Windows0.69' - path: Package/Assembled-BaseKit-Windows0.69 - - name: Download Assembled-BaseKit-Windows 0.70 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-BaseKit-Windows0.70' - path: Package/Assembled-BaseKit-Windows0.70 - - name: Download Assembled-BaseKit-Windows 0.71 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-BaseKit-Windows0.71' - path: Package/Assembled-BaseKit-Windows0.71 + # - name: Download Assembled-BaseKit-Windows 0.69 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-BaseKit-Windows0.69' + # path: Package/Assembled-BaseKit-Windows0.69 + # - name: Download Assembled-BaseKit-Windows 0.70 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-BaseKit-Windows0.70' + # path: Package/Assembled-BaseKit-Windows0.70 + # - name: Download Assembled-BaseKit-Windows 0.71 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-BaseKit-Windows0.71' + # path: Package/Assembled-BaseKit-Windows0.71 - name: Display structure of downloaded Assembled and Assembled-Windows folders run: ls -R @@ -216,41 +216,41 @@ jobs: env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-windows-0-64 - run: | - npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} - npm publish --access public - working-directory: ./Package/Assembled-Windows0.64 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-windows-0-65 - run: | - npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} - npm publish --access public - working-directory: ./Package/Assembled-Windows0.65 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-windows-0-69 - run: | - npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} - npm publish --access public - working-directory: ./Package/Assembled-Windows0.69 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-windows-0-70 - run: | - npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} - npm publish --access public - working-directory: ./Package/Assembled-Windows0.70 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-windows-0-71 - run: | - npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} - npm publish --access public - working-directory: ./Package/Assembled-Windows0.71 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Version & Publish Package @babylonjs/react-native-windows-0-64 + # run: | + # npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} + # npm publish --access public + # working-directory: ./Package/Assembled-Windows0.64 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Version & Publish Package @babylonjs/react-native-windows-0-65 + # run: | + # npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} + # npm publish --access public + # working-directory: ./Package/Assembled-Windows0.65 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Version & Publish Package @babylonjs/react-native-windows-0-69 + # run: | + # npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} + # npm publish --access public + # working-directory: ./Package/Assembled-Windows0.69 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Version & Publish Package @babylonjs/react-native-windows-0-70 + # run: | + # npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} + # npm publish --access public + # working-directory: ./Package/Assembled-Windows0.70 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Version & Publish Package @babylonjs/react-native-windows-0-71 + # run: | + # npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} + # npm publish --access public + # working-directory: ./Package/Assembled-Windows0.71 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} #BaseKit - name: Version & Publish Package @babylonjs/react-native-basekit-iosandroid-0-69 run: | @@ -273,24 +273,24 @@ jobs: working-directory: ./Package/Assembled-BaseKit-iOSAndroid0.71 env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-basekit-windows-0-69 - run: | - npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} - npm publish --access public - working-directory: ./Package/Assembled-BaseKit-Windows0.69 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-basekit-windows-0-70 - run: | - npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} - npm publish --access public - working-directory: ./Package/Assembled-BaseKit-Windows0.70 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-basekit-windows-0-71 - run: | - npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} - npm publish --access public - working-directory: ./Package/Assembled-BaseKit-Windows0.71 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file + # - name: Version & Publish Package @babylonjs/react-native-basekit-windows-0-69 + # run: | + # npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} + # npm publish --access public + # working-directory: ./Package/Assembled-BaseKit-Windows0.69 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Version & Publish Package @babylonjs/react-native-basekit-windows-0-70 + # run: | + # npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} + # npm publish --access public + # working-directory: ./Package/Assembled-BaseKit-Windows0.70 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Version & Publish Package @babylonjs/react-native-basekit-windows-0-71 + # run: | + # npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} + # npm publish --access public + # working-directory: ./Package/Assembled-BaseKit-Windows0.71 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/publish_preview.yml b/.github/workflows/publish_preview.yml index 50f207f50..ca6e5678d 100644 --- a/.github/workflows/publish_preview.yml +++ b/.github/workflows/publish_preview.yml @@ -49,35 +49,35 @@ jobs: react-native-version: '0.71' release-version: ${{ github.event.inputs.release_version }} - build-windows-064: - uses: ./.github/workflows/windows.yml - with: - react-native-version: '0.64' - release-version: ${{ github.event.inputs.release_version }} + # build-windows-064: + # uses: ./.github/workflows/windows.yml + # with: + # react-native-version: '0.64' + # release-version: ${{ github.event.inputs.release_version }} - build-windows-065: - uses: ./.github/workflows/windows.yml - with: - react-native-version: '0.65' - release-version: ${{ github.event.inputs.release_version }} + # build-windows-065: + # uses: ./.github/workflows/windows.yml + # with: + # react-native-version: '0.65' + # release-version: ${{ github.event.inputs.release_version }} - build-windows-069: - uses: ./.github/workflows/windows.yml - with: - react-native-version: '0.69' - release-version: ${{ github.event.inputs.release_version }} + # build-windows-069: + # uses: ./.github/workflows/windows.yml + # with: + # react-native-version: '0.69' + # release-version: ${{ github.event.inputs.release_version }} - build-windows-070: - uses: ./.github/workflows/windows.yml - with: - react-native-version: '0.70' - release-version: ${{ github.event.inputs.release_version }} + # build-windows-070: + # uses: ./.github/workflows/windows.yml + # with: + # react-native-version: '0.70' + # release-version: ${{ github.event.inputs.release_version }} - build-windows-071: - uses: ./.github/workflows/windows.yml - with: - react-native-version: '0.71' - release-version: ${{ github.event.inputs.release_version }} + # build-windows-071: + # uses: ./.github/workflows/windows.yml + # with: + # react-native-version: '0.71' + # release-version: ${{ github.event.inputs.release_version }} build-typescript: uses: ./.github/workflows/typescript.yml @@ -85,7 +85,7 @@ jobs: release-version: ${{ github.event.inputs.release_version }} package: - needs: [build-typescript, build-android-ios-064, build-android-ios-065, build-android-ios-069, build-android-ios-070, build-android-ios-071, build-windows-064, build-windows-065, build-windows-069, build-windows-070, build-windows-071] + needs: [build-typescript, build-android-ios-064, build-android-ios-065, build-android-ios-069, build-android-ios-070, build-android-ios-071] #, build-windows-064, build-windows-065, build-windows-069, build-windows-070, build-windows-071] runs-on: macos-latest steps: - name: Checkout Repo @@ -123,31 +123,31 @@ jobs: with: name: 'Assembled-iOSAndroid0.71' path: Package/Assembled-iOSAndroid0.71 - - name: Download Assembled-Windows 0.64 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-Windows0.64' - path: Package/Assembled-Windows0.64 - - name: Download Assembled-Windows 0.65 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-Windows0.65' - path: Package/Assembled-Windows0.65 - - name: Download Assembled-Windows 0.69 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-Windows0.69' - path: Package/Assembled-Windows0.69 - - name: Download Assembled-Windows 0.70 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-Windows0.70' - path: Package/Assembled-Windows0.70 - - name: Download Assembled-Windows 0.71 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-Windows0.71' - path: Package/Assembled-Windows0.71 + # - name: Download Assembled-Windows 0.64 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-Windows0.64' + # path: Package/Assembled-Windows0.64 + # - name: Download Assembled-Windows 0.65 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-Windows0.65' + # path: Package/Assembled-Windows0.65 + # - name: Download Assembled-Windows 0.69 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-Windows0.69' + # path: Package/Assembled-Windows0.69 + # - name: Download Assembled-Windows 0.70 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-Windows0.70' + # path: Package/Assembled-Windows0.70 + # - name: Download Assembled-Windows 0.71 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-Windows0.71' + # path: Package/Assembled-Windows0.71 #BaseKit - name: Download Assembled-BaseKit-iOSAndroid 0.69 Folder uses: actions/download-artifact@v4 @@ -164,21 +164,21 @@ jobs: with: name: 'Assembled-BaseKit-iOSAndroid0.71' path: Package/Assembled-BaseKit-iOSAndroid0.71 - - name: Download Assembled-BaseKit-Windows 0.69 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-BaseKit-Windows0.69' - path: Package/Assembled-BaseKit-Windows0.69 - - name: Download Assembled-BaseKit-Windows 0.70 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-BaseKit-Windows0.70' - path: Package/Assembled-BaseKit-Windows0.70 - - name: Download Assembled-BaseKit-Windows 0.71 Folder - uses: actions/download-artifact@v4 - with: - name: 'Assembled-BaseKit-Windows0.71' - path: Package/Assembled-BaseKit-Windows0.71 + # - name: Download Assembled-BaseKit-Windows 0.69 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-BaseKit-Windows0.69' + # path: Package/Assembled-BaseKit-Windows0.69 + # - name: Download Assembled-BaseKit-Windows 0.70 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-BaseKit-Windows0.70' + # path: Package/Assembled-BaseKit-Windows0.70 + # - name: Download Assembled-BaseKit-Windows 0.71 Folder + # uses: actions/download-artifact@v4 + # with: + # name: 'Assembled-BaseKit-Windows0.71' + # path: Package/Assembled-BaseKit-Windows0.71 - name: Display structure of downloaded Assembled and Assembled-Windows folders run: ls -R @@ -232,41 +232,41 @@ jobs: env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-windows-0-64 - run: | - npm version --no-git-tag-version ${{ github.event.inputs.release_version }} - npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} - working-directory: ./Package/Assembled-Windows0.64 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-windows-0-65 - run: | - npm version --no-git-tag-version ${{ github.event.inputs.release_version }} - npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} - working-directory: ./Package/Assembled-Windows0.65 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-windows-0-69 - run: | - npm version --no-git-tag-version ${{ github.event.inputs.release_version }} - npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} - working-directory: ./Package/Assembled-Windows0.69 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-windows-0-70 - run: | - npm version --no-git-tag-version ${{ github.event.inputs.release_version }} - npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} - working-directory: ./Package/Assembled-Windows0.70 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-windows-0-71 - run: | - npm version --no-git-tag-version ${{ github.event.inputs.release_version }} - npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} - working-directory: ./Package/Assembled-Windows0.71 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Version & Publish Package @babylonjs/react-native-windows-0-64 + # run: | + # npm version --no-git-tag-version ${{ github.event.inputs.release_version }} + # npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} + # working-directory: ./Package/Assembled-Windows0.64 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Version & Publish Package @babylonjs/react-native-windows-0-65 + # run: | + # npm version --no-git-tag-version ${{ github.event.inputs.release_version }} + # npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} + # working-directory: ./Package/Assembled-Windows0.65 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Version & Publish Package @babylonjs/react-native-windows-0-69 + # run: | + # npm version --no-git-tag-version ${{ github.event.inputs.release_version }} + # npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} + # working-directory: ./Package/Assembled-Windows0.69 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Version & Publish Package @babylonjs/react-native-windows-0-70 + # run: | + # npm version --no-git-tag-version ${{ github.event.inputs.release_version }} + # npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} + # working-directory: ./Package/Assembled-Windows0.70 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Version & Publish Package @babylonjs/react-native-windows-0-71 + # run: | + # npm version --no-git-tag-version ${{ github.event.inputs.release_version }} + # npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} + # working-directory: ./Package/Assembled-Windows0.71 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} #BaseKit - name: Version & Publish Package @babylonjs/react-native-basekit-iosandroid-0-69 @@ -290,24 +290,24 @@ jobs: working-directory: ./Package/Assembled-BaseKit-iOSAndroid0.71 env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-basekit-windows-0-69 - run: | - npm version --no-git-tag-version ${{ github.event.inputs.release_version }} - npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} - working-directory: ./Package/Assembled-BaseKit-Windows0.69 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-basekit-windows-0-70 - run: | - npm version --no-git-tag-version ${{ github.event.inputs.release_version }} - npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} - working-directory: ./Package/Assembled-BaseKit-Windows0.70 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Version & Publish Package @babylonjs/react-native-basekit-windows-0-71 - run: | - npm version --no-git-tag-version ${{ github.event.inputs.release_version }} - npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} - working-directory: ./Package/Assembled-BaseKit-Windows0.71 - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file + # - name: Version & Publish Package @babylonjs/react-native-basekit-windows-0-69 + # run: | + # npm version --no-git-tag-version ${{ github.event.inputs.release_version }} + # npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} + # working-directory: ./Package/Assembled-BaseKit-Windows0.69 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Version & Publish Package @babylonjs/react-native-basekit-windows-0-70 + # run: | + # npm version --no-git-tag-version ${{ github.event.inputs.release_version }} + # npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} + # working-directory: ./Package/Assembled-BaseKit-Windows0.70 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + # - name: Version & Publish Package @babylonjs/react-native-basekit-windows-0-71 + # run: | + # npm version --no-git-tag-version ${{ github.event.inputs.release_version }} + # npm publish --access public --tag ${{ github.event.inputs.NPM_tag }} ${{ github.event.inputs.NPM_publish_arg }} + # working-directory: ./Package/Assembled-BaseKit-Windows0.71 + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/test_version.yml b/.github/workflows/test_version.yml index 2f37af26a..bfa1bb592 100644 --- a/.github/workflows/test_version.yml +++ b/.github/workflows/test_version.yml @@ -29,38 +29,38 @@ on: default: '18' jobs: - build-windows: - runs-on: windows-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v2.3.3 - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.0.2 - - name: Setup Node ${{ github.event.inputs.Node_Version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ github.event.inputs.Node_Version }} - - name: Build Playground Windows x64 - run: | - npx react-native init Playground --version ${{ github.event.inputs.RN_Version }} - cp Apps/Playground/playground-shared/App.tsx ./Playground/App.tsx - cd Playground - npx react-native-windows-init --overwrite - npm install @babylonjs/core@${{ github.event.inputs.BJS_Version }} - npm install @babylonjs/loaders@${{ github.event.inputs.BJS_Version }} - npm install @babylonjs/react-native@${{ github.event.inputs.BRN_Version }} - npm install @babylonjs/react-native-windows-${{ github.event.inputs.BRN_Postfix }}@${{ github.event.inputs.BRN_Version }} - npm install @react-native-community/slider - # npm install react-native-permissions - npx react-native autolink-windows - msbuild.exe /r "./windows/Playground.sln" - msbuild.exe /p:Configuration="Release" /p:Platform="x64" /m "./windows/Playground.sln" + # build-windows: + # runs-on: windows-latest + # steps: + # - name: Checkout Repo + # uses: actions/checkout@v2.3.3 + # - name: Setup MSBuild + # uses: microsoft/setup-msbuild@v1.0.2 + # - name: Setup Node ${{ github.event.inputs.Node_Version }} + # uses: actions/setup-node@v3 + # with: + # node-version: ${{ github.event.inputs.Node_Version }} + # - name: Build Playground Windows x64 + # run: | + # npx react-native init Playground --version ${{ github.event.inputs.RN_Version }} + # cp Apps/Playground/playground-shared/App.tsx ./Playground/App.tsx + # cd Playground + # npx react-native-windows-init --overwrite + # npm install @babylonjs/core@${{ github.event.inputs.BJS_Version }} + # npm install @babylonjs/loaders@${{ github.event.inputs.BJS_Version }} + # npm install @babylonjs/react-native@${{ github.event.inputs.BRN_Version }} + # npm install @babylonjs/react-native-windows-${{ github.event.inputs.BRN_Postfix }}@${{ github.event.inputs.BRN_Version }} + # npm install @react-native-community/slider + # # npm install react-native-permissions + # npx react-native autolink-windows + # msbuild.exe /r "./windows/Playground.sln" + # msbuild.exe /p:Configuration="Release" /p:Platform="x64" /m "./windows/Playground.sln" - - name: Upload UWP x64 - 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 + # - name: Upload UWP x64 + # 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 build-android: runs-on: ubuntu-latest From 87f2aed8d46f1c42497755deaf5dded2a49e2f3d Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Thu, 10 Jul 2025 09:47:03 +0200 Subject: [PATCH 42/43] BN commit id --- Modules/@babylonjs/react-native/shared/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native/shared/CMakeLists.txt b/Modules/@babylonjs/react-native/shared/CMakeLists.txt index a120ab4fe..c268be332 100644 --- a/Modules/@babylonjs/react-native/shared/CMakeLists.txt +++ b/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 7f82d72f22e9789b9b66cb837aec0c9bc8ff65ee) + GIT_TAG 699764a1ae4225d95ece13f544f9c56e60baf894) set(SHARED_INCLUDES "${CMAKE_CURRENT_LIST_DIR}") From 0c57858c3c2c9d65f2504634baf757f6fa51fa5b Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Thu, 10 Jul 2025 10:16:03 +0200 Subject: [PATCH 43/43] Blob.xcscheme --- Package/gulpfile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Package/gulpfile.js b/Package/gulpfile.js index e4ab1f4e3..f1d5c0ceb 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -580,6 +580,7 @@ const validateAssemblediOSAndroid = async () => { `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/Window.xcscheme`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/XMLHttpRequest.xcscheme`, `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/xr.xcscheme`, + `${assemblediOSAndroidDir}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/Blob.xcscheme`, `${assemblediOSAndroidDir}/package.json`, `${assemblediOSAndroidDir}/react-native-babylon.podspec`, `${assemblediOSAndroidDir}/README.md`,