Skip to content

Commit

Permalink
Remove dependency on swift-system (#448)
Browse files Browse the repository at this point in the history
This dependency is unused and just unnecessarily complicates things.
  • Loading branch information
neonichu authored Nov 30, 2023
1 parent 464a3e6 commit 8732961
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 15 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
11 changes: 0 additions & 11 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ let package = Package(
dependencies: [
"TSCLibc",
"TSCclibc",
.product(name: "SystemPackage", package: "swift-system"),
],
exclude: CMakeFiles + ["README.md"],
cxxSettings: [
Expand Down Expand Up @@ -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"),
]
}
2 changes: 0 additions & 2 deletions Sources/TSCBasic/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ target_compile_options(TSCBasic PUBLIC
"$<$<PLATFORM_ID:Android>:SHELL:-Xcc -U_GNU_SOURCE>"
# Ignore secure function warnings on Windows.
"$<$<PLATFORM_ID:Windows>:SHELL:-Xcc -D_CRT_SECURE_NO_WARNINGS>")
target_link_libraries(TSCBasic PUBLIC
SwiftSystem::SystemPackage)
target_link_libraries(TSCBasic PRIVATE
TSCclibc
TSCLibc)
Expand Down
1 change: 0 additions & 1 deletion Sources/TSCBasic/FileSystem.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import TSCLibc
import Foundation
import Dispatch
import SystemPackage

public struct FileSystemError: Error, Equatable, Sendable {
public enum Kind: Equatable, Sendable {
Expand Down

0 comments on commit 8732961

Please sign in to comment.