Skip to content

Commit a18bddb

Browse files
authored
Add back NIOFileSystem (#3380)
Motivation: We accidentally removed the 'NIOFileSystem' module from the '_NIOFileSystem' product in the last release. Modifications: - Rename 'NIOFileSystem' and 'NIOFileSystemFoundationCompat' to 'NIOFS' and 'NIOFSFoundationCompat' - Add back 'NIOFileSystem' which re-exports '_NIOFileSystem' (there was no publicly available 'NIOFileSystemFoundationCompat' module to remove, only '_NIOFileSystemFoundationCompat'). Result: Fewer breaks
1 parent db49620 commit a18bddb

File tree

77 files changed

+66
-46
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+66
-46
lines changed

Package.swift

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ let package = Package(
6464
.library(name: "NIOFoundationCompat", targets: ["NIOFoundationCompat"]),
6565
.library(name: "NIOWebSocket", targets: ["NIOWebSocket"]),
6666
.library(name: "NIOTestUtils", targets: ["NIOTestUtils"]),
67-
.library(name: "_NIOFileSystem", targets: ["_NIOFileSystem"]),
67+
.library(name: "_NIOFileSystem", targets: ["_NIOFileSystem", "NIOFileSystem"]),
6868
.library(name: "_NIOFileSystemFoundationCompat", targets: ["_NIOFileSystemFoundationCompat"]),
6969
],
7070
targets: [
@@ -242,7 +242,7 @@ let package = Package(
242242
swiftSettings: strictConcurrencySettings
243243
),
244244
.target(
245-
name: "NIOFileSystem",
245+
name: "NIOFS",
246246
dependencies: [
247247
"NIOCore",
248248
"NIOPosix",
@@ -252,20 +252,20 @@ let package = Package(
252252
swiftCollections,
253253
swiftSystem,
254254
],
255-
path: "Sources/NIOFileSystem",
255+
path: "Sources/NIOFS",
256256
exclude: includePrivacyManifest ? [] : ["PrivacyInfo.xcprivacy"],
257257
resources: includePrivacyManifest ? [.copy("PrivacyInfo.xcprivacy")] : [],
258258
swiftSettings: strictConcurrencySettings + [
259259
.define("ENABLE_MOCKING", .when(configuration: .debug))
260260
]
261261
),
262262
.target(
263-
name: "NIOFileSystemFoundationCompat",
263+
name: "NIOFSFoundationCompat",
264264
dependencies: [
265-
"NIOFileSystem",
265+
"NIOFS",
266266
"NIOFoundationCompat",
267267
],
268-
path: "Sources/NIOFileSystemFoundationCompat",
268+
path: "Sources/NIOFSFoundationCompat",
269269
swiftSettings: strictConcurrencySettings
270270
),
271271

@@ -296,6 +296,11 @@ let package = Package(
296296
path: "Sources/_NIOFileSystemFoundationCompat",
297297
swiftSettings: strictConcurrencySettings
298298
),
299+
.target(
300+
name: "NIOFileSystem",
301+
dependencies: ["_NIOFileSystem"],
302+
swiftSettings: strictConcurrencySettings
303+
),
299304

300305
// MARK: - Examples
301306

@@ -578,10 +583,10 @@ let package = Package(
578583
swiftSettings: strictConcurrencySettings
579584
),
580585
.testTarget(
581-
name: "NIOFileSystemTests",
586+
name: "NIOFSTests",
582587
dependencies: [
583588
"NIOCore",
584-
"NIOFileSystem",
589+
"NIOFS",
585590
swiftAtomics,
586591
swiftCollections,
587592
swiftSystem,
@@ -591,11 +596,11 @@ let package = Package(
591596
]
592597
),
593598
.testTarget(
594-
name: "NIOFileSystemIntegrationTests",
599+
name: "NIOFSIntegrationTests",
595600
dependencies: [
596601
"NIOCore",
597602
"NIOPosix",
598-
"NIOFileSystem",
603+
"NIOFS",
599604
"NIOFoundationCompat",
600605
],
601606
exclude: [
@@ -607,10 +612,10 @@ let package = Package(
607612
swiftSettings: strictConcurrencySettings
608613
),
609614
.testTarget(
610-
name: "NIOFileSystemFoundationCompatTests",
615+
name: "NIOFSFoundationCompatTests",
611616
dependencies: [
612-
"NIOFileSystem",
613-
"NIOFileSystemFoundationCompat",
617+
"NIOFS",
618+
"NIOFSFoundationCompat",
614619
],
615620
swiftSettings: strictConcurrencySettings
616621
),
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)