Skip to content

Commit 97ba0af

Browse files
authored
chore: bump react-native to 0.85 (#2742)
1 parent b1758a6 commit 97ba0af

14 files changed

Lines changed: 1675 additions & 1473 deletions

File tree

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
name: Create React Native Test App
22
description: Initializes a new test app
33
inputs:
4-
platform:
5-
description: The platform to create a test app for
4+
arguments:
65
required: true
76
runs:
87
using: composite
98
steps:
9+
- name: Disable minimum age gate
10+
run: |
11+
yarn config unset npmMinimalAgeGate
12+
shell: bash
1013
- name: Install
1114
run: |
12-
scripts/install-test-template.sh ${{ inputs.platform }}
15+
scripts/install-test-template.sh --version highest ${{ inputs.arguments }}
1316
shell: bash
1417
- name: Initialize a new app
1518
run: |
16-
if [[ ${{ inputs.platform }} == "all" ]]; then
17-
yarn init-test-app --destination test-app --name TestApp -p android -p ios -p macos -p visionos -p windows
18-
else
19-
yarn init-test-app --destination test-app --name TestApp --platform ${{ inputs.platform }}
20-
fi
19+
yarn init-test-app --destination test-app --name TestApp ${{ inputs.arguments }}
2120
shell: bash
2221
working-directory: template-example

.github/actions/setup-toolchain/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,16 @@ runs:
6868
jdks
6969
- name: Set up MSBuild
7070
if: ${{ inputs.platform == 'windows' }}
71-
uses: microsoft/setup-msbuild@v2
71+
uses: microsoft/setup-msbuild@v3
7272
- name: Set up Ruby
7373
if: ${{ runner.os != 'Windows' }}
7474
uses: ruby/setup-ruby@v1
7575
with:
76-
ruby-version: "3.2.3"
76+
ruby-version: "3.3.11"
7777
bundler: Gemfile.lock
7878
bundler-cache: true
7979
- name: Set up Node.js
80-
uses: actions/setup-node@v6.3.0
80+
uses: actions/setup-node@v6
8181
with:
8282
node-version: ${{ inputs.node-version }}
8383
cache: ${{ inputs.cache-npm-dependencies }}

.github/renovate.json

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"packageRules": [
55
{
66
"groupName": "@react-native-community/cli",
7-
"allowedVersions": "^20.0.0",
7+
"allowedVersions": "^20.1.0",
88
"matchPackageNames": ["@react-native-community/cli**"]
99
},
1010
{
@@ -23,7 +23,7 @@
2323
},
2424
{
2525
"groupName": "Metro",
26-
"allowedVersions": "^0.82.0",
26+
"allowedVersions": "^0.84.0",
2727
"matchSourceUrls": ["https://github.com/facebook/metro{/,}**"]
2828
},
2929
{
@@ -39,23 +39,31 @@
3939
]
4040
},
4141
{
42-
"groupName": "react",
43-
"matchPackageNames": ["@types/react", "react"],
44-
"allowedVersions": "~19.1.0"
42+
"matchPackageNames": ["react"],
43+
"enabled": false
4544
},
4645
{
4746
"groupName": "react-native",
4847
"matchPackageNames": [
49-
"@callstack/react-native-visionos",
5048
"@react-native-community/template",
49+
"@react-native/**",
50+
"react-native"
51+
],
52+
"allowedVersions": "^0.85.0"
53+
},
54+
{
55+
"groupName": "react-native-macos",
56+
"matchPackageNames": [
5157
"@react-native-mac/**",
5258
"@react-native-macos/**",
53-
"@react-native/**",
54-
"react-native",
55-
"react-native-macos",
56-
"react-native-windows"
59+
"react-native-macos"
5760
],
5861
"allowedVersions": "^0.81.0"
62+
},
63+
{
64+
"groupName": "react-native-windows",
65+
"matchPackageNames": ["@react-native-windows/**", "react-native-windows"],
66+
"allowedVersions": "^0.82.0"
5967
}
6068
],
6169
"postUpdateOptions": ["yarnDedupeHighest"],

