diff --git a/hooks/afterCompile.js b/hooks/afterPrepare.js similarity index 89% rename from hooks/afterCompile.js rename to hooks/afterPrepare.js index 969d328d..3a8420c2 100644 --- a/hooks/afterCompile.js +++ b/hooks/afterPrepare.js @@ -4,7 +4,7 @@ 'use strict' var configPrefrences = require('./lib/sdk/configXml.js') var iosPlist = require('./lib/ios/plist.js') - var iosPreferences = require('./lib/ios/preferences.js') + var iosCapabilities = require('./lib/ios/capabilities.js') var iosAssociatedDomains = require('./lib/ios/associatedDomains.js') var iosDevelopmentTeam = require('./lib/ios/developmentTeam.js') var androidManifest = require('./lib/android/androidManifest.js') @@ -25,7 +25,7 @@ } if (platform === IOS) { iosPlist.addBranchSettings(preferences) - iosPreferences.enableAssociatedDomains(preferences) + iosCapabilities.enableAssociatedDomains(preferences) iosAssociatedDomains.addAssociatedDomains(preferences) iosDevelopmentTeam.addDevelopmentTeam(context, preferences) } diff --git a/hooks/lib/ios/preferences.js b/hooks/lib/ios/capabilities.js similarity index 84% rename from hooks/lib/ios/preferences.js rename to hooks/lib/ios/capabilities.js index 9756c918..7613f83a 100755 --- a/hooks/lib/ios/preferences.js +++ b/hooks/lib/ios/capabilities.js @@ -28,7 +28,6 @@ var configurations = removeComments(xcodeProject.pbxXCBuildConfigurationSection()) var config var buildSettings - var deploymentTargetIsUpdated for (config in configurations) { buildSettings = configurations[config].buildSettings @@ -39,30 +38,17 @@ var buildDeploymentTarget = buildSettings.IPHONEOS_DEPLOYMENT_TARGET.toString() if (compare(buildDeploymentTarget, IOS_DEPLOYMENT_TARGET) === -1) { buildSettings.IPHONEOS_DEPLOYMENT_TARGET = IOS_DEPLOYMENT_TARGET - deploymentTargetIsUpdated = true } } else { buildSettings.IPHONEOS_DEPLOYMENT_TARGET = IOS_DEPLOYMENT_TARGET - deploymentTargetIsUpdated = true } } - - if (deploymentTargetIsUpdated) { - console.warn('IOS project now has deployment target set as: ' + IOS_DEPLOYMENT_TARGET) - } - - console.warn('IOS project Code Sign Entitlements now set to: ' + entitlementsFile) } function addPbxReference (xcodeProject, entitlementsFile) { var fileReferenceSection = removeComments(xcodeProject.pbxFileReferenceSection()) - if (isPbxReferenceAlreadySet(fileReferenceSection, entitlementsFile)) { - console.warn('Entitlements file is in reference section.') - return - } - - console.warn('Entitlements file is not in references section, adding it') + if (isPbxReferenceAlreadySet(fileReferenceSection, entitlementsFile)) return xcodeProject.addResourceFile(path.basename(entitlementsFile)) } diff --git a/plugin.template.xml b/plugin.template.xml index e440693b..6094c69b 100644 --- a/plugin.template.xml +++ b/plugin.template.xml @@ -46,7 +46,7 @@ SOFTWARE. - + diff --git a/plugin.xml b/plugin.xml index 2d2e06c7..6fff9157 100644 --- a/plugin.xml +++ b/plugin.xml @@ -46,7 +46,7 @@ SOFTWARE. - +