Skip to content

Fix for local packages in nested xcode groups #30

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
TomaszLizer wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix for local packages in nested xcode groups #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22febcf
Bumps XcodeProj to fix unsupported reference type
TomaszLizer Dec 16, 2024
e52bc15
Adds tests for local packages nested in group
TomaszLizer Dec 17, 2024
c74ab31
Fixes local package reference parsing
TomaszLizer Dec 16, 2024
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
4 changes: 2 additions & 2 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.0"),
.package(url: "https://github.com/tuist/XcodeProj.git", .upToNextMajor(from: "8.8.0"))
.package(url: "https://github.com/tuist/XcodeProj.git", .upToNextMajor(from: "8.16.0"))
],
targets: [
.executableTarget(name: "Main", dependencies: [
Expand Down Expand Up @@ -226,6 +226,7 @@ let package = Package(
]),
.testTarget(name: "XcodeProjectParserLiveTests", dependencies: [
"FileSystem",
"FileSystemLive",
"XcodeProject",
"XcodeProjectParserLive"
], resources: [.copy("Example")])
Expand Down
5 changes: 3 additions & 2 deletions Sources/Library/Parsing/XcodeProjectParserLive/XcodeProjectParserLive.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,10 @@ private extension PBXFileReference {
}

func potentialPackageSwiftFileURL(forSourceRoot sourceRoot: URL) -> URL? {
guard let path = path else {
guard let fullPath = try? fullPath(sourceRoot: sourceRoot.path) else {
return nil
}
return ((sourceRoot as NSURL).appendingPathComponent(path) as? NSURL)?.appendingPathComponent("Package.swift")
let packageUrl = URL(fileURLWithPath: fullPath)
return packageUrl.appendingPathComponent("Package.swift")
}
}
22 changes: 20 additions & 2 deletions Tests/ExampleProject/Example.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
72B5FC29293E2857007CA7EA /* Runestone in Frameworks */ = {isa = PBXBuildFile; productRef = 72B5FC28293E2857007CA7EA /* Runestone */; };
72DBC59729404943001D5DEF /* ExampleLibraryA in Frameworks */ = {isa = PBXBuildFile; productRef = 72DBC59629404943001D5DEF /* ExampleLibraryA */; };
72DBC59929404945001D5DEF /* ExampleLibraryB in Frameworks */ = {isa = PBXBuildFile; productRef = 72DBC59829404945001D5DEF /* ExampleLibraryB */; };
AE5D64FD2D115AC700B6A28D /* TreeSitterJSONRunestone in Frameworks */ = {isa = PBXBuildFile; productRef = AE5D64FC2D115AC700B6A28D /* TreeSitterJSONRunestone */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -54,7 +55,8 @@
72A7F377293AB6C2004FBAB5 /* ExampleUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleUITests.swift; sourceTree = "<group>"; };
72A7F379293AB6C2004FBAB5 /* ExampleUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleUITestsLaunchTests.swift; sourceTree = "<group>"; };
72A7F387293AB740004FBAB5 /* ExamplePackageA */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ExamplePackageA; sourceTree = "<group>"; };
72A7F38B293AB756004FBAB5 /* ExamplePackageB */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ExamplePackageB; sourceTree = "<group>"; };
AE5D64FE2D115BE200B6A28D /* ExamplePackageB */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ExamplePackageB; sourceTree = "<group>"; };
AE5D64FF2D115BE200B6A28D /* ExamplePackageC */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ExamplePackageC; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -65,6 +67,7 @@
72B5FC29293E2857007CA7EA /* Runestone in Frameworks */,
72DBC59929404945001D5DEF /* ExampleLibraryB in Frameworks */,
72B014E2294214E0007A98FF /* TreeSitterJavaScriptRunestone in Frameworks */,
AE5D64FD2D115AC700B6A28D /* TreeSitterJSONRunestone in Frameworks */,
72DBC59729404943001D5DEF /* ExampleLibraryA in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -89,6 +92,7 @@
72A7F34A293AB6C1004FBAB5 = {
isa = PBXGroup;
children = (
AE5D65002D115BE200B6A28D /* NestedPackages */,
72A7F386293AB740004FBAB5 /* Packages */,
72A7F355293AB6C1004FBAB5 /* Example */,
72A7F36C293AB6C2004FBAB5 /* ExampleTests */,
Expand Down Expand Up @@ -143,7 +147,6 @@
isa = PBXGroup;
children = (
72A7F387293AB740004FBAB5 /* ExamplePackageA */,
72A7F38B293AB756004FBAB5 /* ExamplePackageB */,
);
name = Packages;
sourceTree = "<group>";
Expand All @@ -155,6 +158,15 @@
name = Frameworks;
sourceTree = "<group>";
};
AE5D65002D115BE200B6A28D /* NestedPackages */ = {
isa = PBXGroup;
children = (
AE5D64FE2D115BE200B6A28D /* ExamplePackageB */,
AE5D64FF2D115BE200B6A28D /* ExamplePackageC */,
);
path = NestedPackages;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -176,6 +188,7 @@
72DBC59629404943001D5DEF /* ExampleLibraryA */,
72DBC59829404945001D5DEF /* ExampleLibraryB */,
72B014E1294214E0007A98FF /* TreeSitterJavaScriptRunestone */,
AE5D64FC2D115AC700B6A28D /* TreeSitterJSONRunestone */,
);
productName = Example;
productReference = 72A7F353293AB6C1004FBAB5 /* Example.app */;
Expand Down Expand Up @@ -679,6 +692,11 @@
isa = XCSwiftPackageProductDependency;
productName = ExampleLibraryB;
};
AE5D64FC2D115AC700B6A28D /* TreeSitterJSONRunestone */ = {
isa = XCSwiftPackageProductDependency;
package = 72B014E0294214E0007A98FF /* XCRemoteSwiftPackageReference "TreeSitterLanguages" */;
productName = TreeSitterJSONRunestone;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 72A7F34B293AB6C1004FBAB5 /* Project object */;
Expand Down
0 ...ExampleProject/ExamplePackageB/.gitignore → ...NestedPackages/ExamplePackageB/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...mpleProject/ExamplePackageB/Package.swift → ...tedPackages/ExamplePackageB/Package.swift
View file
Open in desktop
File renamed without changes.
0 ...kageB/Sources/ExampleLibraryB/Dummy.swift → ...kageB/Sources/ExampleLibraryB/Dummy.swift
View file
Open in desktop
File renamed without changes.
0 ...ExampleProject/ExamplePackageC/.gitignore → ...NestedPackages/ExamplePackageC/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...mpleProject/ExamplePackageC/Package.swift → ...tedPackages/ExamplePackageC/Package.swift
View file
Open in desktop
File renamed without changes.
0 ...kageC/Sources/ExampleLibraryC/Dummy.swift → ...kageC/Sources/ExampleLibraryC/Dummy.swift
View file
Open in desktop
File renamed without changes.
44 changes: 27 additions & 17 deletions Tests/XcodeProjectParserLiveTests/Example/Example.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
72A7F36E293AB6C2004FBAB5 /* ExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72A7F36D293AB6C2004FBAB5 /* ExampleTests.swift */; };
72A7F378293AB6C2004FBAB5 /* ExampleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72A7F377293AB6C2004FBAB5 /* ExampleUITests.swift */; };
72A7F37A293AB6C2004FBAB5 /* ExampleUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72A7F379293AB6C2004FBAB5 /* ExampleUITestsLaunchTests.swift */; };
72B014E529421A15007A98FF /* TreeSitterJSONRunestone in Frameworks */ = {isa = PBXBuildFile; productRef = 72B014E429421A15007A98FF /* TreeSitterJSONRunestone */; };
72B014E729421A15007A98FF /* TreeSitterJavaScriptRunestone in Frameworks */ = {isa = PBXBuildFile; productRef = 72B014E629421A15007A98FF /* TreeSitterJavaScriptRunestone */; };
72B014E2294214E0007A98FF /* TreeSitterJavaScriptRunestone in Frameworks */ = {isa = PBXBuildFile; productRef = 72B014E1294214E0007A98FF /* TreeSitterJavaScriptRunestone */; };
72B5FC29293E2857007CA7EA /* Runestone in Frameworks */ = {isa = PBXBuildFile; productRef = 72B5FC28293E2857007CA7EA /* Runestone */; };
72DBC59729404943001D5DEF /* ExampleLibraryA in Frameworks */ = {isa = PBXBuildFile; productRef = 72DBC59629404943001D5DEF /* ExampleLibraryA */; };
72DBC59929404945001D5DEF /* ExampleLibraryB in Frameworks */ = {isa = PBXBuildFile; productRef = 72DBC59829404945001D5DEF /* ExampleLibraryB */; };
AE5D64FD2D115AC700B6A28D /* TreeSitterJSONRunestone in Frameworks */ = {isa = PBXBuildFile; productRef = AE5D64FC2D115AC700B6A28D /* TreeSitterJSONRunestone */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -55,7 +55,8 @@
72A7F377293AB6C2004FBAB5 /* ExampleUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleUITests.swift; sourceTree = "<group>"; };
72A7F379293AB6C2004FBAB5 /* ExampleUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleUITestsLaunchTests.swift; sourceTree = "<group>"; };
72A7F387293AB740004FBAB5 /* ExamplePackageA */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ExamplePackageA; sourceTree = "<group>"; };
72A7F38B293AB756004FBAB5 /* ExamplePackageB */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ExamplePackageB; sourceTree = "<group>"; };
AE5D64FE2D115BE200B6A28D /* ExamplePackageB */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ExamplePackageB; sourceTree = "<group>"; };
AE5D64FF2D115BE200B6A28D /* ExamplePackageC */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ExamplePackageC; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -65,9 +66,9 @@
files = (
72B5FC29293E2857007CA7EA /* Runestone in Frameworks */,
72DBC59929404945001D5DEF /* ExampleLibraryB in Frameworks */,
72B014E2294214E0007A98FF /* TreeSitterJavaScriptRunestone in Frameworks */,
AE5D64FD2D115AC700B6A28D /* TreeSitterJSONRunestone in Frameworks */,
72DBC59729404943001D5DEF /* ExampleLibraryA in Frameworks */,
72B014E529421A15007A98FF /* TreeSitterJSONRunestone in Frameworks */,
72B014E729421A15007A98FF /* TreeSitterJavaScriptRunestone in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -91,6 +92,7 @@
72A7F34A293AB6C1004FBAB5 = {
isa = PBXGroup;
children = (
AE5D65002D115BE200B6A28D /* NestedPackages */,
72A7F386293AB740004FBAB5 /* Packages */,
72A7F355293AB6C1004FBAB5 /* Example */,
72A7F36C293AB6C2004FBAB5 /* ExampleTests */,
Expand Down Expand Up @@ -145,7 +147,6 @@
isa = PBXGroup;
children = (
72A7F387293AB740004FBAB5 /* ExamplePackageA */,
72A7F38B293AB756004FBAB5 /* ExamplePackageB */,
);
name = Packages;
sourceTree = "<group>";
Expand All @@ -157,6 +158,15 @@
name = Frameworks;
sourceTree = "<group>";
};
AE5D65002D115BE200B6A28D /* NestedPackages */ = {
isa = PBXGroup;
children = (
AE5D64FE2D115BE200B6A28D /* ExamplePackageB */,
AE5D64FF2D115BE200B6A28D /* ExamplePackageC */,
);
path = NestedPackages;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -177,8 +187,8 @@
72B5FC28293E2857007CA7EA /* Runestone */,
72DBC59629404943001D5DEF /* ExampleLibraryA */,
72DBC59829404945001D5DEF /* ExampleLibraryB */,
72B014E429421A15007A98FF /* TreeSitterJSONRunestone */,
72B014E629421A15007A98FF /* TreeSitterJavaScriptRunestone */,
72B014E1294214E0007A98FF /* TreeSitterJavaScriptRunestone */,
AE5D64FC2D115AC700B6A28D /* TreeSitterJSONRunestone */,
);
productName = Example;
productReference = 72A7F353293AB6C1004FBAB5 /* Example.app */;
Expand Down Expand Up @@ -254,7 +264,7 @@
mainGroup = 72A7F34A293AB6C1004FBAB5;
packageReferences = (
72B5FC27293E2857007CA7EA /* XCRemoteSwiftPackageReference "Runestone" */,
72B014E329421A15007A98FF /* XCRemoteSwiftPackageReference "TreeSitterLanguages" */,
72B014E0294214E0007A98FF /* XCRemoteSwiftPackageReference "TreeSitterLanguages" */,
);
productRefGroup = 72A7F354293AB6C1004FBAB5 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -645,7 +655,7 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
72B014E329421A15007A98FF /* XCRemoteSwiftPackageReference "TreeSitterLanguages" */ = {
72B014E0294214E0007A98FF /* XCRemoteSwiftPackageReference "TreeSitterLanguages" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "[email protected]:simonbs/TreeSitterLanguages.git";
requirement = {
Expand All @@ -664,14 +674,9 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
72B014E429421A15007A98FF /* TreeSitterJSONRunestone */ = {
72B014E1294214E0007A98FF /* TreeSitterJavaScriptRunestone */ = {
isa = XCSwiftPackageProductDependency;
package = 72B014E329421A15007A98FF /* XCRemoteSwiftPackageReference "TreeSitterLanguages" */;
productName = TreeSitterJSONRunestone;
};
72B014E629421A15007A98FF /* TreeSitterJavaScriptRunestone */ = {
isa = XCSwiftPackageProductDependency;
package = 72B014E329421A15007A98FF /* XCRemoteSwiftPackageReference "TreeSitterLanguages" */;
package = 72B014E0294214E0007A98FF /* XCRemoteSwiftPackageReference "TreeSitterLanguages" */;
productName = TreeSitterJavaScriptRunestone;
};
72B5FC28293E2857007CA7EA /* Runestone */ = {
Expand All @@ -687,6 +692,11 @@
isa = XCSwiftPackageProductDependency;
productName = ExampleLibraryB;
};
AE5D64FC2D115AC700B6A28D /* TreeSitterJSONRunestone */ = {
isa = XCSwiftPackageProductDependency;
package = 72B014E0294214E0007A98FF /* XCRemoteSwiftPackageReference "TreeSitterLanguages" */;
productName = TreeSitterJSONRunestone;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 72A7F34B293AB6C1004FBAB5 /* Project object */;
Expand Down
0 ...eTests/Example/ExamplePackageB/.gitignore → ...NestedPackages/ExamplePackageB/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...sts/Example/ExamplePackageB/Package.swift → ...tedPackages/ExamplePackageB/Package.swift
View file
Open in desktop
File renamed without changes.
0 ...eTests/Example/ExamplePackageC/.gitignore → ...NestedPackages/ExamplePackageC/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...sts/Example/ExamplePackageC/Package.swift → ...tedPackages/ExamplePackageC/Package.swift
View file
Open in desktop
File renamed without changes.
21 changes: 19 additions & 2 deletions Tests/XcodeProjectParserLiveTests/XcodeProjectParserLiveTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@testable import XcodeProject
@testable import XcodeProjectParserLive
import FileSystemLive
import XCTest

final class XcodeProjectParserLiveTests: XCTestCase {
Expand Down Expand Up @@ -33,9 +34,11 @@ final class XcodeProjectParserLiveTests: XCTestCase {
}

func testSwiftPackageCount() throws {
let parser = XcodeProjectParserLive(fileSystem: FileSystemMock())
// The example project contains 5 Swift packages:
// 2 remote and 3 local (2 of which are nested in group)
let parser = XcodeProjectParserLive(fileSystem: FileSystemLive())
let xcodeProject = try parser.parseProject(at: URL.Mock.exampleXcodeProject)
XCTAssertEqual(xcodeProject.swiftPackages.count, 4)
XCTAssertEqual(xcodeProject.swiftPackages.count, 5)
}

func testParsesLocalSwiftPackage() throws {
Expand All @@ -51,6 +54,20 @@ final class XcodeProjectParserLiveTests: XCTestCase {
XCTFail("Expected ExamplePackageA to be a local package")
}
}

func testParsesLocalSwiftPackageInNestedGroupDirectory() throws {
let parser = XcodeProjectParserLive(fileSystem: FileSystemLive())
let xcodeProject = try parser.parseProject(at: URL.Mock.exampleXcodeProject)
let swiftPackage = xcodeProject.swiftPackages.first { $0.name == "ExamplePackageB" }
XCTAssertNotNil(swiftPackage)
if case let .local(parameters) = swiftPackage {
XCTAssertEqual(parameters.name, "ExamplePackageB")
let fileURLHasPackageSwiftSuffix = parameters.fileURL.absoluteString.hasSuffix("NestedPackages/ExamplePackageB/Package.swift")
XCTAssertTrue(fileURLHasPackageSwiftSuffix, "Expected file URL to end with the package name and Package.swift")
} else {
XCTFail("Expected ExamplePackageB to be a local package")
}
}

func testParsesRemoteSwiftPackageWithSingleProduct() throws {
let parser = XcodeProjectParserLive(fileSystem: FileSystemMock())
Expand Down