mirror of
https://github.com/apple/swift-system
synced 2026-11-22 04:30:46 +00:00
Merge branch 'release/1.3.0'
# Conflicts: # .gitignore # .swiftci/5_10_ubuntu2204 # .swiftci/5_8_ubuntu2204 # .swiftci/5_9_ubuntu2204 # .swiftci/nightly_6_0_macos # .swiftci/nightly_6_0_ubuntu2204 # .swiftci/nightly_main_macos # .swiftci/nightly_main_ubuntu2204 # .swiftci/nightly_main_windows # Package.swift # Sources/System/Internals/CInterop.swift # Sources/System/Internals/Constants.swift # Sources/System/Internals/Exports.swift # Sources/System/Internals/Syscalls.swift # Tests/SystemTests/FileOperationsTest.swift
This commit is contained in:
commit
0d6be7ac22
4 files changed
+11
-7
No files matched your search
+2
-1
@@ -2,7 +2,8 @@
|
||||
/.swiftpm
|
||||
/.build
|
||||
/Packages
|
||||
swift-system.xcodeproj
|
||||
/*.xcodeproj
|
||||
xcuserdata/
|
||||
.*.sw?
|
||||
/.swiftpm
|
||||
.docc-build
|
||||
+3
-4
@@ -1,10 +1,9 @@
|
||||
// swift-tools-version:5.6
|
||||
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
||||
// swift-tools-version:5.8
|
||||
|
||||
/*
|
||||
This source file is part of the Swift System open source project
|
||||
|
||||
Copyright (c) 2020 Apple Inc. and the Swift System project authors
|
||||
Copyright (c) 2020-2024 Apple Inc. and the Swift System project authors
|
||||
Licensed under Apache License v2.0 with Runtime Library Exception
|
||||
|
||||
See https://swift.org/LICENSE.txt for license information
|
||||
@@ -47,6 +46,6 @@ let package = Package(
|
||||
swiftSettings: [
|
||||
.define("SYSTEM_PACKAGE"),
|
||||
.define("SYSTEM_PACKAGE_DARWIN", .when(platforms: DarwinPlatforms)),
|
||||
])
|
||||
]),
|
||||
]
|
||||
)
|
||||
@@ -30,7 +30,7 @@ To use the `SystemPackage` library in a SwiftPM project,
|
||||
add the following line to the dependencies in your `Package.swift` file:
|
||||
|
||||
```swift
|
||||
.package(url: "https://github.com/apple/swift-system", from: "1.0.0"),
|
||||
.package(url: "https://github.com/apple/swift-system", from: "1.3.0"),
|
||||
```
|
||||
|
||||
Finally, include `"SystemPackage"` as a dependency for your executable target:
|
||||
@@ -39,7 +39,7 @@ Finally, include `"SystemPackage"` as a dependency for your executable target:
|
||||
let package = Package(
|
||||
// name, platforms, products, etc.
|
||||
dependencies: [
|
||||
.package(url: "https://github.com/apple/swift-system", from: "1.0.0"),
|
||||
.package(url: "https://github.com/apple/swift-system", from: "1.3.0"),
|
||||
// other dependencies
|
||||
],
|
||||
targets: [
|
||||
|
||||
@@ -41,6 +41,10 @@ target_sources(SystemPackage PRIVATE
|
||||
target_link_libraries(SystemPackage PUBLIC
|
||||
CSystem)
|
||||
|
||||
set(SWIFT_SYSTEM_APPLE_PLATFORMS "Darwin" "iOS" "watchOS" "tvOS" "visionOS")
|
||||
if(CMAKE_SYSTEM_NAME IN_LIST SWIFT_SYSTEM_APPLE_PLATFORMS)
|
||||
target_compile_definitions(SystemPackage PRIVATE SYSTEM_PACKAGE_DARWIN)
|
||||
endif()
|
||||
|
||||
_install_target(SystemPackage)
|
||||
set_property(GLOBAL APPEND PROPERTY SWIFT_SYSTEM_EXPORTS SystemPackage)
|
||||
Reference in new issue
Block a user