From 165fbd34ce0e952a9d1600d2fe3438e1bd85684e Mon Sep 17 00:00:00 2001 From: Adin Cebic Date: Fri, 21 Jun 2024 17:31:25 +0200 Subject: [PATCH] Fix rest of the swiftlint violations Signed-off-by: Adin Cebic --- .../Internal/XCWorkspaceData.swift | 4 ++-- .../XcodeWorkspaceParserLive.swift | 6 +++--- .../Sources/ExamplePackageA/ExamplePackageA.swift | 2 -- .../ExamplePackageATests/ExamplePackageATests.swift | 12 ------------ 4 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 Tests/XcodeWorkspaceParserLiveTests/Example/ExamplePackageA/Sources/ExamplePackageA/ExamplePackageA.swift delete mode 100644 Tests/XcodeWorkspaceParserLiveTests/Example/ExamplePackageA/Tests/ExamplePackageATests/ExamplePackageATests.swift diff --git a/Sources/Library/Parsing/XcodeWorkspaceParserLive/Internal/XCWorkspaceData.swift b/Sources/Library/Parsing/XcodeWorkspaceParserLive/Internal/XCWorkspaceData.swift index f8fc1f6..71fcde9 100644 --- a/Sources/Library/Parsing/XcodeWorkspaceParserLive/Internal/XCWorkspaceData.swift +++ b/Sources/Library/Parsing/XcodeWorkspaceParserLive/Internal/XCWorkspaceData.swift @@ -29,8 +29,8 @@ struct XCWorkspaceData: Decodable { let name: String let location: String var fileReferences: [FileRef] { - _fileReferences.map { - let newLocation = $0.location.replacingOccurrences(of: "group:", with: "\(name)/") + _fileReferences.map { fileRef in + let newLocation = fileRef.location.replacingOccurrences(of: "group:", with: "\(name)/") let newFileRef = FileRef(location: newLocation) return newFileRef } diff --git a/Sources/Library/Parsing/XcodeWorkspaceParserLive/XcodeWorkspaceParserLive.swift b/Sources/Library/Parsing/XcodeWorkspaceParserLive/XcodeWorkspaceParserLive.swift index 81f375d..90d475a 100644 --- a/Sources/Library/Parsing/XcodeWorkspaceParserLive/XcodeWorkspaceParserLive.swift +++ b/Sources/Library/Parsing/XcodeWorkspaceParserLive/XcodeWorkspaceParserLive.swift @@ -35,8 +35,8 @@ public struct XcodeWorkspaceParserLive: XcodeWorkspaceParser { private extension XcodeWorkspaceParserLive { func localSwiftPackages(in workspace: XCWorkspaceData, atSourceRoot sourceRoot: URL) throws -> [SwiftPackage] { - let fileReferences = workspace.groups.flatMap { - $0.fileReferences + let fileReferences = workspace.groups.flatMap { group in + group.fileReferences } return try fileReferences.compactMap { fileReference in guard let packageSwiftFileURL = fileReference.potentialPackageSwiftFileURL(forSourceRoot: sourceRoot) else { @@ -54,7 +54,7 @@ private extension XcodeWorkspaceParserLive { enum XcodeWorkspaceParsingError: Error { case xcodeProjectNotFound - var localizedDescription: String { + var errorDescription: String { return "Could not derive location of the Xcode project file from the given workspace." } } diff --git a/Tests/XcodeWorkspaceParserLiveTests/Example/ExamplePackageA/Sources/ExamplePackageA/ExamplePackageA.swift b/Tests/XcodeWorkspaceParserLiveTests/Example/ExamplePackageA/Sources/ExamplePackageA/ExamplePackageA.swift deleted file mode 100644 index 08b22b8..0000000 --- a/Tests/XcodeWorkspaceParserLiveTests/Example/ExamplePackageA/Sources/ExamplePackageA/ExamplePackageA.swift +++ /dev/null @@ -1,2 +0,0 @@ -// The Swift Programming Language -// https://docs.swift.org/swift-book diff --git a/Tests/XcodeWorkspaceParserLiveTests/Example/ExamplePackageA/Tests/ExamplePackageATests/ExamplePackageATests.swift b/Tests/XcodeWorkspaceParserLiveTests/Example/ExamplePackageA/Tests/ExamplePackageATests/ExamplePackageATests.swift deleted file mode 100644 index eebe14c..0000000 --- a/Tests/XcodeWorkspaceParserLiveTests/Example/ExamplePackageA/Tests/ExamplePackageATests/ExamplePackageATests.swift +++ /dev/null @@ -1,12 +0,0 @@ -@testable import ExamplePackageA -import XCTest - -final class ExamplePackageATests: XCTestCase { - func testExample() throws { - // XCTest Documentation - // https://developer.apple.com/documentation/xctest - - // Defining Test Cases and Test Methods - // https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods - } -}