Skip to content

Remove dependency on swift-system #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Remove dependency on swift-system #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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