Skip to content

Update dependency com.facebook:ktfmt to v0.64 #530

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

Merged
JakeWharton merged 2 commits into from
Jun 24, 2026
Merged

Update dependency com.facebook:ktfmt to v0.64 #530

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
28621d8
Update dependency com.facebook:ktfmt to v0.64
renovate[bot] Jun 24, 2026
b58dfc9
Reformat
JakeWharton Jun 24, 2026
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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ mavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.37.0"
spotlessPlugin = "com.diffplug.spotless:spotless-plugin-gradle:8.7.0"
buildConfigPlugin = "com.github.gmazzo.buildconfig:plugin:6.0.10"
pokoPlugin = "dev.drewhamilton.poko:dev.drewhamilton.poko.gradle.plugin:0.23.1"
ktfmt = "com.facebook:ktfmt:0.63"
ktfmt = "com.facebook:ktfmt:0.64"
225 changes: 112 additions & 113 deletions reports/src/main/kotlin/com/jakewharton/diffuse/diff/ArchiveFilesDiff.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,142 +97,141 @@ internal fun ArchiveFilesDiff.toSummaryTable(
name: String,
displayTypes: List<Type>,
skipIfEmptyTypes: Set<Type> = emptySet(),
) =
diffuseTable {
) = diffuseTable {
header {
if (includeCompressed) {
row {
cell(name) {
alignment = BottomLeft
rowSpan = 2
}
cell("compressed") {
columnSpan = 3
alignment = BottomCenter
}
cell("uncompressed") {
columnSpan = 3
alignment = BottomCenter
}
}
row("old", "new", "diff", "old", "new", "diff")
} else {
row {
cell(name) { alignment = BottomLeft }
cell("old")
cell("new")
cell("diff")
}
}
}

fun TableSectionDsl.addApkRow(name: String, type: Type? = null) {
val old = if (type != null) oldFiles.filterValues { it.type == type } else oldFiles
val new = if (type != null) newFiles.filterValues { it.type == type } else newFiles
val oldSize = old.values.fold(0.binaryBytes) { acc, file -> acc + file.size }
val newSize = new.values.fold(0.binaryBytes) { acc, file -> acc + file.size }
val oldUncompressedSize =
old.values.fold(0.binaryBytes) { acc, file -> acc + file.uncompressedSize }
val newUncompressedSize =
new.values.fold(0.binaryBytes) { acc, file -> acc + file.uncompressedSize }
if (oldSize != 0.binaryBytes || newSize != 0.binaryBytes || type !in skipIfEmptyTypes) {
val uncompressedDiff = (newUncompressedSize - oldUncompressedSize).toDiffString()
if (includeCompressed) {
row(
name,
oldSize,
newSize,
(newSize - oldSize).toDiffString(),
oldUncompressedSize,
newUncompressedSize,
uncompressedDiff,
)
} else {
row(name, oldUncompressedSize, newUncompressedSize, uncompressedDiff)
}
}
}

body {
cellStyle { alignment = MiddleRight }
for (type in displayTypes) {
addApkRow(type.displayName, type)
}
}

footer {
cellStyle { alignment = MiddleRight }
addApkRow("total")
}
}
.renderText()

