Merge pull request #2799 from blundell/fix-instru-tests

pyricau · web-flow · commit a6d2b6b9352b · 2026-02-26T14:47:04.000-06:00
Update Gradle, AGP, Hilt
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -71,15 +71,18 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-cached-${{ matrix.api-level }}-${{ matrix.os }}-${{ matrix.target }}
+          key: avd-cached-${{ matrix.api-level }}-${{ matrix.os }}-${{ matrix.target }}-${{ hashFiles('**/libs.versions.toml') }}
+          restore-keys: |
+            avd-cached-${{ matrix.api-level }}-${{ matrix.os }}-${{ matrix.target }}-
       - name: Create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
           target: ${{ matrix.target }}
           arch: ${{ matrix.arch }}
-          force-avd-creation: false
+          # FORCE true here ensures if 'actions/cache' restored old avd, we wipe and start with a fresh image for the new dependency hash.
+          force-avd-creation: true
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-snapshot-load
           disable-animations: false
           script: echo "Generated AVD snapshot for caching."
@@ -92,14 +95,6 @@ jobs:
           arch: ${{ matrix.arch }}
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-snapshot-save
           script: |
-            # Uninstall existing packages to avoid INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES
-            # when a cached AVD snapshot has old APKs signed with different keys.
-            adb uninstall com.squareup.leakcanary || true
-            adb uninstall com.squareup.leakcanary.test || true
-            adb uninstall com.squareup.leakcanary.core || true
-            adb uninstall com.squareup.leakcanary.core.test || true
-            adb uninstall com.squareup.leakcanary.instrumentation || true
-            adb uninstall com.squareup.leakcanary.instrumentation.test || true
             touch emulator.log
             chmod 777 emulator.log
             adb logcat >> emulator.log &
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -22,7 +22,7 @@ buildscript {
     classpath(libs.gradlePlugin.binaryCompatibility)
     classpath(libs.gradlePlugin.keeper)
     classpath(libs.gradlePlugin.sqldelight)
-    classpath("com.google.dagger:hilt-android-gradle-plugin:2.43.2")
+    classpath(libs.gradlePlugin.hilt)
   }
 }
 
@@ -68,6 +68,8 @@ subprojects {
         "-Xlint:all",
         "-Xlint:-serial",
         "-Xlint:-deprecation",
+        "-Xlint:-options",     // Silences Java 8 obsolete warning
+        // "-Xlint:-this-escape", // Silences Java 21+ leaking 'this' warning (Java 21+ only) (Currently we build with J17 so not needed)
         // espresso-core classes say they're compiled with 51.0 but contain 52.0 attributes.
         // warning: [classfile] MethodParameters attribute introduced in version 52.0 class files is ignored in version 51.0 class files
         // "-Werror"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -18,22 +18,27 @@
 compose = "1.4.3"
 kotlin = "1.8.21"
 coroutines = "1.7.3"
-androidXTest = "1.1.0"
-androidXJunit = "1.1.3"
+androidXTest = "1.5.0"
+androidXJunit = "1.1.5"
 workManager = "2.7.0"
 detekt = "1.23.8"
+hilt = "2.53"
 androidMinSdk = "14"
-androidCompileSdk = "34"
+androidCompileSdk = "35"
 
 [libraries]
-gradlePlugin-android = { module = "com.android.tools.build:gradle", version = "8.0.0" }
+gradlePlugin-android = { module = "com.android.tools.build:gradle", version = "8.2.2" }
 gradlePlugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 gradlePlugin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.8.10" }
 gradlePlugin-binaryCompatibility = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version = "0.13.1" }
 gradlePlugin-mavenPublish = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.25.2" }
 gradlePlugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
 gradlePlugin-keeper = { module = "com.slack.keeper:keeper", version = "0.7.0" }
 gradlePlugin-sqldelight = { module = "app.cash.sqldelight:gradle-plugin", version = "2.0.0-alpha05" }
+gradlePlugin-hilt = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
+
+hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
+hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" }
 
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 
@@ -50,13 +55,13 @@ androidX-fragment = { module = "androidx.fragment:fragment", version = "1.0.0" }
 androidX-multidex = { module = "androidx.multidex:multidex", version = "2.0.1" }
 # Exposed transitively, avoid increasing
 androidX-startup = { module = "androidx.startup:startup-runtime", version = "1.0.0" }
-androidX-test-core = { module = "androidx.test:core", version = "1.4.0" }
-androidX-test-monitor = { module = "androidx.test:monitor", version = "1.4.0" }
+androidX-test-core = { module = "androidx.test:core", version = "1.5.0" }
+androidX-test-monitor = { module = "androidx.test:monitor", version = "1.6.1" }
 androidX-test-rules = { module = "androidx.test:rules", version.ref = "androidXTest" }
 # Exposed transitively, avoid increasing
