From 6055cf29380aef4cc70b2b3a6fc532bf0fb4df8a Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Sat, 29 Nov 2025 19:52:17 +0800 Subject: [PATCH 1/2] acra: Switch to ZacSweers's fork of autoservice Google has no plans to officially support KSP for autoservice Ref: https://github.com/google/auto/issues/882 Signed-off-by: Aayush Gupta --- app/build.gradle.kts | 2 +- gradle/libs.versions.toml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5cf357c74..723b139c2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -260,7 +260,7 @@ dependencies { // Metadata generator for service descriptors compileOnly(libs.google.autoservice.annotations) - ksp(libs.google.autoservice.compiler) + ksp(libs.zacsweers.autoservice.compiler) // Manager for complex RecyclerView layouts implementation(libs.lisawray.groupie.core) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 23765591b..0fc252587 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,8 @@ acra = "5.13.1" agp = "8.13.1" appcompat = "1.7.1" assertj = "3.27.6" -autoservice = "1.1.1" +autoservice-google = "1.1.1" +autoservice-zacsweers = "1.2.0" bridge = "v2.0.2" cardview = "1.0.0" checkstyle = "12.1.2" @@ -95,8 +96,7 @@ evernote-statesaver-core = { module = "com.evernote:android-state", version.ref facebook-stetho-core = { module = "com.facebook.stetho:stetho", version.ref = "stetho" } facebook-stetho-okhttp3 = { module = "com.facebook.stetho:stetho-okhttp3", version.ref = "stetho" } google-android-material = { module = "com.google.android.material:material", version.ref = "material" } -google-autoservice-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoservice" } -google-autoservice-compiler = { module = "com.google.auto.service:auto-service", version.ref = "autoservice" } +google-autoservice-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoservice-google" } google-exoplayer-core = { module = "com.google.android.exoplayer:exoplayer-core", version.ref = "exoplayer" } google-exoplayer-dash = { module = "com.google.android.exoplayer:exoplayer-dash", version.ref = "exoplayer" } google-exoplayer-database = { module = "com.google.android.exoplayer:exoplayer-database", version.ref = "exoplayer" } @@ -128,6 +128,7 @@ squareup-leakcanary-plumber = { module = "com.squareup.leakcanary:plumber-androi squareup-leakcanary-watcher = { module = "com.squareup.leakcanary:leakcanary-object-watcher-android", version.ref = "leakcanary" } squareup-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } squareup-picasso = { module = "com.squareup.picasso:picasso", version.ref = "picasso" } +zacsweers-autoservice-compiler = { module = "dev.zacsweers.autoservice:auto-service-ksp", version.ref = "autoservice-zacsweers" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } From e91d647b279f29e65d61e7e3b92e445e76891e77 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Sat, 29 Nov 2025 19:54:36 +0800 Subject: [PATCH 2/2] acra: Relocate autoservice dependencies under acra block They are only used for ACRA Ref: https://www.acra.ch/docs/Custom-Extensions#by-annotation Signed-off-by: Aayush Gupta --- app/build.gradle.kts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 723b139c2..df8c278c1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -258,10 +258,6 @@ dependencies { implementation(libs.google.exoplayer.smoothstreaming) implementation(libs.google.exoplayer.ui) - // Metadata generator for service descriptors - compileOnly(libs.google.autoservice.annotations) - ksp(libs.zacsweers.autoservice.compiler) - // Manager for complex RecyclerView layouts implementation(libs.lisawray.groupie.core) implementation(libs.lisawray.groupie.viewbinding) @@ -275,6 +271,8 @@ dependencies { // Crash reporting implementation(libs.acra.core) + compileOnly(libs.google.autoservice.annotations) + ksp(libs.zacsweers.autoservice.compiler) // Properly restarting implementation(libs.jakewharton.phoenix)