diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts index a0be9c8e..c7690cfb 100644 --- a/app/app/build.gradle.kts +++ b/app/app/build.gradle.kts @@ -47,17 +47,17 @@ android { buildTypes { release { - applicationIdSuffix = ".release" - - postprocessing { - isRemoveUnusedCode = true - isObfuscate = false - isOptimizeCode = true - } + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) } debug { - applicationIdSuffix = ".debug" isDebuggable = true + isMinifyEnabled = false + isShrinkResources = false } create("nightly") { initWith(getByName("release")) diff --git a/app/ui/build.gradle.kts b/app/ui/build.gradle.kts index 8fb5005d..60611b6e 100644 --- a/app/ui/build.gradle.kts +++ b/app/ui/build.gradle.kts @@ -16,18 +16,26 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") +// //consumerProguardFiles("consumer-rules.pro") signingConfig = signingConfigs.getByName("debug") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } create("nightly") { + isMinifyEnabled = false + isShrinkResources = false initWith(getByName("release")) matchingFallbacks += "release" } diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/ConfigureWidgetSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/ConfigureWidgetSheet.kt index 9892ceb2..b9f4169b 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/ConfigureWidgetSheet.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/ConfigureWidgetSheet.kt @@ -293,7 +293,6 @@ fun ColumnScope.ConfigureAppWidget( val widgetInfo = remember(widget.config.widgetId) { AppWidgetManager.getInstance(context).getAppWidgetInfo(widget.config.widgetId) } - if (widgetInfo == null) { var replaceWidget by rememberSaveable { mutableStateOf(false) @@ -365,6 +364,7 @@ fun ColumnScope.ConfigureAppWidget( } AppWidgetHost( + widgetInfo = widgetInfo, widgetId = widget.config.widgetId, modifier = Modifier diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts index 9e12caa7..c4c0b896 100644 --- a/core/base/build.gradle.kts +++ b/core/base/build.gradle.kts @@ -11,15 +11,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") +// //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } create("nightly") { initWith(getByName("release")) diff --git a/core/compat/build.gradle.kts b/core/compat/build.gradle.kts index fc180bf7..7fc7ebd9 100644 --- a/core/compat/build.gradle.kts +++ b/core/compat/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") +// //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/core/crashreporter/build.gradle.kts b/core/crashreporter/build.gradle.kts index 401db6ee..e0f1341e 100644 --- a/core/crashreporter/build.gradle.kts +++ b/core/crashreporter/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") +// //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/core/devicepose/build.gradle.kts b/core/devicepose/build.gradle.kts index 63aecfb3..c9759c37 100644 --- a/core/devicepose/build.gradle.kts +++ b/core/devicepose/build.gradle.kts @@ -11,16 +11,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } compileOptions { diff --git a/core/devicepose/src/main/java/de/mm20/launcher2/devicepose/DevicePoseProvider.kt b/core/devicepose/src/main/java/de/mm20/launcher2/devicepose/DevicePoseProvider.kt index 4e76b0d7..03087839 100644 --- a/core/devicepose/src/main/java/de/mm20/launcher2/devicepose/DevicePoseProvider.kt +++ b/core/devicepose/src/main/java/de/mm20/launcher2/devicepose/DevicePoseProvider.kt @@ -20,7 +20,9 @@ import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.flow.channelFlow import de.mm20.launcher2.ktx.foldOrNull import de.mm20.launcher2.ktx.isBetterThan +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.withContext import java.util.concurrent.locks.ReentrantReadWriteLock import kotlin.concurrent.read import kotlin.concurrent.write @@ -78,20 +80,24 @@ class DevicePoseProvider internal constructor( } if (hasFineAccess) { - requestLocationUpdates( - LocationManager.GPS_PROVIDER, - minTimeMs, - minDistanceM, - locationCallback - ) + withContext(Dispatchers.Main) { + requestLocationUpdates( + LocationManager.GPS_PROVIDER, + minTimeMs, + minDistanceM, + locationCallback + ) + } } if (hasCoarseAccess) { - requestLocationUpdates( - LocationManager.NETWORK_PROVIDER, - minTimeMs, - minDistanceM, - locationCallback - ) + withContext(Dispatchers.Main) { + requestLocationUpdates( + LocationManager.NETWORK_PROVIDER, + minTimeMs, + minDistanceM, + locationCallback + ) + } } }?.onFailure { Log.e("DevicePoseProvider", "Failed to register location listener", it) diff --git a/core/i18n/build.gradle.kts b/core/i18n/build.gradle.kts index 3ebd2cc8..5e8dee1a 100644 --- a/core/i18n/build.gradle.kts +++ b/core/i18n/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/core/ktx/build.gradle.kts b/core/ktx/build.gradle.kts index b2d0fd49..fa915641 100644 --- a/core/ktx/build.gradle.kts +++ b/core/ktx/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/core/permissions/build.gradle.kts b/core/permissions/build.gradle.kts index e361fd8f..289dad56 100644 --- a/core/permissions/build.gradle.kts +++ b/core/permissions/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/core/preferences/build.gradle.kts b/core/preferences/build.gradle.kts index 979b749c..51239878 100644 --- a/core/preferences/build.gradle.kts +++ b/core/preferences/build.gradle.kts @@ -11,15 +11,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/core/profiles/build.gradle.kts b/core/profiles/build.gradle.kts index 4c0f7329..54243b6d 100644 --- a/core/profiles/build.gradle.kts +++ b/core/profiles/build.gradle.kts @@ -11,15 +11,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } create("nightly") { initWith(getByName("release")) diff --git a/core/shared/build.gradle.kts b/core/shared/build.gradle.kts index 0428bfd0..2097e344 100644 --- a/core/shared/build.gradle.kts +++ b/core/shared/build.gradle.kts @@ -14,15 +14,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") +// //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } create("nightly") { initWith(getByName("release")) diff --git a/data/applications/build.gradle.kts b/data/applications/build.gradle.kts index 4914e8ab..bd7806dc 100644 --- a/data/applications/build.gradle.kts +++ b/data/applications/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/appshortcuts/build.gradle.kts b/data/appshortcuts/build.gradle.kts index 1c2e6c3a..3af37414 100644 --- a/data/appshortcuts/build.gradle.kts +++ b/data/appshortcuts/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/calculator/build.gradle.kts b/data/calculator/build.gradle.kts index 44c351e4..e1d9c7b8 100644 --- a/data/calculator/build.gradle.kts +++ b/data/calculator/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/calendar/build.gradle.kts b/data/calendar/build.gradle.kts index e399a129..11d244db 100644 --- a/data/calendar/build.gradle.kts +++ b/data/calendar/build.gradle.kts @@ -11,15 +11,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/contacts/build.gradle.kts b/data/contacts/build.gradle.kts index 1e66927c..0717f6c7 100644 --- a/data/contacts/build.gradle.kts +++ b/data/contacts/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/currencies/build.gradle.kts b/data/currencies/build.gradle.kts index c75bc776..b2c9431f 100644 --- a/data/currencies/build.gradle.kts +++ b/data/currencies/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/customattrs/build.gradle.kts b/data/customattrs/build.gradle.kts index bd5011a7..96d2c252 100644 --- a/data/customattrs/build.gradle.kts +++ b/data/customattrs/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/database/build.gradle.kts b/data/database/build.gradle.kts index 87ce3092..d912e27b 100644 --- a/data/database/build.gradle.kts +++ b/data/database/build.gradle.kts @@ -12,7 +12,7 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") javaCompileOptions { annotationProcessorOptions { @@ -23,10 +23,16 @@ android { buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/files/build.gradle.kts b/data/files/build.gradle.kts index 5b127e64..aaad36ec 100644 --- a/data/files/build.gradle.kts +++ b/data/files/build.gradle.kts @@ -11,15 +11,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/locations/build.gradle.kts b/data/locations/build.gradle.kts index 6ef81d72..623ddaee 100644 --- a/data/locations/build.gradle.kts +++ b/data/locations/build.gradle.kts @@ -13,16 +13,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } compileOptions { diff --git a/data/notifications/build.gradle.kts b/data/notifications/build.gradle.kts index dd2b37aa..c4ad60fc 100644 --- a/data/notifications/build.gradle.kts +++ b/data/notifications/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/plugins/build.gradle.kts b/data/plugins/build.gradle.kts index 75b4db09..76486501 100644 --- a/data/plugins/build.gradle.kts +++ b/data/plugins/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/search-actions/build.gradle.kts b/data/search-actions/build.gradle.kts index 6350bb68..69c8dad7 100644 --- a/data/search-actions/build.gradle.kts +++ b/data/search-actions/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/searchable/build.gradle.kts b/data/searchable/build.gradle.kts index 6dbab070..09d82dc8 100644 --- a/data/searchable/build.gradle.kts +++ b/data/searchable/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/themes/build.gradle.kts b/data/themes/build.gradle.kts index 09b72790..b486fa63 100644 --- a/data/themes/build.gradle.kts +++ b/data/themes/build.gradle.kts @@ -11,15 +11,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/unitconverter/build.gradle.kts b/data/unitconverter/build.gradle.kts index 80311490..0cf604a2 100644 --- a/data/unitconverter/build.gradle.kts +++ b/data/unitconverter/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/weather/build.gradle.kts b/data/weather/build.gradle.kts index f18e8e2a..afde795f 100644 --- a/data/weather/build.gradle.kts +++ b/data/weather/build.gradle.kts @@ -11,15 +11,19 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +//// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false } } @@ -43,6 +47,7 @@ dependencies { implementation(libs.bundles.retrofit) implementation(libs.suncalc) implementation(libs.koin.android) + implementation("com.squareup.okhttp3:logging-interceptor:4.5.0") implementation(project(":data:database")) implementation(project(":core:base")) diff --git a/data/weather/consumer-rules.pro b/data/weather/consumer-rules.pro index 3a4a1b7d..faa5a4d3 100644 --- a/data/weather/consumer-rules.pro +++ b/data/weather/consumer-rules.pro @@ -1,3 +1,11 @@ --keep class de.mm20.launcher2.weather.** { *; } --keep class kotlin.coroutines.Continuation --dontwarn edu.umd.cs.findbugs.annotations.Nullable \ No newline at end of file +#-keep class de.mm20.launcher2.weather.** { *; } +#-keep class kotlin.coroutines.Continuation +#-dontwarn edu.umd.cs.findbugs.annotations.Nullable +# +#-assumenosideeffects class android.util.Log { +## public static *** d(...); +# public static *** v(...); +# public static *** i(...); +# public static *** w(...); +## public static *** e(...); +#} \ No newline at end of file diff --git a/data/weather/proguard-rules.pro b/data/weather/proguard-rules.pro index 6cad0a65..08db59f3 100644 --- a/data/weather/proguard-rules.pro +++ b/data/weather/proguard-rules.pro @@ -1,21 +1,28 @@ -# 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. +## 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. +## +## For more details, see +## http://developer.android.com/guide/developing/tools/proguard.html # -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# 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 \ No newline at end of file +## 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 +#-assumenosideeffects class android.util.Log { +## public static *** d(...); +# public static *** v(...); +# public static *** i(...); +# public static *** w(...); +## public static *** e(...); +#} \ No newline at end of file diff --git a/data/weather/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapProvider.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapProvider.kt index 49877b1c..71caa935 100644 --- a/data/weather/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapProvider.kt +++ b/data/weather/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapProvider.kt @@ -7,9 +7,13 @@ import de.mm20.launcher2.preferences.weather.WeatherLocation import de.mm20.launcher2.weather.Forecast import de.mm20.launcher2.weather.R import de.mm20.launcher2.weather.WeatherProvider +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory import java.util.Locale +import java.util.concurrent.TimeUnit +import kotlin.getValue internal class OpenWeatherMapProvider( private val context: Context, @@ -17,11 +21,24 @@ internal class OpenWeatherMapProvider( private val retrofit by lazy { Retrofit.Builder() + .client(client) .baseUrl("https://api.openweathermap.org/") .addConverterFactory(GsonConverterFactory.create()) .build() } + private val client by lazy { + val timeOutMillSeconds = 1500L + OkHttpClient.Builder() + .addInterceptor(HttpLoggingInterceptor().apply { + level = HttpLoggingInterceptor.Level.BODY + }) + .callTimeout(timeOutMillSeconds,TimeUnit.MILLISECONDS) + .connectTimeout(timeOutMillSeconds,TimeUnit.MILLISECONDS) + .readTimeout(timeOutMillSeconds,TimeUnit.MILLISECONDS) + .writeTimeout(timeOutMillSeconds,TimeUnit.MILLISECONDS) + .build() + } private val openWeatherMapService by lazy { retrofit.create(OpenWeatherMapApi::class.java) } diff --git a/data/weather/src/main/res/values/config_example.xml b/data/weather/src/main/res/values/config_example.xml index 04f03783..68102295 100644 --- a/data/weather/src/main/res/values/config_example.xml +++ b/data/weather/src/main/res/values/config_example.xml @@ -1,6 +1,6 @@ - + 87cd0810b7e4b4debd31a6ef98b98154" \ No newline at end of file diff --git a/data/websites/build.gradle.kts b/data/websites/build.gradle.kts index 679c11e4..ea822a89 100644 --- a/data/websites/build.gradle.kts +++ b/data/websites/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/widgets/build.gradle.kts b/data/widgets/build.gradle.kts index b0c7c195..b2acbc2b 100644 --- a/data/widgets/build.gradle.kts +++ b/data/widgets/build.gradle.kts @@ -11,15 +11,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/data/wikipedia/build.gradle.kts b/data/wikipedia/build.gradle.kts index c0de7174..a9df4752 100644 --- a/data/wikipedia/build.gradle.kts +++ b/data/wikipedia/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c4e6b37e..c485209a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ targetSdk = "36" pluginSdk = "2.2.0" -gradle = "8.1.2" +gradle = "8.12" android-gradle-plugin = "8.10.1" ksp-gradle-plugin = "2.1.21-2.0.1" @@ -139,6 +139,7 @@ osmopeninghours = { group = "de.westnordost", name = "osm-opening-hours", versio kotlin = ["kotlin-stdlib", "kotlinx-coroutines-core", "kotlinx-coroutines-android", "kotlinx-collections-immutable", "kotlinx-serialization-json"] androidx-lifecycle = ["androidx-lifecycle-viewmodel", "androidx-lifecycle-common", "androidx-lifecycle-runtime", "androidx-lifecycle-viewmodelcompose", "androidx-lifecycle-runtimecompose"] retrofit = ["retrofit-core", "retrofit-gson"] + tests = ["junit"] [plugins] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8f16c9dc..7aa91a4d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Feb 09 12:41:42 CET 2025 +#Tue Jul 15 14:35:45 KST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/address-formatter/build.gradle.kts b/libs/address-formatter/build.gradle.kts index 0e93de6e..cc871481 100644 --- a/libs/address-formatter/build.gradle.kts +++ b/libs/address-formatter/build.gradle.kts @@ -10,16 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - consumerProguardFiles("proguard-rules.pro") + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/libs/material-color-utilities/build.gradle.kts b/libs/material-color-utilities/build.gradle.kts index a790c26f..f6cb06c2 100644 --- a/libs/material-color-utilities/build.gradle.kts +++ b/libs/material-color-utilities/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/libs/nextcloud/build.gradle.kts b/libs/nextcloud/build.gradle.kts index 30e8ff2d..f8b088a0 100644 --- a/libs/nextcloud/build.gradle.kts +++ b/libs/nextcloud/build.gradle.kts @@ -12,15 +12,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/libs/owncloud/build.gradle.kts b/libs/owncloud/build.gradle.kts index 364f01e1..ae4b92d6 100644 --- a/libs/owncloud/build.gradle.kts +++ b/libs/owncloud/build.gradle.kts @@ -12,15 +12,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/libs/tinypinyin/build.gradle.kts b/libs/tinypinyin/build.gradle.kts index fc5fbdc2..a6c3b151 100644 --- a/libs/tinypinyin/build.gradle.kts +++ b/libs/tinypinyin/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/libs/webdav/build.gradle.kts b/libs/webdav/build.gradle.kts index 2102c9f7..ad257967 100644 --- a/libs/webdav/build.gradle.kts +++ b/libs/webdav/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/plugins/sdk/build.gradle.kts b/plugins/sdk/build.gradle.kts index e22a74fd..0722e2e8 100644 --- a/plugins/sdk/build.gradle.kts +++ b/plugins/sdk/build.gradle.kts @@ -14,7 +14,7 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildFeatures { @@ -23,10 +23,16 @@ android { buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } create("nightly") { initWith(getByName("release")) diff --git a/services/accounts/build.gradle.kts b/services/accounts/build.gradle.kts index b1741d12..e2574a4d 100644 --- a/services/accounts/build.gradle.kts +++ b/services/accounts/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/services/backup/build.gradle.kts b/services/backup/build.gradle.kts index 226628b9..1664d5d5 100644 --- a/services/backup/build.gradle.kts +++ b/services/backup/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/services/badges/build.gradle.kts b/services/badges/build.gradle.kts index 2d7fc9a5..4b192041 100644 --- a/services/badges/build.gradle.kts +++ b/services/badges/build.gradle.kts @@ -11,15 +11,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/services/favorites/build.gradle.kts b/services/favorites/build.gradle.kts index 4e772398..a7359c1e 100644 --- a/services/favorites/build.gradle.kts +++ b/services/favorites/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/services/global-actions/build.gradle.kts b/services/global-actions/build.gradle.kts index 91ca810a..89df0d8c 100644 --- a/services/global-actions/build.gradle.kts +++ b/services/global-actions/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/services/icons/build.gradle.kts b/services/icons/build.gradle.kts index 7716ed16..d78f1af4 100644 --- a/services/icons/build.gradle.kts +++ b/services/icons/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/services/music/build.gradle.kts b/services/music/build.gradle.kts index 1b1f72df..34c66d7b 100644 --- a/services/music/build.gradle.kts +++ b/services/music/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/services/plugins/build.gradle.kts b/services/plugins/build.gradle.kts index 19a65ed6..75b5e107 100644 --- a/services/plugins/build.gradle.kts +++ b/services/plugins/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/services/search/build.gradle.kts b/services/search/build.gradle.kts index e24d9772..830f8c1c 100644 --- a/services/search/build.gradle.kts +++ b/services/search/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/services/tags/build.gradle.kts b/services/tags/build.gradle.kts index 2e48ad6c..73e18e83 100644 --- a/services/tags/build.gradle.kts +++ b/services/tags/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } } diff --git a/services/widgets/build.gradle.kts b/services/widgets/build.gradle.kts index 253d3ee1..2b84c1a3 100644 --- a/services/widgets/build.gradle.kts +++ b/services/widgets/build.gradle.kts @@ -10,15 +10,21 @@ android { minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") + //consumerProguardFiles("consumer-rules.pro") } buildTypes { release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = false + isShrinkResources = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) + } + debug { + isMinifyEnabled = false + isShrinkResources = false } }