Merge branch 'master' into fix/configfiles-synced-folder-duplicate

Author: AlexNsbmr

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Next Version
 
+## 2.45.3
+
+### Fixed
+- Fix folder source PBXFileReference path regression with createIntermediateGroups #1605 @yonaskolb
+- Fix synced folders: includes silently ignored + no deduplication across targets #1604 @4brunu
+
 ## 2.45.2
 
 ### Fixed

Makefile

@@ -1,6 +1,6 @@
 TOOL_NAME = XcodeGen
 export EXECUTABLE_NAME = xcodegen
-VERSION = 2.45.2
+VERSION = 2.45.3
 
 PREFIX = /usr/local
 INSTALL_PATH = $(PREFIX)/bin/$(EXECUTABLE_NAME)

README.md

@@ -112,7 +112,7 @@ swift run xcodegen
 Add the following to your Package.swift file's dependencies:
 
 ```swift
-.package(url: "https://github.com/yonaskolb/XcodeGen.git", from: "2.45.2"),
+.package(url: "https://github.com/yonaskolb/XcodeGen.git", from: "2.45.3"),
 ```
 
 And then import wherever needed: `import XcodeGenKit`

Sources/XcodeGen/main.swift

@@ -3,6 +3,6 @@ import ProjectSpec
 import XcodeGenCLI
 import Version
 
-let version = Version("2.45.2")
+let version = Version("2.45.3")
 let cli = XcodeGenCLI(version: version)
 cli.execute()

Sources/XcodeGenKit/SourceGenerator.swift

@@ -798,7 +798,9 @@ class SourceGenerator {
             try makePathRelative(for: sourceReference, at: path)
         } else if createIntermediateGroups {
             createIntermediaGroups(for: sourceReference, at: sourcePath)
-            try makePathRelative(for: sourceReference, at: sourcePath)
+            if type != .folder {
+                try makePathRelative(for: sourceReference, at: sourcePath)
+            }
         }
 
         return sourceFiles

Tests/XcodeGenKitTests/SourceGeneratorTests.swift

@@ -996,6 +996,29 @@ class SourceGeneratorTests: XCTestCase {
                 try pbxProj.expectFileMissing(paths: ["Sources", "A", "a.swift"])
             }
 
+            $0.it("generates folder references with createIntermediateGroups") {
+                let directories = """
+                Sources:
+                  A:
+                    - a.resource
+                    - b.resource
+                """
+                try createDirectories(directories)
+
+                let target = Target(name: "Test", type: .application, platform: .iOS, sources: [
+                    TargetSource(path: "Sources/A", type: .folder),
+                ])
+                let project = Project(
+                    basePath: directoryPath,
+                    name: "Test",
+                    targets: [target],
+                    options: .init(createIntermediateGroups: true)
+                )
+
+                let pbxProj = try project.generatePbxProj()
+                try pbxProj.expectFile(paths: ["Sources", "Sources/A"], names: ["Sources", "A"], buildPhase: .resources)
+            }
+
             $0.it("adds files to correct build phase") {
                 let directories = """
                   A: