[1.118.*] Pre-release merge (#548)

This commit is contained in:
tramline-github[bot] 2024-05-04 14:30:09 +00:00 committed by GitHub
commit c59fdf6f51
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions

View File

@ -283,7 +283,7 @@ fun LobstersPostsScreen(
snackbarHostState = snackbarHostState,
)
}
composable<Settings> { LibrariesContainer(modifier = Modifier.fillMaxSize()) }
composable<AboutLibraries> { LibrariesContainer(modifier = Modifier.fillMaxSize()) }
}
}
}

View File

@ -71,7 +71,7 @@ internal fun setExpanded(commentNode: CommentNode, expanded: Boolean): CommentNo
return commentNode
}
internal fun findTopMostParent(node: CommentNode): CommentNode {
internal tailrec fun findTopMostParent(node: CommentNode): CommentNode {
val parent = node.parent
return if (parent != null) {
findTopMostParent(parent)
@ -106,7 +106,7 @@ private fun LazyListScope.node(
if (!node.isExpanded && node.parent?.isExpanded == false) {
return
}
item {
item(key = node.comment.shortId) {
CommentEntry(
commentNode = node,
htmlConverter = htmlConverter,

View File

@ -1,6 +1,6 @@
[versions]
aboutLibraries = "11.1.4"
agp = "8.5.0-alpha07"
agp = "8.5.0-alpha08"
benchmark = "1.3.0-alpha04"
coil = "2.6.0"
# @keep used for kotlinCompilerExtensionVersion
@ -101,7 +101,7 @@ retrofit-kotlinxSerializationConverter = { module = "com.squareup.retrofit2:conv
sentry-android = { module = "io.sentry:sentry-android", version.ref = "sentry-sdk" }
sentry-bom = { module = "io.sentry:sentry-bom", version.ref = "sentry-sdk" }
slack-compose-lints = "com.slack.lint.compose:compose-lint-checks:1.3.1"
slack-lints = "com.slack.lint:slack-lint-checks:0.7.2"
slack-lints = "com.slack.lint:slack-lint-checks:0.7.3"
sqldelight-androidDriver = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
sqldelight-dialect338 = { module = "app.cash.sqldelight:sqlite-3-38-dialect", version.ref = "sqldelight" }
sqldelight-extensions-coroutines = { module = "app.cash.sqldelight:coroutines-extensions-jvm", version.ref = "sqldelight" }