Skip to content
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

Android support #1352

Merged
merged 3 commits into from
Jan 15, 2025
Merged

Android support #1352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b545da7
Android support
marcprux Jan 5, 2025
700dafc
Update CI for Android
marcprux Jan 5, 2025
6d067d7
Update Android CI
marcprux Jan 5, 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
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,8 @@ jobs:
action: test
enable-code-coverage: true
- uses: codecov/codecov-action@v1
test-android:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: skiptools/swift-android-action@v2
8 changes: 8 additions & 0 deletions Tests/A+/XCTestManifests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
#if !canImport(ObjectiveC)
import XCTest

#if os(Linux) || os(Android)
extension XCTestExpectation {
func fulfill() {
fulfill(#file, line: #line)
}
}
#endif

extension Test212 {
// DO NOT MODIFY: This is autogenerated, use:
// `swift test --generate-linuxmain`
Expand Down
3 changes: 3 additions & 0 deletions Tests/CorePromise/LoggingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
@testable import PromiseKit
import Dispatch
import XCTest
#if canImport(Android)
import Android
#endif

class LoggingTests: XCTestCase {
/**
Expand Down
2 changes: 1 addition & 1 deletion Tests/CorePromise/Utilities.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ extension Promise {
func silenceWarning() {}
}

#if os(Linux)
#if os(Linux) || os(Android)
import func CoreFoundation._CFIsMainThread

extension Thread {
Expand Down
Loading