chore(deps): Upgrade to AGP 8.5

Also reorganized library list

app/build.gradle.kts

@@ -85,23 +85,23 @@ dependencies {
     // Import the Compose BOM
     implementation(platform(libs.androidx.compose.bom))
 
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.multidex)
     implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.appcompat)
     implementation(libs.androidx.animation.core.android)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.dynamicanimation.ktx)
+    implementation(libs.androidx.foundation.android)
+    implementation(libs.androidx.legacy.support.v4)
     implementation(libs.androidx.material)
+    implementation(libs.androidx.multidex)
+    implementation(libs.androidx.preference.ktx)
     implementation(libs.androidx.ui.graphics.android)
-    implementation(libs.androidx.foundation.android)
     implementation(libs.androidx.ui.tooling.preview.android)
     implementation(libs.androidx.window)
-    implementation(libs.material)
-    implementation(libs.androidx.legacy.support.v4)
-    implementation(libs.androidx.dynamicanimation.ktx)
-    implementation(libs.androidx.preference.ktx)
-    implementation(libs.firebase.perf.ktx)
-    implementation(libs.firebase.crashlytics.ktx)
     implementation(libs.firebase.analytics.ktx)
+    implementation(libs.firebase.crashlytics.ktx)
+    implementation(libs.firebase.perf.ktx)
+    implementation(libs.material)
     implementation(libs.appupdater)
     implementation(libs.helperlib)
     implementation(libs.attribouter)

gradle/libs.versions.toml

@@ -1,70 +1,70 @@
 [versions]
 activityCompose = "1.9.0"
-agp = "8.4.2"
+agp = "8.5.0"
+appcompat = "1.7.0"
 appupdater = "3.0.2"
 attribouter = "0.1.9"
+composeBom = "2024.06.00"
+coreKtx = "1.13.1"
 dynamicanimationKtx = "1.0.0-alpha03"
+espressoCore = "3.5.1"
+firebaseBom = "33.1.0"
+firebaseCrashlytics = "3.0.1"
+firebasePerf = "1.4.2"
 foundationAndroid = "1.6.8"
+googleServices = "4.4.2"
 helperlib = "1.4.3"
-kotlin = "2.0.0"
-coreKtx = "1.13.1"
 junit = "4.13.2"
 junitVersion = "1.1.5"
-espressoCore = "3.5.1"
-appcompat = "1.7.0"
+kotlin = "2.0.0"
 legacySupportV4 = "1.0.0"
 material = "1.12.0"
-composeBom = "2024.06.00"
-firebaseBom = "33.1.0"
 multidex = "2.0.1"
 preferenceKtx = "1.2.1"
+sonarqube = "5.0.0.4638"
 testCore = "1.5.0"
-testRunner = "1.5.2"
 testRules = "1.5.0"
+testRunner = "1.5.2"
 uiToolingPreviewAndroid = "1.6.8"
 window = "1.3.0"
-googleServices = "4.4.2"
-firebasePerf = "1.4.2"
-firebaseCrashlytics = "3.0.1"
-sonarqube = "5.0.0.4638"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
 androidx-animation-core-android = { module = "androidx.compose.animation:animation-core-android" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 androidx-dynamicanimation-ktx = { module = "androidx.dynamicanimation:dynamicanimation-ktx", version.ref = "dynamicanimationKtx" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-foundation-android = { module = "androidx.compose.foundation:foundation-android", version.ref = "foundationAndroid" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-legacy-support-v4 = { module = "androidx.legacy:legacy-support-v4", version.ref = "legacySupportV4" }
 androidx-material = { module = "androidx.compose.material:material" }
 androidx-multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
 androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
+androidx-test-core = { group = "androidx.test", name = "core", version.ref = "testCore" }
+androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "testRules" }
+androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "testRunner" }
 androidx-ui-graphics-android = { module = "androidx.compose.ui:ui-graphics-android" }
 androidx-ui-tooling-preview-android = { module = "androidx.compose.ui:ui-tooling-preview-android", version.ref = "uiToolingPreviewAndroid" }
 androidx-window = { module = "androidx.window:window", version.ref = "window" }
-appupdater = { module = "com.itachi1706.appupdater:appupdater", version.ref = "appupdater" }
-attribouter = { module = "me.jfenn:Attribouter", version.ref = "attribouter" }
 firebase-analytics-ktx = { module = "com.google.firebase:firebase-analytics-ktx" }
 firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" }
-androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
-androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 firebase-crashlytics-ktx = { module = "com.google.firebase:firebase-crashlytics-ktx" }
 firebase-perf-ktx = { module = "com.google.firebase:firebase-perf-ktx" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+appupdater = { module = "com.itachi1706.appupdater:appupdater", version.ref = "appupdater" }
 helperlib = { module = "com.itachi1706.helpers:helperlib", version.ref = "helperlib" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
-androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
-androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
-androidx-test-core = { group = "androidx.test", name = "core", version.ref = "testCore" }
-androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "testRunner" }
-androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "testRules" }
-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+attribouter = { module = "me.jfenn:Attribouter", version.ref = "attribouter" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlytics" }
 firebase-perf = { id = "com.google.firebase.firebase-perf", version.ref = "firebasePerf" }
-sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" }
+google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" }
 
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Jan 18 05:08:22 SGT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME