diff --git a/.github/workflows/bn_master_commit.yml b/.github/workflows/bn_master_commit.yml index 91e4f70c1..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-2019 - 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 756b946a3..4c4292932 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 }} @@ -188,106 +188,107 @@ jobs: env: JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }} - build-windows: - runs-on: windows-2019 - 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-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-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 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 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" /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" /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: @@ -314,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 d4d0f478d..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 @@ -78,91 +78,91 @@ 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 - with: - name: 'Assembled-Windows0.64' - path: Package/Assembled-Windows0.64 - - name: Download Assembled-Windows 0.65 Folder - uses: actions/download-artifact@v2 - with: - name: 'Assembled-Windows0.65' - path: Package/Assembled-Windows0.65 - - name: Download Assembled-Windows 0.69 Folder - uses: actions/download-artifact@v2 - with: - name: 'Assembled-Windows0.69' - path: Package/Assembled-Windows0.69 - - name: Download Assembled-Windows 0.70 Folder - uses: actions/download-artifact@v2 - with: - name: 'Assembled-Windows0.70' - path: Package/Assembled-Windows0.70 - - name: Download Assembled-Windows 0.71 Folder - uses: actions/download-artifact@v2 - 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@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 - 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 - 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 - 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 f8f609030..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 @@ -94,91 +94,91 @@ 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 - with: - name: 'Assembled-Windows0.64' - path: Package/Assembled-Windows0.64 - - name: Download Assembled-Windows 0.65 Folder - uses: actions/download-artifact@v2 - with: - name: 'Assembled-Windows0.65' - path: Package/Assembled-Windows0.65 - - name: Download Assembled-Windows 0.69 Folder - uses: actions/download-artifact@v2 - with: - name: 'Assembled-Windows0.69' - path: Package/Assembled-Windows0.69 - - name: Download Assembled-Windows 0.70 Folder - uses: actions/download-artifact@v2 - with: - name: 'Assembled-Windows0.70' - path: Package/Assembled-Windows0.70 - - name: Download Assembled-Windows 0.71 Folder - uses: actions/download-artifact@v2 - 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@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 - 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 - 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 - 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 978e48ece..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-2019 - 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 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 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.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/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.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/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.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/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/CMakeLists.txt b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt index 937729188..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) @@ -38,6 +41,18 @@ 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}/) +if (NOT ${BASEKIT_BUILD}) + disable_warnings(NativeXr) + disable_warnings(NativeCamera) +endif() +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) 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/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/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index dec1f250c..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 @@ -136,17 +136,19 @@ $(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); $(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); $(BabylonNativeBuildDir)_deps\urllib-build\$(Configuration); - $(BabylonNativeBuildDir)_deps\bgfx.cmake-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); @@ -174,21 +176,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; @@ -199,20 +197,15 @@ NativeInput.lib; 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; + Scheduling.lib; XMLHttpRequest.lib; - xr.lib; WindowsApp.lib; %(AdditionalDependencies); @@ -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; @@ -260,20 +249,15 @@ NativeInput.lib; 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; + Scheduling.lib; XMLHttpRequest.lib; - xr.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 bbe043098..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") @@ -46,6 +49,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) + target_link_libraries(BabylonNative arcana GraphicsDevice @@ -57,6 +70,7 @@ target_link_libraries(BabylonNative NativeOptimizations NativeTracing Window + Scheduling XMLHttpRequest Canvas ${ADDITIONAL_LIBRARIES}) diff --git a/Modules/@babylonjs/react-native-windows/windows/scripts/Utils.psm1 b/Modules/@babylonjs/react-native-windows/windows/scripts/Utils.psm1 index be6d2ab41..734a4994a 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" @@ -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 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{}; diff --git a/Modules/@babylonjs/react-native/shared/CMakeLists.txt b/Modules/@babylonjs/react-native/shared/CMakeLists.txt index 69f8e1e61..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 d0c97077d07da3a4f07d92473155db11c2e5a6c3) + GIT_TAG 699764a1ae4225d95ece13f544f9c56e60baf894) set(SHARED_INCLUDES "${CMAKE_CURRENT_LIST_DIR}") diff --git a/Package/BaseKit/react-native-babylon.podspec b/Package/BaseKit/react-native-babylon.podspec index c279b0d34..699dc73b5 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,12 @@ 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/libScheduling.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..f1d5c0ceb 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'); @@ -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`). @@ -529,7 +501,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`, @@ -550,17 +521,12 @@ 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`, - `${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`, @@ -572,6 +538,49 @@ 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`, + `${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/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/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}/ios/ReactNativeBabylon.xcodeproj/xcshareddata/xcschemes/Blob.xcscheme`, `${assemblediOSAndroidDir}/package.json`, `${assemblediOSAndroidDir}/react-native-babylon.podspec`, `${assemblediOSAndroidDir}/README.md`, diff --git a/Package/iOS/CMakeLists.txt b/Package/iOS/CMakeLists.txt index 1196a05ab..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) @@ -22,16 +25,11 @@ 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 - astc-encoder - etc1 - etc2 - nvtt - squish - pvrtc - iqa - edtaa3 - tinyexr + bimg_encode + bimg_decode bgfx bimg bx @@ -55,10 +53,10 @@ set(PACKAGED_LIBS SPIRV spirv-cross-core spirv-cross-msl - tinyexr UrlLib Window XMLHttpRequest + Scheduling xr ) diff --git a/README.md b/README.md index a1ce7e490..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: @@ -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). +