diff --git a/Package.resolved b/Package.resolved index 71dabee..ed55c5a 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/tadija/AEXML.git", "state" : { - "revision" : "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3", - "version" : "4.6.1" + "revision" : "db806756c989760b35108146381535aec231092b", + "version" : "4.7.0" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/tuist/XcodeProj.git", "state" : { - "revision" : "b6de1bfe021b861c94e7c83821b595083f74b997", - "version" : "8.8.0" + "revision" : "a0cbb0174e71dba41c1bb572e8cd1fb6138daa03", + "version" : "9.6.0" } } ], diff --git a/Package.swift b/Package.swift index 78fc674..2f80f9d 100644 --- a/Package.swift +++ b/Package.swift @@ -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: "9.6.0")) ], targets: [ .executableTarget(name: "Main", dependencies: [ diff --git a/Sources/Library/Parsing/XcodeProjectParserLive/XcodeProjectParserLive.swift b/Sources/Library/Parsing/XcodeProjectParserLive/XcodeProjectParserLive.swift index 7e0560f..1a7647c 100644 --- a/Sources/Library/Parsing/XcodeProjectParserLive/XcodeProjectParserLive.swift +++ b/Sources/Library/Parsing/XcodeProjectParserLive/XcodeProjectParserLive.swift @@ -29,7 +29,7 @@ public struct XcodeProjectParserLive: XcodeProjectParser { private extension XcodeProjectParserLive { func targets(in project: XcodeProj) -> [XcodeProject.Target] { return project.pbxproj.nativeTargets.map { target in - let packageProductDependencies = target.packageProductDependencies.map(\.productName) + let packageProductDependencies = target.packageProductDependencies.map { $0.map(\.productName) } ?? [] return .init(name: target.name, packageProductDependencies: packageProductDependencies) } } @@ -42,7 +42,9 @@ private extension XcodeProjectParserLive { } var swiftPackages: [IntermediateRemoteSwiftPackage] = [] for target in project.pbxproj.nativeTargets { - for dependency in target.packageProductDependencies { + guard let packageProductDependencies = target.packageProductDependencies else { continue } + + for dependency in packageProductDependencies { guard let package = dependency.package, let packageName = package.name else { continue }