internal fun ArchiveFilesDiff.toDetailReport() = buildString {
appendLine()
appendLine(
diffuseTable {
header {
if (includeCompressed) {
row {
cell(name) {
alignment = BottomLeft
rowSpan = 2
}
cell("compressed") {
columnSpan = 3
alignment = BottomCenter
columnSpan = 2
alignment = MiddleCenter
}
cell("uncompressed") {
columnSpan = 3
alignment = BottomCenter
columnSpan = 2
alignment = MiddleCenter
}
cell("path") {
rowSpan = 2
alignment = BottomLeft
}
}
row("old", "new", "diff", "old", "new", "diff")
row("size", "diff", "size", "diff")
} else {
row {
cell(name) { alignment = BottomLeft }
cell("old")
cell("new")
cell("size")
cell("diff")
cell("path") { alignment = BottomLeft }
}
}
}

fun TableSectionDsl.addApkRow(name: String, type: Type? = null) {
val old = if (type != null) oldFiles.filterValues { it.type == type } else oldFiles
val new = if (type != null) newFiles.filterValues { it.type == type } else newFiles
val oldSize = old.values.fold(0.binaryBytes) { acc, file -> acc + file.size }
val newSize = new.values.fold(0.binaryBytes) { acc, file -> acc + file.size }
val oldUncompressedSize =
old.values.fold(0.binaryBytes) { acc, file -> acc + file.uncompressedSize }
val newUncompressedSize =
new.values.fold(0.binaryBytes) { acc, file -> acc + file.uncompressedSize }
if (oldSize != 0.binaryBytes || newSize != 0.binaryBytes || type !in skipIfEmptyTypes) {
val uncompressedDiff = (newUncompressedSize - oldUncompressedSize).toDiffString()
footer {
row {
if (includeCompressed) {
row(
name,
oldSize,
newSize,
(newSize - oldSize).toDiffString(),
oldUncompressedSize,
newUncompressedSize,
uncompressedDiff,
)
} else {
row(name, oldUncompressedSize, newUncompressedSize, uncompressedDiff)
val totalSize = changes.fold(0.binaryBytes) { acc, change -> acc + change.size }
val totalDiff = changes.fold(0.binaryBytes) { acc, change -> acc + change.sizeDiff }
cell(totalSize) { alignment = MiddleRight }
cell(totalDiff.toDiffString()) { alignment = MiddleRight }
}
val totalUncompressedSize =
changes.fold(0.binaryBytes) { acc, change -> acc + change.uncompressedSize }
val totalUncompressedDiff =
changes.fold(0.binaryBytes) { acc, change -> acc + change.uncompressedSizeDiff }
cell(totalUncompressedSize) { alignment = MiddleRight }
cell(totalUncompressedDiff.toDiffString()) { alignment = MiddleRight }
cell("(total)")
}
}

body {
cellStyle { alignment = MiddleRight }
for (type in displayTypes) {
addApkRow(type.displayName, type)
}
}

footer {
cellStyle { alignment = MiddleRight }
addApkRow("total")
}
}
.renderText()

internal fun ArchiveFilesDiff.toDetailReport() = buildString {
appendLine()
appendLine(
diffuseTable {
header {
if (includeCompressed) {
row {
cell("compressed") {
columnSpan = 2
alignment = MiddleCenter
}
cell("uncompressed") {
columnSpan = 2
alignment = MiddleCenter
}
cell("path") {
rowSpan = 2
alignment = BottomLeft
}
}
row("size", "diff", "size", "diff")
} else {
row {
cell("size")
cell("diff")
cell("path") { alignment = BottomLeft }
}
for ((path, size, sizeDiff, uncompressedSize, uncompressedSizeDiff, type) in changes) {
val typeChar =
when (type) {
Change.Type.Added -> '+'
Change.Type.Removed -> '-'
Change.Type.Changed -> '∆'
}
}
footer {
row {
if (includeCompressed) {
val totalSize = changes.fold(0.binaryBytes) { acc, change -> acc + change.size }
val totalDiff = changes.fold(0.binaryBytes) { acc, change -> acc + change.sizeDiff }
cell(totalSize) { alignment = MiddleRight }
cell(totalDiff.toDiffString()) { alignment = MiddleRight }
}
val totalUncompressedSize =
changes.fold(0.binaryBytes) { acc, change -> acc + change.uncompressedSize }
val totalUncompressedDiff =
changes.fold(0.binaryBytes) { acc, change -> acc + change.uncompressedSizeDiff }
cell(totalUncompressedSize) { alignment = MiddleRight }
cell(totalUncompressedDiff.toDiffString()) { alignment = MiddleRight }
cell("(total)")
row {
if (includeCompressed) {
cell(if (type != Change.Type.Removed) size else "") { alignment = MiddleRight }
cell(sizeDiff.toDiffString()) { alignment = MiddleRight }
}
}
for ((path, size, sizeDiff, uncompressedSize, uncompressedSizeDiff, type) in changes) {
val typeChar =
when (type) {
Change.Type.Added -> '+'
Change.Type.Removed -> '-'
Change.Type.Changed -> '∆'
}
row {
if (includeCompressed) {
cell(if (type != Change.Type.Removed) size else "") { alignment = MiddleRight }
cell(sizeDiff.toDiffString()) { alignment = MiddleRight }
}
cell(if (type != Change.Type.Removed) uncompressedSize else "") {
alignment = MiddleRight
}
cell(uncompressedSizeDiff.toDiffString()) { alignment = MiddleRight }
cell("$typeChar $path")
cell(if (type != Change.Type.Removed) uncompressedSize else "") {
alignment = MiddleRight
}
cell(uncompressedSizeDiff.toDiffString()) { alignment = MiddleRight }
cell("$typeChar $path")
}
}
}
.renderText()
)
}
Loading