From 8732961d5119731aa115a4dadd2a01150b99de16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boris=20B=C3=BCgling?= Date: Thu, 30 Nov 2023 17:01:59 -0500 Subject: [PATCH] Remove dependency on swift-system (#448) This dependency is unused and just unnecessarily complicates things. --- CMakeLists.txt | 1 - Package.swift | 11 ----------- Sources/TSCBasic/CMakeLists.txt | 2 -- Sources/TSCBasic/FileSystem.swift | 1 - 4 files changed, 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5c7fb1f..fa443140 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,6 @@ option(BUILD_SHARED_LIBS "Build shared libraries by default" YES) find_package(dispatch QUIET) find_package(Foundation QUIET) find_package(Threads QUIET) -find_package(SwiftSystem CONFIG REQUIRED) add_subdirectory(Sources) add_subdirectory(cmake/modules) diff --git a/Package.swift b/Package.swift index ab2774c8..40c0d295 100644 --- a/Package.swift +++ b/Package.swift @@ -69,7 +69,6 @@ let package = Package( dependencies: [ "TSCLibc", "TSCclibc", - .product(name: "SystemPackage", package: "swift-system"), ], exclude: CMakeFiles + ["README.md"], cxxSettings: [ @@ -110,13 +109,3 @@ let package = Package( exclude: ["pkgconfigInputs", "Inputs"]), ] ) - - if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil { - package.dependencies += [ - .package(url: "https://github.com/apple/swift-system.git", from: "1.1.1"), - ] - } else { - package.dependencies += [ - .package(path: "../swift-system"), - ] - } diff --git a/Sources/TSCBasic/CMakeLists.txt b/Sources/TSCBasic/CMakeLists.txt index 1217bdfc..0f30dfff 100644 --- a/Sources/TSCBasic/CMakeLists.txt +++ b/Sources/TSCBasic/CMakeLists.txt @@ -56,8 +56,6 @@ target_compile_options(TSCBasic PUBLIC "$<$:SHELL:-Xcc -U_GNU_SOURCE>" # Ignore secure function warnings on Windows. "$<$:SHELL:-Xcc -D_CRT_SECURE_NO_WARNINGS>") -target_link_libraries(TSCBasic PUBLIC - SwiftSystem::SystemPackage) target_link_libraries(TSCBasic PRIVATE TSCclibc TSCLibc) diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift index b33b1c61..8667130d 100644 --- a/Sources/TSCBasic/FileSystem.swift +++ b/Sources/TSCBasic/FileSystem.swift @@ -11,7 +11,6 @@ import TSCLibc import Foundation import Dispatch -import SystemPackage public struct FileSystemError: Error, Equatable, Sendable { public enum Kind: Equatable, Sendable {