Minor updates

.github/workflows/main.yml

@@ -10,23 +10,23 @@ jobs:
   validation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v2
 
   checks:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'zulu'
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/actions/setup-gradle@v3
       - name: Build project
         run: ./gradlew build --stacktrace
 
   instrumentation-tests:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     strategy:
       # Allow tests to continue on other devices if they fail on one device.
@@ -55,14 +55,20 @@ jobs:
         #    target: aosp_atd
         #    channel: canary
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+          ls /dev/kvm
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'zulu'
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/actions/setup-gradle@v3
       - name: AVD cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: avd-cache
         with:
           path: |
@@ -94,7 +100,7 @@ jobs:
             ./gradlew leakcanary:leakcanary-android-core:connectedCheck leakcanary:leakcanary-android:connectedCheck leakcanary:leakcanary-android-instrumentation:connectedCheck --no-build-cache --no-daemon --stacktrace
       - name: Upload results
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.api-level }}-${{ matrix.arch }}-instrumentation-test-results
           path: |
@@ -106,12 +112,12 @@ jobs:
     needs: [ checks, instrumentation-tests ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'zulu'
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/actions/setup-gradle@v3
       - name: Deploy snapshot
         run: ./gradlew publish
         env:

.github/workflows/stale.yaml

@@ -9,7 +9,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 30

build.gradle

@@ -20,7 +20,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
   }
 }
 

docs/requirements.txt

@@ -1,3 +1,3 @@
-mkdocs==1.4.2
-mkdocs-material==9.1.3
+mkdocs==1.5.3
+mkdocs-material==9.5.8
 mkdocs-markdownextradata-plugin==0.2.5

gradle/libs.versions.toml

@@ -15,55 +15,65 @@
 [versions]
 # We would like to use Kotlin recent language features but keep Kotlin 1.3 library APIs
 # The benefit is that depending clients do not have to upgrade to Kotlin 1.4
-kotlin = "1.8.21"
+kotlin = "1.9.20"
 coroutines = "1.7.3"
-androidXTest = "1.1.0"
-androidXJunit = "1.1.3"
-workManager = "2.7.0"
+androidXTest = "1.5.0"
+androidXJunit = "1.1.5"
+workManager = "2.9.0"
+composeCompiler = "1.5.4"
+hilt = "2.50"
+sqldelight = "2.0.0"
 
 [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-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.9.10" }
+gradlePlugin-binaryCompatibility = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version = "0.13.2" }
+gradlePlugin-mavenPublish = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.27.0" }
 gradlePlugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version = "1.6.0" }
 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-sqldelight = { module = "app.cash.sqldelight:gradle-plugin", version.ref = "sqldelight" }
+gradlePlugin-hilt = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
 
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 
+# This isn't strictly used, but allows Renovate to see us using the Compose Compiler artifact
+compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "composeCompiler" }
 # We don't need the latest version of AndroidX (there are no bugs that impact what LeakCanary
 # relies on), we're sticking a bit older because most apps will be using a more recent version
 # and they'll automatically resolve to higher version without having to necessarily resort to a
 # resolution strategy.
 androidX-fragment = { module = "androidx.fragment:fragment", version = "1.0.0" }
 # 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-startup = { module = "androidx.startup:startup-runtime", version = "1.1.1" }
+androidX-test-core = { module = "androidx.test:core", version = "1.5.0" }
 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" }
+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-work-runtime = { module = "androidx.work:work-runtime", version.ref = "workManager" }
 androidX-work-multiprocess = { module = "androidx.work:work-multiprocess", version.ref = "workManager" }
 
 androidSupport = { module = "com.android.support:support-v4", version = "28.0.0" }
 assertjCore = { module = "org.assertj:assertj-core", version = "3.9.1" }
-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" }
+clikt = { module = "com.github.ajalt:clikt", version = "2.8.0" }
+neo4j = { module = "org.neo4j:neo4j", version = "4.4.30" }
+curtains = { module = "com.squareup.curtains:curtains", version = "1.2.5" }
 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" }
+mockito = { module = "org.mockito:mockito-core", version = "5.10.0" }
 mockitoKotlin = { module = "com.nhaarman.mockitokotlin2:mockito-kotlin", version = "2.2.0" }
-robolectric = { module = "org.robolectric:robolectric", version = "4.0-alpha-3" }
-okio2 = { module = "com.squareup.okio:okio", version = "2.2.2" }
-okio1 = { module = "com.squareup.okio:okio", version = "1.14.0" }
+robolectric = { module = "org.robolectric:robolectric", version = "4.11.1" }
+okio2 = { module = "com.squareup.okio:okio", version = "2.10.0" }
+okio1 = { module = "com.squareup.okio:okio", version = "1.17.6" }
+hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
+hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" }
+sqldelight-android-driver = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
+sqldelight-coroutines-extensions = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqldelight" }

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.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

leakcanary/leakcanary-android-process/src/main/java/leakcanary/internal/RemoteLeakCanaryWorkerService.kt

@@ -30,13 +30,14 @@ class RemoteLeakCanaryWorkerService : RemoteWorkerService() {
     // No real app context for you, sorry!
     override fun getApplicationContext() = this
 
-    override fun getWorkManagerConfiguration() = Configuration.Builder()
-      // If the default package name is not set, WorkManager will cancel all runnables
-      // when initialized as it can't tell that it's not running in the main process.
-      // This would lead to an extra round trip where the canceling reaches the main process
-      // which then cancels the remote job and reschedules it and then only the work gets done.
-      .setDefaultProcessName(packageName)
-      .build()
+    override val workManagerConfiguration: Configuration
+      get() = Configuration.Builder()
+        // If the default package name is not set, WorkManager will cancel all runnables
+        // when initialized as it can't tell that it's not running in the main process.
+        // This would lead to an extra round trip where the canceling reaches the main process
+        // which then cancels the remote job and reschedules it and then only the work gets done.
+        .setDefaultProcessName(packageName)
+        .build()
   }
 
   private val fakeAppContext by lazy {

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 {

leakcanary/leakcanary-app/build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 ext {
-  compose_version = '1.4.3'
+  compose_version = '1.6.1'
 }
 
 def gitSha() {
@@ -62,7 +62,7 @@ android {
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion '1.4.7'
+    kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
   }
 
   packagingOptions {
@@ -74,29 +74,28 @@ android {
 
 dependencies {
   implementation projects.leakcanary.leakcanaryAppAidl
-  // TODO Move these to ./gradle/libs/versions/toml
-  implementation "app.cash.sqldelight:android-driver:2.0.0-alpha05"
-  implementation "app.cash.sqldelight:coroutines-extensions:2.0.0-alpha05"
-  implementation 'androidx.core:core-ktx:1.9.0'
-  implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-  implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
-  implementation 'androidx.activity:activity-compose:1.5.1'
+  implementation libs.sqldelight.android.driver
+  implementation libs.sqldelight.coroutines.extensions
+  implementation 'androidx.core:core-ktx:1.12.0'
+  implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
+  implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0'
+  implementation 'androidx.activity:activity-compose:1.8.2'
   implementation "androidx.compose.ui:ui:$compose_version"
   implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-  implementation 'androidx.compose.material3:material3:1.0.0-beta02'
-  implementation 'androidx.sqlite:sqlite-framework:2.2.0'
+  implementation 'androidx.compose.material3:material3:1.2.0'
+  implementation 'androidx.sqlite:sqlite-framework:2.4.0'
   implementation 'me.saket.extendedspans:extendedspans:1.3.0'
   testImplementation 'junit:junit:4.13.2'
-  androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-  androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+  androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+  androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
   androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
   debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
   debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
   // 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 {