Merge branch 'main' into test/widget-automation

This commit is contained in:
robin committed 2026-10-08 11:45:17 +00:00
commit 98ffa47fa4
5 files changed
+59 -48

No files matched your search

+18 -6
View File
@@ -5,7 +5,6 @@ plugins {
val tagVersion = (project.findProperty("versionNameOverride") as String?) ?: "0.0.0-dev"
// "1.2.3" oder "1.2.3-alpha9" -> Kern "1.2.3" für den versionCode
val core = tagVersion
.removePrefix("v")
.substringBefore("-")
@@ -16,9 +15,7 @@ val patch = parts.getOrElse(2) { 0 }
android {
namespace = "de.schanbro.weekfocus"
compileSdk {
version = release(37)
}
compileSdk = 37
defaultConfig {
applicationId = "de.schanbro.weekfocus"
@@ -30,6 +27,16 @@ android {
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
// not necessary
/*splits {
abi {
isEnable = true
reset()
include("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
isUniversalApk = true
}
}*/
signingConfigs {
create("release") {
val ksPath = System.getenv("KEYSTORE_PATH")
@@ -50,8 +57,13 @@ android {
release {
signingConfig = signingConfigs.getByName("release")
optimization {
enable = false
enable = true
}
isShrinkResources = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
compileOptions {
@@ -79,5 +91,5 @@ dependencies {
androidTestImplementation(libs.androidx.junit)
debugImplementation(libs.androidx.compose.ui.test.manifest)
debugImplementation(libs.androidx.compose.ui.tooling)
implementation("androidx.compose.material:material-icons-extended")
implementation(libs.androidx.material.icons.extended)
}