Update XCConfig again for include fixes

Package.resolved

@@ -41,7 +41,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mattmassicotte/XCConfig",
       "state" : {
-        "revision" : "38fe6d21eaf34c36c3835cb4c5b81b4654de1abc"
+        "revision" : "6375b3d7ac16e5c4103c3cbe7b633411bee47d37"
       }
     },
     {

Package.swift

@@ -12,7 +12,7 @@ let package = Package(
 	],
 	dependencies: [
 		.package(url: "https://github.com/tuist/XcodeProj", from: "8.15.0"),
-		.package(url: "https://github.com/mattmassicotte/XCConfig", revision: "38fe6d21eaf34c36c3835cb4c5b81b4654de1abc"),
+		.package(url: "https://github.com/mattmassicotte/XCConfig", revision: "6375b3d7ac16e5c4103c3cbe7b633411bee47d37"),
 		.package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.3"),
 		.package(url: "https://github.com/jpsim/Yams.git", from: "5.0.0"),
 	],

Sources/XCLinting/Extensions/PBXProj+BuildSettings.swift

@@ -36,7 +36,7 @@ extension PBXProj {
 
 	func enumerateBuildSettingStatements(
 		rootURL: URL,
-		_ block: (PBXProject, PBXTarget, XCBuildConfiguration, [[Statement]], URL?) throws -> Void
+		_ block: (PBXProject, PBXTarget, XCBuildConfiguration, [BuildSetting: String]) throws -> Void
 	) throws {
 		let sourceRootPath = rootURL.path
 
@@ -46,22 +46,28 @@ extension PBXProj {
 			for target in proj.targets {
 				for config in target.buildConfigurationList?.buildConfigurations ?? [] {
 					let projConfig = projConfigList?.configuration(name: config.name)
-					let baseConfigURL = try projConfig?.baseConfigurationURL(with: sourceRootPath)
-					let projConfigStatements = try baseConfigURL.map { try Parser().parse(contentsOf: $0) }
-					let projStatements = projConfig?.buildSettingsStatements ?? []
-
+					let projConfigURL = try projConfig?.baseConfigurationURL(with: sourceRootPath)
 					let configURL = try config.baseConfigurationURL(with: sourceRootPath)
-					let configStatements = try configURL.map {try Parser().parse(contentsOf: $0) }
-					let statements = config.buildSettingsStatements
 
-					let heirarchy = [
-						projConfigStatements ?? [],
-						projStatements,
-						configStatements ?? [],
-						statements
-					]
+					let heirarchy = BuildSettingsHeirarchy(
+						projectRootURL: rootURL,
+						platformDefaults: [],
+						projectConfigURL: projConfigURL,
+						project: projConfig?.buildSettingsAssignments ?? [],
+						configURL: configURL,
+						target: config.buildSettingsAssignments
+					)
+
+					let settings: [BuildSetting: String]
+
+					do {
+						settings = try Evaluator().evaluate(heirarchy)
+					} catch {
+						print("XCConfig failed to evaluate settings heirarchy:", error)
+						settings = [:]
+					}
 
-					try block(proj, target, config, heirarchy, configURL)
+					try block(proj, target, config, settings)
 				}
 			}
 		}

Sources/XCLinting/Extensions/XCBuildConfiguration+BuildSettings.swift

@@ -12,11 +12,11 @@ extension XCBuildConfiguration {
 		return URL(fileURLWithPath: fullPath, isDirectory: false)
 	}
 
-	var buildSettingsStatements: [Statement] {
-		buildSettings.compactMap { (key, value) -> Statement? in
+	var buildSettingsAssignments: [Assignment] {
+		buildSettings.compactMap { (key, value) -> Assignment? in
 			guard let value = value as? String else { return nil }
 
-			return Statement.assignment(Assignment(key: key, value: value))
+			return Assignment(key: key, value: value)
 		}
 	}
 }

Sources/XCLinting/Rules/ValidateBuildSettingsRule.swift

@@ -43,17 +43,8 @@ struct ValidateBuildSettingsRule {
 	) throws {
 		let project = environment.project
 		let sourceRootURL = environment.projectRootURL.deletingLastPathComponent()
-		let evaluator = Evaluator()
-		let platformStatements: [Statement] = []
-
-		try project.pbxproj.enumerateBuildSettingStatements(rootURL: sourceRootURL) { proj, target, config, statementsList, url in
-			let heirarchy = [platformStatements] + statementsList
-
-			// This is bogus. But the only solution I can come up with is to change how evaluation works, and that's complex.
-			let effectiveURL = url ?? sourceRootURL
-
-			let settings = try evaluator.evaluate(heirarchy: heirarchy, for: effectiveURL)
 
+		try project.pbxproj.enumerateBuildSettingStatements(rootURL: sourceRootURL) { proj, target, config, settings in
 			try block(target, config, settings)
 		}
 	}