diff --git a/.github/workflows/bn_master_commit.yml b/.github/workflows/bn_master_commit.yml index 330274e18..91e4f70c1 100644 --- a/.github/workflows/bn_master_commit.yml +++ b/.github/workflows/bn_master_commit.yml @@ -16,6 +16,8 @@ jobs: uses: actions/checkout@v2.3.3 with: submodules: 'recursive' + - name: Free space + uses: ./.github/workflows/macos_freespace - name: Setup Node 16 uses: actions/setup-node@v3 with: @@ -55,6 +57,8 @@ jobs: uses: actions/checkout@v2.3.3 with: submodules: 'recursive' + - name: Free space + uses: ./.github/workflows/macos_freespace - name: Setup Node 16 uses: actions/setup-node@v3 with: diff --git a/.github/workflows/ios_android.yml b/.github/workflows/ios_android.yml index f0cba55e1..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: '15.0.1' + default: '15.4' jobs: Build: @@ -21,6 +21,8 @@ jobs: uses: actions/checkout@v2.3.3 with: submodules: 'recursive' + - name: Free space + uses: ./.github/workflows/macos_freespace - name: Setup Node 16 uses: actions/setup-node@v3 with: @@ -54,12 +56,12 @@ jobs: env: JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }} - name: Upload Assembled iOS Android Folder - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: 'Assembled-iOSAndroid${{ inputs.react-native-version }}' path: Package/Assembled-iOSAndroid - name: Upload Assembled iOS Android BaseKit Folder - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: 'Assembled-BaseKit-iOSAndroid${{ inputs.react-native-version }}' path: Package/Assembled-BaseKit-iOSAndroid \ No newline at end of file diff --git a/.github/workflows/macos_freespace/action.yml b/.github/workflows/macos_freespace/action.yml new file mode 100644 index 000000000..ae59e7e31 --- /dev/null +++ b/.github/workflows/macos_freespace/action.yml @@ -0,0 +1,15 @@ +name: Free up disk space +description: Free up disk space see https://github.com/actions/runner-images/issues/10511 +runs: + using: "composite" + steps: + - name: Free up disk space + shell: bash + run: | + xcrun simctl delete all + sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/* + sudo rm -rf /Applications/Xcode_14.3.1.app + sudo rm -rf /Applications/Xcode_15.0.1.app + sudo rm -rf /Applications/Xcode_15.1.app + sudo rm -rf /Applications/Xcode_15.2.app + sudo rm -rf /Applications/Xcode_15.3.app diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7e4de8c29..3284112a0 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -14,6 +14,8 @@ jobs: uses: actions/checkout@v2.3.3 with: submodules: 'recursive' + - name: Free space + uses: ./.github/workflows/macos_freespace - name: Setup Node 16 uses: actions/setup-node@v3 with: @@ -52,6 +54,8 @@ jobs: 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: @@ -90,6 +94,8 @@ jobs: uses: actions/checkout@v2.3.3 with: submodules: 'recursive' + - name: Free space + uses: ./.github/workflows/macos_freespace - name: Setup Node 16 uses: actions/setup-node@v3 with: @@ -114,6 +120,8 @@ jobs: uses: actions/checkout@v2.3.3 with: submodules: 'recursive' + - name: Free space + uses: ./.github/workflows/macos_freespace - name: Setup Watchman run: brew install watchman @@ -139,6 +147,8 @@ jobs: uses: actions/checkout@v2.3.3 with: submodules: 'recursive' + - name: Free space + uses: ./.github/workflows/macos_freespace - name: Setup Node 16 uses: actions/setup-node@v3 with: @@ -323,4 +333,4 @@ jobs: build-typescript: uses: ./.github/workflows/typescript.yml with: - release-version: 0.0.${GITHUB_SHA::8} \ No newline at end of file + release-version: 0.0.${GITHUB_SHA::8} diff --git a/.github/workflows/test_version.yml b/.github/workflows/test_version.yml index 369a092de..978e48ece 100644 --- a/.github/workflows/test_version.yml +++ b/.github/workflows/test_version.yml @@ -57,7 +57,7 @@ jobs: msbuild.exe /p:Configuration="Release" /p:Platform="x64" /m "./windows/Playground.sln" - name: Upload UWP x64 - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: 'WindowsAppx' path: Playground/windows/AppPackages/Playground/Playground_1.0.0.0_x64_Test/ #Playground_1.0.0.0_x64.appx @@ -94,7 +94,7 @@ jobs: ./gradlew app:assembleRelease --stacktrace --info - name: Upload APK - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: 'AndroidAPK' path: Playground/android/app/build/outputs/apk/release/app-release.apk @@ -128,7 +128,7 @@ jobs: xcodebuild -sdk iphonesimulator -arch x86_64 -configuration Release -workspace Playground.xcworkspace -scheme Playground build CODE_SIGNING_ALLOWED=NO -archivePath ./playgroundSimulator.xcarchive archive - name: Upload iOS App - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: 'iOSApp' path: Playground/ios/playgroundSimulator.xcarchive @@ -164,7 +164,7 @@ jobs: ./gradlew app:assembleRelease --stacktrace --info - name: Upload APK - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: 'AndroidBasekitAPK' path: Playground/android/app/build/outputs/apk/release/app-release.apk @@ -197,7 +197,7 @@ jobs: xcodebuild -sdk iphonesimulator -arch x86_64 -configuration Release -workspace Playground.xcworkspace -scheme Playground build CODE_SIGNING_ALLOWED=NO -archivePath ./playgroundSimulator.xcarchive archive - name: Upload iOS App - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: 'iOSBasekitApp' path: Playground/ios/playgroundSimulator.xcarchive @@ -207,7 +207,7 @@ jobs: # runs-on: macos-latest # steps: # - name: Download APK -# uses: actions/download-artifact@v2 +# uses: actions/download-artifact@v4 # with: # name: 'AndroidAPK' # path: ./ diff --git a/.github/workflows/typescript.yml b/.github/workflows/typescript.yml index cace9f7d4..72b46384b 100644 --- a/.github/workflows/typescript.yml +++ b/.github/workflows/typescript.yml @@ -31,7 +31,7 @@ jobs: run: npx gulp buildTS --releaseVersion ${{ inputs.release-version }} working-directory: ./Package - name: Upload Assembled Folder - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: 'Assembled' path: Package/Assembled diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 37586e3f5..f07803716 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -41,12 +41,12 @@ jobs: run: npx gulp buildUWPPublish --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ inputs.release-version }} working-directory: ./Package - name: Upload Assembled-Windows Folder - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: 'Assembled-Windows${{ inputs.react-native-version }}' path: Package/Assembled-Windows - name: Upload Assembled-BaseKit-Windows Folder - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: 'Assembled-BaseKit-Windows${{ inputs.react-native-version }}' path: Package/Assembled-BaseKit-Windows \ No newline at end of file diff --git a/Apps/BRNPlayground/metro.config.js b/Apps/BRNPlayground/metro.config.js index b32f67da0..019a575a3 100644 --- a/Apps/BRNPlayground/metro.config.js +++ b/Apps/BRNPlayground/metro.config.js @@ -11,8 +11,8 @@ module.exports = makeMetroConfig({ }), }, watchFolders: [ - path.join(__dirname, "node_modules", "@babylonjs/react-native"), - path.join(__dirname, "node_modules", "@babylonjs/react-native-iosandroid"), - path.join(__dirname, "node_modules", "@babylonjs/react-native-windows"), + path.dirname(require.resolve("@babylonjs/react-native/package.json")), + path.dirname(require.resolve("@babylonjs/react-native-iosandroid/package.json")), + path.dirname(require.resolve("@babylonjs/react-native-windows/package.json")), ], }); diff --git a/Apps/BRNPlayground/package-lock.json b/Apps/BRNPlayground/package-lock.json index 038c880ee..8aa2b7862 100644 --- a/Apps/BRNPlayground/package-lock.json +++ b/Apps/BRNPlayground/package-lock.json @@ -9,8 +9,8 @@ "version": "0.0.1", "hasInstallScript": true, "dependencies": { - "@babylonjs/core": "6.14.0", - "@babylonjs/loaders": "6.14.0", + "@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", @@ -37,7 +37,7 @@ "jest": "^29.6.3", "mkdirp": "^1.0.0", "prettier": "2.8.8", - "react-native-test-app": "^3.4.2", + "react-native-test-app": "^3.10.3", "react-test-renderer": "18.2.0", "typescript": "5.0.4" }, @@ -55,7 +55,7 @@ "devDependencies": { "@babel/core": "^7.8.4", "@babel/runtime": "^7.8.4", - "@babylonjs/core": "6.14.0", + "@babylonjs/core": ">=5.53.1", "@rnw-scripts/eslint-config": "0.1.6", "@rnw-scripts/ts-config": "0.1.0", "@types/base-64": "^0.1.3", @@ -72,7 +72,7 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@babylonjs/core": "^6.14.0", + "@babylonjs/core": ">=5.53.1", "react": ">=16.13.1", "react-native": ">=0.63.1", "react-native-permissions": "^3.0.0" @@ -107,7 +107,7 @@ "devDependencies": { "@babel/core": "^7.8.4", "@babel/runtime": "^7.8.4", - "@babylonjs/core": "6.14.0", + "@babylonjs/core": ">=5.53.1", "@rnw-scripts/eslint-config": "0.1.6", "@rnw-scripts/ts-config": "0.1.0", "@types/base-64": "^0.1.3", @@ -125,7 +125,7 @@ "typescript": "^3.8.3" }, "peerDependencies": { - "@babylonjs/core": "^6.14.0", + "@babylonjs/core": ">=5.53.1", "@babylonjs/react-native": "version", "react": ">=17.0.1", "react-native": ">=0.64.0", @@ -5391,9 +5391,9 @@ } }, "node_modules/@rnx-kit/react-native-host": { - "version": "0.4.9", - "resolved": "https://registry.npmjs.org/@rnx-kit/react-native-host/-/react-native-host-0.4.9.tgz", - "integrity": "sha512-S8cp6sOLDsrW5bYk6LEoxU90UEms/eC2J2inF4UJ2p/AT2ibzU9ftO+oSAfoRQIizpAqAf823fuAsSXdfdQA5w==", + "version": "0.4.12", + "resolved": "https://registry.npmjs.org/@rnx-kit/react-native-host/-/react-native-host-0.4.12.tgz", + "integrity": "sha512-LVOoF6/+s8JnkCn5hjZTzdyjkL54LOh1vHAimeKeGc427SPEAmHLpOohDNiMhq0kR/jY3qn8TkX8X7C8gXNWKQ==", "dev": true, "peerDependencies": { "react-native": ">=0.66" @@ -13722,18 +13722,18 @@ } }, "node_modules/react-native-test-app": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/react-native-test-app/-/react-native-test-app-3.7.2.tgz", - "integrity": "sha512-h6maTpyIlUQtsXk2uC92aDAeAvTmgclB52ygik+MhZ2NYG695yN6kj2lK7doLLLqnLRBVc4B0nDJ9GTycu1svw==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/react-native-test-app/-/react-native-test-app-3.10.3.tgz", + "integrity": "sha512-mamLagA1cBffcM8co8g/O1SJi2PsjDU63BG0GVTOVNPzie9hb1K0CWlMw+jMMXXHeKGvinrZEIaJXjIISn7PlQ==", "dev": true, "dependencies": { - "@rnx-kit/react-native-host": "^0.4.9", + "@rnx-kit/react-native-host": "^0.4.12", "ajv": "^8.0.0", "cliui": "^8.0.0", "fast-xml-parser": "^4.0.0", "prompts": "^2.4.0", "semver": "^7.3.5", - "uuid": "^9.0.0" + "uuid": "^10.0.0" }, "bin": { "configure-test-app": "scripts/configure.mjs", @@ -13745,12 +13745,12 @@ "node": ">=16.17" }, "peerDependencies": { - "@callstack/react-native-visionos": "0.73 - 0.74", + "@callstack/react-native-visionos": "0.73 - 0.75", "@expo/config-plugins": ">=5.0", - "react": "17.0.1 - 18.2", - "react-native": "0.66 - 0.74 || >=0.75.0-0 <0.75.0", - "react-native-macos": "^0.0.0-0 || 0.66 || 0.68 || 0.71 - 0.73", - "react-native-windows": "^0.0.0-0 || 0.66 - 0.74" + "react": "17.0.1 - 19.0", + "react-native": "0.66 - 0.75 || >=0.76.0-0 <0.76.0", + "react-native-macos": "^0.0.0-0 || 0.66 || 0.68 || 0.71 - 0.75", + "react-native-windows": "^0.0.0-0 || 0.66 - 0.75" }, "peerDependenciesMeta": { "@callstack/react-native-visionos": { @@ -15643,9 +15643,9 @@ } }, "node_modules/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", "dev": true, "funding": [ "https://github.com/sponsors/broofa", diff --git a/Apps/BRNPlayground/package.json b/Apps/BRNPlayground/package.json index 85bc7527b..af9e5f435 100644 --- a/Apps/BRNPlayground/package.json +++ b/Apps/BRNPlayground/package.json @@ -45,7 +45,7 @@ "jest": "^29.6.3", "mkdirp": "^1.0.0", "prettier": "2.8.8", - "react-native-test-app": "^3.4.2", + "react-native-test-app": "^3.10.3", "react-test-renderer": "18.2.0", "typescript": "5.0.4" },