-androidX-test-runner = { module = "androidx.test:runner", version = "1.4.0" }
-androidX-test-orchestrator = { module = "androidx.test:orchestrator", version = "1.4.1" }
-androidX-test-espresso = { module = "androidx.test.espresso:espresso-core", version = "3.4.0" }
+androidX-test-runner = { module = "androidx.test:runner", version = "1.5.2" }
+androidX-test-orchestrator = { module = "androidx.test:orchestrator", version = "1.4.2" } # 1.5.0+ requires API 21+, keeping at 1.4.2 for API 16 compatibility
+androidX-test-espresso = { module = "androidx.test.espresso:espresso-core", version = "3.5.1" }
 androidX-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidXJunit" }
 androidX-test-junitKtx = { module = "androidx.test.ext:junit-ktx", version.ref = "androidXJunit" }
 androidX-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version = "2.2.0" }
@@ -70,7 +75,7 @@ clikt = { module = "com.github.ajalt:clikt", version = "2.3.0" }
 neo4j = { module = "org.neo4j:neo4j", version = "4.4.6" }
 curtains = { module = "com.squareup.curtains:curtains", version = "1.2.4" }
 jline = { module = "jline:jline", version = "2.14.6" }
-junit = { module = "junit:junit", version = "4.12" }
+junit = { module = "junit:junit", version = "4.13.2" }
 kotlinStatistics = { module = "org.nield:kotlin-statistics", version = "1.2.1" }
 mockito = { module = "org.mockito:mockito-core", version = "3.5.10" }
 mockitoKotlin = { module = "com.nhaarman.mockitokotlin2:mockito-kotlin", version = "2.2.0" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/leakcanary/leakcanary-android-core/build.gradle.kts b/leakcanary/leakcanary-android-core/build.gradle.kts
@@ -38,6 +38,12 @@ fun gitSha(): String {
 android {
   resourcePrefix = "leak_canary_"
   compileSdk = libs.versions.androidCompileSdk.get().toInt()
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+
   defaultConfig {
     minSdk = libs.versions.androidMinSdk.get().toInt()
     // Avoid DeprecatedTargetSdkVersionDialog during UI tests
diff --git a/leakcanary/leakcanary-android-core/src/main/java/leakcanary/internal/LeakDirectoryProvider.kt b/leakcanary/leakcanary-android-core/src/main/java/leakcanary/internal/LeakDirectoryProvider.kt
@@ -80,6 +80,8 @@ internal class LeakDirectoryProvider constructor(
   }
 
   @TargetApi(M) fun hasStoragePermission(): Boolean {
+    // Defensive check: @TargetApi doesn't prevent this method from being called on older APIs
+    @Suppress("ObsoleteSdkInt")
     if (SDK_INT < M) {
       return true
     }
diff --git a/leakcanary/leakcanary-android-core/src/main/java/leakcanary/internal/RequestPermissionActivity.kt b/leakcanary/leakcanary-android-core/src/main/java/leakcanary/internal/RequestPermissionActivity.kt
@@ -84,6 +84,8 @@ internal class RequestPermissionActivity : Activity() {
 
     fun createPendingIntent(context: Context, permission: String): PendingIntent {
       val intent = createIntent(context, permission)
+      // Defensive check: @TargetApi on class doesn't prevent this method from being called on older APIs
+      @Suppress("ObsoleteSdkInt")
       val flags = if (Build.VERSION.SDK_INT >= 23) {
         FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
       } else {
diff --git a/leakcanary/leakcanary-android-process/build.gradle.kts b/leakcanary/leakcanary-android-process/build.gradle.kts
@@ -14,6 +14,12 @@ dependencies {
 
 android {
   compileSdk = libs.versions.androidCompileSdk.get().toInt()
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+
   defaultConfig {
     minSdk = libs.versions.androidMinSdk.get().toInt()
   }
diff --git a/leakcanary/leakcanary-android-process/src/main/java/leakcanary/LeakCanaryProcess.kt b/leakcanary/leakcanary-android-process/src/main/java/leakcanary/LeakCanaryProcess.kt
@@ -50,7 +50,7 @@ object LeakCanaryProcess {
       return false
     }
 
-    val mainProcess = packageInfo.applicationInfo.processName
+    val mainProcess = packageInfo.applicationInfo?.processName ?: return false
 
     val component = ComponentName(context, serviceClass)
     val serviceInfo: ServiceInfo
diff --git a/leakcanary/leakcanary-android-utils/build.gradle.kts b/leakcanary/leakcanary-android-utils/build.gradle.kts
@@ -13,6 +13,12 @@ dependencies {
 
 android {
   compileSdk = libs.versions.androidCompileSdk.get().toInt()
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+
   defaultConfig {
     minSdk = libs.versions.androidMinSdk.get().toInt()
   }
diff --git a/leakcanary/leakcanary-android/build.gradle.kts b/leakcanary/leakcanary-android/build.gradle.kts
@@ -21,6 +21,12 @@ dependencies {
 
 android {
   compileSdk = libs.versions.androidCompileSdk.get().toInt()
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+
   defaultConfig {
     minSdk = libs.versions.androidMinSdk.get().toInt()
     // Avoid DeprecatedTargetSdkVersionDialog / INSTALL_FAILED_DEPRECATED_SDK_VERSION on API 28+
diff --git a/leakcanary/leakcanary-app-aidl/api/leakcanary-app-aidl.api b/leakcanary/leakcanary-app-aidl/api/leakcanary-app-aidl.api
@@ -1,4 +1,5 @@
 public abstract interface class org/leakcanary/internal/LeakUiApp : android/os/IInterface {
+	public static final field DESCRIPTOR Ljava/lang/String;
 	public abstract fun sendHeapAnalysis (Lorg/leakcanary/internal/ParcelableHeapAnalysis;Landroid/net/Uri;)V
 }
 
@@ -12,9 +13,11 @@ public abstract class org/leakcanary/internal/LeakUiApp$Stub : android/os/Binder
 	public fun <init> ()V
 	public fun asBinder ()Landroid/os/IBinder;
 	public static fun asInterface (Landroid/os/IBinder;)Lorg/leakcanary/internal/LeakUiApp;
-	public static fun getDefaultImpl ()Lorg/leakcanary/internal/LeakUiApp;
 	public fun onTransact (ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-	public static fun setDefaultImpl (Lorg/leakcanary/internal/LeakUiApp;)Z
+}
+
+public class org/leakcanary/internal/LeakUiApp$_Parcel {
+	public fun <init> ()V
 }
 
 public final class org/leakcanary/internal/ParcelableHeapAnalysis : android/os/Parcelable {
diff --git a/leakcanary/leakcanary-app/build.gradle.kts b/leakcanary/leakcanary-app/build.gradle.kts
@@ -65,7 +65,7 @@ android {
     kotlinCompilerExtensionVersion = "1.4.7"
   }
 
-  packagingOptions {
+  packaging {
     resources {
       excludes += "/META-INF/{AL2.0,LGPL2.1}"
     }
@@ -94,9 +94,9 @@ dependencies {
   debugImplementation("androidx.compose.ui:ui-test-manifest:${libs.versions.compose.get()}")
   // TODO Split out what's included in debug vs the subset for release
   implementation(projects.leakcanary.leakcanaryAndroid)
-  implementation("com.google.dagger:hilt-android:2.43.2")
+  implementation(libs.hilt.android)
   implementation(libs.okio2)
-  kapt("com.google.dagger:hilt-compiler:2.43.2")
+  kapt(libs.hilt.compiler)
 }
 
 kapt {
diff --git a/object-watcher/object-watcher-android-core/build.gradle.kts b/object-watcher/object-watcher-android-core/build.gradle.kts
@@ -20,6 +20,11 @@ android {
   resourcePrefix = "leak_canary_watcher_"
   compileSdk = libs.versions.androidCompileSdk.get().toInt()
 
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+
   defaultConfig {
     minSdk = libs.versions.androidMinSdk.get().toInt()
     consumerProguardFiles("consumer-proguard-rules.pro")
diff --git a/object-watcher/object-watcher-android/build.gradle.kts b/object-watcher/object-watcher-android/build.gradle.kts
@@ -12,6 +12,11 @@ android {
   resourcePrefix = "leak_canary_watcher_"
   compileSdk = libs.versions.androidCompileSdk.get().toInt()
 
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+
   defaultConfig {
     minSdk = libs.versions.androidMinSdk.get().toInt()
     consumerProguardFiles("consumer-proguard-rules.pro")
diff --git a/plumber/plumber-android-core/build.gradle.kts b/plumber/plumber-android-core/build.gradle.kts
@@ -17,6 +17,12 @@ dependencies {
 android {
   resourcePrefix = "leak_canary_plumber"
   compileSdk = libs.versions.androidCompileSdk.get().toInt()
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+
   defaultConfig {
     minSdk = libs.versions.androidMinSdk.get().toInt()
     consumerProguardFiles("consumer-proguard-rules.pro")
diff --git a/samples/leakcanary-android-sample/build.gradle.kts b/samples/leakcanary-android-sample/build.gradle.kts
@@ -92,7 +92,7 @@ android {
     }
   }
   namespace = "com.example.leakcanary"
-  testNamespace = "com.squareup.leakcanary.instrumentation.test"
+  testNamespace = "com.example.leakcanary.test"
   lint {
     disable += "GoogleAppIndexingWarning"
   }
diff --git a/samples/leakcanary-android-sample/src/androidTest/java/com/example/leakcanary/test/TuPeuxPasTest.kt b/samples/leakcanary-android-sample/src/androidTest/java/com/example/leakcanary/test/TuPeuxPasTest.kt
@@ -1,4 +1,4 @@
-package leakcanary.tests
+package com.example.leakcanary.test
 
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import com.example.leakcanary.MainActivity

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,8 @@ internal class LeakDirectoryProvider constructor(`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@TargetApi(M) fun hasStoragePermission(): Boolean {`
	`83`	`+ // Defensive check: @TargetApi doesn't prevent this method from being called on older APIs`
	`84`	`+ @Suppress("ObsoleteSdkInt")`
`83`	`85`	`if (SDK_INT < M) {`
`84`	`86`	`return true`
`85`	`87`	`}`