diff --git a/.github/workflows/bn_master_commit.yml b/.github/workflows/bn_master_commit.yml index 91e4f70c1..770c4ba80 100644 --- a/.github/workflows/bn_master_commit.yml +++ b/.github/workflows/bn_master_commit.yml @@ -5,7 +5,7 @@ on: types: [babylonnative-master-update] env: - BRN_Version: 0.64 + BRN_Version: '0.69' jobs: build-android: @@ -18,10 +18,6 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 16 - uses: actions/setup-node@v3 - with: - node-version: 16 - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: @@ -37,12 +33,6 @@ jobs: - name: NPM Install (Binary Package) run: npm install working-directory: ./Package - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '17' - check-latest: true - name: Gulp (Android) run: npx gulp buildAndroid working-directory: ./Package @@ -59,10 +49,6 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 16 - uses: actions/setup-node@v3 - with: - node-version: 16 - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground @@ -90,10 +76,6 @@ jobs: 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: diff --git a/.github/workflows/ios_android.yml b/.github/workflows/ios_android.yml index 12c8be556..4f7f3e053 100644 --- a/.github/workflows/ios_android.yml +++ b/.github/workflows/ios_android.yml @@ -23,10 +23,6 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 16 - uses: actions/setup-node@v3 - with: - node-version: 16 - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: @@ -35,12 +31,6 @@ jobs: run: brew install ninja - name: 'Select XCode ${{ inputs.xcode-version }}' run: sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-version }}.app/Contents/Developer - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '17' - check-latest: true - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3284112a0..8f64db933 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -4,7 +4,7 @@ on: branches: - master env: - BRN_Version: '0.64' + BRN_Version: '0.70' jobs: build-android: @@ -16,10 +16,6 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 16 - uses: actions/setup-node@v3 - with: - node-version: 16 - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: @@ -35,12 +31,6 @@ jobs: - name: NPM Install (Binary Package) run: npm install working-directory: ./Package - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '17' - check-latest: true - name: Gulp (Android) run: npx gulp buildAndroid working-directory: ./Package @@ -96,10 +86,6 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 16 - uses: actions/setup-node@v3 - with: - node-version: 16 - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground @@ -149,22 +135,12 @@ jobs: submodules: 'recursive' - name: Free space uses: ./.github/workflows/macos_freespace - - name: Setup Node 16 - uses: actions/setup-node@v3 - with: - node-version: 16 - name: Setup CMake uses: jwlawson/actions-setup-cmake@v1.8 with: cmake-version: '3.26.3' - name: Setup Ninja run: brew install ninja - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '17' - check-latest: true - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground @@ -195,10 +171,6 @@ jobs: 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: @@ -282,12 +254,6 @@ jobs: working-directory: ./Apps/BRNPlayground/windows # Test packages - build-android-ios-065: - uses: ./.github/workflows/ios_android.yml - with: - react-native-version: '0.65' - release-version: 0.0.${GITHUB_SHA::8} - build-android-ios-069: uses: ./.github/workflows/ios_android.yml with: @@ -306,12 +272,6 @@ 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-069: uses: ./.github/workflows/windows.yml with: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d4d0f478d..778b444b5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,18 +4,6 @@ on: types: [published] jobs: - build-android-ios-064: - uses: ./.github/workflows/ios_android.yml - with: - react-native-version: '0.64' - release-version: ${GITHUB_REF/refs\/tags\//} - - build-android-ios-065: - uses: ./.github/workflows/ios_android.yml - with: - react-native-version: '0.65' - release-version: ${GITHUB_REF/refs\/tags\//} - build-android-ios-069: uses: ./.github/workflows/ios_android.yml with: @@ -34,17 +22,6 @@ 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-069: uses: ./.github/workflows/windows.yml with: @@ -69,7 +46,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-069, build-android-ios-070, build-android-ios-071, build-windows-069, build-windows-070, build-windows-071] runs-on: macos-latest steps: - name: Checkout Repo diff --git a/.github/workflows/publish_preview.yml b/.github/workflows/publish_preview.yml index f8f609030..f4b6d3119 100644 --- a/.github/workflows/publish_preview.yml +++ b/.github/workflows/publish_preview.yml @@ -19,18 +19,6 @@ on: default: --dry-run jobs: - build-android-ios-064: - uses: ./.github/workflows/ios_android.yml - with: - react-native-version: '0.64' - release-version: ${{ github.event.inputs.release_version }} - - build-android-ios-065: - uses: ./.github/workflows/ios_android.yml - with: - react-native-version: '0.65' - release-version: ${{ github.event.inputs.release_version }} - build-android-ios-069: uses: ./.github/workflows/ios_android.yml with: @@ -49,18 +37,6 @@ 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-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: @@ -85,7 +61,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-069, build-android-ios-070, build-android-ios-071, build-windows-069, build-windows-070, build-windows-071] runs-on: macos-latest steps: - name: Checkout Repo diff --git a/.github/workflows/test_version.yml b/.github/workflows/test_version.yml index 978e48ece..f4d3af5fc 100644 --- a/.github/workflows/test_version.yml +++ b/.github/workflows/test_version.yml @@ -71,12 +71,6 @@ jobs: uses: actions/setup-node@v3 with: node-version: ${{ github.event.inputs.Node_Version }} - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '17' - check-latest: true - name: Build Playground Android run: | npm uninstall -g react-native-cli @react-native-community/cli @@ -143,12 +137,6 @@ jobs: uses: actions/setup-node@v3 with: node-version: ${{ github.event.inputs.Node_Version }} - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '17' - check-latest: true - name: Build Playground Android run: | npm uninstall -g react-native-cli @react-native-community/cli diff --git a/.github/workflows/typescript.yml b/.github/workflows/typescript.yml index 72b46384b..f4d90cf9f 100644 --- a/.github/workflows/typescript.yml +++ b/.github/workflows/typescript.yml @@ -14,10 +14,6 @@ jobs: uses: actions/checkout@v2.3.3 with: submodules: 'recursive' - - name: Setup Node 16 - uses: actions/setup-node@v3 - with: - node-version: 16 - name: NPM Install (Playground) run: npm install working-directory: ./Apps/Playground diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f07803716..7f0e34705 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,10 +20,6 @@ jobs: 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: diff --git a/Apps/PackageTest/0.63.1/android/gradle/wrapper/gradle-wrapper.properties b/Apps/PackageTest/0.63.1/android/gradle/wrapper/gradle-wrapper.properties index 669386b87..84a0b92f9 100644 --- a/Apps/PackageTest/0.63.1/android/gradle/wrapper/gradle-wrapper.properties +++ b/Apps/PackageTest/0.63.1/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Apps/PackageTest/0.64.0/android/gradle/wrapper/gradle-wrapper.properties b/Apps/PackageTest/0.64.0/android/gradle/wrapper/gradle-wrapper.properties index 669386b87..84a0b92f9 100644 --- a/Apps/PackageTest/0.64.0/android/gradle/wrapper/gradle-wrapper.properties +++ b/Apps/PackageTest/0.64.0/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Apps/PackageTest/0.65.0/android/gradle/wrapper/gradle-wrapper.properties b/Apps/PackageTest/0.65.0/android/gradle/wrapper/gradle-wrapper.properties index 669386b87..84a0b92f9 100644 --- a/Apps/PackageTest/0.65.0/android/gradle/wrapper/gradle-wrapper.properties +++ b/Apps/PackageTest/0.65.0/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Apps/PackageTest/0.69.0/android/gradle/wrapper/gradle-wrapper.properties b/Apps/PackageTest/0.69.0/android/gradle/wrapper/gradle-wrapper.properties index 669386b87..84a0b92f9 100644 --- a/Apps/PackageTest/0.69.0/android/gradle/wrapper/gradle-wrapper.properties +++ b/Apps/PackageTest/0.69.0/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Apps/Playground/0.64/android/gradle.properties b/Apps/Playground/0.64/android/gradle.properties index 3bdbd3d4e..8f89d799c 100644 --- a/Apps/Playground/0.64/android/gradle.properties +++ b/Apps/Playground/0.64/android/gradle.properties @@ -26,3 +26,6 @@ android.enableJetifier=true # Version of flipper SDK to use with React Native FLIPPER_VERSION=0.54.0 + +#https://docs.gradle.org/nightly/userguide/upgrading_version_7.html#legacy_incrementaltaskinputs_api +android.experimental.legacyTransform.forceNonIncremental=true diff --git a/Apps/Playground/0.64/android/gradle/wrapper/gradle-wrapper.properties b/Apps/Playground/0.64/android/gradle/wrapper/gradle-wrapper.properties index 669386b87..84a0b92f9 100644 --- a/Apps/Playground/0.64/android/gradle/wrapper/gradle-wrapper.properties +++ b/Apps/Playground/0.64/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Apps/Playground/0.65/android/gradle.properties b/Apps/Playground/0.65/android/gradle.properties index dbcbe6f20..f1c3ed408 100644 --- a/Apps/Playground/0.65/android/gradle.properties +++ b/Apps/Playground/0.65/android/gradle.properties @@ -26,3 +26,6 @@ android.enableJetifier=true # Version of flipper SDK to use with React Native FLIPPER_VERSION=0.93.0 + +#https://docs.gradle.org/nightly/userguide/upgrading_version_7.html#legacy_incrementaltaskinputs_api +android.experimental.legacyTransform.forceNonIncremental=true diff --git a/Apps/Playground/0.65/android/gradle/wrapper/gradle-wrapper.properties b/Apps/Playground/0.65/android/gradle/wrapper/gradle-wrapper.properties index 669386b87..84a0b92f9 100644 --- a/Apps/Playground/0.65/android/gradle/wrapper/gradle-wrapper.properties +++ b/Apps/Playground/0.65/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Apps/Playground/0.69/android/gradle.properties b/Apps/Playground/0.69/android/gradle.properties index fa4feae5f..78761fbdf 100644 --- a/Apps/Playground/0.69/android/gradle.properties +++ b/Apps/Playground/0.69/android/gradle.properties @@ -38,3 +38,9 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 # to write custom TurboModules/Fabric components OR use libraries that # are providing them. newArchEnabled=false + +#https://docs.gradle.org/nightly/userguide/upgrading_version_7.html#legacy_incrementaltaskinputs_api +android.experimental.legacyTransform.forceNonIncremental=true + +#This will log all warnings but allow the build to proceed. Needed for deprecated features +org.gradle.warning.mode=all diff --git a/Apps/Playground/0.69/android/gradle/wrapper/gradle-wrapper.properties b/Apps/Playground/0.69/android/gradle/wrapper/gradle-wrapper.properties index 669386b87..84a0b92f9 100644 --- a/Apps/Playground/0.69/android/gradle/wrapper/gradle-wrapper.properties +++ b/Apps/Playground/0.69/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Apps/Playground/0.69/windows/Playground/Playground.vcxproj b/Apps/Playground/0.69/windows/Playground/Playground.vcxproj index 9a61ccf5f..7650686d1 100644 --- a/Apps/Playground/0.69/windows/Playground/Playground.vcxproj +++ b/Apps/Playground/0.69/windows/Playground/Playground.vcxproj @@ -167,11 +167,4 @@ - - - This project references targets in your node_modules\react-native-windows folder that are missing. The missing file is {0}. - - - - diff --git a/Apps/Playground/0.70/android/build.gradle b/Apps/Playground/0.70/android/build.gradle index 54c496777..242e0b84a 100644 --- a/Apps/Playground/0.70/android/build.gradle +++ b/Apps/Playground/0.70/android/build.gradle @@ -2,6 +2,7 @@ buildscript { ext { + ext.kotlin_version = '1.6.0' buildToolsVersion = "30.0.2" minSdkVersion = 21 compileSdkVersion = 31 @@ -23,11 +24,18 @@ buildscript { classpath("com.android.tools.build:gradle:7.2.1") classpath("com.facebook.react:react-native-gradle-plugin") classpath("de.undercouch:gradle-download-task:5.0.1") + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } } +apply plugin: 'kotlin' + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +} + allprojects { repositories { maven { diff --git a/Apps/Playground/0.70/android/gradle.properties b/Apps/Playground/0.70/android/gradle.properties index fa4feae5f..78761fbdf 100644 --- a/Apps/Playground/0.70/android/gradle.properties +++ b/Apps/Playground/0.70/android/gradle.properties @@ -38,3 +38,9 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 # to write custom TurboModules/Fabric components OR use libraries that # are providing them. newArchEnabled=false + +#https://docs.gradle.org/nightly/userguide/upgrading_version_7.html#legacy_incrementaltaskinputs_api +android.experimental.legacyTransform.forceNonIncremental=true + +#This will log all warnings but allow the build to proceed. Needed for deprecated features +org.gradle.warning.mode=all diff --git a/Apps/Playground/0.70/android/gradle/wrapper/gradle-wrapper.properties b/Apps/Playground/0.70/android/gradle/wrapper/gradle-wrapper.properties index 8fad3f5a9..84a0b92f9 100644 --- a/Apps/Playground/0.70/android/gradle/wrapper/gradle-wrapper.properties +++ b/Apps/Playground/0.70/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Apps/Playground/0.70/package-lock.json b/Apps/Playground/0.70/package-lock.json index e81f4cd10..6a89890ee 100644 --- a/Apps/Playground/0.70/package-lock.json +++ b/Apps/Playground/0.70/package-lock.json @@ -18,7 +18,7 @@ "@react-native-community/slider": "^4.0.0-rc.3", "react": "18.1.0", "react-native": "0.70.8", - "react-native-permissions": "^3.0.0", + "react-native-permissions": "^4.1.5", "react-native-windows": "0.70.7" }, "devDependencies": { @@ -41,111 +41,6 @@ "typescript": "^4.8.3" } }, - "../../../Modules/@babylonjs/react-native": { - "version": "0.0.1", - "license": "MIT", - "dependencies": { - "base-64": "^0.1.0", - "semver": "^7.3.2" - }, - "devDependencies": { - "@babel/core": "^7.8.4", - "@babel/runtime": "^7.8.4", - "@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", - "@types/jest": "^25.2.1", - "@types/react": "^16.9.32", - "@types/react-native": "^0.63.1", - "@types/react-native-permissions": "^2.0.0", - "@types/react-test-renderer": "^16.9.2", - "@types/semver": "^7.3.4", - "eslint": "7.12.0", - "just-scripts": "^0.44.7", - "metro-react-native-babel-preset": "^0.56.0", - "prettier": "1.19.1", - "typescript": "^4.3.5" - }, - "peerDependencies": { - "@babylonjs/core": ">=5.53.1", - "react": ">=16.13.1", - "react-native": ">=0.63.1", - "react-native-permissions": "^3.0.0" - } - }, - "../../../Modules/@babylonjs/react-native-iosandroid": { - "version": "0.0.1", - "license": "MIT", - "dependencies": { - "base-64": "^0.1.0", - "semver": "^7.3.2" - }, - "devDependencies": { - "@rnw-scripts/eslint-config": "0.1.6", - "@rnw-scripts/ts-config": "0.1.0", - "eslint": "7.12.0", - "just-scripts": "^0.44.7", - "metro-react-native-babel-preset": "^0.56.0", - "prettier": "1.19.1", - "typescript": "^4.3.5" - }, - "peerDependencies": { - "@babylonjs/react-native": "version", - "react": ">=16.13.1", - "react-native": ">=0.63.1", - "react-native-permissions": "^3.0.0" - } - }, - "../../../Modules/@babylonjs/react-native-windows": { - "version": "0.0.1", - "license": "MIT", - "devDependencies": { - "@babel/core": "^7.8.4", - "@babel/runtime": "^7.8.4", - "@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", - "@types/jest": "^25.2.1", - "@types/react": "^16.9.32", - "@types/react-native": "^0.63.1", - "@types/react-native-permissions": "^2.0.0", - "@types/react-test-renderer": "^16.9.2", - "@types/semver": "^7.3.4", - "eslint": "7.12.0", - "just-scripts": "^0.44.7", - "metro-react-native-babel-preset": "^0.56.0", - "prettier": "1.19.1", - "react-test-renderer": "17.0.1", - "typescript": "^3.8.3" - }, - "peerDependencies": { - "@babylonjs/core": ">=5.53.1", - "@babylonjs/react-native": "version", - "react": ">=17.0.1", - "react-native": ">=0.64.0", - "react-native-permissions": "^3.0.0", - "react-native-windows": ">=0.64.1" - } - }, - "../playground-shared": { - "version": "0.0.1", - "license": "MIT", - "devDependencies": { - "@babylonjs/core": ">=5.53.1", - "@babylonjs/loaders": ">=5.53.1", - "@babylonjs/playground-shared": "file:../playground-shared", - "@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", - "@react-native-community/slider": "^4.0.0-rc.3", - "@types/react": "^18.0.0", - "@types/react-native": "^0.71.0", - "react-native-permissions": "^3.0.0", - "react-native-windows": "^0.71.0" - } - }, "node_modules/@ampproject/remapping": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", @@ -2052,20 +1947,75 @@ } }, "node_modules/@babylonjs/playground-shared": { - "resolved": "../playground-shared", - "link": true + "name": "playground-shared", + "version": "0.0.1", + "resolved": "file:../playground-shared", + "license": "MIT" }, "node_modules/@babylonjs/react-native": { - "resolved": "../../../Modules/@babylonjs/react-native", - "link": true + "version": "0.0.1", + "resolved": "file:../../../Modules/@babylonjs/react-native", + "license": "MIT", + "dependencies": { + "base-64": "^0.1.0", + "semver": "^7.3.2" + }, + "peerDependencies": { + "@babylonjs/core": ">=5.53.1", + "react": ">=16.13.1", + "react-native": ">=0.63.1", + "react-native-permissions": "^3.0.0" + } }, "node_modules/@babylonjs/react-native-iosandroid": { - "resolved": "../../../Modules/@babylonjs/react-native-iosandroid", - "link": true + "version": "0.0.1", + "resolved": "file:../../../Modules/@babylonjs/react-native-iosandroid", + "license": "MIT", + "dependencies": { + "base-64": "^0.1.0", + "semver": "^7.3.2" + }, + "peerDependencies": { + "@babylonjs/react-native": "0.0.1", + "react": ">=16.13.1", + "react-native": ">=0.63.1", + "react-native-permissions": "^3.0.0" + } + }, + "node_modules/@babylonjs/react-native-iosandroid/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } }, "node_modules/@babylonjs/react-native-windows": { - "resolved": "../../../Modules/@babylonjs/react-native-windows", - "link": true + "version": "0.0.1", + "resolved": "file:../../../Modules/@babylonjs/react-native-windows", + "license": "MIT", + "peerDependencies": { + "@babylonjs/core": ">=5.53.1", + "@babylonjs/react-native": "0.0.1", + "react": ">=17.0.1", + "react-native": ">=0.64.0", + "react-native-permissions": "^3.0.0", + "react-native-windows": ">=0.64.1" + } + }, + "node_modules/@babylonjs/react-native/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } }, "node_modules/@bcoe/v8-coverage": { "version": "0.2.3", @@ -6240,6 +6190,11 @@ "node": ">=0.10.0" } }, + "node_modules/base-64": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz", + "integrity": "sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA==" + }, "node_modules/base/node_modules/define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", @@ -13796,13 +13751,13 @@ "integrity": "sha512-oOanj84fJEXUg9FoEAQomA8ISG+DVIrTZ3qF7m69VQUJyOGYyDZmPqKcjvRku4KXlEH6hWO9i4ACLzNBh8gC0A==" }, "node_modules/react-native-permissions": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/react-native-permissions/-/react-native-permissions-3.6.1.tgz", - "integrity": "sha512-fzPpPQXeD34inUccqtoResSwYubfrwUguP4qrVUUv8+KSMjYSaHGoS5HaIJLZHlN9gO+TvLJZ2L5ZljTsb6qnQ==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/react-native-permissions/-/react-native-permissions-4.1.5.tgz", + "integrity": "sha512-r6VMRacASmtRHS+GZ+5HQCp9p9kiE+UU9magHOZCXZLTJitdTuVHWZRrb4v4oqZGU+zAp3mZhTQftuMMv+WLUg==", "peerDependencies": { - "react": ">=16.13.1", - "react-native": ">=0.63.3", - "react-native-windows": ">=0.62.0" + "react": ">=18.1.0", + "react-native": ">=0.70.0", + "react-native-windows": ">=0.70.0" }, "peerDependenciesMeta": { "react-native-windows": { @@ -18116,81 +18071,39 @@ "requires": {} }, "@babylonjs/playground-shared": { - "version": "file:../playground-shared", - "requires": { - "@babylonjs/core": ">=5.53.1", - "@babylonjs/loaders": ">=5.53.1", - "@babylonjs/playground-shared": "file:", - "@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", - "@react-native-community/slider": "^4.0.0-rc.3", - "@types/react": "^18.0.0", - "@types/react-native": "^0.71.0", - "react-native-permissions": "^3.0.0", - "react-native-windows": "^0.71.0" - } + "version": "npm:playground-shared@0.0.1" }, "@babylonjs/react-native": { - "version": "file:../../../Modules/@babylonjs/react-native", + "version": "0.0.1", "requires": { - "@babel/core": "^7.8.4", - "@babel/runtime": "^7.8.4", - "@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", - "@types/jest": "^25.2.1", - "@types/react": "^16.9.32", - "@types/react-native": "^0.63.1", - "@types/react-native-permissions": "^2.0.0", - "@types/react-test-renderer": "^16.9.2", - "@types/semver": "^7.3.4", "base-64": "^0.1.0", - "eslint": "7.12.0", - "just-scripts": "^0.44.7", - "metro-react-native-babel-preset": "^0.56.0", - "prettier": "1.19.1", - "semver": "^7.3.2", - "typescript": "^4.3.5" + "semver": "^7.3.2" + }, + "dependencies": { + "semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==" + } } }, "@babylonjs/react-native-iosandroid": { - "version": "file:../../../Modules/@babylonjs/react-native-iosandroid", + "version": "0.0.1", "requires": { - "@rnw-scripts/eslint-config": "0.1.6", - "@rnw-scripts/ts-config": "0.1.0", "base-64": "^0.1.0", - "eslint": "7.12.0", - "just-scripts": "^0.44.7", - "metro-react-native-babel-preset": "^0.56.0", - "prettier": "1.19.1", - "semver": "^7.3.2", - "typescript": "^4.3.5" + "semver": "^7.3.2" + }, + "dependencies": { + "semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==" + } } }, "@babylonjs/react-native-windows": { - "version": "file:../../../Modules/@babylonjs/react-native-windows", - "requires": { - "@babel/core": "^7.8.4", - "@babel/runtime": "^7.8.4", - "@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", - "@types/jest": "^25.2.1", - "@types/react": "^16.9.32", - "@types/react-native": "^0.63.1", - "@types/react-native-permissions": "^2.0.0", - "@types/react-test-renderer": "^16.9.2", - "@types/semver": "^7.3.4", - "eslint": "7.12.0", - "just-scripts": "^0.44.7", - "metro-react-native-babel-preset": "^0.56.0", - "prettier": "1.19.1", - "react-test-renderer": "17.0.1", - "typescript": "^3.8.3" - } + "version": "0.0.1", + "requires": {} }, "@bcoe/v8-coverage": { "version": "0.2.3", @@ -21316,6 +21229,11 @@ } } }, + "base-64": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz", + "integrity": "sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA==" + }, "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -27016,9 +26934,9 @@ "integrity": "sha512-oOanj84fJEXUg9FoEAQomA8ISG+DVIrTZ3qF7m69VQUJyOGYyDZmPqKcjvRku4KXlEH6hWO9i4ACLzNBh8gC0A==" }, "react-native-permissions": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/react-native-permissions/-/react-native-permissions-3.6.1.tgz", - "integrity": "sha512-fzPpPQXeD34inUccqtoResSwYubfrwUguP4qrVUUv8+KSMjYSaHGoS5HaIJLZHlN9gO+TvLJZ2L5ZljTsb6qnQ==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/react-native-permissions/-/react-native-permissions-4.1.5.tgz", + "integrity": "sha512-r6VMRacASmtRHS+GZ+5HQCp9p9kiE+UU9magHOZCXZLTJitdTuVHWZRrb4v4oqZGU+zAp3mZhTQftuMMv+WLUg==", "requires": {} }, "react-native-windows": { diff --git a/Apps/Playground/0.70/package.json b/Apps/Playground/0.70/package.json index c989b1281..135eff8d0 100644 --- a/Apps/Playground/0.70/package.json +++ b/Apps/Playground/0.70/package.json @@ -22,7 +22,7 @@ "@react-native-community/slider": "^4.0.0-rc.3", "react": "18.1.0", "react-native": "0.70.8", - "react-native-permissions": "^3.0.0", + "react-native-permissions": "^4.1.5", "react-native-windows": "0.70.7" }, "devDependencies": { diff --git a/Apps/Playground/0.70/windows/Playground/Playground.vcxproj b/Apps/Playground/0.70/windows/Playground/Playground.vcxproj index ce8600d8f..4cc531cca 100644 --- a/Apps/Playground/0.70/windows/Playground/Playground.vcxproj +++ b/Apps/Playground/0.70/windows/Playground/Playground.vcxproj @@ -167,11 +167,4 @@ - - - This project references targets in your node_modules\react-native-windows folder that are missing. The missing file is {0}. - - - - \ No newline at end of file diff --git a/Apps/Playground/0.71/android/build.gradle b/Apps/Playground/0.71/android/build.gradle index 3bc803b2c..6fa51d401 100644 --- a/Apps/Playground/0.71/android/build.gradle +++ b/Apps/Playground/0.71/android/build.gradle @@ -1,6 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext.kotlin_version = '1.6.0' ext { buildToolsVersion = "30.0.2" minSdkVersion = 21 @@ -16,5 +17,12 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:7.2.1") classpath("com.facebook.react:react-native-gradle-plugin") + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } + +apply plugin: 'kotlin' + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +} \ No newline at end of file diff --git a/Apps/Playground/0.71/android/gradle.properties b/Apps/Playground/0.71/android/gradle.properties index e4af465e8..7498bfd61 100644 --- a/Apps/Playground/0.71/android/gradle.properties +++ b/Apps/Playground/0.71/android/gradle.properties @@ -42,3 +42,9 @@ newArchEnabled=false # Use this property to enable or disable the Hermes JS engine. # If set to false, you will be using JSC instead. hermesEnabled=true + +#https://docs.gradle.org/nightly/userguide/upgrading_version_7.html#legacy_incrementaltaskinputs_api +android.experimental.legacyTransform.forceNonIncremental=true + +#This will log all warnings but allow the build to proceed. Needed for deprecated features +org.gradle.warning.mode=all \ No newline at end of file diff --git a/Apps/Playground/0.71/android/gradle/wrapper/gradle-wrapper.properties b/Apps/Playground/0.71/android/gradle/wrapper/gradle-wrapper.properties index 8fad3f5a9..84a0b92f9 100644 --- a/Apps/Playground/0.71/android/gradle/wrapper/gradle-wrapper.properties +++ b/Apps/Playground/0.71/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Apps/Playground/0.71/windows/Playground/Playground.vcxproj b/Apps/Playground/0.71/windows/Playground/Playground.vcxproj index a23e257f4..514c74270 100644 --- a/Apps/Playground/0.71/windows/Playground/Playground.vcxproj +++ b/Apps/Playground/0.71/windows/Playground/Playground.vcxproj @@ -164,11 +164,4 @@ - - - This project references targets in your node_modules\react-native-windows folder that are missing. The missing file is {0}. - - - - diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index dec1f250c..39b92f194 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -313,13 +313,6 @@ - - - This project references targets in your node_modules\react-native-windows folder that are missing. The missing file is {0}. - - - - This project is missing the @babylonjs/react-native npm package. Please install this @babylonjs/react-native with npm. diff --git a/Modules/@babylonjs/react-native-windows/windows/scripts/BuildPlayground.bat b/Modules/@babylonjs/react-native-windows/windows/scripts/BuildPlayground.bat index ea585321d..bdea7590e 100644 --- a/Modules/@babylonjs/react-native-windows/windows/scripts/BuildPlayground.bat +++ b/Modules/@babylonjs/react-native-windows/windows/scripts/BuildPlayground.bat @@ -1,5 +1,5 @@ @ECHO OFF SETLOCAL -SET NODE_OPTIONS="--max-old-space-size=8192" +SET NODE_OPTIONS="--openssl-legacy-provider --max-old-space-size=8192" SET PowerShellScriptPath=%~dpn0.ps1 PowerShell.exe -NoProfile -ExecutionPolicy Bypass -Command "& '%PowerShellScriptPath%' %1 %2 %3 %4;exit $LASTEXITCODE" \ No newline at end of file diff --git a/Package/gulpfile.js b/Package/gulpfile.js index 928a743f5..81da1b3af 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -96,7 +96,7 @@ const buildIOSRNTA = gulp.series(makeXCodeProjRNTA, buildIphoneOS, buildIphoneSi const buildAndroid = async () => { const basekitBuildProp = basekitBuild ? "-PBASEKIT_BUILD=1" : ""; - exec(`./gradlew babylonjs_react-native:assembleRelease --stacktrace --info ${basekitBuildProp}`, '../Apps/Playground/Playground/android'); + exec(`./gradlew babylonjs_react-native:assembleRelease --warning-mode=all --stacktrace --info ${basekitBuildProp}`, '../Apps/Playground/Playground/android'); }; const buildAndroidRNTA = async () => {