.github/workflows/build.yml

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,6 @@ jobs:
212212
ios-template:
213213
name: "iOS [template]"
214214
permissions: {}
215-
strategy:
216-
matrix:
217-
template: [all, ios]
218215
runs-on: macos-15
219216
if: ${{ github.event_name != 'schedule' }}
220217
steps:
@@ -233,7 +230,7 @@ jobs:
233230
- name: Initialize test app
234231
uses: ./.github/actions/init-test-app
235232
with:
236-
platform: ${{ matrix.template }}
233+
arguments: -p android -p ios
237234
- name: Bundle JavaScript
238235
run: |
239236
yarn build:ios
@@ -310,7 +307,6 @@ jobs:
310307
permissions: {}
311308
strategy:
312309
matrix:
313-
template: [all, android]
314310
runner: [ubuntu-24.04, windows-2025]
315311
runs-on: ${{ matrix.runner }}
316312
if: ${{ github.event_name != 'schedule' }}
@@ -326,7 +322,7 @@ jobs:
326322
- name: Initialize test app
327323
uses: ./.github/actions/init-test-app
328324
with:
329-
platform: ${{ matrix.template }}
325+
arguments: -p android -p ios
330326
- name: Bundle JavaScript
331327
run: |
332328
yarn build:android
@@ -405,9 +401,6 @@ jobs:
405401
macos-template:
406402
name: "macOS [template]"
407403
permissions: {}
408-
strategy:
409-
matrix:
410-
template: [all, macos]
411404
runs-on: macos-15
412405
if: ${{ github.event_name != 'schedule' }}
413406
steps:
@@ -426,7 +419,7 @@ jobs:
426419
- name: Initialize test app
427420
uses: ./.github/actions/init-test-app
428421
with:
429-
platform: ${{ matrix.template }}
422+
arguments: -p macos
430423
- name: Bundle JavaScript
431424
run: |
432425
yarn build:macos
@@ -502,9 +495,6 @@ jobs:
502495
visionos-template:
503496
name: "visionOS [template]"
504497
permissions: {}
505-
strategy:
506-
matrix:
507-
template: [all, visionos]
508498
runs-on: macos-15
509499
if: false # visionOS temporarily disabled until releases are resumed
510500
steps:
@@ -523,7 +513,7 @@ jobs:
523513
- name: Initialize test app
524514
uses: ./.github/actions/init-test-app
525515
with:
526-
platform: ${{ matrix.template }}
516+
arguments: -p visionos
527517
- name: Bundle JavaScript
528518
run: |
529519
yarn build:visionos
@@ -636,9 +626,6 @@ jobs:
636626
permissions: {}
637627
runs-on: windows-2025
638628
if: ${{ github.event_name != 'schedule' }}
639-
strategy:
640-
matrix:
641-
template: [all, windows]
642629
steps:
643630
- name: Checkout
644631
uses: actions/checkout@v6
@@ -653,7 +640,7 @@ jobs:
653640
- name: Initialize test app
654641
uses: ./.github/actions/init-test-app
655642
with:
656-
platform: ${{ matrix.template }}
643+
arguments: -p windows --version 0.82.1
657644
- name: Bundle JavaScript
658645
run: |
659646
yarn build:windows
@@ -775,7 +762,7 @@ jobs:
775762
runs-on: ubuntu-24.04
776763
steps:
777764
- name: Label
778-
uses: actions/labeler@v6.0.1
765+
uses: actions/labeler@v6
779766
with:
780767
repo-token: ${{ secrets.GITHUB_TOKEN }}
781768
sync-labels: true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ local.properties
2424
node_modules/
2525
!test/__fixtures__/**/node_modules/
2626
package-lock.json
27+
packages/app/android/support/build/
2728
packages/app/example/Screenshot-*.png
2829
packages/example-*/*/.xcode.env
2930
packages/example-*/*/DerivedData/

package.json

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,6 @@
6969
"@nx/devkit/minimatch": "^10.2.4",
7070
"@nx/js/picomatch": "^4.0.2",
7171
"@nx/workspace/picomatch": "^4.0.2",
72-
"@react-native-community/cli": "^20.0.0",
73-
"@react-native-community/cli-platform-android": "^20.0.0",
74-
"@react-native-community/cli-platform-apple": "^20.0.0",
75-
"@react-native-community/cli-platform-ios": "^20.0.0",
76-
"@react-native-mac/virtualized-lists": "^0.81.0",
77-
"@react-native/assets-registry": "^0.81.0",
78-
"@react-native/codegen": "^0.81.0",
79-
"@react-native/community-cli-plugin": "^0.81.0",
80-
"@react-native/community-cli-plugin/@react-native-community/cli-server-api": "^20.0.0",
81-
"@react-native/community-cli-plugin/@react-native-community/cli-tools": "^20.0.0",
82-
"@react-native/gradle-plugin": "^0.81.0",
83-
"@react-native/js-polyfills": "^0.81.0",
84-
"@react-native/normalize-colors": "^0.81.0",
85-
"@react-native/virtualized-lists": "^0.81.0",
8672
"appium/ajv": "~8.18.0",
8773
"appium/axios": "^1.13.6",
8874
"appium/lodash": "^4.17.23",
@@ -95,7 +81,9 @@
9581
"babel-jest": "ignore:",
9682
"compression/bytes": "^3.1.2",
9783
"nx/minimatch": "^10.2.4",
98-
"react-native-windows/metro-source-map": "^0.83.1",
84+
"react-native-windows/@react-native-community/cli": "^20.0.0",
85+
"react-native-windows/@react-native-community/cli-platform-android": "^20.0.0",
86+
"react-native-windows/@react-native-community/cli-platform-ios": "^20.0.0",
9987
"safe-buffer": "~5.2.1",
10088
"simple-plist/bplist-creator": "~0.1.0",
10189
"simple-plist/bplist-parser": "~0.3.1"

packages/app/example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)