Skip to content

Commit 6ea7b72

Browse files
PR feedback and use latest BN
1 parent b6af351 commit 6ea7b72

File tree

9 files changed

+8
-30
lines changed

9 files changed

+8
-30
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ jobs:
1111
- name: Setting up developer environment
1212
run: node setup_dev.js
1313
working-directory: ./
14-
# - name: Build Android Bundle
15-
# run: npm run build:android
16-
# working-directory: ./Apps/Playground
14+
1715
- name: Gulp (Android)
1816
run: npx gulp buildAndroid
1917
working-directory: ./Package

.github/workflows/ios.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ jobs:
2121
pod install
2222
working-directory: ./Apps/Playground
2323

24-
# - name: Build iOS Bundle
25-
# run: npm run build:ios
26-
# working-directory: ./Apps/Playground
27-
2824
- name: Gulp (iOS)
2925
run: npx gulp buildIOS
3026
working-directory: ./Package

.github/workflows/package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
steps:
99
- name: Checkout Repo
1010
uses: actions/[email protected]
11-
- name: NPM Install (Binary Package)
11+
- name: NPM Install
1212
run: npm install
1313
working-directory: ./Package
1414
- name: Download Assembled Folder

.github/workflows/typescript.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- name: Checkout Repo
1010
uses: actions/[email protected]
1111

12-
- name: NPM Install (Binary Package)
12+
- name: NPM Install
1313
run: npm install
1414
working-directory: ./Package
1515
- name: NPM Install (Modules)

.github/workflows/windows.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,6 @@ jobs:
2626
node setup_dev.js
2727
working-directory: ./
2828

29-
# Windows development version need a bundle to be built
30-
# building bundle consists in running tsc in package, copy needed files in modules and running bundling command
31-
32-
# - name: Build Windows Bundle
33-
# run: npm run build:windows
34-
# working-directory: ./Apps/Playground
35-
# Bundle ready, now we can build the project
36-
3729
- name: NPM Generate Windows Project
3830
run: npx install-windows-test-app
3931
working-directory: ./Apps/Playground

Apps/Playground/package-windows.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,8 @@
33
"version": "0.0.1",
44
"private": true,
55
"scripts": {
6-
"android": "react-native run-android",
7-
"build:android": "mkdirp dist/res && react-native bundle --entry-file index.js --platform android --dev true --bundle-output dist/main.android.jsbundle --assets-dest dist/res",
8-
"build:ios": "mkdirp dist && react-native bundle --entry-file index.js --platform ios --dev true --bundle-output dist/main.ios.jsbundle --assets-dest dist",
9-
"build:macos": "mkdirp dist && react-native bundle --entry-file index.js --platform macos --dev true --bundle-output dist/main.macos.jsbundle --assets-dest dist",
106
"build:windows": "mkdirp dist && react-native bundle --entry-file index.js --platform windows --dev true --bundle-output dist/main.windows.bundle --assets-dest dist",
11-
"ios": "react-native run-ios",
127
"lint": "eslint .",
13-
"macos": "react-native run-macos --scheme Playground",
148
"start": "react-native start",
159
"test": "jest",
1610
"windows": "react-native run-windows --sln windows/Playground.sln"
@@ -33,8 +27,6 @@
3327
"@babel/preset-env": "^7.25.3",
3428
"@babel/runtime": "^7.25.0",
3529
"@react-native-community/cli": "19.0.0",
36-
"@react-native-community/cli-platform-android": "19.0.0",
37-
"@react-native-community/cli-platform-ios": "19.0.0",
3830
"@react-native/babel-preset": "0.80.0",
3931
"@react-native/eslint-config": "0.80.0",
4032
"@react-native/metro-config": "0.80.0",

Modules/@babylonjs/react-native/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The `react-native-permissions` dependency is required for XR capabilities of Bab
1212

1313
### Android Configuration
1414

15-
The minimum Android SDK version is 18. This must be set as `minSdkVersion` in the consuming project's `build.gradle` file.
15+
The minimum Android SDK version is 21. This must be set as `minSdkVersion` in the consuming project's `build.gradle` file.
1616

1717
### iOS Configuration
1818

Package/gulpfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ const createPackage = async () => {
224224
exec('npm pack', 'Assembled');
225225
};
226226

227-
const COMMIT_ID = '6c25966e8f8c0f3a0c13fdf77064f1bde790391f';
228-
const ZIP_URL = `https://github.com/CedricGuillemet/BabylonNative/archive/${COMMIT_ID}.zip`;
227+
const COMMIT_ID = 'c27ac0485ceeb4e69d00778f6da130ef074b3ba2';
228+
const ZIP_URL = `https://github.com/BabylonJS/BabylonNative/archive/${COMMIT_ID}.zip`;
229229
const TARGET_DIR = path.resolve(__dirname, '../Modules/@babylonjs/react-native/shared/BabylonNative');
230230
const ZIP_PATH = path.join(TARGET_DIR, `${COMMIT_ID}.zip`);
231231
const UNZIP_FOLDER = path.join(TARGET_DIR, `Repo`);

setup_dev.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ async function main() {
6969

7070
const rootDir = process.cwd();
7171

72-
// Step 1: NPM Install (Binary Package)
72+
// Step 1: NPM Install
7373
const packageDir = path.join(rootDir, 'Package');
74-
executeStep('npm install', packageDir, 'NPM Install (Binary Package)');
74+
executeStep('npm install', packageDir, 'NPM Install');
7575

7676
// Step 2: Build BabylonNative source tree
7777
executeStep('npx gulp buildBabylonNativeSourceTree', packageDir, 'Build BabylonNative source tree');

0 commit comments

Comments
 (0)