Merge branch 'master' of github.com:mac-cain13/R.swift

tomlokhorst · tomlokhorst · commit dbeb112ff41e · 2023-03-05T13:44:06.000+01:00
diff --git a/Sources/RswiftParsers/Resources/AssetCatalog+Parser.swift b/Sources/RswiftParsers/Resources/AssetCatalog+Parser.swift
@@ -53,7 +53,7 @@ extension AssetCatalog: SupportedExtensions {
         var namespaces: [URL: NamespaceDirectory] = [URL(fileURLWithPath: ".", relativeTo: catalogURL): root]
 
         for case let fileURL as URL in directoryEnumerator {
-            guard fileURL.baseURL == catalogURL else {
+            guard fileURL.baseURL?.resolvingSymlinksInPath() == catalogURL.resolvingSymlinksInPath() else {
                 throw ResourceParsingError("File \(fileURL) is not in AssetCatalog \(catalogURL)")
             }
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ extension AssetCatalog: SupportedExtensions {`
`53`	`53`	`var namespaces: [URL: NamespaceDirectory] = [URL(fileURLWithPath: ".", relativeTo: catalogURL): root]`
`54`	`54`
`55`	`55`	`for case let fileURL as URL in directoryEnumerator {`
`56`		`- guard fileURL.baseURL == catalogURL else {`
	`56`	`+ guard fileURL.baseURL?.resolvingSymlinksInPath() == catalogURL.resolvingSymlinksInPath() else {`
`57`	`57`	`throw ResourceParsingError("File \(fileURL) is not in AssetCatalog \(catalogURL)")`
`58`	`58`	`}`
`59`	`59`