Allow plists to inherit from others by using the :inherit_from key #44
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Jon889
commented
Feb 13, 2020
| @@ -284,6 +284,7 @@ | |||
| buildSettings = { | |||
| CLANG_ENABLE_MODULES = YES; | |||
| LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; | |||
| MACOSX_DEPLOYMENT_TARGET = 10.11; | |||
There was a problem hiding this comment.
Had to increase the deployment target from 10.10 (Yosemite, 2014) to 10.11 (El Capitan) as URL(fileURLWithPath: String, relativeTo: URL) is only available from 10.11.
theblixguy
reviewed
Mar 2, 2020
| guard var plistDictionary = (try? PropertyListSerialization.propertyList(from: data, options: [], format: nil)) as? [String: AnyObject] else { | ||
| fatalError("Failed to load plist from: \(url.absoluteString)") | ||
| } | ||
| let inheritKey = ":inherit_from" |
There was a problem hiding this comment.
I am not sure if this deserves a special key name style - perhaps it could be simply called basePlistFile.
| fatalError("Expected \"\(inheritKey)\" in \(url.absoluteString) to be a string path") | ||
| } | ||
| let inheritedPlist = loadPlist(url: URL(fileURLWithPath: inheritPath, relativeTo: url)) | ||
| plistDictionary = inheritedPlist.merging(plistDictionary, uniquingKeysWith: { (_, override) in override }) |
There was a problem hiding this comment.
Suggested change
| plistDictionary = inheritedPlist.merging(plistDictionary, uniquingKeysWith: { (_, override) in override }) | |
| plistDictionary = inheritedPlist.merging(plistDictionary, uniquingKeysWith: { (_, newValue) in newValue }) |
Please call this newValue for clarity.
| @@ -295,6 +296,7 @@ | |||
| buildSettings = { | |||
| CLANG_ENABLE_MODULES = YES; | |||
| LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; | |||
| MACOSX_DEPLOYMENT_TARGET = 10.11; | |||
There was a problem hiding this comment.
If we're bumping the minimum macOS version, then I think it needs to be mentioned in the CHANGELOG as well.
| let inheritKey = ":inherit_from" | ||
| if let inheritPath = plistDictionary.removeValue(forKey: inheritKey) { | ||
| guard let inheritPath = inheritPath as? String, !inheritPath.isEmpty else { | ||
| fatalError("Expected \"\(inheritKey)\" in \(url.absoluteString) to be a string path") |
There was a problem hiding this comment.
The failure message should also mention that the path must be non-empty (since you're checking for it above):
Suggested change
| fatalError("Expected \"\(inheritKey)\" in \(url.absoluteString) to be a string path") | |
| fatalError("Expected \"\(inheritKey)\" in \(url.absoluteString) to be a non-empty String path") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An implementation to allow inheriting from other plists as mentioned in issue #43