forcereact
Advanced tools
Comparing version 7.2.0 to 7.3.0
{ | ||
"name": "forcereact", | ||
"version": "7.2.0", | ||
"version": "7.3.0", | ||
"description": "Utilities for creating react native mobile apps based on the Salesforce Mobile SDK for iOS and Android", | ||
@@ -26,3 +26,3 @@ "keywords": [ | ||
"dependencies": { | ||
"@oclif/dev-cli": "^1.22.0", | ||
"@oclif/dev-cli": "^1.22.2", | ||
"shelljs": "0.8.3" | ||
@@ -29,0 +29,0 @@ }, |
@@ -31,3 +31,3 @@ /* | ||
var VERSION= '7.2.0'; | ||
var VERSION= '7.3.0'; | ||
@@ -52,4 +52,4 @@ module.exports = { | ||
checkCmd: 'pod --version', | ||
minVersion: '1.2', | ||
maxVersion: '1.6' | ||
minVersion: '1.7', | ||
maxVersion: '1.8' | ||
}, | ||
@@ -183,3 +183,3 @@ cordova: { | ||
error: cli => val => '\'' + val + '\' is not a valid package name.', | ||
validate: cli => val => /^[a-z]+[a-z0-9_]*(\.[a-z]+[a-z0-9_]*)*$/.test(val), | ||
validate: cli => val => /^[a-z]+[a-z0-9_]*(\.[a-z]+[a-z0-9_-]*)*$/.test(val), | ||
type: 'string' | ||
@@ -186,0 +186,0 @@ }, |
@@ -47,2 +47,7 @@ /* | ||
if (config.platform === 'ios' && config.apptype === 'react_native') { | ||
// Use legacy build | ||
useLegacyBuild(config, 'ios'); | ||
} | ||
// Cleanup | ||
@@ -88,16 +93,4 @@ utils.removeFile(path.join(config.projectDir, 'template.js')); | ||
if (config.platform === 'ios') { | ||
var xcSettingsDir = path.join(config.projectDir,'platforms', 'ios', config.appname + '.xcworkspace', 'xcshareddata') | ||
var xcSettingsFile = path.join(xcSettingsDir, 'WorkspaceSettings.xcsettings'); | ||
var plistFileContent = '<?xml version="1.0" encoding="UTF-8"?>\n' + | ||
'<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n' + | ||
'<plist version="1.0">\n' + | ||
'<dict>\n' + | ||
'<key>BuildSystemType</key>\n' + | ||
'<string>Original</string>\n' + | ||
'</dict>\n' + | ||
'</plist>\n'; | ||
utils.logInfo('Creating WorkspaceSettings.xcsettings for project. Setting the BuildSystemType to original in ' + xcSettingsFile); | ||
utils.mkDirIfNeeded(xcSettingsDir) | ||
fs.writeFileSync(xcSettingsFile,plistFileContent,'utf8'); | ||
utils.logInfo('Created WorkspaceSettings.xcsettings for project ' + config.appname); | ||
// Use legacy build | ||
useLegacyBuild(config, path.join('platforms', 'ios')); | ||
@@ -119,2 +112,22 @@ // 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) | ||
// | ||
// Use legacy build system in XCode | ||
// | ||
function useLegacyBuild(config, iosSubDir) { | ||
var xcSettingsDir = path.join(config.projectDir, iosSubDir, config.appname + '.xcworkspace', 'xcshareddata') | ||
var xcSettingsFile = path.join(xcSettingsDir, 'WorkspaceSettings.xcsettings'); | ||
var plistFileContent = '<?xml version="1.0" encoding="UTF-8"?>\n' + | ||
'<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n' + | ||
'<plist version="1.0">\n' + | ||
'<dict>\n' + | ||
'<key>BuildSystemType</key>\n' + | ||
'<string>Original</string>\n' + | ||
'</dict>\n' + | ||
'</plist>\n'; | ||
utils.logInfo('Creating WorkspaceSettings.xcsettings for project. Setting the BuildSystemType to original in ' + xcSettingsFile); | ||
utils.mkDirIfNeeded(xcSettingsDir) | ||
fs.writeFileSync(xcSettingsFile,plistFileContent,'utf8'); | ||
utils.logInfo('Created WorkspaceSettings.xcsettings for project ' + config.appname); | ||
} | ||
// | ||
// Print details | ||
@@ -121,0 +134,0 @@ // |
77920
1634
Updated@oclif/dev-cli@^1.22.2