Skip to content

Commit 7a98f9c

Browse files
authored
Remove FoundationPreview umbrella module (#818)
* Remove FoundationPreview umbrella module * Fix test failures
1 parent a57b06e commit 7a98f9c

File tree

4 files changed

+4
-28
lines changed

4 files changed

+4
-28
lines changed

Package.swift

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,14 @@ var dependencies: [Package.Dependency] {
7171
}
7272

7373
let package = Package(
74-
name: "FoundationPreview",
74+
name: "swift-foundation",
7575
platforms: [.macOS("13.3"), .iOS("16.4"), .tvOS("16.4"), .watchOS("9.4")],
7676
products: [
77-
// Products define the executables and libraries a package produces, and make them visible to other packages.
78-
.library(name: "FoundationPreview", targets: ["FoundationPreview"]),
7977
.library(name: "FoundationEssentials", targets: ["FoundationEssentials"]),
8078
.library(name: "FoundationInternationalization", targets: ["FoundationInternationalization"]),
8179
],
8280
dependencies: dependencies,
8381
targets: [
84-
// Foundation (umbrella)
85-
.target(
86-
name: "FoundationPreview",
87-
dependencies: [
88-
"FoundationEssentials",
89-
"FoundationInternationalization",
90-
],
91-
path: "Sources/Foundation"),
92-
9382
// _FoundationCShims (Internal)
9483
.target(name: "_FoundationCShims",
9584
cSettings: [.define("_CRT_SECURE_NO_WARNINGS",

Sources/Foundation/Foundation.swift

Lines changed: 0 additions & 13 deletions
This file was deleted.

Tests/FoundationEssentialsTests/ProcessInfoTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ final class ProcessInfoTests : XCTestCase {
172172
#if FOUNDATION_FRAMEWORK
173173
let targetName = "TestHost"
174174
#elseif os(Linux) || os(Windows)
175-
let targetName = "FoundationPreviewPackageTests.xctest"
175+
let targetName = "swift-foundationPackageTests.xctest"
176176
#else
177177
let targetName = "xctest"
178178
#endif

Tests/FoundationEssentialsTests/ResourceUtilities.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ func testData(forResource resource: String, withExtension ext: String, subdirect
5454
return try? Data(contentsOf: essentialsURL)
5555
#else
5656
// swiftpm drops the resources next to the executable, at:
57-
// ./FoundationPreview_FoundationEssentialsTests.resources/Resources/
57+
// ./swift-foundation_FoundationEssentialsTests.resources/Resources/
5858
// Hard-coding the path is unfortunate, but a temporary need until we have a better way to handle this
5959
var path = URL(filePath: ProcessInfo.processInfo.arguments[0])
6060
.deletingLastPathComponent()
61-
.appending(component: "FoundationPreview_FoundationEssentialsTests.resources", directoryHint: .isDirectory)
61+
.appending(component: "swift-foundation_FoundationEssentialsTests.resources", directoryHint: .isDirectory)
6262
.appending(component: "Resources", directoryHint: .isDirectory)
6363
if let subdirectory {
6464
path.append(path: subdirectory, directoryHint: .isDirectory)

0 commit comments

Comments
 (0)