Skip to content

Revert breaking changes #25

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

Merged
merged 2 commits into from
Jul 30, 2024
Merged

Revert breaking changes #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6148bfd
Revert "Add strings catalog parser (#9)"
fortmarek Jul 30, 2024
33ae312
Revert "Defer binary path for platform"
fortmarek Jul 30, 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
6 changes: 6 additions & 0 deletions Sources/XcodeGraph/Graph/GraphDependency.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,23 @@ public enum GraphDependency: Hashable, CustomStringConvertible, Comparable, Coda
public struct XCFramework: Hashable, CustomStringConvertible, Comparable, Codable {
public let path: AbsolutePath
public let infoPlist: XCFrameworkInfoPlist
public let primaryBinaryPath: AbsolutePath
public let linking: BinaryLinking
public let mergeable: Bool
public let status: FrameworkStatus

public init(
path: AbsolutePath,
infoPlist: XCFrameworkInfoPlist,
primaryBinaryPath: AbsolutePath,
linking: BinaryLinking,
mergeable: Bool,
status: FrameworkStatus,
macroPath _: AbsolutePath?
) {
self.path = path
self.infoPlist = infoPlist
self.primaryBinaryPath = primaryBinaryPath
self.linking = linking
self.mergeable = mergeable
self.status = status
Expand Down Expand Up @@ -313,6 +316,8 @@ public enum GraphDependency: Hashable, CustomStringConvertible, Comparable, Coda
public static func testXCFramework(
path: AbsolutePath = AbsolutePath.root.appending(try! RelativePath(validating: "Test.xcframework")),
infoPlist: XCFrameworkInfoPlist = .test(),
primaryBinaryPath: AbsolutePath = AbsolutePath.root
.appending(try! RelativePath(validating: "Test.xcframework/Test")),
linking: BinaryLinking = .dynamic,
status: FrameworkStatus = .required,
macroPath: AbsolutePath? = nil
Expand All @@ -321,6 +326,7 @@ public enum GraphDependency: Hashable, CustomStringConvertible, Comparable, Coda
GraphDependency.XCFramework(
path: path,
infoPlist: infoPlist,
primaryBinaryPath: primaryBinaryPath,
linking: linking,
mergeable: false,
status: status,
Expand Down
7 changes: 7 additions & 0 deletions Sources/XcodeGraph/Models/Metadata/XCFrameworkMetadata.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Path
public struct XCFrameworkMetadata: Equatable {
public var path: AbsolutePath
public var infoPlist: XCFrameworkInfoPlist
public var primaryBinaryPath: AbsolutePath
public var linking: BinaryLinking
public var mergeable: Bool
public var status: FrameworkStatus
Expand All @@ -13,13 +14,15 @@ public struct XCFrameworkMetadata: Equatable {
public init(
path: AbsolutePath,
infoPlist: XCFrameworkInfoPlist,
primaryBinaryPath: AbsolutePath,
linking: BinaryLinking,
mergeable: Bool,
status: FrameworkStatus,
macroPath: AbsolutePath?
) {
self.path = path
self.infoPlist = infoPlist
self.primaryBinaryPath = primaryBinaryPath
self.linking = linking
self.mergeable = mergeable
self.status = status
Expand All @@ -33,6 +36,9 @@ public struct XCFrameworkMetadata: Equatable {
// swiftlint:disable:next force_try
path: AbsolutePath = try! AbsolutePath(validating: "/XCFrameworks/XCFramework.xcframework"),
infoPlist: XCFrameworkInfoPlist = .test(),
primaryBinaryPath: AbsolutePath =
// swiftlint:disable:next force_try
try! AbsolutePath(validating: "/XCFrameworks/XCFramework.xcframework/ios-arm64/XCFramework"),
linking: BinaryLinking = .dynamic,
mergeable: Bool = false,
status: FrameworkStatus = .required,
Expand All @@ -41,6 +47,7 @@ public struct XCFrameworkMetadata: Equatable {
XCFrameworkMetadata(
path: path,
infoPlist: infoPlist,
primaryBinaryPath: primaryBinaryPath,
linking: linking,
mergeable: mergeable,
status: status,
Expand Down
1 change: 0 additions & 1 deletion Sources/XcodeGraph/Models/ResourceSynthesizer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public struct ResourceSynthesizer: Equatable, Hashable, Codable {

public enum Parser: String, Equatable, Hashable, Codable {
case strings
case stringsCatalog
case assets
case plists
case fonts
Expand Down