Skip to content

Sort permissions ANDROID-17565 #13

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
jeprubio merged 4 commits into from
Mar 19, 2026
Merged

Sort permissions ANDROID-17565 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e39c53c
Update sorting permissions before appending them ANDROID-17565
jeprubio Mar 18, 2026
3406522
Update recreated the sample-baseline ANDROID-17565
jeprubio Mar 18, 2026
7579ac3
Update fix sorting in old tests ANDROID-17565
jeprubio Mar 18, 2026
5fd40ef
Update plugin version ANDROID-17565
jeprubio Mar 18, 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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ To add the PermissionCheck plugin to your project, you have to add this block of

```groovy
plugins {
id "com.telefonica.manifestcheck" version "1.1.0"
id "com.telefonica.manifestcheck" version "1.1.1"
}
```

Expand All @@ -57,7 +57,7 @@ buildscript {
}
}
dependencies {
classpath "com.telefonica:manifestcheck:1.1.0"
classpath "com.telefonica:manifestcheck:1.1.1"
}
}
```
Expand Down
2 changes: 1 addition & 1 deletion manifestcheck/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

group = "com.telefonica"
version = "1.1.0" // Also update the version in the README
version = "1.1.1" // Also update the version in the README

val uber: Configuration by configurations.creating

Expand Down
48 changes: 24 additions & 24 deletions ...rc/test/kotlin/com/telefonica/manifestcheck/MultiVariantPermissionCheckIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@ class MultiVariantPermissionCheckIntegrationTest {
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<baseline>
<variant name="debug">
<uses-permission name="android.permission.INTERNET"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-feature glEsVersion="0x00020000" required="true"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission name="android.permission.INTERNET"/>
</variant>
<variant name="release">
<uses-permission name="android.permission.INTERNET"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-feature glEsVersion="0x00020000" required="true"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission name="android.permission.INTERNET"/>
</variant>
</baseline>

Expand Down Expand Up @@ -79,18 +79,18 @@ class MultiVariantPermissionCheckIntegrationTest {
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<baseline>
<variant name="debug">
<uses-permission name="android.permission.INTERNET"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-feature glEsVersion="0x00020000" required="true"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission name="android.permission.INTERNET"/>
</variant>
<variant name="release">
<uses-permission name="android.permission.INTERNET"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-feature glEsVersion="0x00020000" required="true"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission name="android.permission.INTERNET"/>
</variant>
</baseline>

Expand All @@ -113,18 +113,18 @@ class MultiVariantPermissionCheckIntegrationTest {
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<baseline>
<variant name="debug">
<uses-permission name="android.permission.INTERNET"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-feature glEsVersion="0x00020000" required="true"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission name="android.permission.INTERNET"/>
</variant>
<variant name="release">
<uses-permission name="android.permission.INTERNET"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-feature glEsVersion="0x00020000" required="true"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission name="android.permission.INTERNET"/>
</variant>
</baseline>

Expand Down
28 changes: 14 additions & 14 deletions ...c/test/kotlin/com/telefonica/manifestcheck/SingleVariantPermissionCheckIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ class SingleVariantPermissionCheckIntegrationTest {
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<baseline>
<variant name="debug">
<uses-permission name="android.permission.INTERNET"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-feature glEsVersion="0x00020000" required="true"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission name="android.permission.INTERNET"/>
</variant>
</baseline>

Expand Down Expand Up @@ -72,16 +72,16 @@ class SingleVariantPermissionCheckIntegrationTest {
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<baseline>
<variant name="debug">
<uses-permission name="android.permission.INTERNET"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-feature glEsVersion="0x00020000" required="true"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission name="android.permission.INTERNET"/>
</variant>
<variant name="release">
<uses-permission name="android.permission.INTERNET"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission name="android.permission.INTERNET"/>
</variant>
</baseline>

Expand All @@ -104,11 +104,11 @@ class SingleVariantPermissionCheckIntegrationTest {
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<baseline>
<variant name="debug">
<uses-permission name="android.permission.INTERNET"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-feature glEsVersion="0x00020000" required="true"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission maxSdkVersion="26" name="android.permission.CAMERA"/>
<uses-permission name="android.permission.INTERNET"/>
</variant>
</baseline>

Expand Down
2 changes: 1 addition & 1 deletion plugin-core/src/main/kotlin/com/telefonica/manifestcheck/internal/BaselineHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ internal class BaselineHandler(private val baselineFile: File) {
// Create permission entries for a single variant
appendElement("variant") {
setAttribute("name", variantName)
variantPermissions.forEach { permission ->
variantPermissions.sorted().forEach { permission ->

@jeprubio jeprubio Mar 18, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fix

appendChild(permission.toXmlElement(document))
}
}
Expand Down
30 changes: 30 additions & 0 deletions .../test/kotlin/com/telefonica/simonschiller/permissioncheck/internal/BaselineHandlerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,4 +321,34 @@ class BaselineHandlerTest {
""".trimIndent()
assertEquals(expectedBaselineContent, baselineFile.readText().normaliseLineSeparators())
}

@Test
fun `Baseline serializes permissions in sorted order`() {
val baselineFile = tempDir.resolve("permission-baseline.xml")
// Intentionally unsorted
val permissions = setOf(
Permission("android.permission.INTERNET"),
Permission("android.permission.CAMERA"),
Sdk23Permission("android.permission.CAMERA"),
Sdk23Permission("android.permission.ACCESS_FINE_LOCATION")
)
val baselineHandler = BaselineHandler(baselineFile)
baselineHandler.serialize(mapOf("debug" to permissions))

val expectedBaselineContent = """
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<baseline>
<variant name="debug">
<uses-permission-sdk-23 name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission name="android.permission.CAMERA"/>
<uses-permission-sdk-23 name="android.permission.CAMERA"/>
<uses-permission name="android.permission.INTERNET"/>
</variant>
</baseline>
""".trimIndent()
assertEquals(
expectedBaselineContent.trim(),
baselineFile.readText().normaliseLineSeparators().trim()
)
}
}
20 changes: 10 additions & 10 deletions sample/app/sample-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<baseline>
<variant name="debug">
<uses-permission name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission maxSdkVersion="27" name="android.permission.INTERNET"/>
<uses-permission name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-feature glEsVersion="0x00020000" required="true"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-permission maxSdkVersion="26" name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission maxSdkVersion="26" name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-feature glEsVersion="0x00020000" required="true"/>
<uses-permission maxSdkVersion="27" name="android.permission.INTERNET"/>
<uses-permission name="android.permission.WRITE_EXTERNAL_STORAGE"/>
</variant>
<variant name="release">
<uses-permission name="android.permission.CAMERA"/>
<uses-permission maxSdkVersion="27" name="android.permission.INTERNET"/>
<uses-permission name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-feature glEsVersion="0x00020000" required="true"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-permission maxSdkVersion="26" name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission maxSdkVersion="26" name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission-sdk-23 name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-feature name="android.hardware.camera.autofocus" required="false"/>
<uses-feature glEsVersion="0x00020000" required="true"/>
<uses-permission name="android.permission.CAMERA"/>
<uses-permission maxSdkVersion="27" name="android.permission.INTERNET"/>
</variant>
</baseline>