Compose 1.8.0-alpha06 #1712
Merged
Compose 1.8.0-alpha06 #1712
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Watching... |
eymar
reviewed
Dec 9, 2024
...ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/ParagraphLayouter.skiko.kt
Show resolved
Hide resolved
| @@ -16,4 +16,9 @@ | |||
|
|
|||
| package androidx.compose.ui | |||
|
|
|||
| internal actual fun currentTimeMillis(): Long { | |||
| // TODO https://youtrack.jetbrains.com/issue/CMP-7152/Implement-currentTimeMillis-for-web | |||
There was a problem hiding this comment.
Should it be fixed before merging this PR, or later in jb-main?
JFYI: we have currentNanoTime() from skiko.
There was a problem hiding this comment.
If it's not blocking CI - later
compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/Actuals.skiko.kt
Outdated
Show resolved
Hide resolved
…b-main # Conflicts: # gradle.properties
igordmn
approved these changes
Dec 9, 2024
MatkovIvan
deleted the
integration-copy/compose/ce39fdf8982/to-jb-main
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DO NOT SQUASH! SHOULD BE MERGED MANUALLY