From 9e355e692e6b86693205909242f1b02b27d66949 Mon Sep 17 00:00:00 2001 From: Anton Doudarev Date: Mon, 26 Sep 2016 19:40:41 -0400 Subject: [PATCH] Swift 2.3 --- ConfigManager/ConfigManager.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ConfigManager/ConfigManager.swift b/ConfigManager/ConfigManager.swift index fd4cb26..77f5583 100644 --- a/ConfigManager/ConfigManager.swift +++ b/ConfigManager/ConfigManager.swift @@ -57,7 +57,7 @@ public class ConfigManager { return value } else if let value = env[ConfigManagerStringConstants.EnvKey] { return value - } else if let bundleInfoDict = NSBundle.mainBundle().infoDictionary, value = bundleInfoDict["ConfigManagerEnv"] as? String { + } else if let bundleInfoDict = NSBundle.mainBundle().infoDictionary, let value = bundleInfoDict["ConfigManagerEnv"] as? String { return value } @@ -112,7 +112,7 @@ public class ConfigManager { static func configFilePaths(defaultPath: String, configEnvironment: String?) -> [NSURL]? { let defaultUrlPath = NSURL.fileURLWithPath(defaultPath) var paths = [defaultUrlPath] - + guard let filename = defaultUrlPath.lastPathComponent else { return paths } @@ -177,8 +177,8 @@ public class ConfigManager { // Check if there is a key to extend another config file. If so, extend recursively. if let extendedContentsFilename = configurationPayload?[ConfigManagerStringConstants.ConfigurationExtensionKey] as? String, - folderPath = path.URLByDeletingLastPathComponent, - _ = configurationPayload + let folderPath = path.URLByDeletingLastPathComponent, + let _ = configurationPayload { var extendedConfigurationPayload = readConfiguration(folderPath.URLByAppendingPathComponent(extendedContentsFilename)!) extendedConfigurationPayload?.updateWith(configurationPayload!)