Skip to content

Rename ManifestDiff to AndroidManifestDiff #499

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 1 commit into from
Mar 28, 2026
+8 −5
Merged

Rename ManifestDiff to AndroidManifestDiff #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 reports/src/main/kotlin/com/jakewharton/diffuse/diff/AabDiff.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion reports/src/main/kotlin/com/jakewharton/diffuse/diff/AarDiff.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
7 changes: 5 additions & 2 deletions .../jakewharton/diffuse/diff/ManifestDiff.kt → ...arton/diffuse/diff/AndroidManifestDiff.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ||
Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion reports/src/main/kotlin/com/jakewharton/diffuse/diff/ApkDiff.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())

Expand Down