mirror of
https://github.com/meshtastic/Meshtastic-Android.git
synced 2026-04-20 22:23:37 +00:00
chore(r8): remove redundant keep rules covered by consumer rules
Removes explicit -keep/-dontwarn wildcards whose behavior is already
provided by the library's own bundled consumer-rules.pro, by Room's
generated static references, or by narrower annotation-targeted keeps.
The merged R8 configuration shrinks by 34 lines (1981→1947 googleRelease,
1653→1619 fdroidRelease), giving R8 more tree-shaking freedom.
Removed (covered by library-bundled consumer rules):
- kotlin.Metadata, kotlin.reflect.**, kotlin.coroutines.Continuation,
kotlinx.coroutines.** (kotlin-stdlib + kotlinx-coroutines-core)
- androidx.datastore.**, androidx.paging.**, androidx.lifecycle.**,
androidx.navigation3.**, androidx.sqlite.**
- coil3.**, okio.**, co.touchlab.kermit.**,
com.mikepenz.aboutlibraries.**, com.mikepenz.markdown.**,
com.juul.kable.**, io.ktor.**, io.ktor.client.engine.java.**
(HttpClientEngineFactory ServiceLoader keep retained)
Room (room3) narrowed:
- Dropped org.meshtastic.core.database.{dao,entity,Converters}.** and
**_Impl wildcards. RoomDatabaseConstructor +
MeshtasticDatabaseConstructor/MeshtasticDatabase keeps retained.
Room 3.0 KMP generates static references rather than reflective
lookups, so reachable DAO/entity/_Impl code survives tree-shaking.
Wire protobuf narrowed:
- Dropped com.squareup.wire.**, org.meshtastic.proto.**, meshtastic.**
wildcards and deleted core/proto/consumer-rules.pro (20 per-class keeps).
- Replaced with targeted -keepclassmembers for ADAPTER fields on
Message subclasses and ProtoAdapter member preservation. Verified
no Class.forName lookups into org.meshtastic.proto namespace.
Meshtastic model + DI:
- Dropped org.meshtastic.core.model.** wildcard and deleted
core/model/consumer-rules.pro (DataPacket is @CommonParcelize'd;
no reflective access to core.model).
- Replaced org.meshtastic.**.di.** wildcard with a narrow
@KoinViewModel class annotation keep (the @Module, @ComponentScan,
@Single, @Factory keeps above already cover the rest of Koin).
Compose resources refinement:
- Narrowed org.meshtastic.core.resources.** to Res + Res$* members
only (sufficient for the fdroid startup-crash workaround in #5146).
Intentionally retained (documented workarounds / policy):
- -dontoptimize, -dontobfuscate, -printconfiguration
- All Koin annotation keeps + org.koin.**
- kotlinx-serialization @Serializable keeps
- Room RoomDatabaseConstructor + MeshtasticDatabase(-Constructor)
- Ktor HttpClientEngineFactory ServiceLoader keep
- Desktop MainKt + org.meshtastic.desktop.** entry points
- All -dontwarn rules for JVM/Android platform gaps
- app/proguard-rules.pro Compose runtime/ui/animation/foundation/
material3 keeps (defence-in-depth with -dontoptimize; may interact
with the parallel CMP freeze RCA investigation).
Verified:
- ./gradlew :app:assembleFdroidRelease — SUCCESS (after each batch)
- ./gradlew :app:assembleGoogleRelease — SUCCESS
- ./gradlew spotlessApply detekt — SUCCESS
- :desktop:createReleaseDistributable — pre-existing failure on
origin/main (Vico/Skia warnings), unrelated to these changes.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
GitHub Copilot CLI
James Rich
parent
90f6e21a9c
commit
c1c01d7765
4 changed files with 36 additions and 114 deletions
|
|
@ -20,12 +20,10 @@
|
|||
-keepattributes SourceFile,LineNumberTable,*Annotation*,Signature,InnerClasses,EnclosingMethod,Exceptions,RuntimeVisibleAnnotations
|
||||
|
||||
# ---- Kotlin / Coroutines ----------------------------------------------------
|
||||
|
||||
-keep class kotlin.Metadata { *; }
|
||||
-keep class kotlin.reflect.** { *; }
|
||||
-keep class kotlin.coroutines.Continuation { *; }
|
||||
-keep class kotlinx.coroutines.** { *; }
|
||||
-dontwarn kotlinx.coroutines.**
|
||||
# Kotlin stdlib and kotlinx-coroutines ship their own consumer ProGuard rules
|
||||
# (kotlin-stdlib and kotlinx-coroutines-core consumer-rules.pro) which keep
|
||||
# Metadata, Continuation, kotlin.reflect internals, and debug metadata. No
|
||||
# explicit wildcards needed here.
|
||||
|
||||
# ---- Koin DI (reflection-based injection) -----------------------------------
|
||||
|
||||
|
|
@ -41,9 +39,7 @@
|
|||
-keep @org.koin.core.annotation.ComponentScan class * { *; }
|
||||
-keep @org.koin.core.annotation.Single class * { *; }
|
||||
-keep @org.koin.core.annotation.Factory class * { *; }
|
||||
|
||||
# Generated Koin module extensions (Koin Annotations plugin output)
|
||||
-keep class org.meshtastic.**.di.** { *; }
|
||||
-keep @org.koin.core.annotation.KoinViewModel class * { *; }
|
||||
|
||||
# ---- kotlinx-serialization --------------------------------------------------
|
||||
|
||||
|
|
@ -63,13 +59,14 @@
|
|||
|
||||
# ---- Wire Protobuf ----------------------------------------------------------
|
||||
|
||||
# Wire generates ADAPTER companion objects accessed via reflection
|
||||
-keep class com.squareup.wire.** { *; }
|
||||
-dontwarn com.squareup.wire.**
|
||||
|
||||
# Generated proto message classes (both meshtastic protos and internal package)
|
||||
-keep class org.meshtastic.proto.** { *; }
|
||||
-keep class meshtastic.** { *; }
|
||||
# Wire generates an ADAPTER static field on every Message subclass accessed
|
||||
# reflectively during encoding/decoding. Keep those fields and the
|
||||
# ProtoAdapter subclasses themselves; Wire's bundled consumer rules preserve
|
||||
# the runtime itself.
|
||||
-keepclassmembers class * extends com.squareup.wire.Message {
|
||||
public static *** ADAPTER;
|
||||
}
|
||||
-keepclassmembers class * extends com.squareup.wire.ProtoAdapter { *; }
|
||||
|
||||
# Suppress warnings about missing Android Parcelable (Wire cross-platform stubs
|
||||
# when compiling for non-Android JVM targets; harmless on Android).
|
||||
|
|
@ -86,40 +83,24 @@
|
|||
-keep class org.meshtastic.core.database.MeshtasticDatabaseConstructor { *; }
|
||||
-keep class org.meshtastic.core.database.MeshtasticDatabase { *; }
|
||||
|
||||
# Room DAOs — Room generates implementations at compile time; keep interfaces
|
||||
-keep class org.meshtastic.core.database.dao.** { *; }
|
||||
|
||||
# Room Entities — accessed via reflection for column mapping
|
||||
-keep class org.meshtastic.core.database.entity.** { *; }
|
||||
|
||||
# Room TypeConverters — invoked reflectively
|
||||
-keep class org.meshtastic.core.database.Converters { *; }
|
||||
|
||||
# Room generated _Impl classes
|
||||
-keep class **_Impl { *; }
|
||||
# Room's own consumer rules (from androidx.room3) keep DAOs, entities,
|
||||
# generated _Impl classes, and TypeConverters referenced from the database.
|
||||
|
||||
# ---- SQLite bundled --------------------------------------------------------
|
||||
|
||||
-keep class androidx.sqlite.** { *; }
|
||||
-dontwarn androidx.sqlite.**
|
||||
# androidx.sqlite ships consumer rules.
|
||||
|
||||
# ---- Ktor (ServiceLoader + plugin discovery) --------------------------------
|
||||
|
||||
-keep class io.ktor.** { *; }
|
||||
-dontwarn io.ktor.**
|
||||
|
||||
# Keep ServiceLoader metadata files
|
||||
# Keep ServiceLoader metadata files (ktor discovers HttpClientEngineFactory
|
||||
# implementations reflectively via ServiceLoader).
|
||||
-keepclassmembers class * implements io.ktor.client.HttpClientEngineFactory { *; }
|
||||
|
||||
# ---- Coil 3 (image loading) -------------------------------------------------
|
||||
|
||||
-keep class coil3.** { *; }
|
||||
-dontwarn coil3.**
|
||||
# coil3 ships consumer rules.
|
||||
|
||||
# ---- Kable BLE --------------------------------------------------------------
|
||||
|
||||
-keep class com.juul.kable.** { *; }
|
||||
-dontwarn com.juul.kable.**
|
||||
# com.juul.kable ships consumer rules; if release builds fail with missing
|
||||
# Kable classes, restore a narrow keep for the specific reflection-loaded type.
|
||||
|
||||
# ---- Compose Multiplatform resources ----------------------------------------
|
||||
|
||||
|
|
@ -127,17 +108,14 @@
|
|||
# Without these the fdroid flavor has crashed at startup with a misleading
|
||||
# URLDecodeException due to R8 exception-class merging.
|
||||
-keep class org.jetbrains.compose.resources.** { *; }
|
||||
-keep class org.meshtastic.core.resources.** { *; }
|
||||
-keep class org.meshtastic.core.resources.Res { *; }
|
||||
-keepclassmembers class org.meshtastic.core.resources.Res$* { *; }
|
||||
|
||||
# ---- AboutLibraries ---------------------------------------------------------
|
||||
|
||||
-keep class com.mikepenz.aboutlibraries.** { *; }
|
||||
-dontwarn com.mikepenz.aboutlibraries.**
|
||||
# com.mikepenz.aboutlibraries ships consumer rules.
|
||||
|
||||
# ---- Multiplatform Markdown Renderer ----------------------------------------
|
||||
|
||||
-keep class com.mikepenz.markdown.** { *; }
|
||||
-dontwarn com.mikepenz.markdown.**
|
||||
# com.mikepenz.markdown ships consumer rules.
|
||||
|
||||
# ---- QR Code Kotlin ---------------------------------------------------------
|
||||
|
||||
|
|
@ -147,36 +125,24 @@
|
|||
-dontwarn qrcode.**
|
||||
|
||||
# ---- Kermit logging ---------------------------------------------------------
|
||||
|
||||
-keep class co.touchlab.kermit.** { *; }
|
||||
-dontwarn co.touchlab.kermit.**
|
||||
# co.touchlab.kermit ships consumer rules.
|
||||
|
||||
# ---- Okio -------------------------------------------------------------------
|
||||
|
||||
-keep class okio.** { *; }
|
||||
-dontwarn okio.**
|
||||
# okio ships consumer rules.
|
||||
|
||||
# ---- DataStore --------------------------------------------------------------
|
||||
|
||||
-keep class androidx.datastore.** { *; }
|
||||
-dontwarn androidx.datastore.**
|
||||
# androidx.datastore ships consumer rules.
|
||||
|
||||
# ---- Paging -----------------------------------------------------------------
|
||||
|
||||
-keep class androidx.paging.** { *; }
|
||||
-dontwarn androidx.paging.**
|
||||
# androidx.paging ships consumer rules.
|
||||
|
||||
# ---- Lifecycle / Navigation 3 / ViewModel (JetBrains forks) -----------------
|
||||
|
||||
-keep class androidx.lifecycle.** { *; }
|
||||
-keep class androidx.navigation3.** { *; }
|
||||
-dontwarn androidx.lifecycle.**
|
||||
-dontwarn androidx.navigation3.**
|
||||
# androidx.lifecycle and androidx.navigation3 ship consumer rules.
|
||||
|
||||
# ---- Meshtastic shared model ------------------------------------------------
|
||||
|
||||
# Core model classes (used in serialization, Room, and Koin injection)
|
||||
-keep class org.meshtastic.core.model.** { *; }
|
||||
# core.model types are reached via static references from Koin-wired graphs,
|
||||
# Room entities, and kotlinx-serialization @Serializable companions — all of
|
||||
# which have their own keep rules above.
|
||||
|
||||
# ---- Compose Runtime & Animation --------------------------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
-keep class org.meshtastic.core.model.DataPacket
|
||||
-keep class org.meshtastic.core.model.DataPacket$CREATOR
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
# Core proto classes required for packet handling and serialization
|
||||
# FromRadio and related message types (primary packet container)
|
||||
-keep class org.meshtastic.proto.FromRadio
|
||||
-keep class org.meshtastic.proto.Data
|
||||
-keep class org.meshtastic.proto.MeshPacket
|
||||
-keep class org.meshtastic.proto.LogRecord
|
||||
|
||||
# Message type payloads (handled in packet routing)
|
||||
-keep class org.meshtastic.proto.AdminMessage
|
||||
-keep class org.meshtastic.proto.StoreAndForward
|
||||
-keep class org.meshtastic.proto.StoreForwardPlusPlus
|
||||
-keep class org.meshtastic.proto.Routing
|
||||
|
||||
# User and Node information
|
||||
-keep class org.meshtastic.proto.User
|
||||
-keep class org.meshtastic.proto.NeighborInfo
|
||||
-keep class org.meshtastic.proto.Neighbor
|
||||
|
||||
# Location and environment data
|
||||
-keep class org.meshtastic.proto.Position
|
||||
-keep class org.meshtastic.proto.Waypoint
|
||||
-keep class org.meshtastic.proto.StatusMessage
|
||||
|
||||
# Telemetry data types
|
||||
-keep class org.meshtastic.proto.Telemetry
|
||||
-keep class org.meshtastic.proto.DeviceMetrics
|
||||
-keep class org.meshtastic.proto.EnvironmentMetrics
|
||||
-keep class org.meshtastic.proto.AirQualityMetrics
|
||||
-keep class org.meshtastic.proto.PowerMetrics
|
||||
-keep class org.meshtastic.proto.LocalStats
|
||||
-keep class org.meshtastic.proto.HostMetrics
|
||||
|
||||
# Other data
|
||||
-keep class org.meshtastic.proto.Paxcount
|
||||
-keep class org.meshtastic.proto.DeviceMetadata
|
||||
|
||||
# Configuration classes
|
||||
-keep class org.meshtastic.proto.ChannelSet
|
||||
-keep class org.meshtastic.proto.LocalConfig
|
||||
-keep class org.meshtastic.proto.Config
|
||||
-keep class org.meshtastic.proto.ModuleConfig
|
||||
-keep class org.meshtastic.proto.Channel
|
||||
-keep class org.meshtastic.proto.ClientNotification
|
||||
5
desktop/proguard-rules.pro
vendored
5
desktop/proguard-rules.pro
vendored
|
|
@ -46,8 +46,9 @@
|
|||
-keep class org.meshtastic.desktop.MainKt { *; }
|
||||
|
||||
# ---- Ktor Java engine (desktop-only; Android uses OkHttp) -------------------
|
||||
|
||||
-keep class io.ktor.client.engine.java.** { *; }
|
||||
# io.ktor.client.engine.java ships consumer rules; the shared
|
||||
# HttpClientEngineFactory ServiceLoader keep in shared-rules.pro covers the
|
||||
# reflective discovery path.
|
||||
|
||||
# ---- Meshtastic desktop host shell ------------------------------------------
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue