Comparing version 11.0.1 to 11.1.0
{ | ||
"name": "forceios", | ||
"version": "11.0.1", | ||
"version": "11.1.0", | ||
"description": "Utilities for creating mobile apps based on the Salesforce Mobile SDK for iOS", | ||
@@ -5,0 +5,0 @@ "keywords": [ "mobilesdk", "ios", "salesforce", "mobile", "sdk" ], |
@@ -31,3 +31,3 @@ /* | ||
var VERSION= '11.0.1'; | ||
var VERSION= '11.1.0'; | ||
@@ -68,4 +68,4 @@ module.exports = { | ||
platformVersion: { | ||
ios: '6.3.0', | ||
android: '11.0.0' | ||
ios: '7.0.1', | ||
android: '12.0.1' | ||
} | ||
@@ -72,0 +72,0 @@ }, |
@@ -113,19 +113,17 @@ /* | ||
if (config.platform.split(',').indexOf('ios') != -1) { | ||
if (utils.getToolVersion('xcodebuild -version') < 14000000) { | ||
// Use legacy build for xcode 13 and older | ||
useLegacyBuild(config, path.join('platforms', 'ios')); | ||
// Removing libCordova.a from build (it causes issues e.g. CDVWKWebViewEngine won't register as plugin because it won't be recognized as a kind of CDVPlugin) | ||
utils.logInfo('Updating xcode project file'); | ||
var xcodeProjectFile = path.join(config.projectDir,'platforms', 'ios', config.appname + '.xcodeproj', 'project.pbxproj') | ||
var xcodeProjectFileContent = fs.readFileSync(xcodeProjectFile, 'utf8'); | ||
var newXcodeProjectFileContent = xcodeProjectFileContent.split('\n').filter(line => line.indexOf('libCordova.a in Frameworks') == -1).join('\n'); | ||
fs.writeFileSync(xcodeProjectFile, newXcodeProjectFileContent); | ||
utils.logInfo('Updated xcode project file'); | ||
} else { | ||
if (utils.getToolVersion('xcodebuild -version') < 14000000) { | ||
// Use legacy build for xcode 13 and older | ||
useLegacyBuild(config, path.join('platforms', 'ios')); | ||
} else { | ||
// Patch podfile for xcode 14 | ||
fixPods(config, path.join('platforms', 'ios')); | ||
} | ||
} | ||
// Remove libCordova.a from build | ||
utils.logInfo('Updating xcode project file'); | ||
var xcodeProjectFile = path.join(config.projectDir,'platforms', 'ios', config.appname + '.xcodeproj', 'project.pbxproj') | ||
var xcodeProjectFileContent = fs.readFileSync(xcodeProjectFile, 'utf8'); | ||
var newXcodeProjectFileContent = xcodeProjectFileContent.split('\n').filter(line => line.indexOf('libCordova.a in Frameworks') == -1).join('\n'); | ||
fs.writeFileSync(xcodeProjectFile, newXcodeProjectFileContent); | ||
utils.logInfo('Updated xcode project file'); | ||
} | ||
@@ -276,3 +274,3 @@ | ||
for (var toolName of toolNames) { | ||
utils.checkToolVersion(SDK.tools[toolName].checkCmd, SDK.tools[toolName].minVersion, SDK.tools[toolName].maxVersion); | ||
utils.checkToolVersion(SDK.tools[toolName].checkCmd, SDK.tools[toolName].minVersion, SDK.tools[toolName].maxVersion, toolName); | ||
} | ||
@@ -279,0 +277,0 @@ } |
@@ -93,6 +93,7 @@ /* | ||
* @param {String} maxVersionSupported Maximum version supported | ||
* @param {String} toolName Name of tool | ||
* | ||
* @throws {Error} if tool not found or version too low | ||
*/ | ||
function checkToolVersion(cmd, minVersionRequired, maxVersionSupported) { | ||
function checkToolVersion(cmd, minVersionRequired, maxVersionSupported, toolName) { | ||
var toolVersionNum = getToolVersion(cmd); | ||
@@ -102,4 +103,4 @@ var minVersionRequiredNum = getVersionNumberFromString(minVersionRequired); | ||
if (toolVersionNum < minVersionRequiredNum) { | ||
throw new Error('Installed ' + toolName + ' version (' + toolVersion + ') is less than the minimum required version (' | ||
+ minVersionRequired + '). Please update your version of ' + toolName + '.'); | ||
throw new Error('Installed ' + toolName + ' is less than the minimum required version (' | ||
+ minVersionRequired + ').\nPlease upgrade your version of ' + toolName + '.'); | ||
} | ||
@@ -110,4 +111,4 @@ | ||
if (toolVersionNum > maxVersionSupportedNum) { | ||
throw new Error('Installed ' + toolName + ' version (' + toolVersion + ') is more than the maximum supported version (' | ||
+ maxVersionSupported + '). Please downgrade your version of ' + toolName + '.'); | ||
throw new Error('Installed ' + toolName + ' is more than the maximum supported version (' | ||
+ maxVersionSupported + ').\nPlease downgrade your version of ' + toolName + '.'); | ||
} | ||
@@ -114,0 +115,0 @@ } |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
2497
109796