From 6b41a43f32be7b472e9ccbea3ced5ca8a3220bf4 Mon Sep 17 00:00:00 2001 From: Mike Date: Fri, 24 May 2024 01:58:14 +0800 Subject: [PATCH] Fixed conflicting proguard ruling from other modules --- README.md | 1 + app/build.gradle.kts | 4 ++-- core/common/build.gradle.kts | 2 +- core/feature/build.gradle.kts | 3 +-- feature/pokemon/data/build.gradle.kts | 2 +- feature/pokemon/domain/build.gradle.kts | 2 +- feature/pokemondetails/data/build.gradle.kts | 2 +- feature/pokemondetails/domain/build.gradle.kts | 2 +- feature/pokemondetails/ui/build.gradle.kts | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 955e689..e17c41d 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,7 @@ Each feature module is built with a sub-module that follows Domain, Data and UI * **Coil Image Loading:** Attempt to load an image using Coil with or without loading animation * **CI/CD Using Github:** Utilizing Github Actions and Github Releases page for pipelines and deployment (uses debug apk but you can build release or sign as you like) +* **R8:** Release and R8 ready, just make sure to generate your own keystore / signing capability * **Lib Versions Catalog:** Uses new lib.versions.toml versions catalog to manage dependencies and their versions ## Built With diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e1c8711..a626231 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -28,8 +28,8 @@ android { buildTypes { release { isDebuggable = false - isMinifyEnabled = false - isShrinkResources = false + isMinifyEnabled = true + isShrinkResources = true proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro", diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index e069887..2b34bf1 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -17,7 +17,7 @@ android { buildTypes { release { - isMinifyEnabled = true + isMinifyEnabled = false proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro", diff --git a/core/feature/build.gradle.kts b/core/feature/build.gradle.kts index 5efe109..39f92f9 100644 --- a/core/feature/build.gradle.kts +++ b/core/feature/build.gradle.kts @@ -17,7 +17,7 @@ android { buildTypes { release { - isMinifyEnabled = true + isMinifyEnabled = false proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro", @@ -41,7 +41,6 @@ dependencies { implementation(libs.appcompat) implementation(libs.material) implementation(libs.navigation.compose) - testImplementation(libs.junit) androidTestImplementation(libs.androidx.test.ext.junit) androidTestImplementation(libs.espresso.core) diff --git a/feature/pokemon/data/build.gradle.kts b/feature/pokemon/data/build.gradle.kts index cf8fd92..37d793c 100644 --- a/feature/pokemon/data/build.gradle.kts +++ b/feature/pokemon/data/build.gradle.kts @@ -19,7 +19,7 @@ android { buildTypes { release { - isMinifyEnabled = true + isMinifyEnabled = false proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro", diff --git a/feature/pokemon/domain/build.gradle.kts b/feature/pokemon/domain/build.gradle.kts index 4f2e274..d865574 100644 --- a/feature/pokemon/domain/build.gradle.kts +++ b/feature/pokemon/domain/build.gradle.kts @@ -19,7 +19,7 @@ android { buildTypes { release { - isMinifyEnabled = true + isMinifyEnabled = false proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro", diff --git a/feature/pokemondetails/data/build.gradle.kts b/feature/pokemondetails/data/build.gradle.kts index 90eb4fd..adc0322 100644 --- a/feature/pokemondetails/data/build.gradle.kts +++ b/feature/pokemondetails/data/build.gradle.kts @@ -19,7 +19,7 @@ android { buildTypes { release { - isMinifyEnabled = true + isMinifyEnabled = false proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro", diff --git a/feature/pokemondetails/domain/build.gradle.kts b/feature/pokemondetails/domain/build.gradle.kts index 013f745..1069202 100644 --- a/feature/pokemondetails/domain/build.gradle.kts +++ b/feature/pokemondetails/domain/build.gradle.kts @@ -19,7 +19,7 @@ android { buildTypes { release { - isMinifyEnabled = true + isMinifyEnabled = false proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro", diff --git a/feature/pokemondetails/ui/build.gradle.kts b/feature/pokemondetails/ui/build.gradle.kts index 6f066ea..f402313 100644 --- a/feature/pokemondetails/ui/build.gradle.kts +++ b/feature/pokemondetails/ui/build.gradle.kts @@ -20,7 +20,7 @@ android { buildTypes { release { - isMinifyEnabled = true + isMinifyEnabled = false proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro",