From 2c966770a2e2dbcd9db29a35a6638de6bbfb6653 Mon Sep 17 00:00:00 2001
From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com>
Date: Thu, 15 Feb 2024 10:43:11 +0100
Subject: [PATCH 01/13] default node/java versions
---
.github/workflows/bn_master_commit.yml | 18 -----------------
.github/workflows/ios_android.yml | 10 ---------
.github/workflows/pr.yml | 28 --------------------------
.github/workflows/test_version.yml | 12 -----------
.github/workflows/typescript.yml | 4 ----
.github/workflows/windows.yml | 4 ----
6 files changed, 76 deletions(-)
diff --git a/.github/workflows/bn_master_commit.yml b/.github/workflows/bn_master_commit.yml
index 330274e18..358c5df59 100644
--- a/.github/workflows/bn_master_commit.yml
+++ b/.github/workflows/bn_master_commit.yml
@@ -16,10 +16,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: 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
@@ -55,10 +45,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
@@ -86,10 +72,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 f887e8384..420a5f264 100644
--- a/.github/workflows/ios_android.yml
+++ b/.github/workflows/ios_android.yml
@@ -21,10 +21,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: Setup CMake
uses: jwlawson/actions-setup-cmake@v1.8
with:
@@ -33,12 +29,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 9caaa44ef..3c39ea784 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.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: Setup CMake
uses: jwlawson/actions-setup-cmake@v1.8
with:
@@ -33,12 +29,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
@@ -52,10 +42,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
@@ -76,22 +62,12 @@ jobs:
uses: actions/checkout@v2.3.3
with:
submodules: 'recursive'
- - 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
@@ -122,10 +98,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/test_version.yml b/.github/workflows/test_version.yml
index 369a092de..2952c3d70 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 cace9f7d4..73929ec33 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 37586e3f5..9a1a2385d 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:
From d3bbe5cd8f677a84ab59edf1777715e3ce3c030d Mon Sep 17 00:00:00 2001
From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com>
Date: Thu, 15 Feb 2024 11:25:44 +0100
Subject: [PATCH 02/13] newer gradle
---
.../0.63.1/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
.../0.64.0/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
.../0.65.0/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
.../0.69.0/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
.../0.64/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
.../0.65/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
.../0.69/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
.../0.70/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
.../0.71/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
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/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/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/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.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.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
From 0cebdba25c9107f778bcf3e8c6c1aa8f563b1366 Mon Sep 17 00:00:00 2001
From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com>
Date: Thu, 15 Feb 2024 11:59:17 +0100
Subject: [PATCH 03/13] up kotline
---
Apps/PackageTest/0.63.1/android/build.gradle | 1 +
Apps/PackageTest/0.64.0/android/build.gradle | 1 +
Apps/PackageTest/0.65.0/android/build.gradle | 1 +
Apps/PackageTest/0.69.0/android/build.gradle | 1 +
Apps/Playground/0.64/android/build.gradle | 1 +
Apps/Playground/0.65/android/build.gradle | 1 +
Apps/Playground/0.69/android/build.gradle | 1 +
Apps/Playground/0.70/android/build.gradle | 1 +
Apps/Playground/0.71/android/build.gradle | 1 +
9 files changed, 9 insertions(+)
diff --git a/Apps/PackageTest/0.63.1/android/build.gradle b/Apps/PackageTest/0.63.1/android/build.gradle
index 4ed7aa24c..b657dc674 100644
--- a/Apps/PackageTest/0.63.1/android/build.gradle
+++ b/Apps/PackageTest/0.63.1/android/build.gradle
@@ -7,6 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
+ kotlinVersion = "1.9.0"
}
repositories {
google()
diff --git a/Apps/PackageTest/0.64.0/android/build.gradle b/Apps/PackageTest/0.64.0/android/build.gradle
index 4ed7aa24c..b657dc674 100644
--- a/Apps/PackageTest/0.64.0/android/build.gradle
+++ b/Apps/PackageTest/0.64.0/android/build.gradle
@@ -7,6 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
+ kotlinVersion = "1.9.0"
}
repositories {
google()
diff --git a/Apps/PackageTest/0.65.0/android/build.gradle b/Apps/PackageTest/0.65.0/android/build.gradle
index 1dcab657e..6d2be3625 100644
--- a/Apps/PackageTest/0.65.0/android/build.gradle
+++ b/Apps/PackageTest/0.65.0/android/build.gradle
@@ -7,6 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
+ kotlinVersion = "1.9.0"
}
repositories {
google()
diff --git a/Apps/PackageTest/0.69.0/android/build.gradle b/Apps/PackageTest/0.69.0/android/build.gradle
index c0ef0a842..278d03d60 100644
--- a/Apps/PackageTest/0.69.0/android/build.gradle
+++ b/Apps/PackageTest/0.69.0/android/build.gradle
@@ -15,6 +15,7 @@ buildscript {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
+ kotlinVersion = "1.9.0"
}
repositories {
google()
diff --git a/Apps/Playground/0.64/android/build.gradle b/Apps/Playground/0.64/android/build.gradle
index 4ed7aa24c..b657dc674 100644
--- a/Apps/Playground/0.64/android/build.gradle
+++ b/Apps/Playground/0.64/android/build.gradle
@@ -7,6 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
+ kotlinVersion = "1.9.0"
}
repositories {
google()
diff --git a/Apps/Playground/0.65/android/build.gradle b/Apps/Playground/0.65/android/build.gradle
index 1dcab657e..6d2be3625 100644
--- a/Apps/Playground/0.65/android/build.gradle
+++ b/Apps/Playground/0.65/android/build.gradle
@@ -7,6 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
+ kotlinVersion = "1.9.0"
}
repositories {
google()
diff --git a/Apps/Playground/0.69/android/build.gradle b/Apps/Playground/0.69/android/build.gradle
index b0e2d1626..7c42cee75 100644
--- a/Apps/Playground/0.69/android/build.gradle
+++ b/Apps/Playground/0.69/android/build.gradle
@@ -15,6 +15,7 @@ buildscript {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
+ kotlinVersion = "1.9.0"
}
repositories {
google()
diff --git a/Apps/Playground/0.70/android/build.gradle b/Apps/Playground/0.70/android/build.gradle
index 54c496777..74836c370 100644
--- a/Apps/Playground/0.70/android/build.gradle
+++ b/Apps/Playground/0.70/android/build.gradle
@@ -14,6 +14,7 @@ buildscript {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
+ kotlinVersion = "1.9.0"
}
repositories {
google()
diff --git a/Apps/Playground/0.71/android/build.gradle b/Apps/Playground/0.71/android/build.gradle
index 3bc803b2c..5ef9e10dc 100644
--- a/Apps/Playground/0.71/android/build.gradle
+++ b/Apps/Playground/0.71/android/build.gradle
@@ -8,6 +8,7 @@ buildscript {
targetSdkVersion = 30
ndkVersion = "23.1.7779620"
+ kotlinVersion = "1.9.0"
}
repositories {
google()
From c22d3cfe03e9aa01f7e088e8e9e6bdae5f0952e8 Mon Sep 17 00:00:00 2001
From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com>
Date: Thu, 15 Feb 2024 14:14:55 +0100
Subject: [PATCH 04/13] kotlinVersion = "1.6.0"
---
Apps/PackageTest/0.63.1/android/build.gradle | 2 +-
Apps/PackageTest/0.64.0/android/build.gradle | 2 +-
Apps/PackageTest/0.65.0/android/build.gradle | 2 +-
Apps/PackageTest/0.69.0/android/build.gradle | 2 +-
Apps/Playground/0.64/android/build.gradle | 2 +-
Apps/Playground/0.65/android/build.gradle | 2 +-
Apps/Playground/0.69/android/build.gradle | 2 +-
Apps/Playground/0.70/android/build.gradle | 2 +-
Apps/Playground/0.71/android/build.gradle | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Apps/PackageTest/0.63.1/android/build.gradle b/Apps/PackageTest/0.63.1/android/build.gradle
index b657dc674..f104fb50e 100644
--- a/Apps/PackageTest/0.63.1/android/build.gradle
+++ b/Apps/PackageTest/0.63.1/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.9.0"
+ kotlinVersion = "1.6.0"
}
repositories {
google()
diff --git a/Apps/PackageTest/0.64.0/android/build.gradle b/Apps/PackageTest/0.64.0/android/build.gradle
index b657dc674..f104fb50e 100644
--- a/Apps/PackageTest/0.64.0/android/build.gradle
+++ b/Apps/PackageTest/0.64.0/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.9.0"
+ kotlinVersion = "1.6.0"
}
repositories {
google()
diff --git a/Apps/PackageTest/0.65.0/android/build.gradle b/Apps/PackageTest/0.65.0/android/build.gradle
index 6d2be3625..b3f70b0d1 100644
--- a/Apps/PackageTest/0.65.0/android/build.gradle
+++ b/Apps/PackageTest/0.65.0/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.9.0"
+ kotlinVersion = "1.6.0"
}
repositories {
google()
diff --git a/Apps/PackageTest/0.69.0/android/build.gradle b/Apps/PackageTest/0.69.0/android/build.gradle
index 278d03d60..4580867ad 100644
--- a/Apps/PackageTest/0.69.0/android/build.gradle
+++ b/Apps/PackageTest/0.69.0/android/build.gradle
@@ -15,7 +15,7 @@ buildscript {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
- kotlinVersion = "1.9.0"
+ kotlinVersion = "1.6.0"
}
repositories {
google()
diff --git a/Apps/Playground/0.64/android/build.gradle b/Apps/Playground/0.64/android/build.gradle
index b657dc674..f104fb50e 100644
--- a/Apps/Playground/0.64/android/build.gradle
+++ b/Apps/Playground/0.64/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.9.0"
+ kotlinVersion = "1.6.0"
}
repositories {
google()
diff --git a/Apps/Playground/0.65/android/build.gradle b/Apps/Playground/0.65/android/build.gradle
index 6d2be3625..b3f70b0d1 100644
--- a/Apps/Playground/0.65/android/build.gradle
+++ b/Apps/Playground/0.65/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.9.0"
+ kotlinVersion = "1.6.0"
}
repositories {
google()
diff --git a/Apps/Playground/0.69/android/build.gradle b/Apps/Playground/0.69/android/build.gradle
index 7c42cee75..6b1ba63ce 100644
--- a/Apps/Playground/0.69/android/build.gradle
+++ b/Apps/Playground/0.69/android/build.gradle
@@ -15,7 +15,7 @@ buildscript {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
- kotlinVersion = "1.9.0"
+ kotlinVersion = "1.6.0"
}
repositories {
google()
diff --git a/Apps/Playground/0.70/android/build.gradle b/Apps/Playground/0.70/android/build.gradle
index 74836c370..238d5c6f6 100644
--- a/Apps/Playground/0.70/android/build.gradle
+++ b/Apps/Playground/0.70/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
- kotlinVersion = "1.9.0"
+ kotlinVersion = "1.6.0"
}
repositories {
google()
diff --git a/Apps/Playground/0.71/android/build.gradle b/Apps/Playground/0.71/android/build.gradle
index 5ef9e10dc..66f94caa1 100644
--- a/Apps/Playground/0.71/android/build.gradle
+++ b/Apps/Playground/0.71/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
targetSdkVersion = 30
ndkVersion = "23.1.7779620"
- kotlinVersion = "1.9.0"
+ kotlinVersion = "1.6.0"
}
repositories {
google()
From 009e380cdd35f2a98befaf852f6c6da1be0a929e Mon Sep 17 00:00:00 2001
From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com>
Date: Tue, 20 Feb 2024 10:35:39 +0100
Subject: [PATCH 05/13] openssl for windows build
---
.../react-native-windows/windows/scripts/BuildPlayground.bat | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/@babylonjs/react-native-windows/windows/scripts/BuildPlayground.bat b/Modules/@babylonjs/react-native-windows/windows/scripts/BuildPlayground.bat
index ea585321d..41746e59d 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="--max-old-space-size=8192 --openssl-legacy-provider"
SET PowerShellScriptPath=%~dpn0.ps1
PowerShell.exe -NoProfile -ExecutionPolicy Bypass -Command "& '%PowerShellScriptPath%' %1 %2 %3 %4;exit $LASTEXITCODE"
\ No newline at end of file
From 02c8747ed87d26919945c5ee67c312bd83058af7 Mon Sep 17 00:00:00 2001
From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com>
Date: Tue, 20 Feb 2024 10:40:56 +0100
Subject: [PATCH 06/13] IncrementalTaskInputs fix test
---
Apps/Playground/0.64/android/gradle.properties | 3 +++
Apps/Playground/0.65/android/gradle.properties | 3 +++
Apps/Playground/0.69/android/gradle.properties | 3 +++
Apps/Playground/0.70/android/gradle.properties | 3 +++
Apps/Playground/0.71/android/gradle.properties | 3 +++
5 files changed, 15 insertions(+)
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.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.69/android/gradle.properties b/Apps/Playground/0.69/android/gradle.properties
index fa4feae5f..982a0373c 100644
--- a/Apps/Playground/0.69/android/gradle.properties
+++ b/Apps/Playground/0.69/android/gradle.properties
@@ -38,3 +38,6 @@ 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
diff --git a/Apps/Playground/0.70/android/gradle.properties b/Apps/Playground/0.70/android/gradle.properties
index fa4feae5f..982a0373c 100644
--- a/Apps/Playground/0.70/android/gradle.properties
+++ b/Apps/Playground/0.70/android/gradle.properties
@@ -38,3 +38,6 @@ 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
diff --git a/Apps/Playground/0.71/android/gradle.properties b/Apps/Playground/0.71/android/gradle.properties
index e4af465e8..31c9c7beb 100644
--- a/Apps/Playground/0.71/android/gradle.properties
+++ b/Apps/Playground/0.71/android/gradle.properties
@@ -42,3 +42,6 @@ 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
From 51af5a8c0894344cb5302d676904a0fdd779ceaf Mon Sep 17 00:00:00 2001
From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com>
Date: Tue, 20 Feb 2024 11:10:37 +0100
Subject: [PATCH 07/13] NODE_OPTIONS syntax
---
Apps/PackageTest/0.63.1/android/build.gradle | 2 +-
Apps/PackageTest/0.64.0/android/build.gradle | 2 +-
Apps/PackageTest/0.65.0/android/build.gradle | 2 +-
Apps/PackageTest/0.69.0/android/build.gradle | 2 +-
Apps/Playground/0.64/android/build.gradle | 2 +-
Apps/Playground/0.65/android/build.gradle | 2 +-
Apps/Playground/0.69/android/build.gradle | 2 +-
Apps/Playground/0.70/android/build.gradle | 2 +-
Apps/Playground/0.71/android/build.gradle | 2 +-
.../react-native-windows/windows/scripts/BuildPlayground.bat | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Apps/PackageTest/0.63.1/android/build.gradle b/Apps/PackageTest/0.63.1/android/build.gradle
index f104fb50e..cc45b9e1e 100644
--- a/Apps/PackageTest/0.63.1/android/build.gradle
+++ b/Apps/PackageTest/0.63.1/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.6.0"
+ kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/PackageTest/0.64.0/android/build.gradle b/Apps/PackageTest/0.64.0/android/build.gradle
index f104fb50e..cc45b9e1e 100644
--- a/Apps/PackageTest/0.64.0/android/build.gradle
+++ b/Apps/PackageTest/0.64.0/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.6.0"
+ kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/PackageTest/0.65.0/android/build.gradle b/Apps/PackageTest/0.65.0/android/build.gradle
index b3f70b0d1..7ee9b3273 100644
--- a/Apps/PackageTest/0.65.0/android/build.gradle
+++ b/Apps/PackageTest/0.65.0/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.6.0"
+ kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/PackageTest/0.69.0/android/build.gradle b/Apps/PackageTest/0.69.0/android/build.gradle
index 4580867ad..af6df32ef 100644
--- a/Apps/PackageTest/0.69.0/android/build.gradle
+++ b/Apps/PackageTest/0.69.0/android/build.gradle
@@ -15,7 +15,7 @@ buildscript {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
- kotlinVersion = "1.6.0"
+ kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/Playground/0.64/android/build.gradle b/Apps/Playground/0.64/android/build.gradle
index f104fb50e..cc45b9e1e 100644
--- a/Apps/Playground/0.64/android/build.gradle
+++ b/Apps/Playground/0.64/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.6.0"
+ kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/Playground/0.65/android/build.gradle b/Apps/Playground/0.65/android/build.gradle
index b3f70b0d1..7ee9b3273 100644
--- a/Apps/Playground/0.65/android/build.gradle
+++ b/Apps/Playground/0.65/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.6.0"
+ kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/Playground/0.69/android/build.gradle b/Apps/Playground/0.69/android/build.gradle
index 6b1ba63ce..5b4652689 100644
--- a/Apps/Playground/0.69/android/build.gradle
+++ b/Apps/Playground/0.69/android/build.gradle
@@ -15,7 +15,7 @@ buildscript {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
- kotlinVersion = "1.6.0"
+ kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/Playground/0.70/android/build.gradle b/Apps/Playground/0.70/android/build.gradle
index 238d5c6f6..dca21e8bb 100644
--- a/Apps/Playground/0.70/android/build.gradle
+++ b/Apps/Playground/0.70/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
- kotlinVersion = "1.6.0"
+ kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/Playground/0.71/android/build.gradle b/Apps/Playground/0.71/android/build.gradle
index 66f94caa1..d046030a6 100644
--- a/Apps/Playground/0.71/android/build.gradle
+++ b/Apps/Playground/0.71/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
targetSdkVersion = 30
ndkVersion = "23.1.7779620"
- kotlinVersion = "1.6.0"
+ kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Modules/@babylonjs/react-native-windows/windows/scripts/BuildPlayground.bat b/Modules/@babylonjs/react-native-windows/windows/scripts/BuildPlayground.bat
index 41746e59d..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 --openssl-legacy-provider"
+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
From 0742c39f23273344cfda15fb884ce7e4dc921fb0 Mon Sep 17 00:00:00 2001
From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com>
Date: Tue, 20 Feb 2024 11:44:46 +0100
Subject: [PATCH 08/13] warning mode
---
Apps/PackageTest/0.63.1/android/build.gradle | 1 -
Apps/PackageTest/0.64.0/android/build.gradle | 1 -
Apps/PackageTest/0.65.0/android/build.gradle | 1 -
Apps/PackageTest/0.69.0/android/build.gradle | 1 -
Apps/Playground/0.64/android/build.gradle | 1 -
Apps/Playground/0.65/android/build.gradle | 1 -
Apps/Playground/0.69/android/build.gradle | 1 -
Apps/Playground/0.70/android/build.gradle | 1 -
Apps/Playground/0.71/android/build.gradle | 1 -
Package/gulpfile.js | 2 +-
10 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/Apps/PackageTest/0.63.1/android/build.gradle b/Apps/PackageTest/0.63.1/android/build.gradle
index cc45b9e1e..4ed7aa24c 100644
--- a/Apps/PackageTest/0.63.1/android/build.gradle
+++ b/Apps/PackageTest/0.63.1/android/build.gradle
@@ -7,7 +7,6 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/PackageTest/0.64.0/android/build.gradle b/Apps/PackageTest/0.64.0/android/build.gradle
index cc45b9e1e..4ed7aa24c 100644
--- a/Apps/PackageTest/0.64.0/android/build.gradle
+++ b/Apps/PackageTest/0.64.0/android/build.gradle
@@ -7,7 +7,6 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/PackageTest/0.65.0/android/build.gradle b/Apps/PackageTest/0.65.0/android/build.gradle
index 7ee9b3273..1dcab657e 100644
--- a/Apps/PackageTest/0.65.0/android/build.gradle
+++ b/Apps/PackageTest/0.65.0/android/build.gradle
@@ -7,7 +7,6 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/PackageTest/0.69.0/android/build.gradle b/Apps/PackageTest/0.69.0/android/build.gradle
index af6df32ef..c0ef0a842 100644
--- a/Apps/PackageTest/0.69.0/android/build.gradle
+++ b/Apps/PackageTest/0.69.0/android/build.gradle
@@ -15,7 +15,6 @@ buildscript {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
- kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/Playground/0.64/android/build.gradle b/Apps/Playground/0.64/android/build.gradle
index cc45b9e1e..4ed7aa24c 100644
--- a/Apps/Playground/0.64/android/build.gradle
+++ b/Apps/Playground/0.64/android/build.gradle
@@ -7,7 +7,6 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/Playground/0.65/android/build.gradle b/Apps/Playground/0.65/android/build.gradle
index 7ee9b3273..1dcab657e 100644
--- a/Apps/Playground/0.65/android/build.gradle
+++ b/Apps/Playground/0.65/android/build.gradle
@@ -7,7 +7,6 @@ buildscript {
compileSdkVersion = 33
targetSdkVersion = 33
ndkVersion = "21.4.7075529"
- kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/Playground/0.69/android/build.gradle b/Apps/Playground/0.69/android/build.gradle
index 5b4652689..b0e2d1626 100644
--- a/Apps/Playground/0.69/android/build.gradle
+++ b/Apps/Playground/0.69/android/build.gradle
@@ -15,7 +15,6 @@ buildscript {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
- kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/Playground/0.70/android/build.gradle b/Apps/Playground/0.70/android/build.gradle
index dca21e8bb..54c496777 100644
--- a/Apps/Playground/0.70/android/build.gradle
+++ b/Apps/Playground/0.70/android/build.gradle
@@ -14,7 +14,6 @@ buildscript {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
- kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Apps/Playground/0.71/android/build.gradle b/Apps/Playground/0.71/android/build.gradle
index d046030a6..3bc803b2c 100644
--- a/Apps/Playground/0.71/android/build.gradle
+++ b/Apps/Playground/0.71/android/build.gradle
@@ -8,7 +8,6 @@ buildscript {
targetSdkVersion = 30
ndkVersion = "23.1.7779620"
- kotlinVersion = "1.6.10"
}
repositories {
google()
diff --git a/Package/gulpfile.js b/Package/gulpfile.js
index 452c48237..519d116db 100644
--- a/Package/gulpfile.js
+++ b/Package/gulpfile.js
@@ -90,7 +90,7 @@ const buildIOS = gulp.series(makeXCodeProj, buildIphoneOS, buildIphoneSimulator)
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 makeUWPProjectPlatform = async (name, arch) => {
From e9859dbf9a7d86632f6b69c6aa072a6e21329d4d Mon Sep 17 00:00:00 2001
From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com>
Date: Wed, 29 May 2024 10:36:02 +0200
Subject: [PATCH 09/13] RN 0.69 test
---
.github/workflows/bn_master_commit.yml | 2 +-
.github/workflows/pr.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/bn_master_commit.yml b/.github/workflows/bn_master_commit.yml
index 358c5df59..55b508d84 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:
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 9df38ed31..54b5d03ed 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.69'
jobs:
build-android:
From 62d74257ce1507c89decb8c550dd4a63a05d6714 Mon Sep 17 00:00:00 2001
From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com>
Date: Thu, 30 May 2024 11:06:56 +0200
Subject: [PATCH 10/13] vcxproj clean up
---
Apps/Playground/0.69/windows/Playground/Playground.vcxproj | 7 -------
Apps/Playground/0.70/windows/Playground/Playground.vcxproj | 7 -------
Apps/Playground/0.71/windows/Playground/Playground.vcxproj | 7 -------
.../windows/BabylonReactNative/BabylonReactNative.vcxproj | 7 -------
4 files changed, 28 deletions(-)
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/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/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.
From 505a68e5c2bba9a94ea9b88bff93e68ef112b623 Mon Sep 17 00:00:00 2001
From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com>
Date: Fri, 31 May 2024 09:47:49 +0200
Subject: [PATCH 11/13] test with 0.70 for PR
---
.github/workflows/pr.yml | 2 +-
Apps/Playground/0.70/package-lock.json | 290 +++++++++----------------
Apps/Playground/0.70/package.json | 2 +-
3 files changed, 106 insertions(+), 188 deletions(-)
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 54b5d03ed..dacc5027f 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -4,7 +4,7 @@ on:
branches:
- master
env:
- BRN_Version: '0.69'
+ BRN_Version: '0.70'
jobs:
build-android:
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": {
From 9fcba81b5516d5b279882de0f5b66a5e27f18c79 Mon Sep 17 00:00:00 2001
From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com>
Date: Tue, 24 Sep 2024 14:40:01 +0200
Subject: [PATCH 12/13] test updates/fixes
---
.github/workflows/pr.yml | 12 ---------
.github/workflows/publish.yml | 25 +-----------------
.github/workflows/publish_preview.yml | 26 +------------------
.../Playground/0.69/android/gradle.properties | 3 +++
.../Playground/0.70/android/gradle.properties | 3 +++
Apps/Playground/0.71/android/build.gradle | 8 ++++++
.../Playground/0.71/android/gradle.properties | 3 +++
7 files changed, 19 insertions(+), 61 deletions(-)
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index a1c24f271..8f64db933 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -254,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:
@@ -278,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/Apps/Playground/0.69/android/gradle.properties b/Apps/Playground/0.69/android/gradle.properties
index 982a0373c..78761fbdf 100644
--- a/Apps/Playground/0.69/android/gradle.properties
+++ b/Apps/Playground/0.69/android/gradle.properties
@@ -41,3 +41,6 @@ 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.properties b/Apps/Playground/0.70/android/gradle.properties
index 982a0373c..78761fbdf 100644
--- a/Apps/Playground/0.70/android/gradle.properties
+++ b/Apps/Playground/0.70/android/gradle.properties
@@ -41,3 +41,6 @@ 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.71/android/build.gradle b/Apps/Playground/0.71/android/build.gradle
index 3bc803b2c..a86156694 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.8.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 31c9c7beb..7498bfd61 100644
--- a/Apps/Playground/0.71/android/gradle.properties
+++ b/Apps/Playground/0.71/android/gradle.properties
@@ -45,3 +45,6 @@ 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
From f45907f0a5bd4a10615d2cecef9db401dad2825b Mon Sep 17 00:00:00 2001
From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com>
Date: Tue, 24 Sep 2024 15:28:08 +0200
Subject: [PATCH 13/13] kotlin 1.6.0
---
Apps/Playground/0.70/android/build.gradle | 8 ++++++++
Apps/Playground/0.71/android/build.gradle | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
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.71/android/build.gradle b/Apps/Playground/0.71/android/build.gradle
index a86156694..6fa51d401 100644
--- a/Apps/Playground/0.71/android/build.gradle
+++ b/Apps/Playground/0.71/android/build.gradle
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.8.0'
+ ext.kotlin_version = '1.6.0'
ext {
buildToolsVersion = "30.0.2"
minSdkVersion = 21