Skip to content

Add recent Android API levels (28, 29, 31, 33, 34) to instrumentation CI matrix #2803

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
pyricau merged 6 commits into from
Feb 26, 2026
Merged

Add recent Android API levels (28, 29, 31, 33, 34) to instrumentation CI matrix #2803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
14b806e
Add recent Android API levels to instrumentation test matrix
pyricau Feb 26, 2026
d42b3b5
Upgrade wrapper-validation-action to gradle/actions/wrapper-validatio…
pyricau Feb 26, 2026
b79e8a9
Fix INSTALL_FAILED_DEPRECATED_SDK_VERSION on API 28+ for leakcanary-a…
pyricau Feb 26, 2026
38deaf5
Fix LeakActivityTest on API 33+ by disabling notifications during test
pyricau Feb 26, 2026
b72effd
Drop API 28 and 29 from instrumentation test matrix
pyricau Feb 26, 2026
1731885
Pin gradle/actions/wrapper-validation to commit SHA to satisfy code s…
pyricau Feb 26, 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
11 changes: 4 additions & 7 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: gradle/wrapper-validation-action@v1
- uses: gradle/actions/wrapper-validation@48b5f213c81028ace310571dc5ec0fbbca0b2947 # v4

checks:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -39,7 +39,9 @@ jobs:
- 21
- 23
- 26
# - 29 flaky
- 31
- 33
- 34
include:
- arch: x86
api-level: 16
Expand All @@ -49,11 +51,6 @@ jobs:
api-level: 19
target: google_apis
channel: stable
# Failing (something about permissions maybe?
# - arch: x86
# api-level: 30
# target: aosp_atd
# channel: canary
steps:
- name: Enable KVM group perms
run: |
Expand Down
2 changes: 2 additions & 0 deletions leakcanary/leakcanary-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ android {
compileSdk = libs.versions.androidCompileSdk.get().toInt()
defaultConfig {
minSdk = libs.versions.androidMinSdk.get().toInt()
// Avoid DeprecatedTargetSdkVersionDialog / INSTALL_FAILED_DEPRECATED_SDK_VERSION on API 28+
targetSdk = libs.versions.androidCompileSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
buildFeatures.buildConfig = false
Expand Down
13 changes: 9 additions & 4 deletions leakcanary/leakcanary-android/src/androidTest/java/leakcanary/LeakActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,16 @@ internal class LeakActivityTest {
fun importHeapDumpFile() = tryAndRestoreConfig {
val latch = CountDownLatch(1)
LeakCanary.config = LeakCanary.config.run {
copy(eventListeners = eventListeners + EventListener { event ->
if (event is HeapAnalysisDone<*>) {
latch.countDown()
copy(
// Disable notifications to prevent RequestPermissionActivity from launching on API 33+
// (targetSdk >= 33 triggers POST_NOTIFICATIONS permission request which pauses LeakActivity)
showNotifications = false,
eventListeners = eventListeners + EventListener { event ->
if (event is HeapAnalysisDone<*>) {
latch.countDown()
}
}
})
)
}
val hprof = writeHeapDump {
"Holder" clazz {
Expand Down
Loading