Merge branch 'main' into pr-402

apps/android/app/build.gradle.kts

@@ -19,8 +19,8 @@ android {
     applicationId = "com.clawdbot.android"
     minSdk = 31
     targetSdk = 36
-    versionCode = 1
-    versionName = "2026.1.5"
+    versionCode = 20260107
+    versionName = "2026.1.7"
   }
 
   buildTypes {
@@ -29,14 +29,6 @@ android {
     }
   }
 
-  applicationVariants.all {
-    val variant = this
-    outputs.all {
-      val output = this as com.android.build.gradle.internal.api.BaseVariantOutputImpl
-      output.outputFileName = "clawdbot-${variant.versionName}-${variant.buildType.name}.apk"
-    }
-  }
-
   buildFeatures {
     compose = true
     buildConfig = true
@@ -62,6 +54,16 @@ android {
   }
 }
 
+androidComponents {
+  onVariants { variant ->
+    variant.outputs.forEach { output ->
+      val apkOutput = output as? com.android.build.api.variant.ApkVariantOutput ?: return@forEach
+      val versionName = variant.versionName.orNull ?: "0"
+      apkOutput.outputFileName.set("clawdbot-${versionName}-${variant.name}.apk")
+    }
+  }
+}
+
 kotlin {
   compilerOptions {
     jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)