diff --git a/Package.swift b/Package.swift index 1c07180d5..8a9807452 100644 --- a/Package.swift +++ b/Package.swift @@ -71,25 +71,14 @@ var dependencies: [Package.Dependency] { } let package = Package( - name: "FoundationPreview", + name: "swift-foundation", platforms: [.macOS("13.3"), .iOS("16.4"), .tvOS("16.4"), .watchOS("9.4")], products: [ - // Products define the executables and libraries a package produces, and make them visible to other packages. - .library(name: "FoundationPreview", targets: ["FoundationPreview"]), .library(name: "FoundationEssentials", targets: ["FoundationEssentials"]), .library(name: "FoundationInternationalization", targets: ["FoundationInternationalization"]), ], dependencies: dependencies, targets: [ - // Foundation (umbrella) - .target( - name: "FoundationPreview", - dependencies: [ - "FoundationEssentials", - "FoundationInternationalization", - ], - path: "Sources/Foundation"), - // _FoundationCShims (Internal) .target(name: "_FoundationCShims", cSettings: [.define("_CRT_SECURE_NO_WARNINGS", diff --git a/Sources/Foundation/Foundation.swift b/Sources/Foundation/Foundation.swift deleted file mode 100644 index 4a2a3b151..000000000 --- a/Sources/Foundation/Foundation.swift +++ /dev/null @@ -1,13 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// This source file is part of the Swift.org open source project -// -// Copyright (c) 2022 Apple Inc. and the Swift project authors -// Licensed under Apache License v2.0 with Runtime Library Exception -// -// See https://swift.org/LICENSE.txt for license information -// -//===----------------------------------------------------------------------===// - -@_exported import FoundationEssentials -@_exported import FoundationInternationalization diff --git a/Tests/FoundationEssentialsTests/ProcessInfoTests.swift b/Tests/FoundationEssentialsTests/ProcessInfoTests.swift index 1e73a9fbf..6cf540240 100644 --- a/Tests/FoundationEssentialsTests/ProcessInfoTests.swift +++ b/Tests/FoundationEssentialsTests/ProcessInfoTests.swift @@ -172,7 +172,7 @@ final class ProcessInfoTests : XCTestCase { #if FOUNDATION_FRAMEWORK let targetName = "TestHost" #elseif os(Linux) || os(Windows) - let targetName = "FoundationPreviewPackageTests.xctest" + let targetName = "swift-foundationPackageTests.xctest" #else let targetName = "xctest" #endif diff --git a/Tests/FoundationEssentialsTests/ResourceUtilities.swift b/Tests/FoundationEssentialsTests/ResourceUtilities.swift index 5ce04b09f..e0edf5abf 100644 --- a/Tests/FoundationEssentialsTests/ResourceUtilities.swift +++ b/Tests/FoundationEssentialsTests/ResourceUtilities.swift @@ -54,11 +54,11 @@ func testData(forResource resource: String, withExtension ext: String, subdirect return try? Data(contentsOf: essentialsURL) #else // swiftpm drops the resources next to the executable, at: - // ./FoundationPreview_FoundationEssentialsTests.resources/Resources/ + // ./swift-foundation_FoundationEssentialsTests.resources/Resources/ // Hard-coding the path is unfortunate, but a temporary need until we have a better way to handle this var path = URL(filePath: ProcessInfo.processInfo.arguments[0]) .deletingLastPathComponent() - .appending(component: "FoundationPreview_FoundationEssentialsTests.resources", directoryHint: .isDirectory) + .appending(component: "swift-foundation_FoundationEssentialsTests.resources", directoryHint: .isDirectory) .appending(component: "Resources", directoryHint: .isDirectory) if let subdirectory { path.append(path: subdirectory, directoryHint: .isDirectory)