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

Bump uuid from 1.10.0 to 1.11.0 in /common #331

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Bump uuid from 1.10.0 to 1.11.0 in /common #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0b9dba
Bump uuid from 1.10.0 to 1.11.0 in /common
dependabot[bot] Nov 4, 2024
d1512ba
Fix a data race in unit test
ianthetechie Nov 4, 2024
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
1 change: 0 additions & 1 deletion .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ jobs:
working-directory: android

test:

runs-on: ubuntu-latest
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-android-test
Expand Down
5 changes: 5 additions & 0 deletions apple/Tests/FerrostarCoreTests/FerrostarCoreTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,11 @@ final class FerrostarCoreTests: XCTestCase {
await fulfillment(of: [routeDeviationCallbackExp], timeout: 1.0)
await fulfillment(of: [loadedAltRoutesExp], timeout: 1.0)

// At this point, there is a brief window where the delegate call loading alternate routes has completed,
// but the state is still updating. This is a quick hack to fix the tests
// in the absence of something more reliable.
try? await Task.sleep(nanoseconds: NSEC_PER_SEC / 10)

XCTAssert(core.state?.isCalculatingNewRoute == false, "Expected to no longer be calculating a new route")
}

Expand Down
4 changes: 2 additions & 2 deletions common/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/ferrostar/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ serde_json = { version = "1.0.132", default-features = false }
serde-wasm-bindgen = { version = "0.6.5", optional = true }
thiserror = "1.0.66"
uniffi = { workspace = true, optional = true }
uuid = { version = "1.10.0", features = ["v4", "serde"] }
uuid = { version = "1.11.0", features = ["v4", "serde"] }
getrandom = { version = "0.2.15", optional = true }
wasm-bindgen = { version = "0.2.93", optional = true }
web-time = { version = "1.1.0", features = ["serde"], optional = true }
Expand Down
Loading