diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 1c9e9e1a..63651ef8 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -52,7 +52,6 @@ jobs: working-directory: android test: - runs-on: ubuntu-latest concurrency: group: ${{ github.workflow }}-${{ github.ref }}-android-test diff --git a/apple/Tests/FerrostarCoreTests/FerrostarCoreTests.swift b/apple/Tests/FerrostarCoreTests/FerrostarCoreTests.swift index 1a860c48..c5fc4423 100644 --- a/apple/Tests/FerrostarCoreTests/FerrostarCoreTests.swift +++ b/apple/Tests/FerrostarCoreTests/FerrostarCoreTests.swift @@ -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") } diff --git a/common/Cargo.lock b/common/Cargo.lock index 0f41cf80..573f0b8c 100644 --- a/common/Cargo.lock +++ b/common/Cargo.lock @@ -1605,9 +1605,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", "serde", diff --git a/common/ferrostar/Cargo.toml b/common/ferrostar/Cargo.toml index 115dc21d..cbee6969 100644 --- a/common/ferrostar/Cargo.toml +++ b/common/ferrostar/Cargo.toml @@ -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 }