Skip to content

Add Android support #222

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
finagolfin wants to merge 1 commit into
base: main
Choose a base branch
from
+462 −70
Open

Add Android support #222

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
10 changes: 7 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.15
with:
swift_flags: "-Xswiftc -warnings-as-errors"
swift_nightly_flags: "--build-system native -Xswiftc -warnings-as-errors" # workaround nightly-main issue
swift_nightly_flags: "-Xswiftc -warnings-as-errors"
enable_macos_checks: true
macos_exclude_xcode_versions: "[{\"xcode_version\": \"swift_6.1\"}, {\"xcode_version\": \"swift_6.2\"}]"
macos_build_command: bash .github/workflows/scripts/ci-macos.sh
Expand All @@ -26,7 +26,9 @@ jobs:
linux_swift_versions: '["nightly-6.3", "6.3"]'
Comment thread
finagolfin marked this conversation as resolved.
linux_build_command: bash .github/workflows/scripts/ci-linux.sh
enable_windows_checks: false
enable_android_sdk_build: false
android_sdk_versions: '["nightly-6.4.x", "6.4"]'
enable_android_sdk_build: true
enable_android_sdk_checks: true
enable_embedded_wasm_sdk_build: false
enable_linux_static_sdk_build: true
tests-nightly-main:
Expand All @@ -40,6 +42,8 @@ jobs:
linux_build_command: bash .github/workflows/scripts/ci-linux.sh
enable_macos_checks: false
enable_windows_checks: false
enable_android_sdk_build: false
android_sdk_versions: '["nightly-main"]'
enable_android_sdk_build: true
enable_android_sdk_checks: true
enable_embedded_wasm_sdk_build: false
enable_linux_static_sdk_build: true
10 changes: 7 additions & 3 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.15
with:
swift_flags: "-Xswiftc -warnings-as-errors"
swift_nightly_flags: "--build-system native -Xswiftc -warnings-as-errors" # workaround nightly-main issue
swift_nightly_flags: "-Xswiftc -warnings-as-errors"
enable_macos_checks: true
macos_exclude_xcode_versions: "[{\"xcode_version\": \"swift_6.1\"}, {\"xcode_version\": \"swift_6.2\"}]"
macos_build_command: bash .github/workflows/scripts/ci-macos.sh
Expand All @@ -24,7 +24,9 @@ jobs:
linux_swift_versions: '["nightly-6.3", "6.3"]'
linux_build_command: bash .github/workflows/scripts/ci-linux.sh
enable_windows_checks: false
enable_android_sdk_build: false
android_sdk_versions: '["nightly-6.4.x", "6.4"]'
enable_android_sdk_build: true
enable_android_sdk_checks: true
enable_embedded_wasm_sdk_build: false
enable_linux_static_sdk_build: true
tests-nightly-main:
Expand All @@ -38,7 +40,9 @@ jobs:
linux_build_command: bash .github/workflows/scripts/ci-linux.sh
enable_macos_checks: false
enable_windows_checks: false
enable_android_sdk_build: false
android_sdk_versions: '["nightly-main"]'
enable_android_sdk_build: true
enable_android_sdk_checks: true
enable_embedded_wasm_sdk_build: false
enable_linux_static_sdk_build: true
soundness:
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ let package = Package(
.target(
name: "SwiftNetwork",
dependencies: [
.product(name: "Logging", package: "swift-log", condition: .when(platforms: [.linux])),
.product(name: "Logging", package: "swift-log", condition: .when(platforms: [.linux, .android])),
.target(name: "SwiftNetworkLinuxShim", condition: .when(platforms: [.linux])),
.product(name: "DequeModule", package: "swift-collections"),
.product(name: "BasicContainers", package: "swift-collections"),
Expand All @@ -138,7 +138,7 @@ let package = Package(
name: "SwiftNetworkTestHarness",
dependencies: [
"SwiftNetwork",
.product(name: "Logging", package: "swift-log", condition: .when(platforms: [.linux])),
.product(name: "Logging", package: "swift-log", condition: .when(platforms: [.linux, .android])),
.product(name: "DequeModule", package: "swift-collections"),
.product(name: "BasicContainers", package: "swift-collections"),
],
Expand All @@ -151,7 +151,7 @@ let package = Package(
"SwiftNetworkTestHarness",
.product(name: "SwiftTLS", package: "swift-tls"),
.product(name: "Crypto", package: "swift-crypto"),
.product(name: "Logging", package: "swift-log", condition: .when(platforms: [.linux])),
.product(name: "Logging", package: "swift-log", condition: .when(platforms: [.linux, .android])),
],
swiftSettings: availabilityMacros + settings
),
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ On macOS, iOS, and other Apple platforms, apps should use the Network.framework
## Prerequisites

- [Swift 6.3 and up](https://swift.org/install)
- macOS 26.0 and up or Linux (Ubuntu 22.04+)
- macOS 26.0 and up, Linux (Ubuntu 22.04+), Android API 23+
- Xcode 26.0 and up (Apple platforms only)

## Building and Testing
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Connection/Connection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ internal import DequeModule
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging

@finagolfin finagolfin Oct 6, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All these imports were added by a regex substitution, then manually reviewed.

#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Context/NetworkContext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ import Dispatch
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Endpoint/AddressEndpoint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Endpoint/NetlinkAddress.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
import Glibc
internal import Logging
internal import SwiftNetworkLinuxShim
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/EndpointFlow/EndpointFlow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ internal import DequeModule
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/EndpointFlow/EndpointFlowExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/EndpointFlow/EndpointFlowProtocols.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/EndpointFlow/WriteRequest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ internal import SwiftSystem
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Parameters/Parameters.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ internal import DequeModule
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Parameters/PathParameters.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ internal import DequeModule
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Path/Interface.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Path/PathProperties.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ internal import DequeModule
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/BaseProtocolLinkages.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/BottomProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/BridgeProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/Checksum.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/CustomIPProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/CustomLinkProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/DemuxProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/ExternalProtocolLinkages.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/Frame.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ internal import DequeModule
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/IPProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/ManyToManyProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/OneToOneProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/ProtocolEventManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ internal import DequeModule
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
5 changes: 4 additions & 1 deletion Sources/SwiftNetwork/Protocols/ProtocolInstance.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ internal import DequeModule
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down Expand Up @@ -303,7 +306,7 @@ public struct NetworkLoggerState: ~Copyable {
public func notice(_ message: @autoclosure () -> String, callingFunction: StaticString = #function) {
let logPrefix = logPrefix
let message = message()
#if os(Linux)
#if os(Linux) || os(Android)
Logger.proto.notice("\(callingFunction) \(logPrefix) \(message)")
#else
Logger.proto.log("\(callingFunction) \(logPrefix) \(message)")
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/ProtocolLinkage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/ProtocolStack.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ internal import DequeModule
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
3 changes: 3 additions & 0 deletions Sources/SwiftNetwork/Protocols/ProtocolStreamHandlers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#if canImport(Glibc)
import Glibc
internal import Logging
#elseif canImport(Android)
import Android
internal import Logging
#elseif canImport(Musl)
import Musl
internal import Logging
Expand Down
Loading
Loading