Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix newer versions of cordova-android #78

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix newer versions of cordova-android #78

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aef3f1f
Fix newer versions of cordova-android
joseph-montanez Jun 17, 2022
db9fc7a
missing script var
joseph-montanez Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions src/add-swift-support.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,27 +188,36 @@ const getBridgingHeaderPath = (projectPath, iosPlatformVersion) => {
return bridgingHeaderPath;
};


const getPlatformVersionsFromFileSystem = (context, projectRoot) => {
const cordovaUtil = context.requireCordovaModule('cordova-lib/src/cordova/util');
const platformsOnFs = cordovaUtil.listPlatforms(projectRoot);
const platformVersions = platformsOnFs.map(platform => {
const script = path.join(projectRoot, 'platforms', platform, 'cordova', 'version');
return new Promise((resolve, reject) => {
childProcess.exec('"' + script + '"', {}, (error, stdout, _) => {
if (error) {
reject(error);
return;
}
resolve(stdout.trim());
if (platform === 'ios') {
return new Promise((resolve, reject) => {
const script = path.join(projectRoot, 'platforms', platform, 'cordova', 'version');
childProcess.exec('"' + script + '"', {}, (error, stdout, _) => {
if (error) {
reject(error);
return;
}
resolve(stdout.trim());
});
}).then(result => {
const version = result.replace(/\r?\n|\r/g, '');
return { platform, version };
}, (error) => {
console.log(error);
process.exit(1);
});
}).then(result => {
const version = result.replace(/\r?\n|\r/g, '');
return { platform, version };
}, (error) => {
console.log(error);
process.exit(1);
});
} else {
return new Promise((resolve, reject) => {
//-- Version is ignored if not iOS so getting the version doesn't apply
resolve({ platform, version: "" });
});
}
});

return Promise.all(platformVersions);
};