Skip to content

Commit 0d6be7a

Browse files
committed
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
2 parents b642f54 + f9266c8 commit 0d6be7a

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/.swiftpm
33
/.build
44
/Packages
5-
swift-system.xcodeproj
5+
/*.xcodeproj
66
xcuserdata/
77
.*.sw?
8+
/.swiftpm
89
.docc-build

Package.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
// swift-tools-version:5.6
2-
// The swift-tools-version declares the minimum version of Swift required to build this package.
1+
// swift-tools-version:5.8
32

43
/*
54
This source file is part of the Swift System open source project
65

7-
Copyright (c) 2020 Apple Inc. and the Swift System project authors
6+
Copyright (c) 2020-2024 Apple Inc. and the Swift System project authors
87
Licensed under Apache License v2.0 with Runtime Library Exception
98

109
See https://swift.org/LICENSE.txt for license information
@@ -47,6 +46,6 @@ let package = Package(
4746
swiftSettings: [
4847
.define("SYSTEM_PACKAGE"),
4948
.define("SYSTEM_PACKAGE_DARWIN", .when(platforms: DarwinPlatforms)),
50-
])
49+
]),
5150
]
5251
)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ To use the `SystemPackage` library in a SwiftPM project,
3030
add the following line to the dependencies in your `Package.swift` file:
3131

3232
```swift
33-
.package(url: "https://github.com/apple/swift-system", from: "1.0.0"),
33+
.package(url: "https://github.com/apple/swift-system", from: "1.3.0"),
3434
```
3535

3636
Finally, include `"SystemPackage"` as a dependency for your executable target:
@@ -39,7 +39,7 @@ Finally, include `"SystemPackage"` as a dependency for your executable target:
3939
let package = Package(
4040
// name, platforms, products, etc.
4141
dependencies: [
42-
.package(url: "https://github.com/apple/swift-system", from: "1.0.0"),
42+
.package(url: "https://github.com/apple/swift-system", from: "1.3.0"),
4343
// other dependencies
4444
],
4545
targets: [

Sources/System/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ target_sources(SystemPackage PRIVATE
4141
target_link_libraries(SystemPackage PUBLIC
4242
CSystem)
4343

44+
set(SWIFT_SYSTEM_APPLE_PLATFORMS "Darwin" "iOS" "watchOS" "tvOS" "visionOS")
45+
if(CMAKE_SYSTEM_NAME IN_LIST SWIFT_SYSTEM_APPLE_PLATFORMS)
46+
target_compile_definitions(SystemPackage PRIVATE SYSTEM_PACKAGE_DARWIN)
47+
endif()
4448

4549
_install_target(SystemPackage)
4650
set_property(GLOBAL APPEND PROPERTY SWIFT_SYSTEM_EXPORTS SystemPackage)

0 commit comments

Comments
 (0)