From d1a190139b585f56e437145f75831fdd0e43fd1b Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 28 Mar 2026 10:59:24 +0800 Subject: [PATCH] Rename ManifestDiff to AndroidManifestDiff --- .../main/kotlin/com/jakewharton/diffuse/diff/AabDiff.kt | 2 +- .../main/kotlin/com/jakewharton/diffuse/diff/AarDiff.kt | 2 +- .../diff/{ManifestDiff.kt => AndroidManifestDiff.kt} | 7 +++++-- .../main/kotlin/com/jakewharton/diffuse/diff/ApkDiff.kt | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) rename reports/src/main/kotlin/com/jakewharton/diffuse/diff/{ManifestDiff.kt => AndroidManifestDiff.kt} (88%) diff --git a/reports/src/main/kotlin/com/jakewharton/diffuse/diff/AabDiff.kt b/reports/src/main/kotlin/com/jakewharton/diffuse/diff/AabDiff.kt index fff9baa2..c2a3e318 100644 --- a/reports/src/main/kotlin/com/jakewharton/diffuse/diff/AabDiff.kt +++ b/reports/src/main/kotlin/com/jakewharton/diffuse/diff/AabDiff.kt @@ -12,7 +12,7 @@ internal class AabDiff(val oldAab: Aab, val newAab: Aab) : BinaryDiff { oldModule.dexes.map { it.withMapping(oldAab.apiMapping) }, newModule.dexes.map { it.withMapping(newAab.apiMapping) }, ) - val manifest = ManifestDiff(oldModule.manifest, newModule.manifest) + val manifest = AndroidManifestDiff(oldModule.manifest, newModule.manifest) val changed = archive.changed || dex.changed || manifest.changed } diff --git a/reports/src/main/kotlin/com/jakewharton/diffuse/diff/AarDiff.kt b/reports/src/main/kotlin/com/jakewharton/diffuse/diff/AarDiff.kt index d25cff22..549c1e59 100644 --- a/reports/src/main/kotlin/com/jakewharton/diffuse/diff/AarDiff.kt +++ b/reports/src/main/kotlin/com/jakewharton/diffuse/diff/AarDiff.kt @@ -13,7 +13,7 @@ internal class AarDiff( ) : BinaryDiff { val archive = ArchiveFilesDiff(oldAar.files, newAar.files, includeCompressed = false) val jars = JarsDiff(oldAar.jars, oldMapping, newAar.jars, newMapping) - val manifest = ManifestDiff(oldAar.manifest, newAar.manifest) + val manifest = AndroidManifestDiff(oldAar.manifest, newAar.manifest) override fun toTextReport(summaryOnly: Boolean): Report = AarDiffTextReport(this, summaryOnly) } diff --git a/reports/src/main/kotlin/com/jakewharton/diffuse/diff/ManifestDiff.kt b/reports/src/main/kotlin/com/jakewharton/diffuse/diff/AndroidManifestDiff.kt similarity index 88% rename from reports/src/main/kotlin/com/jakewharton/diffuse/diff/ManifestDiff.kt rename to reports/src/main/kotlin/com/jakewharton/diffuse/diff/AndroidManifestDiff.kt index 7ce12b54..06c8acb4 100644 --- a/reports/src/main/kotlin/com/jakewharton/diffuse/diff/ManifestDiff.kt +++ b/reports/src/main/kotlin/com/jakewharton/diffuse/diff/AndroidManifestDiff.kt @@ -5,7 +5,10 @@ import com.github.difflib.UnifiedDiffUtils import com.jakewharton.diffuse.diffuseTable import com.jakewharton.diffuse.format.AndroidManifest -internal class ManifestDiff(val oldManifest: AndroidManifest, val newManifest: AndroidManifest) { +internal class AndroidManifestDiff( + val oldManifest: AndroidManifest, + val newManifest: AndroidManifest, +) { internal val parsedPropertiesChanged = oldManifest.packageName != newManifest.packageName || oldManifest.versionName != newManifest.versionName || @@ -27,7 +30,7 @@ internal class ManifestDiff(val oldManifest: AndroidManifest, val newManifest: A val changed = parsedPropertiesChanged || diff.isNotEmpty() } -internal fun ManifestDiff.toDetailReport() = buildString { +internal fun AndroidManifestDiff.toDetailReport() = buildString { if (parsedPropertiesChanged) { appendLine() appendLine( diff --git a/reports/src/main/kotlin/com/jakewharton/diffuse/diff/ApkDiff.kt b/reports/src/main/kotlin/com/jakewharton/diffuse/diff/ApkDiff.kt index 4a4651a9..302dbc43 100644 --- a/reports/src/main/kotlin/com/jakewharton/diffuse/diff/ApkDiff.kt +++ b/reports/src/main/kotlin/com/jakewharton/diffuse/diff/ApkDiff.kt @@ -20,7 +20,7 @@ internal class ApkDiff( newApk.dexes.map { it.withMapping(newMapping) }, ) val arsc = ArscDiff(oldApk.arsc, newApk.arsc) - val manifest = ManifestDiff(oldApk.manifest, newApk.manifest) + val manifest = AndroidManifestDiff(oldApk.manifest, newApk.manifest) val lintMessages = listOfNotNull(archive.resourcesArscCompression())