Update deps

Author: ileitch

.github/workflows/test.yml

@@ -35,29 +35,49 @@ jobs:
         - name: Scan
           run: bazel run //:periphery -- scan --bazel --quiet --strict --baseline baselines/bazel.json
   macOS:
+    name: macOS
     strategy:
       fail-fast: false
       matrix:
-        xcode: ["16.2", "16.1", "16.0", "15.4"]
+        step: ["nightly", "16.3", "16.2", "16.1"]
         include:
-          - xcode: "16.2"
+          - step: "nightly"
+            xcode: "16.2"
+            swiftly: "main-snapshot"
+            macos: macos-15
+            continueOnError: true
+          - step: "16.3"
+            xcode: "16.3"
             macos: macos-15
-          - xcode: "16.1"
+          - step: "16.2"
+            xcode: "16.2"
             macos: macos-15
-          - xcode: "16.0"
+          - step: "16.1"
+            xcode: "16.1"
             macos: macos-15
-          - xcode: "15.4"
-            macos: macos-14
     runs-on: ${{ matrix.macos }}
-    name: macOS
     steps:
     - uses: actions/checkout@master
     - name: Select Xcode version
       run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app; swift -version
+    - name: Install Swiftly
+      if: ${{ matrix.swiftly }}
+      run: |
+        curl -O https://download.swift.org/swiftly/darwin/swiftly.pkg
+        installer -pkg swiftly.pkg -target CurrentUserHomeDirectory
+        ~/.swiftly/bin/swiftly init --skip-install
+        . ~/.swiftly/env.sh
+        ls -al
+    - name: Install Swift (Swiftly)
+      if: ${{ matrix.swiftly }}
+      run: |
+        echo $PATH
+        swiftly install ${{ matrix.swiftly }} --use
     - name: Get Swift Version
       id: get-swift-version
       run: |
-          echo "::set-output name=version::$(swift -version | head -n 1 | sed s/,// )"
+        swift -version
+        echo "::set-output name=version::$(swift -version | head -n 1 | sed s/,// )"
       shell: bash
     - name: Cache resolved dependencies
       id: cache-resolved-dependencies
@@ -79,23 +99,28 @@ jobs:
     - name: Test
       run: ${{ env.swift_test }}
   linux:
+    name: Linux
     strategy:
       fail-fast: false
       matrix:
-        swift: ["6.0", "5.10"]
+        swift: ["nightly", "6.1", "6.0"]
         include:
+          - swift: "nightly"
+            container: "swiftlang/swift:nightly"
+            continueOnError: true
+          - swift: "6.1"
+            container: "swift:6.1"
           - swift: "6.0"
             container: "swift:6.0"
-          - swift: "5.10"
-            container: "swift:5.10"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container: ${{ matrix.container }}
-    name: Linux
+    continue-on-error: ${{ matrix.continueOnError == true }}
     steps:
     - uses: actions/checkout@master
     - name: Get Swift Version
       id: get-swift-version
       run: |
+        swift -version
         echo "::set-output name=version::$(swift -version | head -n 1 | sed s/,// )"
       shell: bash
     - name: Cache resolved dependencies

MODULE.bazel

@@ -15,10 +15,10 @@ bazel_dep(name = "aexml", version = "4.7.0")
 bazel_dep(name = "swift_argument_parser", version = "1.5.0")
 bazel_dep(name = "swift-filename-matcher", version = "2.0.0")
 bazel_dep(name = "swift-indexstore", version = "0.3.0")
-bazel_dep(name = "swift-syntax", version = "600.0.1")
+bazel_dep(name = "swift-syntax", version = "601.0.0")
 bazel_dep(name = "swift-system", version = "1.4.2")
 bazel_dep(name = "pathkit", version = "1.0.1")
-bazel_dep(name = "xcodeproj", version = "8.27.3")
+bazel_dep(name = "xcodeproj", version = "9.0.0")
 bazel_dep(name = "yams", version = "5.3.1")
 
 # Generated repo

MODULE.bazel.lock

@@ -1,4 +1,4 @@
-// swift-tools-version:5.10
+// swift-tools-version:6.0
 import PackageDescription
 
 var dependencies: [Package.Dependency] = [
@@ -7,15 +7,15 @@ var dependencies: [Package.Dependency] = [
     .package(url: "https://github.com/tadija/AEXML", from: "4.0.0"),
     .package(url: "https://github.com/apple/swift-argument-parser", from: "1.0.0"),
     .package(url: "https://github.com/kateinoigakukun/swift-indexstore", from: "0.3.0"),
-    .package(url: "https://github.com/apple/swift-syntax", from: "600.0.1"),
+    .package(url: "https://github.com/apple/swift-syntax", from: "601.0.1"),
     .package(url: "https://github.com/ileitch/swift-filename-matcher", from: "2.0.0"),
 ]
 
 #if os(macOS)
     dependencies.append(
         .package(
             url: "https://github.com/tuist/xcodeproj",
-            from: "8.27.3"
+            from: "9.0.0"
         )
     )
 #endif
@@ -181,5 +181,5 @@ let package = Package(
     ],
     dependencies: dependencies,
     targets: targets,
-    swiftLanguageVersions: [.v5]
+    swiftLanguageModes: [.v5]
 )

Package.resolved

@@ -467,7 +467,9 @@ public final class DeclarationSyntaxVisitor: PeripherySyntaxVisitor {
         guard let clause else { return [] }
 
         return clause.arguments.reduce(into: .init()) { result, param in
-            result.formUnion(typeSyntaxInspector.typeLocations(for: param.argument))
+            if case let .type(argumentType) = param.argument {
+                result.formUnion(typeSyntaxInspector.typeLocations(for: argumentType))
+            }
         }
     }
 

