Ignore normal directory with dots

.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
           command: swift build
       - run:
           name: Test
-          command: swift test 2>&1 | xcpretty
+          command: swift test
       - run:
           name: Check Project Diff
           command: ./diff-fixtures.sh
@@ -30,7 +30,7 @@ jobs:
           command: swift build
       - run:
           name: Test
-          command: swift test 2>&1 | xcpretty
+          command: swift test
       # disabled till UUID's are stable
       # - run:
       #     name: Check Project Diff

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## master
+
+#### ⚠️Breaking Changes⚠️
+
+XcodeGen now retrieves UTI of a directory to know if it's a special directory such as `Assets.xcassets/`. That means other normal directories **with dots** will not appear in `Copy Bundle Resources` Build Phase any more.
+
+- Ignore normal directory with dots [397](https://github.com/yonaskolb/XcodeGen/pull/397)  @toshi0383
+
 ## 1.11.2
 
 If XcodeGen is compiled with Swift 4.2, then UUID's in the generated project will not be deterministic. This will be fixed in an upcoming release with an update to xcodeproj 6.0

Sources/XcodeGenKit/PathKitExtension.swift

@@ -0,0 +1,28 @@
+import Foundation
+import PathKit
+
+extension Path {
+
+    /// Treat this as a file (resource or source) instead of a normal directory.
+    var isFileDirectory: Bool {
+
+        if isFile || self.extension == nil {
+            return false
+        }
+
+        if let uti = try! URL(fileURLWithPath: self.string)
+            .resourceValues(forKeys: [URLResourceKey.typeIdentifierKey])
+            .typeIdentifier {
+
+            // If uti is `public.folder` or `dyn*`, it's a normal directory in most cases.
+            // But for example *.lproj appears to be a `public.folder`.
+            // So make sure to filter to treat it as a special directory.
+            print("Path.string: \(self.string), uti: \(uti)")
+            return uti != "public.folder" && !uti.starts(with: "dyn")
+
+        }
+
+        return false
+    }
+
+}

Sources/XcodeGenKit/SourceGenerator.swift

@@ -186,23 +186,38 @@ class SourceGenerator {
         if path.lastComponent == "Info.plist" {
             return nil
         }
-        if let fileExtension = path.extension {
+
+        guard let fileExtension = path.extension else {
+            return nil
+        }
+
+        if path.isDirectory {
             switch fileExtension {
-            case "swift", "m", "mm", "cpp", "c", "cc", "S", "xcdatamodeld", "metal": return .sources
-            case "h", "hh", "hpp", "ipp", "tpp", "hxx", "def": return .headers
-            case "modulemap":
-                guard targetType == .staticLibrary else { return nil }
-                return .copyFiles(TargetSource.BuildPhase.CopyFilesSettings(
-                    destination: .productsDirectory,
-                    subpath: "include/$(PRODUCT_NAME)"
-                ))
-            case "framework": return .frameworks
-            case "xpc": return .copyFiles(.xpcServices)
-            case "xcconfig", "entitlements", "gpx", "lproj", "apns": return nil
-            default: return .resources
+            case "xcdatamodeld":
+                return .sources
+            case "framework":
+                return .frameworks
+            case "xpc":
+                return .copyFiles(.xpcServices)
+            case "lproj":
+                return nil
+            default:
+                return .resources
             }
         }
-        return nil
+
+        switch fileExtension {
+        case "swift", "m", "mm", "cpp", "c", "cc", "S", "metal": return .sources
+        case "h", "hh", "hpp", "ipp", "tpp", "hxx", "def": return .headers
+        case "modulemap":
+            guard targetType == .staticLibrary else { return nil }
+            return .copyFiles(TargetSource.BuildPhase.CopyFilesSettings(
+                destination: .productsDirectory,
+                subpath: "include/$(PRODUCT_NAME)"
+            ))
+        case "xcconfig", "entitlements", "gpx", "apns": return nil
+        default: return .resources
+        }
     }
 
     /// Create a group or return an existing one at the path.
@@ -310,11 +325,11 @@ class SourceGenerator {
         let children = try getSourceChildren(targetSource: targetSource, dirPath: path)
 
         let directories = children
-            .filter { $0.isDirectory && $0.extension == nil && $0.extension != "lproj" }
+            .filter { $0.isDirectory && !$0.isFileDirectory && $0.extension != "lproj" }
             .sorted { $0.lastComponent < $1.lastComponent }
 
         let filePaths = children
-            .filter { $0.isFile || $0.extension != nil && $0.extension != "lproj" }
+            .filter { $0.isFile || $0.isFileDirectory }
             .sorted { $0.lastComponent < $1.lastComponent }
 
         let localisedDirectories = children

Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj

@@ -120,6 +120,7 @@
 		BF_874851989284 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FR_131384036341 /* Result.framework */; };
 		BF_892119987440 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_854336462818 /* AppDelegate.swift */; settings = {COMPILER_FLAGS = "-Werror"; }; };
 		BF_895856588273 /* StaticLibrary_ObjC.m in Sources */ = {isa = PBXBuildFile; fileRef = "FR_698230898030-1" /* StaticLibrary_ObjC.m */; };
+		BF_900577809062 /* Fox.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_269747717860 /* Fox.swift */; settings = {COMPILER_FLAGS = "-Werror"; }; };
 		BF_901390118565 /* FrameworkFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_172952167809 /* FrameworkFile.swift */; };
 		BF_901508574566 = {isa = PBXBuildFile; fileRef = FR_704531614016 /* StaticLibrary_ObjC.a */; };
 		BF_903574875171 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_777446672298 /* ViewController.swift */; };
@@ -418,6 +419,7 @@
 		FR_257073931060 /* ResourceFolder */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ResourceFolder; path = Resources/ResourceFolder; sourceTree = SOURCE_ROOT; };
 		FR_263408310401 /* Model 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 3.xcdatamodel"; sourceTree = "<group>"; };
 		FR_264279911176 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Interface.storyboard; sourceTree = "<group>"; };
+		FR_269747717860 /* Fox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Fox.swift; sourceTree = "<group>"; };
 		FR_281269793733 /* StaticLibrary_ObjC.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = StaticLibrary_ObjC.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		FR_285483315484 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		FR_293137352077 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -752,6 +754,14 @@
 			path = App_iOS_Tests;
 			sourceTree = "<group>";
 		};
+		G_7841902032535 /* F.O.X */ = {
+			isa = PBXGroup;
+			children = (
+				FR_269747717860 /* Fox.swift */,
+			);
+			path = F.O.X;
+			sourceTree = "<group>";
+		};
 		G_8030722683864 /* UnderFileGroup */ = {
 			isa = PBXGroup;
 			children = (
@@ -771,6 +781,7 @@
 		G_8252321105004 /* App */ = {
 			isa = PBXGroup;
 			children = (
+				G_7841902032535 /* F.O.X */,
 				FR_854336462818 /* AppDelegate.swift */,
 				FR_868653349092 /* Assets.xcassets */,
 				FR_725187762757 /* Info.plist */,
@@ -1662,6 +1673,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				BF_892119987440 /* AppDelegate.swift in Sources */,
+				BF_900577809062 /* Fox.swift in Sources */,
 				BF_670499288392 /* Model.xcdatamodeld in Sources */,
 				BF_503484983186 /* MoreUnder.swift in Sources */,
 				BF_561304997165 /* Standalone.swift in Sources */,