Skip to content

Fix syncedFolder path when projectDirectory differs #1636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ckitakishi wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −1
Open

Fix syncedFolder path when projectDirectory differs #1636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/XcodeGenKit/SourceGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ class SourceGenerator {
sourceReference = group
case .syncedFolder:

let relativePath = (try? path.relativePath(from: project.basePath)) ?? path
let relativePath = (try? path.relativePath(from: basePath)) ?? path
let resolvedExplicitFolders = resolveExplicitFolders(targetSource: targetSource)

let syncedRootGroup: PBXFileSystemSynchronizedRootGroup
Expand Down
21 changes: 21 additions & 0 deletions Tests/XcodeGenKitTests/SourceGeneratorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,27 @@ class SourceGeneratorTests: XCTestCase {
try expect([syncedFolder]) == pbxProj.nativeTargets.first?.fileSystemSynchronizedGroups
}

$0.it("generates synced folder with different projectDirectory") {
let directories = """
SubDir:
Sources:
- a.swift
"""
try createDirectories(directories)

let target = Target(name: "Test", type: .application, platform: .iOS, sources: [.init(path: "Sources", type: .syncedFolder)])
let project = Project(basePath: directoryPath + "SubDir", name: "Test", targets: [target])

let generator = PBXProjGenerator(project: project, projectDirectory: directoryPath)
let pbxProj = try generator.generate()

let syncedFolders = try pbxProj.getMainGroup().children.compactMap { $0 as? PBXFileSystemSynchronizedRootGroup }
let syncedFolder = try unwrap(syncedFolders.first)

try expect(syncedFolder.path) == "SubDir/Sources"
try expect([syncedFolder]) == pbxProj.nativeTargets.first?.fileSystemSynchronizedGroups
}

$0.it("generates synced folder with explicitFolders") {
let directories = """
Sources:
Expand Down