From b07773a8ccf90c3487f3342cd902375ff49393cc Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Mon, 6 Apr 2026 10:45:38 +0200 Subject: [PATCH] reenable r8 shrinking --- app/app/build.gradle.kts | 16 ++++++++++++---- app/app/proguard-rules.pro | 26 ++++++-------------------- gradle/libs.versions.toml | 1 - 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts index 436959bee..3a53b281a 100644 --- a/app/app/build.gradle.kts +++ b/app/app/build.gradle.kts @@ -46,8 +46,12 @@ android { buildTypes { release { applicationIdSuffix = ".release" - isMinifyEnabled = false - isShrinkResources = false + isMinifyEnabled = true + isShrinkResources = true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) } debug { applicationIdSuffix = ".debug" @@ -60,8 +64,12 @@ android { versionNameSuffix = "-${LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"))}-nightly" signingConfig = signingConfigs.findByName("gh-actions") - isMinifyEnabled = false - isShrinkResources = false + isMinifyEnabled = true + isShrinkResources = true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) } flavorDimensions += "variant" diff --git a/app/app/proguard-rules.pro b/app/app/proguard-rules.pro index 57980d1a3..28bde8f4c 100644 --- a/app/app/proguard-rules.pro +++ b/app/app/proguard-rules.pro @@ -1,21 +1,7 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts.kts. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html +-keepattributes SourceFile,LineNumberTable +-dontobfuscate +-dontoptimize +-keep public class de.mm20.launcher2.ui.launcher.search.common.SearchableItemVM { + public (); +} -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 074eb7ca3..5a84597b5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,6 @@ targetSdk = "36" pluginSdk = "2.2.0" -gradle = "8.1.2" android-gradle-plugin = "9.1.0" ksp-gradle-plugin = "2.3.4"