Revert "Use mise for dev tooling (#806)"

This reverts commit 0c30728.
peripheryapp · Aug 28, 2024 · b95995a · b95995a
1 parent e8a599e
commit b95995a
Show file tree

Hide file tree

Showing 92 changed files with 127 additions and 238 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -41,17 +41,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/ileitch/swift-filename-matcher",
       "state" : {
-        "revision" : "8cc02e902f651bb5812860011ee13707b9e037df",
-        "version" : "0.1.2"
+        "revision" : "17eaeaf60f2703e3ef826de94149c88a78953fd3",
+        "version" : "0.1.1"
       }
     },
     {
       "identity" : "swift-indexstore",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/kateinoigakukun/swift-indexstore",
+      "location" : "https://github.com/ileitch/swift-indexstore",
       "state" : {
-        "revision" : "9363af98d32247bf953855fc99d1f1f1ef803e43",
-        "version" : "0.3.0"
+        "revision" : "e0046a1704e2e7af88355883247ee1f9d47ed9ee",
+        "version" : "9.0.4"
       }
     },
     {
@@ -77,8 +77,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/tuist/xcodeproj",
       "state" : {
-        "revision" : "a1ff175a2f3bfbec166f33b264263c55f2149720",
-        "version" : "8.23.2"
+        "revision" : "c15e011dc0ea74f7833bf33c2791483beb9c7577",
+        "version" : "8.23.1"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -6,7 +6,7 @@ var dependencies: [Package.Dependency] = [
     .package(url: "https://github.com/jpsim/Yams", from: "5.0.0"),
     .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/ileitch/swift-indexstore", from: "9.0.4"),
     .package(url: "https://github.com/apple/swift-syntax", from: "600.0.0-prerelease-2024-08-14"),
     .package(url: "https://github.com/ileitch/swift-filename-matcher", from: "0.0.0"),
 ]
@@ -64,17 +64,6 @@ var targets: [PackageDescription.Target] = [
             .product(name: "SwiftIndexStore", package: "swift-indexstore"),
         ]
     ),
-    .target(name: "BaseLogger"),
-    .target(
-        name: "Configuration",
-        dependencies: [
-            .product(name: "FilenameMatcher", package: "swift-filename-matcher"),
-            .product(name: "Yams", package: "Yams"),
-            .product(name: "SystemPackage", package: "swift-system"),
-            .target(name: "BaseLogger"),
-            .target(name: "Shared"),
-        ]
-    ),
     .target(
         name: "ProjectDrivers",
         dependencies: projectDriverDependencies
@@ -93,8 +82,6 @@ var targets: [PackageDescription.Target] = [
         dependencies: [
             .product(name: "SwiftSyntax", package: "swift-syntax"),
             .target(name: "Shared"),
-            .target(name: "Configuration"),
-            .target(name: "Utils"),
         ]
     ),
     .target(
@@ -105,15 +92,6 @@ var targets: [PackageDescription.Target] = [
             .product(name: "FilenameMatcher", package: "swift-filename-matcher"),
         ]
     ),
-    .target(
-        name: "Utils",
-        dependencies: [
-            .product(name: "Yams", package: "Yams"),
-            .product(name: "SystemPackage", package: "swift-system"),
-            .product(name: "FilenameMatcher", package: "swift-filename-matcher"),
-            .target(name: "Configuration"),
-        ]
-    ),
     .target(
         name: "TestShared",
         dependencies: [

diff --git a/Sources/BaseLogger/BaseLogger.swift b/Sources/BaseLogger/BaseLogger.swift
diff --git a/Sources/Frontend/Commands/CheckUpdateCommand.swift b/Sources/Frontend/Commands/CheckUpdateCommand.swift
@@ -1,7 +1,6 @@
 import ArgumentParser
 import Foundation
-import Utils
-import BaseLogger
+import Shared
 
 struct CheckUpdateCommand: FrontendCommand {
     static let configuration = CommandConfiguration(

diff --git a/Sources/Frontend/Commands/ClearCacheCommand.swift b/Sources/Frontend/Commands/ClearCacheCommand.swift
@@ -1,7 +1,6 @@
 import ArgumentParser
 import Foundation
 import Shared
-import Utils
 
 struct ClearCacheCommand: FrontendCommand {
     static let configuration = CommandConfiguration(

diff --git a/Sources/Frontend/Commands/FrontendCommand.swift b/Sources/Frontend/Commands/FrontendCommand.swift
@@ -1,5 +1,5 @@
 import ArgumentParser
-import BaseLogger
+import Shared
 
 protocol FrontendCommand: ParsableCommand {}
 extension FrontendCommand {

diff --git a/Sources/Frontend/Commands/ScanBehavior.swift b/Sources/Frontend/Commands/ScanBehavior.swift
@@ -2,8 +2,6 @@ import Foundation
 import PeripheryKit
 import Shared
 import SystemPackage
-import Configuration
-import Utils
 
 final class ScanBehavior {
     private let configuration: Configuration

diff --git a/Sources/Frontend/Commands/ScanCommand.swift b/Sources/Frontend/Commands/ScanCommand.swift
@@ -2,7 +2,6 @@ import ArgumentParser
 import Foundation
 import Shared
 import SystemPackage
-import Configuration
 
 struct ScanCommand: FrontendCommand {
     static let configuration = CommandConfiguration(

diff --git a/Sources/Frontend/CommonSetupGuide.swift b/Sources/Frontend/CommonSetupGuide.swift
@@ -1,7 +1,5 @@
 import Foundation
 import Shared
-import Configuration
-import BaseLogger
 
 final class CommonSetupGuide: SetupGuideHelpers {
     private let configuration: Configuration

diff --git a/Sources/Frontend/GuidedSetup.swift b/Sources/Frontend/GuidedSetup.swift
@@ -1,7 +1,5 @@
 import Foundation
 import Shared
-import Configuration
-import BaseLogger
 
 #if canImport(XcodeSupport)
     import XcodeSupport

diff --git a/Sources/Frontend/Project.swift b/Sources/Frontend/Project.swift
@@ -2,7 +2,6 @@ import Foundation
 import ProjectDrivers
 import Shared
 import SystemPackage
-import Configuration
 
 final class Project {
     static func identify() throws -> Self {

diff --git a/Sources/Frontend/SPMProjectSetupGuide.swift b/Sources/Frontend/SPMProjectSetupGuide.swift
@@ -1,7 +1,6 @@
 import Foundation
 import Shared
 import SystemPackage
-import ProjectDrivers
 
 final class SPMProjectSetupGuide: SetupGuideHelpers, SetupGuide {
     static func detect() -> Self? {

diff --git a/Sources/Frontend/Scan.swift b/Sources/Frontend/Scan.swift
@@ -4,9 +4,6 @@ import PeripheryKit
 import ProjectDrivers
 import Shared
 import SourceGraph
-import Configuration
-import Utils
-import BaseLogger
 
 final class Scan {
     private let configuration: Configuration

diff --git a/Sources/Frontend/UpdateChecker.swift b/Sources/Frontend/UpdateChecker.swift
@@ -1,8 +1,6 @@
 import Foundation
 import Shared
-import Configuration
-import Utils
-import BaseLogger
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif

diff --git a/Sources/Frontend/main.swift b/Sources/Frontend/main.swift
@@ -1,6 +1,6 @@
 import ArgumentParser
 import Foundation
-import Utils
+import Shared
 
 Logger.configureBuffering()
 

diff --git a/Sources/Indexer/IndexPipeline.swift b/Sources/Indexer/IndexPipeline.swift
@@ -1,6 +1,6 @@
 import Foundation
+import Shared
 import SourceGraph
-import Utils
 
 public struct IndexPipeline {
     private let plan: IndexPlan

diff --git a/Sources/Indexer/Indexer.swift b/Sources/Indexer/Indexer.swift
@@ -1,8 +1,8 @@
 import FilenameMatcher
 import Foundation
+import Shared
 import SourceGraph
 import SystemPackage
-import Configuration
 
 class Indexer {
     private let configuration: Configuration

diff --git a/Sources/Indexer/InfoPlistIndexer.swift b/Sources/Indexer/InfoPlistIndexer.swift
@@ -1,8 +1,6 @@
 import Shared
 import SourceGraph
 import SystemPackage
-import Utils
-import Configuration
 
 final class InfoPlistIndexer: Indexer {
     private let infoPlistFiles: Set<FilePath>

diff --git a/Sources/Indexer/SourceFileCollector.swift b/Sources/Indexer/SourceFileCollector.swift
@@ -3,8 +3,6 @@ import Shared
 import SourceGraph
 import SwiftIndexStore
 import SystemPackage
-import Utils
-import Configuration
 
 public struct SourceFileCollector {
     private let indexStorePaths: Set<FilePath>

diff --git a/Sources/Indexer/SwiftIndexer.swift b/Sources/Indexer/SwiftIndexer.swift
@@ -4,8 +4,6 @@ import SourceGraph
 import SwiftIndexStore
 import SyntaxAnalysis
 import SystemPackage
-import Utils
-import Configuration
 
 public struct IndexUnit {
     let store: IndexStore

diff --git a/Sources/Indexer/XCDataModelIndexer.swift b/Sources/Indexer/XCDataModelIndexer.swift
@@ -1,8 +1,6 @@
 import Shared
 import SourceGraph
 import SystemPackage
-import Utils
-import Configuration
 
 final class XCDataModelIndexer: Indexer {
     private let files: Set<FilePath>

diff --git a/Sources/Indexer/XCMappingModelIndexer.swift b/Sources/Indexer/XCMappingModelIndexer.swift
@@ -1,8 +1,6 @@
 import Shared
 import SourceGraph
 import SystemPackage
-import Utils
-import Configuration
 
 final class XCMappingModelIndexer: Indexer {
     private let files: Set<FilePath>

diff --git a/Sources/Indexer/XibIndexer.swift b/Sources/Indexer/XibIndexer.swift
@@ -1,8 +1,6 @@
 import Shared
 import SourceGraph
 import SystemPackage
-import Utils
-import Configuration
 
 final class XibIndexer: Indexer {
     private let xibFiles: Set<FilePath>

diff --git a/Sources/PeripheryKit/Results/CheckstyleFormatter.swift b/Sources/PeripheryKit/Results/CheckstyleFormatter.swift
@@ -2,7 +2,6 @@ import Foundation
 import Shared
 import SourceGraph
 import SystemPackage
-import Configuration
 
 final class CheckstyleFormatter: OutputFormatter {
     let configuration: Configuration

diff --git a/Sources/PeripheryKit/Results/CodeClimateFormatter.swift b/Sources/PeripheryKit/Results/CodeClimateFormatter.swift
@@ -1,7 +1,6 @@
 import Foundation
 import Shared
 import SystemPackage
-import Configuration
 
 final class CodeClimateFormatter: OutputFormatter {
     let configuration: Configuration

diff --git a/Sources/PeripheryKit/Results/CsvFormatter.swift b/Sources/PeripheryKit/Results/CsvFormatter.swift
@@ -2,7 +2,6 @@ import Foundation
 import Shared
 import SourceGraph
 import SystemPackage
-import Configuration
 
 final class CsvFormatter: OutputFormatter {
     let configuration: Configuration

diff --git a/Sources/PeripheryKit/Results/GitHubActionsFormatter.swift b/Sources/PeripheryKit/Results/GitHubActionsFormatter.swift
@@ -2,7 +2,6 @@ import Foundation
 import Shared
 import SourceGraph
 import SystemPackage
-import Configuration
 
 final class GitHubActionsFormatter: OutputFormatter {
     let configuration: Configuration

diff --git a/Sources/PeripheryKit/Results/JsonFormatter.swift b/Sources/PeripheryKit/Results/JsonFormatter.swift
@@ -1,7 +1,6 @@
 import Foundation
 import Shared
 import SystemPackage
-import Configuration
 
 final class JsonFormatter: OutputFormatter {
     let configuration: Configuration

diff --git a/Sources/PeripheryKit/Results/OutputDeclarationFilter.swift b/Sources/PeripheryKit/Results/OutputDeclarationFilter.swift
@@ -1,8 +1,7 @@
 import FilenameMatcher
 import Foundation
+import Shared
 import SystemPackage
-import Configuration
-import Utils
 
 public final class OutputDeclarationFilter {
     private let configuration: Configuration

diff --git a/Sources/PeripheryKit/Results/OutputFormatter.swift b/Sources/PeripheryKit/Results/OutputFormatter.swift
@@ -2,8 +2,6 @@ import Foundation
 import Shared
 import SourceGraph
 import SystemPackage
-import Configuration
-import BaseLogger
 
 public protocol OutputFormatter: AnyObject {
     var configuration: Configuration { get }