Update the project dependencies and gradle structure

D4rK7355608 · Jul 22, 2024 · 70658e8 · 70658e8
1 parent 72fdf24
commit 70658e8
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 36 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,78 +1,85 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
-
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("com.google.gms.google-services")
-    id("com.google.firebase.crashlytics")
+    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.jetbrainsKotlinAndroid)
+    alias(libs.plugins.googlePlayServices)
+    alias(libs.plugins.googleFirebase)
 }
+
 android {
+
     compileSdk = 34
     namespace = "com.d4rk.musicsleeptimer.plus"
     defaultConfig {
         applicationId = "com.d4rk.musicsleeptimer.plus"
         minSdk = 26
         targetSdk = 34
-        versionCode = 27
-        versionName = "3.0.0"
-        archivesName = "${applicationId}-v${versionName}"
+        versionCode = 28
+        versionName = "3.0.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += listOf(
-            "en" ,
-            "de" ,
-            "es" ,
-            "fr" ,
-            "hi" ,
-            "hu" ,
-            "in" ,
-            "it" ,
-            "ja" ,
-            "ro" ,
-            "ru" ,
-            "tr" ,
-            "sv" ,
-            "bg" ,
-            "pl" ,
+            "en",
+            "de",
+            "es",
+            "fr",
+            "hi",
+            "hu",
+            "in",
+            "it",
+            "ja",
+            "ro",
+            "ru",
+            "tr",
+            "sv",
+            "bg",
+            "pl",
             "uk"
         )
     }
+
     buildTypes {
         release {
             multiDexEnabled = true
             isMinifyEnabled = true
             isShrinkResources = true
             isDebuggable = false
+            versionNameSuffix = null
             proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt") , "proguard-rules.pro"
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
             )
         }
         debug {
             multiDexEnabled = true
-            isMinifyEnabled = true
-            isShrinkResources = true
             isDebuggable = true
+            versionNameSuffix = null
             proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt") , "proguard-rules.pro"
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
             )
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlinOptions {
         jvmTarget = "17"
     }
+
     buildFeatures {
         viewBinding = true
         buildConfig = true
     }
+
     bundle {
         storeArchive {
             enable = true
         }
     }
 }
+
 dependencies {
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.crashlytics.ktx)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -18,6 +18,7 @@
         android:roundIcon="@mipmap/ic_launcher"
         android:theme="@android:style/Theme.DeviceDefault"
         tools:targetApi="33">
+
         <service
             android:name=".services.SleepTileService"
             android:exported="true"
@@ -35,7 +36,9 @@
                 android:name="android.service.quicksettings.TOGGLEABLE_TILE"
                 android:value="true" />
         </service>
+
         <service android:name=".services.SleepAudioService" />
+
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
             android:enabled="false"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
-agp = "8.4.1"
+agp = "8.5.0"
 appcompat = "1.7.0"
-espressoCore = "3.5.1"
-firebaseBom = "33.1.0"
-kotlin = "1.9.23"
-google-firebase-crashlytics = "3.0.1"
+espressoCore = "3.6.1"
+firebaseBom = "33.1.2"
+kotlin = "2.0.0"
+google-firebase-crashlytics = "3.0.2"
 google-services = "4.4.2"
 junit = "4.13.2"
-junitVersion = "1.1.5"
+junitVersion = "1.2.1"
 multidex = "2.0.1"
 workRuntimeKtx = "2.9.0"
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 04 08:10:55 EEST 2024
+#Mon Jul 22 18:40:01 EEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -5,12 +5,15 @@ pluginManagement {
         mavenCentral()
     }
 }
+
+@Suppress("UnstableApiUsage")
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         google()
         mavenCentral()
     }
 }
+
 rootProject.name = "Music Sleep Timer Plus"
 include(":app")