Use the toml hash in the cache file name

- This allows a new emu to be created if dependencies are updated
- Dependencies being updated can cause signature mismatches in installed test apks
- also add back the KSP change that was removed..

Author: blundell

.github/workflows/main.yml

@@ -74,15 +74,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."
@@ -95,14 +98,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 &

build.gradle.kts

@@ -16,6 +16,7 @@ buildscript {
   dependencies {
     classpath(libs.gradlePlugin.android)
     classpath(libs.gradlePlugin.kotlin)
+    classpath(libs.gradlePlugin.ksp)
     classpath(libs.gradlePlugin.dokka)
     classpath(libs.gradlePlugin.mavenPublish)
     classpath(libs.gradlePlugin.detekt)

gradle/libs.versions.toml

@@ -17,6 +17,7 @@
 # The benefit is that depending clients do not have to upgrade to Kotlin 1.4
 compose = "1.4.3"
 kotlin = "1.8.21"
+ksp = "1.8.21-1.0.11"
 coroutines = "1.7.3"
 androidXTest = "1.5.0"
 androidXJunit = "1.1.5"
@@ -29,6 +30,7 @@ androidCompileSdk = "35"
 [libraries]
 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-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
 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" }

leakcanary/leakcanary-app/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
   id("org.jetbrains.kotlin.android")
   id("app.cash.sqldelight")
   id("com.google.dagger.hilt.android")
-  id("kotlin-kapt")
+  id("com.google.devtools.ksp")
   id("kotlin-parcelize")
 }
 
@@ -96,9 +96,5 @@ dependencies {
   implementation(projects.leakcanary.leakcanaryAndroid)
   implementation(libs.hilt.android)
   implementation(libs.okio2)
-  kapt(libs.hilt.compiler)
-}
-
-kapt {
-  correctErrorTypes = true
+  ksp(libs.hilt.compiler)
 }