From 1424b59317cee32fdf4d8002e54f31430c57a216 Mon Sep 17 00:00:00 2001 From: Gorbenko Roman <45801227+rofle100lvl@users.noreply.github.com> Date: Mon, 30 Sep 2024 17:24:13 +0200 Subject: [PATCH] Fixed periphery scan --- Sources/ProjectDrivers/BazelProjectDriver.swift | 10 +++++----- Sources/ProjectDrivers/GenericProjectDriver.swift | 4 ++-- Sources/ProjectDrivers/Project.swift | 1 + Sources/Scan/Scan.swift | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Sources/ProjectDrivers/BazelProjectDriver.swift b/Sources/ProjectDrivers/BazelProjectDriver.swift index 640eab1de..161cc3f15 100644 --- a/Sources/ProjectDrivers/BazelProjectDriver.swift +++ b/Sources/ProjectDrivers/BazelProjectDriver.swift @@ -4,18 +4,18 @@ import Logger import Shared import SystemPackage -public class BazelProjectDriver: ProjectDriver { - public static var isSupported: Bool { +class BazelProjectDriver: ProjectDriver { + static var isSupported: Bool { FilePath("MODULE.bazel").exists || FilePath("WORKSPACE").exists } - public static func build(configuration: Configuration, shell: Shell, logger: Logger) throws -> Self { + static func build(configuration: Configuration, shell: Shell, logger: Logger) throws -> Self { configuration.bazel = false // Generic project mode is used for the actual scan. configuration.reportExclude.append("**/bazel-out/**/*") return self.init(configuration: configuration, shell: shell, logger: logger) } - private static let topLevelKinds = [ + static let topLevelKinds = [ // rules_apple, iOS "ios_app_clip", "ios_application", @@ -81,7 +81,7 @@ public class BazelProjectDriver: ProjectDriver { self.fileManager = fileManager } - public func build() throws { + func build() throws { guard let executablePath = Bundle.main.executablePath else { fatalError("Expected executable path.") } diff --git a/Sources/ProjectDrivers/GenericProjectDriver.swift b/Sources/ProjectDrivers/GenericProjectDriver.swift index 6807e3643..1ab4be218 100644 --- a/Sources/ProjectDrivers/GenericProjectDriver.swift +++ b/Sources/ProjectDrivers/GenericProjectDriver.swift @@ -6,7 +6,7 @@ import Shared import SwiftIndexStore import SystemPackage -public final class GenericProjectDriver { +final class GenericProjectDriver { struct GenericConfig: Decodable { let indexstores: Set let plists: Set @@ -24,7 +24,7 @@ public final class GenericProjectDriver { private let testTargets: Set private let configuration: Configuration - public convenience init(genericProjectConfig: FilePath, configuration: Configuration) throws { + convenience init(genericProjectConfig: FilePath, configuration: Configuration) throws { guard genericProjectConfig.exists else { throw PeripheryError.pathDoesNotExist(path: genericProjectConfig.string) } diff --git a/Sources/ProjectDrivers/Project.swift b/Sources/ProjectDrivers/Project.swift index dd69e9d28..c7610dce6 100644 --- a/Sources/ProjectDrivers/Project.swift +++ b/Sources/ProjectDrivers/Project.swift @@ -24,6 +24,7 @@ public final class Project { ) } + // periphery:ignore public init(configuration: Configuration) throws { self.configuration = configuration logger = Logger() diff --git a/Sources/Scan/Scan.swift b/Sources/Scan/Scan.swift index 9cfe06fdf..9d6376abf 100644 --- a/Sources/Scan/Scan.swift +++ b/Sources/Scan/Scan.swift @@ -20,6 +20,7 @@ public final class Scan { graph = SourceGraph(configuration: configuration) } + // periphery:ignore public init( configuration: Configuration, sourceGraph: SourceGraph