Merge pull request #9 from toshi0383/target-common

Trim Duplicated Lines between targets' configs

Author: toshi0383

CHANGELOG.md

@@ -1,3 +1,8 @@
+## master
+* Trim Targets' Duplicated Lines  
+  [Toshihiro Suzuki](https://github.com/toshi0383)
+  [#9](https://github.com/toshi0383/xcconfig-extractor/pull/9)
+
 ## 0.3.0
 * Introduce `--include-existing` (`--no-include-existing`) option  
   [Toshihiro Suzuki](https://github.com/toshi0383)

README.md

@@ -28,7 +28,7 @@ Options:
 ```
 
 # Build Setting Validation
-⚠️***Waring***⚠️
+⚠️ ***Waring*** ⚠️
 
 You should check app's Build Settings hasn't been affected by applying this tool.
 xcconfig does not allow any `$(inherited)` from `#include`ing xcconfigs. (See: https://github.com/toshi0383/xcconfig-extractor/pull/8#issuecomment-298234943) So if you have any existing xcconfig configured on your project, it might cause problems.

Sources/xcconfig-extractor/main.swift

@@ -118,10 +118,26 @@ let main = command(
             baseResults[idx].settings = distinctArray(common + baseResults[idx].settings)
             // Write Upper Layer Configs (e.g. App-Debug.xcconfig, AppTests-Debug.xcconfig)
             for r in filtered {
-                r.settings = r.settings - common
-                try write(to: r.path, lines: formatter.format(result: r)) // not including any other xcconfigs for targets'
+                let idx = targetResults.index(of: r)!
+                targetResults[idx].settings = r.settings - common
             }
         }
+        // Trim Duplicates in target configs (e.g. App-Debug.xcconfig and App-Release.xcconfig)
+        for target in pbxproj.rootObject.targets {
+            let filtered = targetResults
+                .filter { $0.path.components.last!.characters.starts(with: "\(target.name)-".characters) }
+            let common: [String] = commonElements(filtered.map { $0.settings })
+            let targetConfigPath = Path("\(dirPath.string)/\(target.name).xcconfig")
+            let r = ResultObject(path: targetConfigPath, settings: common)
+            try write(to: r.path, lines: formatter.format(result: r))
+            for r in filtered {
+                let idx = targetResults.index(of: r)!
+                targetResults[idx].settings = r.settings - common
+                targetResults[idx].includes += [targetConfigPath.lastComponent]
+                try write(to: r.path, lines: formatter.format(result: targetResults[idx]))
+            }
+        }
+
         // Trim Duplicates in configurationName configs (e.g. Debug.xcconfig and Release.xcconfig)
         let common = commonElements(baseResults.map { $0.settings })
         // Write Configuration Base Configs (e.g. Debug.xcconfig, Release.xcconfig)