Performed the necessary migratiosns for the new Kotlin 2.0,0 and a mo…

…re improved structure
D4rK7355608 · Jul 12, 2024 · 95e443a · 95e443a
1 parent 963a411
commit 95e443a
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 22 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,23 +1,22 @@
-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")
-    id("com.google.android.gms.oss-licenses-plugin")
-    id("com.google.devtools.ksp")
+    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.jetbrainsKotlinAndroid)
+    alias(libs.plugins.googlePlayServices)
+    alias(libs.plugins.googleOssServices)
+    alias(libs.plugins.googleFirebase)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.devToolsKsp)
 }
+
 android {
     compileSdk = 34
     namespace = "com.d4rk.cartcalculator"
     defaultConfig {
         applicationId = "com.d4rk.cartcalculator"
         minSdk = 26
         targetSdk = 34
-        versionCode = 53
+        versionCode = 54
         versionName = "1.0.6"
-        archivesName = "${applicationId}-v${versionName}"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += listOf(
             "en",
@@ -41,46 +40,51 @@ android {
             useSupportLibrary = true
         }
     }
+
     buildTypes {
         release {
             multiDexEnabled = true
             isMinifyEnabled = true
             isShrinkResources = true
             isDebuggable = false
-            versionNameSuffix = null
+            versionNameSuffix = "-release"
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
             )
         }
+
         debug {
             multiDexEnabled = true
             isDebuggable = true
-            versionNameSuffix = null
+            versionNameSuffix = "-debug"
             proguardFiles(
                 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
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.13"
-    }
+
+
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
+
     bundle {
         storeArchive {
             enable = true

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.jetbrainsKotlinAndroid) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.googlePlayServices) apply false
     alias(libs.plugins.googleFirebase) apply false
     alias(libs.plugins.googleOssServices) apply false

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.5.0"
+agp = "8.5.1"
 appcompat = "1.7.0"
 appUpdateKtx = "2.1.0"
 composeBom = "2024.06.00"
@@ -15,7 +15,7 @@ volley = "1.2.1"
 workRuntimeKtx = "2.9.0"
 coreSplashscreen = "1.0.1"
 firebaseBom = "32.8.1"
-kotlin = "1.9.23"
+kotlin = "2.0.0"
 junit = "4.13.2"
 activityCompose = "1.9.0"
 junitVersion = "1.2.1"
@@ -26,7 +26,7 @@ composeUi = "1.6.8"
 google-services = "4.4.2"
 google-oss-services = "0.10.6"
 google-firebase-crashlytics = "3.0.2"
-google-devtools-ksp = "1.9.23-1.0.20"
+google-devtools-ksp = "2.0.0-1.0.23"
 roomKtx = "2.6.1"
 playServicesAds = "23.2.0"
 playServicesOssLicenses = "17.1.0"
@@ -86,4 +86,5 @@ jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "k
 googlePlayServices = { id = "com.google.gms.google-services", version.ref = "google-services" }
 googleOssServices = { id = "com.google.android.gms.oss-licenses-plugin", version.ref = "google-oss-services" }
 googleFirebase = { id = "com.google.firebase.crashlytics", version.ref = "google-firebase-crashlytics" }
-devToolsKsp = { id = "com.google.devtools.ksp", version.ref = "google-devtools-ksp" }
+devToolsKsp = { id = "com.google.devtools.ksp", version.ref = "google-devtools-ksp" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jun 17 15:59:41 EEST 2024
+#Fri Jul 12 23:06:55 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