Update build configurations

floschu · Oct 19, 2024 · 3982736 · 3982736
1 parent 4ae69a4
commit 3982736
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,10 +11,9 @@ plugins {
 android {
     namespace "at.florianschuster.hydro"
     compileSdk 34
-
     defaultConfig {
         applicationId "at.florianschuster.hydro"
-        minSdk 28
+        minSdk 30
         targetSdk 34
         versionCode 1
         versionName "1.0.0"
@@ -26,26 +25,35 @@ android {
             arg("room.schemaLocation", "$projectDir/schemas")
         }
     }
-
+    lint {
+        abortOnError = true
+    }
     buildTypes {
         debug {
-            debuggable true
+            debuggable = true
+            applicationIdSuffix = ".debug"
         }
         release {
-            debuggable false
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+            debuggable = false
+            minifyEnabled = true
+            shrinkResources = true
+            proguardFiles(
+                    getDefaultProguardFile("proguard-android-optimize.txt"),
+                    "proguard-rules.pro"
+            )
+            if (file("keystore.jks").exists()) {
+                signingConfig = signingConfigs.getByName("release")
+            }
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
     buildFeatures {
-        compose true
         buildConfig true
     }
     packagingOptions {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ composeBom = "2024.10.00"
 coreKtx = "1.13.1"
 coreSplashscreen = "1.0.1"
 datastorePreferences = "1.1.1"
-kotlin = "2.0.20"
+kotlin = "2.0.21"
 kotlinxDatetime = "0.4.1"
 kotlinxSerializationJson = "1.7.0"
 lifecycle = "2.8.6"