forceios 11.0.0 → 11.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "forceios",
-    "version": "11.0.0",
+    "version": "11.1.0",
     "description": "Utilities for creating mobile apps based on the Salesforce Mobile SDK for iOS",
     "keywords": [ "mobilesdk", "ios", "salesforce", "mobile", "sdk" ],
     "homepage": "https://github.com/forcedotcom/SalesforceMobileSDK-iOS",

package/shared/constants.js

@@ -28,7 +28,7 @@
 var path = require('path'),
     shelljs = require('shelljs');
 
-var VERSION= '11.0.0';
+var VERSION= '11.1.0';
 
 module.exports = {
     version: VERSION,
@@ -64,8 +64,8 @@ module.exports = {
             minVersion: '12.0.0',
              pluginRepoUri: 'salesforce-mobilesdk-cordova-plugin@v' + VERSION, // GA
             platformVersion: {
-                ios: '6.3.0',
-                android: '11.0.0'
+                ios: '7.0.1',
+                android: '12.0.1'
             }
         },
         sfdx: {

package/shared/createHelper.js

@@ -110,23 +110,21 @@ function createHybridApp(config) {
     utils.runProcessThrowError('cordova prepare', config.projectDir);
 
     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');
     }
    
     // Done
@@ -272,7 +270,7 @@ function checkTools(toolNames) {
     try {
         utils.log("Checking tools");
         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);
         }
     }
     catch (error) {

package/shared/utils.js

@@ -90,23 +90,24 @@ function getVersionNumberFromString(versionString) {
  * @param {String} cmd Command to run to get the tool version
  * @param {String} minVersionRequired Minimum version required
  * @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);
     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 + '.');
     }
 
     if (maxVersionSupported) {
         var maxVersionSupportedNum = getVersionNumberFromString(maxVersionSupported);
         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 + '.');
         }
     }
 }