use new gradle api to bring back smart apk naming

Author: bubelov

app/build.gradle.kts

@@ -34,13 +34,43 @@ android {
             isMinifyEnabled = true
             isShrinkResources = true
             proguardFiles(
-    getDefaultProguardFile("proguard-android-optimize.txt"),
-    "proguard-rules.pro",
-)
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
             signingConfig = signingConfigs.getByName("debug")
         }
     }
 
+    androidComponents.onVariants { variant ->
+        println("variant: ${variant.name}")
+
+        if (variant.name == "debug") {
+            for (output in variant.outputs) {
+                if (output.outputFileName.get().contains("universal")) {
+                    output.outputFileName.set("btcmap-debug.apk")
+                } else {
+                    output.enabled.set(false)
+                }
+            }
+        }
+
+        if (variant.name == "release") {
+            for (output in variant.outputs) {
+                if (output.outputFileName.get().contains("universal")) {
+                    output.outputFileName.set("btcmap-${output.versionName.get()}-universal.apk")
+                }
+
+                if (output.outputFileName.get().contains("arm64-v8a")) {
+                    output.outputFileName.set("btcmap-${output.versionName.get()}-arm.apk")
+                }
+
+                if (output.outputFileName.get().contains("x86_64")) {
+                    output.outputFileName.set("btcmap-${output.versionName.get()}-x86.apk")
+                }
+            }
+        }
+    }
+
     buildFeatures {
         buildConfig = true
         viewBinding = true

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 ## Foundation
 # Android Gradle Plugin
 # https://developer.android.com/build/releases/gradle-plugin
-agp = "9.1.1"
+agp = "9.2.0"
 # This project is Kotlin-only
 # https://github.com/JetBrains/kotlin/releases
 kotlin = "2.3.20"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME