Skip to content

Commit 9f8d90f

Browse files
authored
Merge branch 'main' into add-app-language-getters
2 parents 3d00a29 + 34c17a5 commit 9f8d90f

1,040 files changed

Lines changed: 6284 additions & 49416 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/changed-packages/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ outputs:
88
paths:
99
description: An array of relative paths to packages that were changed
1010
runs:
11-
using: node12
11+
using: node20
1212
main: main.js

.github/actions/changed-packages/main.js

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
require = require('esm')(module);
2-
31
const { relative, resolve } = require('path');
4-
const core = require('@actions/core')
2+
const core = require('@actions/core');
3+
4+
(async () => {
5+
const { root } = await import('../../../scripts/lib/repo.mjs');
6+
const { execute } = await import('../../../scripts/lib/cli.mjs');
7+
const { ls } = await import('../../../scripts/lib/lerna.mjs');
58

6-
const { root } = require('../../../scripts/lib/repo.mjs');
7-
const { execute } = require('../../../scripts/lib/cli.mjs');
8-
const { ls } = require('../../../scripts/lib/lerna.mjs');
9+
execute(async () => {
10+
const files = JSON.parse(core.getInput('files', '[]')).map(f => resolve(root, f));
11+
const packages = await ls();
12+
const changedPackages = packages.filter(pkg => files.some(f => f.startsWith(pkg.location)));
13+
const paths = JSON.stringify(changedPackages.map(pkg => relative(root, pkg.location)));
914

10-
execute(async () => {
11-
const files = JSON.parse(core.getInput('files', '[]')).map(f => resolve(root, f));
12-
const packages = await ls();
13-
const changedPackages = packages.filter(pkg => files.some(f => f.startsWith(pkg.location)));
14-
const paths = JSON.stringify(changedPackages.map(pkg => relative(root, pkg.location)));
15+
core.info(`Changed package paths: ${paths}`);
16+
core.setOutput('paths', paths);
17+
});
18+
})();
1519

16-
core.info(`Changed package paths: ${paths}`);
17-
core.setOutput('paths', paths);
18-
});

