Skip to content

Clean up Package.swift for FetchHTTPClient #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guoye-zhang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Clean up Package.swift for FetchHTTPClient #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 8 additions & 18 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ let extraSettings: [SwiftSetting] = [
.enableExperimentalFeature("SuppressedAssociatedTypesWithDefaults"),
.enableExperimentalFeature("LifetimeDependence"),
.enableExperimentalFeature("Lifetimes"),
.enableExperimentalFeature("Extern"),
.enableUpcomingFeature("LifetimeDependence"),
.enableUpcomingFeature("NonisolatedNonsendingByDefault"),
.enableUpcomingFeature("InferIsolatedConformances"),
Expand Down Expand Up @@ -38,10 +39,7 @@ let package = Package(
.default(enabledTraits: ["Configuration"]),
],
dependencies: [
.package(
url: "https://github.com/apple/swift-collections.git",
from: "1.5.0"
),
.package(url: "https://github.com/apple/swift-collections.git", from: "1.5.0"),
.package(
url: "https://github.com/apple/swift-async-algorithms.git",
from: "1.1.4",
Expand Down Expand Up @@ -92,8 +90,6 @@ let package = Package(
.product(name: "AsyncStreaming", package: "swift-async-algorithms"),
"NetworkTypes",
.product(name: "HTTPTypes", package: "swift-http-types"),
.product(name: "HTTPTypesFoundation", package: "swift-http-types"),

.product(name: "AsyncHTTPClient", package: "async-http-client"),
.product(name: "NIOHTTP1", package: "swift-nio"),
],
Expand Down Expand Up @@ -245,22 +241,22 @@ let package = Package(
let enableWASM = Context.environment["HTTP_API_ENABLE_WASM"] != nil

if enableWASM {
// BridgeJS generated code wants `Extern` and doesn't work well with
// `NonisolatedNonsendingByDefault` and `InternalImportsByDefault`
// BridgeJS generated code doesn't work well with `NonisolatedNonsendingByDefault`
let wasmExtraSettings: [SwiftSetting] = [
.strictMemorySafety(),
.enableExperimentalFeature("SuppressedAssociatedTypes"),
.enableExperimentalFeature("LifetimeDependence"),
.enableExperimentalFeature("Lifetimes"),
.enableExperimentalFeature("Extern"),
.enableUpcomingFeature("LifetimeDependence"),
.enableUpcomingFeature("InferIsolatedConformances"),
.enableUpcomingFeature("ExistentialAny"),
.enableUpcomingFeature("MemberImportVisibility"),
.enableExperimentalFeature("Extern"),
.enableUpcomingFeature("InternalImportsByDefault"),
]

package.dependencies.append(
.package(url: "https://github.com/swiftwasm/JavaScriptKit", from: "0.50.2")
.package(url: "https://github.com/swiftwasm/JavaScriptKit", from: "0.53.0")
)
package.products.append(
.library(name: "FetchHTTPClient", targets: ["FetchHTTPClient"])
Expand All @@ -273,10 +269,7 @@ if enableWASM {
.product(name: "AsyncStreaming", package: "swift-async-algorithms"),
.product(name: "BasicContainers", package: "swift-collections"),
.product(name: "HTTPTypes", package: "swift-http-types"),
.product(
name: "JavaScriptKit",
package: "JavaScriptKit",
),
.product(name: "JavaScriptKit", package: "JavaScriptKit"),
.product(name: "JavaScriptEventLoop", package: "JavaScriptKit"),
],
swiftSettings: wasmExtraSettings,
Expand All @@ -292,10 +285,7 @@ if enableWASM {
"FetchHTTPClient",
.product(name: "BasicContainers", package: "swift-collections"),
.product(name: "ContainersPreview", package: "swift-collections"),
.product(
name: "JavaScriptKit",
package: "JavaScriptKit",
),
.product(name: "JavaScriptKit", package: "JavaScriptKit"),
.product(name: "JavaScriptEventLoop", package: "JavaScriptKit"),
],
path: "Examples/WASMClient",
Expand Down
5 changes: 2 additions & 3 deletions Sources/FetchHTTPClient/FetchHTTPClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
//
//===----------------------------------------------------------------------===//

import BasicContainers
public import BasicContainers
import Foundation
import HTTPAPIs
import HTTPTypes
@_exported public import HTTPAPIs
import JavaScriptEventLoop
import JavaScriptKit

Expand Down
2 changes: 0 additions & 2 deletions Sources/FetchHTTPClient/HTTPTypes+ISOLatin1.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
//
//===----------------------------------------------------------------------===//

import HTTPTypes

extension String {
var isASCII: Bool {
self.utf8.allSatisfy { $0 & 0x80 == 0 }
Expand Down
Loading