Skip to content

Commit 5a97b42

Browse files
ItsChaceDItsChaceD
committed
resolve merge conflicts
2 parents 4c5b99d + 1a4e989 commit 5a97b42

File tree

22 files changed

+43
-43
lines changed

22 files changed

+43
-43
lines changed

‎.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-
});

‎action-sheet/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let package = Package(
1010
targets: ["ActionSheetPlugin"])
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
13+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0-beta")
1414
],
1515
targets: [
1616
.target(

‎app-launcher/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let package = Package(
1010
targets: ["AppLauncherPlugin"])
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
13+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0-beta")
1414
],
1515
targets: [
1616
.target(

‎app/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let package = Package(
1010
targets: ["AppPlugin"])
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
13+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0-beta")
1414
],
1515
targets: [
1616
.target(

‎browser/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let package = Package(
1010
targets: ["BrowserPlugin"])
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
13+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0-beta")
1414
],
1515
targets: [
1616
.target(

‎camera/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let package = Package(
1010
targets: ["CameraPlugin"])
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
13+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0-beta")
1414
],
1515
targets: [
1616
.target(

‎clipboard/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let package = Package(
1010
targets: ["ClipboardPlugin"])
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
13+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0-beta")
1414
],
1515
targets: [
1616
.target(

‎device/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let package = Package(
1010
targets: ["DevicePlugin"])
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
13+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0-beta")
1414
],
1515
targets: [
1616
.target(

‎dialog/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let package = Package(
1010
targets: ["DialogPlugin"])
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
13+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0-beta")
1414
],
1515
targets: [
1616
.target(

0 commit comments

Comments
 (0)