.github/actions/filter-out-non-e2e-enabled/action.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.github/actions/filter-out-non-e2e-enabled/main.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/bot.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tasks:
88
comment: |
99
This issue needs more information before it can be addressed.
1010
In particular, the reporter needs to provide a minimal sample app that demonstrates the issue.
11-
If no sample app is provided within 15 days, the issue will be closed.
11+
If no sample app is provided within 7 days, the issue will be closed.
1212
1313
Please see the Contributing Guide for [how to create a Sample App](https://github.com/ionic-team/capacitor/blob/HEAD/CONTRIBUTING.md#creating-a-code-reproduction).
1414
@@ -32,16 +32,3 @@ tasks:
3232
on:
3333
issues:
3434
types: [opened, edited]
35-
- name: assign-to-project
36-
on:
37-
issues:
38-
types: [opened]
39-
pull_request:
40-
types: [opened]
41-
condition: |-
42-
(await getTeamMembers('capacitor')).includes(payload.sender.login)
43-
config:
44-
columns:
45-
issue: 10495656
46-
pr: 10495659
47-
draft-pr: 10495658

.github/workflows/bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: ${{ github.event_name }}/${{ github.event.action }}
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v5
1717
- uses: ionic-team/bot@main
1818
with:
1919
repo-token: ${{ secrets.BOT_TOKEN }}

.github/workflows/ci.yml

Lines changed: 35 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313
strategy:
1414
matrix:
15-
os: [ubuntu-latest, macos-13]
15+
os: [ubuntu-latest, macos-15]
1616
timeout-minutes: 30
1717
outputs:
1818
plugins: ${{ steps.packages.outputs.paths }}
@@ -22,15 +22,13 @@ jobs:
2222
with:
2323
access_token: ${{ secrets.GITHUB_TOKEN }}
2424
- name: Get Latest
25-
uses: actions/setup-node@v3
25+
uses: actions/setup-node@v6
2626
with:
27-
node-version: 18.x
28-
- name: NPM ^9.5.0
29-
run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
30-
- uses: actions/checkout@v3
27+
node-version: 22
28+
- uses: actions/checkout@v5
3129
- name: Restore Dependency Cache
3230
id: cache-modules
33-
uses: actions/cache@v3
31+
uses: actions/cache@v4
3432
with:
3533
path: |
3634
node_modules
@@ -48,23 +46,21 @@ jobs:
4846
- id: packages
4947
uses: ./.github/actions/changed-packages
5048
with:
51-
files: ${{ steps.catjson.outputs.FILES_JSON }}
49+
files: ${{ steps.catjson.outputs.FILES_JSON }}
5250

5351
lint-scripts:
54-
runs-on: macos-13
52+
runs-on: macos-15
5553
timeout-minutes: 30
5654
needs:
5755
- setup
5856
steps:
59-
- uses: actions/setup-node@v3
57+
- uses: actions/setup-node@v6
6058
with:
61-
node-version: 18.x
62-
- name: NPM ^9.5.0
63-
run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
64-
- uses: actions/checkout@v3
59+
node-version: 22
60+
- uses: actions/checkout@v5
6561
- name: Restore Dependency Cache
6662
id: cache-modules
67-
uses: actions/cache@v3
63+
uses: actions/cache@v4
6864
with:
6965
path: |
7066
node_modules
@@ -74,7 +70,7 @@ jobs:
7470
- run: npm run lint
7571

7672
lint:
77-
runs-on: macos-13
73+
runs-on: macos-15
7874
timeout-minutes: 30
7975
needs:
8076
- setup
@@ -84,15 +80,13 @@ jobs:
8480
matrix:
8581
plugin: ${{ fromJson(needs.setup.outputs.plugins) }}
8682
steps:
87-
- uses: actions/setup-node@v3
83+
- uses: actions/setup-node@v6
8884
with:
89-
node-version: 18.x
90-
- name: NPM ^9.5.0
91-
run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
92-
- uses: actions/checkout@v3
85+
node-version: 22
86+
- uses: actions/checkout@v5
9387
- name: Restore Dependency Cache
9488
id: cache-modules
95-
uses: actions/cache@v3
89+
uses: actions/cache@v4
9690
with:
9791
path: |
9892
node_modules
@@ -103,7 +97,7 @@ jobs:
10397
working-directory: ${{ matrix.plugin }}
10498

10599
verify-ios:
106-
runs-on: macos-13
100+
runs-on: macos-15
107101
if: needs.setup.outputs.plugins != '[]'
108102
timeout-minutes: 30
109103
needs:
@@ -113,19 +107,19 @@ jobs:
113107
strategy:
114108
matrix:
115109
xcode:
116-
- /Applications/Xcode_15.0.app
110+
- /Applications/Xcode_26.0.app
117111
plugin: ${{ fromJson(needs.setup.outputs.plugins) }}
118112
steps:
119113
- run: sudo xcode-select --switch ${{ matrix.xcode }}
120-
- uses: actions/setup-node@v3
114+
- run: xcrun simctl list > /dev/null
115+
- run: xcodebuild -downloadPlatform iOS
116+
- uses: actions/setup-node@v6
121117
with:
122-
node-version: 18.x
123-
- name: NPM ^9.5.0
124-
run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
125-
- uses: actions/checkout@v3
118+
node-version: 22
119+
- uses: actions/checkout@v5
126120
- name: Restore Dependency Cache
127121
id: cache-modules
128-
uses: actions/cache@v3
122+
uses: actions/cache@v4
129123
with:
130124
path: |
131125
node_modules
@@ -147,20 +141,18 @@ jobs:
147141
matrix:
148142
plugin: ${{ fromJson(needs.setup.outputs.plugins) }}
149143
steps:
150-
- uses: actions/setup-node@v3
144+
- uses: actions/setup-node@v6
151145
with:
152-
node-version: 18.x
153-
- name: set up JDK 17
154-
uses: actions/setup-java@v3
146+
node-version: 22
147+
- name: set up JDK 21
148+
uses: actions/setup-java@v5
155149
with:
156-
java-version: '17'
150+
java-version: '21'
157151
distribution: 'zulu'
158-
- name: NPM ^9.5.0
159-
run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
160-
- uses: actions/checkout@v3
152+
- uses: actions/checkout@v5
161153
- name: Restore Dependency Cache
162154
id: cache-modules
163-
uses: actions/cache@v3
155+
uses: actions/cache@v4
164156
with:
165157
path: |
166158
node_modules
@@ -183,15 +175,13 @@ jobs:
183175
matrix:
184176
plugin: ${{ fromJson(needs.setup.outputs.plugins) }}
185177
steps:
186-
- uses: actions/setup-node@v3
178+
- uses: actions/setup-node@v6
187179
with:
188-
node-version: 18.x
189-
- name: NPM ^9.5.0
190-
run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
191-
- uses: actions/checkout@v3
180+
node-version: 22
181+
- uses: actions/checkout@v5
192182
- name: Restore Dependency Cache
193183
id: cache-modules
194-
uses: actions/cache@v3
184+
uses: actions/cache@v4
195185
with:
196186
path: |
197187
node_modules

.github/workflows/dev-releases-for-pr.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
with:
2424
access_token: ${{ secrets.GITHUB_TOKEN }}
2525
- name: Get Latest
26-
uses: actions/setup-node@v3
26+
uses: actions/setup-node@v6
2727
with:
28-
node-version: 18.18.0
29-
- uses: actions/checkout@v3
28+
node-version: 22
29+
- uses: actions/checkout@v5
3030
- name: Restore Dependency Cache
3131
id: cache-modules
32-
uses: actions/cache@v3
32+
uses: actions/cache@v4
3333
with:
3434
path: |
3535
node_modules
@@ -61,13 +61,13 @@ jobs:
6161
matrix:
6262
plugin: ${{ fromJson(needs.setup.outputs.plugins) }}
6363
steps:
64-
- uses: actions/setup-node@v3
64+
- uses: actions/setup-node@v6
6565
with:
66-
node-version: 18.18.0
67-
- uses: actions/checkout@v3
66+
node-version: 22
67+
- uses: actions/checkout@v5
6868
- name: Restore Dependency Cache
6969
id: cache-modules
70-
uses: actions/cache@v3
70+
uses: actions/cache@v4
7171
with:
7272
path: |
7373
node_modules

0 commit comments

Comments
 (0)