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(cordova): replace Firebase import objective-c files #1716

Merged
merged 1 commit into from
Jun 27, 2019
Merged

fix(cordova): replace Firebase import objective-c files #1716

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 6 additions & 22 deletions cli/src/ios/update.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,6 @@ export const updateIOSChecks: CheckFunction[] = [checkCocoaPods, checkIOSProject
const platform = 'ios';

export async function updateIOS(config: Config) {
/*
var chalk = require('chalk');
log(`\n${chalk.bold('iOS Note:')} you should periodically run "pod repo update" to make sure your ` +
`local Pod repo is up to date and can find new Pod releases.\n`);
*/


/*
var answers = await inquirer.prompt([{
type: 'input',
name: 'updateRepo',
message: `Run "pod repo update" to make sure you have the latest Pods available before updating (takes a few minutes)?`,
default: 'n'
}]);

if (answers.updateRepo === 'y') {
await runTask(`Running pod repo update to update CocoaPods`, () => {
return runCommand(`pod repo update`);
});
}
*/

let plugins = await getPluginsTask(config);

Expand Down Expand Up @@ -287,10 +266,15 @@ function copyPluginsNativeFiles(config: Config, cordovaPlugins: Plugin[]) {
const filePath = getFilePath(config, p, codeFile.$.src);
const fileDest = join(pluginsPath, destFolder, p.name, fileName);
copySync(filePath, fileDest);
let fileContent = readFileSync(fileDest, 'utf8');
if (fileExt === "swift") {
let fileContent = readFileSync(fileDest, 'utf8');
fileContent = 'import Cordova\n' + fileContent;
writeFileSync(fileDest, fileContent, 'utf8');
} else {
if (fileContent.includes('@import Firebase;')){
fileContent = fileContent.replace('@import Firebase;', '#import <Firebase/Firebase.h>');
writeFileSync(fileDest, fileContent, 'utf8');
}
}
});
const resourceFiles = getPlatformElement(p, platform, 'resource-file');
Expand Down