@capacitor/cli 7.0.0 → 7.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/android-template.tar.gz +0 -0
- package/assets/capacitor-cordova-android-plugins.tar.gz +0 -0
- package/assets/capacitor-cordova-ios-plugins.tar.gz +0 -0
- package/assets/ios-pods-template.tar.gz +0 -0
- package/assets/ios-spm-template.tar.gz +0 -0
- package/dist/tasks/migrate.js +2 -2
- package/dist/util/spm.js +5 -3
- package/package.json +1 -1
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/dist/tasks/migrate.js
CHANGED
|
@@ -45,8 +45,8 @@ const plugins = [
|
|
|
45
45
|
'@capacitor/text-zoom',
|
|
46
46
|
'@capacitor/toast',
|
|
47
47
|
];
|
|
48
|
-
const coreVersion = '
|
|
49
|
-
const pluginVersion = '
|
|
48
|
+
const coreVersion = '^7.0.0';
|
|
49
|
+
const pluginVersion = '^7.0.0';
|
|
50
50
|
const gradleVersion = '8.11.1';
|
|
51
51
|
let installFailed = false;
|
|
52
52
|
async function migrateCommand(config, noprompt, packagemanager) {
|
package/dist/util/spm.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.generatePackageFile = exports.findPackageSwiftFile = exports.checkPackageManager = void 0;
|
|
4
4
|
const fs_extra_1 = require("fs-extra");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
+
const common_1 = require("../common");
|
|
6
7
|
const log_1 = require("../log");
|
|
7
8
|
async function checkPackageManager(config) {
|
|
8
9
|
const iosDirectory = config.ios.nativeProjectDirAbs;
|
|
@@ -21,7 +22,7 @@ async function generatePackageFile(config, plugins) {
|
|
|
21
22
|
const packageSwiftFile = await findPackageSwiftFile(config);
|
|
22
23
|
try {
|
|
23
24
|
log_1.logger.warn('SPM Support is still experimental');
|
|
24
|
-
const textToWrite = generatePackageText(config, plugins);
|
|
25
|
+
const textToWrite = await generatePackageText(config, plugins);
|
|
25
26
|
(0, fs_extra_1.writeFileSync)(packageSwiftFile, textToWrite);
|
|
26
27
|
}
|
|
27
28
|
catch (err) {
|
|
@@ -29,8 +30,9 @@ async function generatePackageFile(config, plugins) {
|
|
|
29
30
|
}
|
|
30
31
|
}
|
|
31
32
|
exports.generatePackageFile = generatePackageFile;
|
|
32
|
-
function generatePackageText(config, plugins) {
|
|
33
|
+
async function generatePackageText(config, plugins) {
|
|
33
34
|
var _a, _b, _c;
|
|
35
|
+
const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
|
|
34
36
|
const pbx = (0, fs_extra_1.readFileSync)((0, path_1.join)(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj'), 'utf-8');
|
|
35
37
|
const searchString = 'IPHONEOS_DEPLOYMENT_TARGET = ';
|
|
36
38
|
const iosVersion = pbx.substring(pbx.indexOf(searchString) + searchString.length, pbx.indexOf(searchString) + searchString.length + 2);
|
|
@@ -47,7 +49,7 @@ let package = Package(
|
|
|
47
49
|
targets: ["CapApp-SPM"])
|
|
48
50
|
],
|
|
49
51
|
dependencies: [
|
|
50
|
-
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git",
|
|
52
|
+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "${iosPlatformVersion}")`;
|
|
51
53
|
for (const plugin of plugins) {
|
|
52
54
|
const relPath = (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
|
|
53
55
|
packageSwiftText += `,\n .package(name: "${(_a = plugin.ios) === null || _a === void 0 ? void 0 : _a.name}", path: "${relPath}")`;
|
package/package.json
CHANGED