Package.swift

@@ -31,15 +31,21 @@ struct TypeSyntaxInspector {
     func types(for typeSyntax: TypeSyntax) -> Set<TokenSyntax> {
         if let identifierType = typeSyntax.as(IdentifierTypeSyntax.self) {
             // Simple type.
-            var result = identifierType.genericArgumentClause?.arguments.flatMapSet { types(for: $0.argument) } ?? []
+            var result: Set<TokenSyntax> = identifierType.genericArgumentClause?.arguments.flatMapSet {
+                guard case let .type(argumentType) = $0.argument else { return [] }
+                return types(for: argumentType)
+            } ?? []
             return result.inserting(identifierType.name)
         } else if let optionalType = typeSyntax.as(OptionalTypeSyntax.self) {
             // Optional type.
             return types(for: optionalType.wrappedType)
         } else if let memberType = typeSyntax.as(MemberTypeSyntax.self) {
             // Member type.
             return types(for: memberType.baseType)
-                .union(memberType.genericArgumentClause?.arguments.flatMapSet { types(for: $0.argument) } ?? [])
+                .union(memberType.genericArgumentClause?.arguments.flatMapSet {
+                    guard case let .type(argumentType) = $0.argument else { return [] }
+                    return types(for: argumentType)
+                } ?? [])
                 .union([memberType.name])
         } else if let tuple = typeSyntax.as(TupleTypeSyntax.self) {
             // Tuple type.

Sources/SyntaxAnalysis/DeclarationSyntaxVisitor.swift

@@ -57,8 +57,17 @@ public final class XcodeTarget {
     }
 
     private func identifyInfoPlistFiles() throws {
-        let plistFiles = target.buildConfigurationList?.buildConfigurations.compactMap {
-            $0.buildSettings["INFOPLIST_FILE"] as? String
+        let plistFiles = target.buildConfigurationList?.buildConfigurations.flatMap {
+            if let setting = $0.buildSettings["INFOPLIST_FILE"] {
+                switch setting {
+                case let .string(value):
+                    return [value]
+                case let .array(values):
+                    return values
+                }
+            }
+
+            return []
         } ?? []
         files[.infoPlist] = plistFiles.mapSet { parseInfoPlistSetting($0) }
     }

Sources/SyntaxAnalysis/TypeSyntaxInspector.swift

@@ -1 +1 @@
-{"v1":{"usrs":["import-Configuration-Sources\/ProjectDrivers\/XcodeProjectDriver.swift:2:5","import-Indexer-Sources\/ProjectDrivers\/XcodeProjectDriver.swift:4:5","import-Logger-Sources\/ProjectDrivers\/XcodeProjectDriver.swift:5:5","import-Shared-Sources\/ProjectDrivers\/XcodeProjectDriver.swift:6:5","import-SourceGraph-Sources\/ProjectDrivers\/XcodeProjectDriver.swift:7:5","import-TestShared-Tests\/PeripheryTests\/ObjcAccessibleRetentionTest.swift:2:1","import-TestShared-Tests\/PeripheryTests\/ObjcAnnotatedRetentionTest.swift:2:1","s:11SourceGraph15ProjectFileKindO10extensionsSaySSGvp","s:6Shared14SetupSelectionO","s:6Shared17SetupGuideHelpersC6select8multipleAA0B9SelectionOSaySSG_tF","s:SS10ExtensionsE17withEscapedQuotesSSvp","s:SS10ExtensionsE4djb2Sivp","s:SS10ExtensionsE7djb2HexSSvp"]}}
+{"v1":{"usrs":["import-Configuration-Sources\/ProjectDrivers\/XcodeProjectDriver.swift:2:5","import-Indexer-Sources\/ProjectDrivers\/XcodeProjectDriver.swift:4:5","import-Logger-Sources\/ProjectDrivers\/XcodeProjectDriver.swift:5:5","import-Shared-Sources\/ProjectDrivers\/XcodeProjectDriver.swift:6:5","import-SourceGraph-Sources\/ProjectDrivers\/XcodeProjectDriver.swift:7:5","import-TestShared-Tests\/PeripheryTests\/ObjcAccessibleRetentionTest.swift:2:1","import-TestShared-Tests\/PeripheryTests\/ObjcAnnotatedRetentionTest.swift:2:1","s:11SourceGraph15ProjectFileKindO10extensionsSaySSGvp","s:13ConfigurationAAC20_retainFilesMatchers33_99B696DD1FA930EA831ABFF16BC88E61LLSay15FilenameMatcherAEVGSgvp","s:13ConfigurationAAC21_indexExcludeMatchers33_99B696DD1FA930EA831ABFF16BC88E61LLSay15FilenameMatcherAEVGSgvp","s:6Shared14SetupSelectionO","s:6Shared17SetupGuideHelpersC6select8multipleAA0B9SelectionOSaySSG_tF","s:8Frontend13UpdateCheckerC13latestVersion33_996BB8CE205CF54754BD877559C8CCFELLSSSgvp","s:8Frontend13UpdateCheckerC5error33_996BB8CE205CF54754BD877559C8CCFELLs5Error_pSgvp","s:SS10ExtensionsE17withEscapedQuotesSSvp","s:SS10ExtensionsE4djb2Sivp","s:SS10ExtensionsE7djb2HexSSvp"]}}