Skip to content

Android support #161

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

Merged
merged 3 commits into from
Jan 19, 2025
Merged

Android support #161

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
218d7f2
Android support
marcprux Jan 7, 2025
a94df2d
Bump swift-nio in Package.resolved and add Android test CI
marcprux Jan 13, 2025
886fd72
Merge branch 'GraphQLSwift:main' into main
marcprux Jan 16, 2025
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
2 changes: 1 addition & 1 deletion Sources/GraphQL/Instrumentation/Instrumentation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public extension Instrumentation {
}

func threadId() -> Int {
#if os(Linux)
#if os(Linux) || os(Android)
return Int(pthread_self())
#else
return Int(pthread_mach_thread_np(pthread_self()))
Expand Down
2 changes: 1 addition & 1 deletion Sources/GraphQL/Map/AnyCoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2699,7 +2699,7 @@ private extension _AnyDecoder {
func unbox(_ value: Any, as type: Bool.Type) throws -> Bool? {
guard !(value is NSNull) else { return nil }

#if DEPLOYMENT_RUNTIME_SWIFT || os(Linux)
#if DEPLOYMENT_RUNTIME_SWIFT || os(Linux) || os(Android)
// Bridging differences require us to split implementations here
guard let number = __SwiftValue.store(value) as? NSNumber else {
throw DecodingError._typeMismatch(at: codingPath, expectation: type, reality: value)
Expand Down
2 changes: 1 addition & 1 deletion Sources/GraphQL/Map/MapCoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2707,7 +2707,7 @@ private extension _MapDecoder {
func unbox(_ value: Any, as type: Bool.Type) throws -> Bool? {
guard !(value is NSNull) else { return nil }

#if DEPLOYMENT_RUNTIME_SWIFT || os(Linux)
#if DEPLOYMENT_RUNTIME_SWIFT || os(Linux) || os(Android)
// Bridging differences require us to split implementations here
guard let number = __SwiftValue.store(value) as? NSNumber else {
throw DecodingError._typeMismatch(at: codingPath, expectation: type, reality: value)
Expand Down
4 changes: 2 additions & 2 deletions Tests/GraphQLTests/InstrumentationTests/InstrumentationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ class InstrumentationTests: XCTestCase, Instrumentation {
}

func testInstrumentationCalls() throws {
// #if os(Linux)
// #if os(Linux) || os(Android)
// expectedThreadId = Int(pthread_self())
// #else
// expectedThreadId = Int(pthread_mach_thread_np(pthread_self()))
Expand All @@ -172,7 +172,7 @@ class InstrumentationTests: XCTestCase, Instrumentation {

func testDispatchQueueInstrumentationWrapper() throws {
// let dispatchGroup = DispatchGroup()
// #if os(Linux)
// #if os(Linux) || os(Android)
// expectedThreadId = Int(pthread_self())
// #else
// expectedThreadId = Int(pthread_mach_thread_np(pthread_self()))
Expand Down
Loading