Skip to content

Commit 2ebe01f

Browse files
committed
Update deps
1 parent 7e42b8c commit 2ebe01f

File tree

6 files changed

+33
-16
lines changed

6 files changed

+33
-16
lines changed

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ bazel_dep(name = "aexml", version = "4.7.0")
1515
bazel_dep(name = "swift_argument_parser", version = "1.5.0")
1616
bazel_dep(name = "swift-filename-matcher", version = "2.0.0")
1717
bazel_dep(name = "swift-indexstore", version = "0.3.0")
18-
bazel_dep(name = "swift-syntax", version = "600.0.1")
18+
bazel_dep(name = "swift-syntax", version = "601.0.0")
1919
bazel_dep(name = "swift-system", version = "1.4.2")
2020
bazel_dep(name = "pathkit", version = "1.0.1")
21-
bazel_dep(name = "xcodeproj", version = "8.27.3")
21+
bazel_dep(name = "xcodeproj", version = "9.0.0")
2222
bazel_dep(name = "yams", version = "5.3.1")
2323

2424
# Generated repo

Package.resolved

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ var dependencies: [Package.Dependency] = [
77
.package(url: "https://github.com/tadija/AEXML", from: "4.0.0"),
88
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.0.0"),
99
.package(url: "https://github.com/kateinoigakukun/swift-indexstore", from: "0.3.0"),
10-
.package(url: "https://github.com/apple/swift-syntax", from: "600.0.1"),
10+
.package(url: "https://github.com/apple/swift-syntax", from: "601.0.0"),
1111
.package(url: "https://github.com/ileitch/swift-filename-matcher", from: "2.0.0"),
1212
]
1313

1414
#if os(macOS)
1515
dependencies.append(
1616
.package(
1717
url: "https://github.com/tuist/xcodeproj",
18-
from: "8.27.3"
18+
from: "9.0.0"
1919
)
2020
)
2121
#endif

Sources/SyntaxAnalysis/DeclarationSyntaxVisitor.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,9 @@ public final class DeclarationSyntaxVisitor: PeripherySyntaxVisitor {
467467
guard let clause else { return [] }
468468

469469
return clause.arguments.reduce(into: .init()) { result, param in
470-
result.formUnion(typeSyntaxInspector.typeLocations(for: param.argument))
470+
if case let .type(argumentType) = param.argument {
471+
result.formUnion(typeSyntaxInspector.typeLocations(for: argumentType))
472+
}
471473
}
472474
}
473475

Sources/SyntaxAnalysis/TypeSyntaxInspector.swift

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,21 @@ struct TypeSyntaxInspector {
3131
func types(for typeSyntax: TypeSyntax) -> Set<TokenSyntax> {
3232
if let identifierType = typeSyntax.as(IdentifierTypeSyntax.self) {
3333
// Simple type.
34-
var result = identifierType.genericArgumentClause?.arguments.flatMapSet { types(for: $0.argument) } ?? []
34+
var result: Set<TokenSyntax> = identifierType.genericArgumentClause?.arguments.flatMapSet {
35+
guard case let .type(argumentType) = $0.argument else { return [] }
36+
return types(for: argumentType)
37+
} ?? []
3538
return result.inserting(identifierType.name)
3639
} else if let optionalType = typeSyntax.as(OptionalTypeSyntax.self) {
3740
// Optional type.
3841
return types(for: optionalType.wrappedType)
3942
} else if let memberType = typeSyntax.as(MemberTypeSyntax.self) {
4043
// Member type.
4144
return types(for: memberType.baseType)
42-
.union(memberType.genericArgumentClause?.arguments.flatMapSet { types(for: $0.argument) } ?? [])
45+
.union(memberType.genericArgumentClause?.arguments.flatMapSet {
46+
guard case let .type(argumentType) = $0.argument else { return [] }
47+
return types(for: argumentType)
48+
} ?? [])
4349
.union([memberType.name])
4450
} else if let tuple = typeSyntax.as(TupleTypeSyntax.self) {
4551
// Tuple type.

Sources/XcodeSupport/XcodeTarget.swift

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,17 @@ public final class XcodeTarget {
5757
}
5858

5959
private func identifyInfoPlistFiles() throws {
60-
let plistFiles = target.buildConfigurationList?.buildConfigurations.compactMap {
61-
$0.buildSettings["INFOPLIST_FILE"] as? String
60+
let plistFiles = target.buildConfigurationList?.buildConfigurations.flatMap {
61+
if let setting = $0.buildSettings["INFOPLIST_FILE"] {
62+
switch setting {
63+
case let .string(value):
64+
return [value]
65+
case let .array(values):
66+
return values
67+
}
68+
}
69+
70+
return []
6271
} ?? []
6372
files[.infoPlist] = plistFiles.mapSet { parseInfoPlistSetting($0) }
6473
}

0 commit comments

Comments
 (0)