From 5d7b087b98c9760547ca97ef7afae6e30f53461a Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 20 Dec 2024 20:24:48 +0100 Subject: [PATCH] Restore commonMain to AOSP state (exceptions) Partially fixes https://youtrack.jetbrains.com/issue/CMP-5740/Upstreaming.-compilation.-other-fixes Restore expect exceptions to the last merged Jetpack Compose (1.8.0-alpha07) and Material3 (1.4.0-alpha04) and implement them the same way. We can no longer use `PlatformOptimizedCancellationException` as it is a different base class, which is prohibited for actual's ## Testing - CI passes ## Release Notes N/A --- .../ui/ui/src/commonMain/kotlin/androidx/compose/ui/Expect.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/Expect.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/Expect.kt index 776a68fdd41d6..2d24041618d0b 100644 --- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/Expect.kt +++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/Expect.kt @@ -42,3 +42,5 @@ internal expect fun currentTimeMillis(): Long internal expect fun postDelayed(delayMillis: Long, block: () -> Unit): Any internal expect fun removePost(token: Any?) + +internal expect fun getCurrentThreadId(): Long