From b7e5bd32f7727d202801d45ce4268339f7cfd4df Mon Sep 17 00:00:00 2001 From: jcesarmobile Date: Tue, 8 Sep 2020 19:25:20 +0200 Subject: [PATCH] fix(cli): replace SDK variables with default values on Cordova plugins --- cli/src/ios/update.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/cli/src/ios/update.ts b/cli/src/ios/update.ts index 404e4f3453..66c297c1d4 100644 --- a/cli/src/ios/update.ts +++ b/cli/src/ios/update.ts @@ -4,7 +4,7 @@ import { convertToUnixPath, copySync, readFileAsync, readFileSync, removeSync, w import { Config } from '../config'; import { join, relative, resolve } from 'path'; import { realpathSync } from 'fs'; -import { Plugin, PluginType, getFilePath, getPlatformElement, getPluginType, getPlugins, printPlugins } from '../plugin'; +import { Plugin, PluginType, getAllElements, getFilePath, getPlatformElement, getPluginType, getPlugins, printPlugins } from '../plugin'; import { checkAndInstallDependencies, handleCordovaPluginsJS, logCordovaManualSteps } from '../cordova'; @@ -132,6 +132,7 @@ async function generateCordovaPodspec(cordovaPlugins: Plugin[], config: Config, let sourceFrameworks: Array = []; let frameworkDeps: Array = []; let compilerFlags: Array = []; + let prefsArray: Array = []; let name = 'CordovaPlugins'; let sourcesFolderName = 'sources'; if (isStatic) { @@ -174,6 +175,7 @@ async function generateCordovaPodspec(cordovaPlugins: Plugin[], config: Config, } } }); + prefsArray = prefsArray.concat(getAllElements(plugin, platform, 'preference')); const podspecs = getPlatformElement(plugin, platform, 'podspec'); podspecs.map((podspec: any) => { podspec.pods.map((pods: any) => { @@ -234,7 +236,8 @@ async function generateCordovaPodspec(cordovaPlugins: Plugin[], config: Config, sna.source_files = 'noarc/**/*.{swift,h,m,c,cc,mm,cpp}' end`); } - const frameworksString = frameworkDeps.join('\n '); + let frameworksString = frameworkDeps.join('\n '); + frameworksString = await replaceFrameworkVariables(config, prefsArray, frameworksString); const content = ` Pod::Spec.new do |s| s.name = '${name}' @@ -360,3 +363,10 @@ async function getPluginsTask(config: Config) { return iosPlugins; }); } + +async function replaceFrameworkVariables(config: Config, prefsArray: Array, frameworkString: string) { + prefsArray.map((preference: any) => { + frameworkString = frameworkString.replace(new RegExp(('$' + preference.$.name).replace('$', '\\$&'), 'g'), preference.$.default); + }); + return frameworkString; +}