From 0e4a34d8386483d3a31c00a67af7e249fdff3a14 Mon Sep 17 00:00:00 2001 From: Andrew Moran Date: Tue, 30 Nov 2021 15:04:35 -0700 Subject: [PATCH 1/6] update latest babylon native submodule --- Modules/@babylonjs/react-native/submodules/BabylonNative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative index 1f4d92ae7..74a6805a9 160000 --- a/Modules/@babylonjs/react-native/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit 1f4d92ae74e1e8d1b546e97501f1a676ba40065a +Subproject commit 74a6805a9996ea21359b0786d8758a0193f3afa9 From 2420abfcbf45d54825d5fdce95d71237eca3d62c Mon Sep 17 00:00:00 2001 From: Andrew Moran Date: Tue, 30 Nov 2021 15:09:07 -0700 Subject: [PATCH 2/6] downgrade arcore to 1.22 --- Modules/@babylonjs/react-native/android/build.gradle | 4 ++-- Package/Android/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/@babylonjs/react-native/android/build.gradle b/Modules/@babylonjs/react-native/android/build.gradle index f77a905f9..efa32bf65 100644 --- a/Modules/@babylonjs/react-native/android/build.gradle +++ b/Modules/@babylonjs/react-native/android/build.gradle @@ -125,11 +125,11 @@ dependencies { //noinspection GradleDynamicVersion implementation 'com.facebook.react:react-native:+' // From node_modules implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'com.google.ar:core:1.27.0' + implementation 'com.google.ar:core:1.22.0' api("com.facebook.fbjni:fbjni-java-only:0.0.3") - natives 'com.google.ar:core:1.27.0' + natives 'com.google.ar:core:1.22.0' fbjniHeaders 'com.facebook.fbjni:fbjni:0.0.2:headers' fbjniLibs 'com.facebook.fbjni:fbjni:0.0.2' } diff --git a/Package/Android/build.gradle b/Package/Android/build.gradle index 080e90494..a800baba3 100644 --- a/Package/Android/build.gradle +++ b/Package/Android/build.gradle @@ -89,7 +89,7 @@ repositories { dependencies { //noinspection GradleDynamicVersion implementation 'com.facebook.react:react-native:+' // From node_modules - implementation 'com.google.ar:core:1.27.0' + implementation 'com.google.ar:core:1.22.0' } def configureReactNativePom(def pom) { From c71a1303617e143f3effb9e6ce611e63065842bc Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 2 Dec 2021 11:51:12 +0100 Subject: [PATCH 3/6] missing tinyexr.lib --- .../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 9d85dd1db..6198cd640 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -175,6 +175,7 @@ BabylonNative.lib; bgfx.lib; bimg.lib; + tinyexr.lib; bx.lib; Canvas.lib; edtaa3.lib; @@ -234,6 +235,7 @@ BabylonNative.lib; bgfx.lib; bimg.lib; + tinyexr.lib; bx.lib; Canvas.lib; edtaa3.lib; From cf5ca838b0c812f20b55b5907cf3ed6efde965a6 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 2 Dec 2021 12:41:30 +0100 Subject: [PATCH 4/6] npm version ? --- Apps/Playground/scripts/tools.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apps/Playground/scripts/tools.js b/Apps/Playground/scripts/tools.js index feef3b383..e4ef745a7 100644 --- a/Apps/Playground/scripts/tools.js +++ b/Apps/Playground/scripts/tools.js @@ -10,8 +10,8 @@ function iosCmake() { function postInstall() { const version = shelljs.exec('npm --version', {silent: true}); - if (!version.trim().match(/6\.\d+\.\d+/g)) { - throw `Error: BabylonReactNative Playground development requires npm version 6.13.*, Your current npm version is ${version}. Run npm install -g npm@6.13 to update your npm version.`; + if (!version.trim().match(/8\.\d+\.\d+/g)) { + throw `Error: BabylonReactNative Playground development requires npm version 8.*, Your current npm version is ${version}. Run npm install -g npm@8 to update your npm version.`; } console.log(chalk.black.bgCyan('Installing Babylon React Native npm packages...')); From b1fbdbf86fe03ecdb6b61b9d3bcd9ac079310c0d Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 2 Dec 2021 12:53:22 +0100 Subject: [PATCH 5/6] npm again --- .github/workflows/pr.yml | 8 ++++++++ Apps/Playground/scripts/tools.js | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e80bf5cb4..ba96023eb 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -16,6 +16,8 @@ jobs: uses: jwlawson/actions-setup-cmake@v1.8 with: cmake-version: '3.19.6' # See https://gitlab.kitware.com/cmake/cmake/-/issues/22021 + - name: Setup npm + run: npm install -g npm@6.13 - name: Setup Ninja run: brew install ninja - name: NPM Install (Playground) @@ -35,6 +37,8 @@ jobs: uses: actions/checkout@v2.3.3 with: submodules: 'recursive' + - name: Setup npm + run: npm install -g npm@6.13 - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground @@ -56,6 +60,8 @@ jobs: uses: jwlawson/actions-setup-cmake@v1.8 with: cmake-version: '3.19.6' # See https://gitlab.kitware.com/cmake/cmake/-/issues/22021 + - name: Setup npm + run: npm install -g npm@6.13 - name: Setup Ninja run: brew install ninja - name: NPM Install (Playground) @@ -85,6 +91,8 @@ jobs: uses: nuget/setup-nuget@v1 with: nuget-version: '5.x' + - name: Setup npm + run: npm install -g npm@6.13 - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground diff --git a/Apps/Playground/scripts/tools.js b/Apps/Playground/scripts/tools.js index e4ef745a7..feef3b383 100644 --- a/Apps/Playground/scripts/tools.js +++ b/Apps/Playground/scripts/tools.js @@ -10,8 +10,8 @@ function iosCmake() { function postInstall() { const version = shelljs.exec('npm --version', {silent: true}); - if (!version.trim().match(/8\.\d+\.\d+/g)) { - throw `Error: BabylonReactNative Playground development requires npm version 8.*, Your current npm version is ${version}. Run npm install -g npm@8 to update your npm version.`; + if (!version.trim().match(/6\.\d+\.\d+/g)) { + throw `Error: BabylonReactNative Playground development requires npm version 6.13.*, Your current npm version is ${version}. Run npm install -g npm@6.13 to update your npm version.`; } console.log(chalk.black.bgCyan('Installing Babylon React Native npm packages...')); From 607f4a6088441b01ffb26cde1acaca24cb84a45c Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 2 Dec 2021 12:59:34 +0100 Subject: [PATCH 6/6] revert npm test --- .github/workflows/pr.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ba96023eb..e80bf5cb4 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -16,8 +16,6 @@ jobs: uses: jwlawson/actions-setup-cmake@v1.8 with: cmake-version: '3.19.6' # See https://gitlab.kitware.com/cmake/cmake/-/issues/22021 - - name: Setup npm - run: npm install -g npm@6.13 - name: Setup Ninja run: brew install ninja - name: NPM Install (Playground) @@ -37,8 +35,6 @@ jobs: uses: actions/checkout@v2.3.3 with: submodules: 'recursive' - - name: Setup npm - run: npm install -g npm@6.13 - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground @@ -60,8 +56,6 @@ jobs: uses: jwlawson/actions-setup-cmake@v1.8 with: cmake-version: '3.19.6' # See https://gitlab.kitware.com/cmake/cmake/-/issues/22021 - - name: Setup npm - run: npm install -g npm@6.13 - name: Setup Ninja run: brew install ninja - name: NPM Install (Playground) @@ -91,8 +85,6 @@ jobs: uses: nuget/setup-nuget@v1 with: nuget-version: '5.x' - - name: Setup npm - run: npm install -g npm@6.13 - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground