Skip to content

Commit 5ea4600

Browse files
committed
Fix Android support
1 parent 340058b commit 5ea4600

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Package.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ let openCombineShimTarget: Target = .target(
2727
dependencies: [
2828
"OpenCombine",
2929
.target(name: "OpenCombineDispatch",
30-
condition: .when(platforms: supportedPlatforms.except([.wasi]))),
30+
condition: .when(platforms: supportedPlatforms.except([.wasi, .android]))),
3131
.target(name: "OpenCombineFoundation",
32-
condition: .when(platforms: supportedPlatforms.except([.wasi]))),
32+
condition: .when(platforms: supportedPlatforms.except([.wasi, .android]))),
3333
]
3434
)
3535
let openCombineTarget: Target = .target(
3636
name: "OpenCombine",
3737
dependencies: [
3838
.target(
3939
name: "COpenCombineHelpers",
40-
condition: .when(platforms: supportedPlatforms.except([.wasi]))
40+
condition: .when(platforms: supportedPlatforms.except([.wasi, .android]))
4141
),
4242
],
4343
exclude: [
@@ -53,7 +53,7 @@ let openCombineFoundationTarget: Target = .target(
5353
"OpenCombine",
5454
.target(
5555
name: "COpenCombineHelpers",
56-
condition: .when(platforms: supportedPlatforms.except([.wasi]))
56+
condition: .when(platforms: supportedPlatforms.except([.wasi, .android]))
5757
),
5858
]
5959
)
@@ -66,9 +66,9 @@ let openCombineTestsTarget: Target = .testTarget(
6666
dependencies: [
6767
"OpenCombine",
6868
.target(name: "OpenCombineDispatch",
69-
condition: .when(platforms: supportedPlatforms.except([.wasi]))),
69+
condition: .when(platforms: supportedPlatforms.except([.wasi, .android]))),
7070
.target(name: "OpenCombineFoundation",
71-
condition: .when(platforms: supportedPlatforms.except([.wasi]))),
71+
condition: .when(platforms: supportedPlatforms.except([.wasi, .android]))),
7272
],
7373
swiftSettings: [
7474
.unsafeFlags(["-enable-testing"]),

Sources/OpenCombine/CombineIdentifier.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@_implementationOnly import COpenCombineHelpers
1010
#endif
1111

12-
#if os(WASI)
12+
#if os(WASI) || os(Android)
1313
private var __identifier: UInt64 = 0
1414

1515
internal func __nextCombineIdentifier() -> UInt64 {

Sources/OpenCombine/Helpers/Locking.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@_implementationOnly import COpenCombineHelpers
1010
#endif
1111

12-
#if os(WASI)
12+
#if os(WASI) || os(Android)
1313
internal struct __UnfairLock { // swiftlint:disable:this type_name
1414
internal static func allocate() -> UnfairLock { return .init() }
1515
internal func lock() {}

Sources/OpenCombine/Publishers/Publishers.Breakpoint.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Created by Sergej Jaskiewicz on 03.12.2019.
66
//
77

8-
#if !os(WASI)
8+
#if !(os(WASI) || os(Android))
99

1010
#if canImport(COpenCombineHelpers)
1111
@_implementationOnly import COpenCombineHelpers

0 commit comments

Comments
 (0)