Downgrade agp and kotlin versions to stable

siarhei-luskanau · Jul 17, 2024 · edd68ae · edd68ae
1 parent 0fbc380
commit edd68ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -7,12 +7,12 @@ plugins {
 
 android {
     namespace = "siarhei.luskanau.managed.virtual.device"
-    compileSdk = 34
+    compileSdk = libs.versions.build.android.compileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "siarhei.luskanau.managed.virtual.device"
-        minSdk = 24
-        targetSdk = 34
+        minSdk = libs.versions.build.android.minSdk.get().toInt()
+        targetSdk = libs.versions.build.android.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
 
@@ -53,7 +53,7 @@ android {
         emulatorSnapshots {
             enableForTestFailures = false
         }
-        (27..34).forEach { apiLevelIt ->
+        (27..35).forEach { apiLevelIt ->
             val name =
                 listOf(
                     "managedVirtualDevice",
@@ -64,6 +64,7 @@ android {
                 apiLevel = apiLevelIt
                 val systemImageConfig: Pair<String?, Boolean?> = when (apiLevel) {
                     33, 34 -> "aosp" to true
+                    35 -> "google" to null
                     else -> null to null
                 }
                 systemImageConfig.first?.also { systemImageSource = it }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.7.0-alpha01"
+agp = "8.5.1"
 android-material = "1.12.0"
 androidx-navigation = "2.7.7"
 androidx-test-espresso = "3.6.1"
@@ -9,7 +9,7 @@ build-android-targetSdk = "35"
 build-javaVersion = "VERSION_17"
 build-jvmTarget = "17"
 detekt = "1.23.6"
-kotlin = "2.0.20-Beta2"
+kotlin = "2.0.0"
 kotlinx-kover = "0.8.2"
 ktlint = "1.3.1"