fix builder

Author: Josh-XT

.github/workflows/build_apk.yml

@@ -69,6 +69,7 @@ jobs:
       APP_NAME: ${{ matrix.flavor.env.APP_NAME }}
       AGIXT_SERVER: ${{ matrix.flavor.env.AGIXT_SERVER }}
       APP_URI: ${{ matrix.flavor.env.APP_URI }}
+      APP_FLAVOR: ${{ matrix.flavor.name }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -110,14 +111,10 @@ jobs:
           GITHUB_USERNAME="${{ github.actor }}"
           if [ "$GITHUB_USERNAME" = "Josh-XT" ]; then
             DISCORD_NAME="<@381837595522367488>"
-          elif [ "$GITHUB_USERNAME" = "waiscodes" ]; then
-            DISCORD_NAME="<@670762167037067304>"
           elif [ "$GITHUB_USERNAME" = "birdup000" ]; then
             DISCORD_NAME="<@856308374567256074>"
           elif [ "$GITHUB_USERNAME" = "Nick-XT" ]; then
             DISCORD_NAME="<@381908912951001088>"
-          elif [ "$GITHUB_USERNAME" = "rm4453" ]; then
-            DISCORD_NAME="<@1104215954356969512>"
           elif [ "$GITHUB_USERNAME" = "Luke-XT" ]; then
             DISCORD_NAME="<@334703813967740938>"
           else

android/app/build.gradle

@@ -16,10 +16,15 @@ if (keystorePropertiesFile.exists()) {
     useReleaseKeys = keystoreFile != null && keystoreFile.exists()
 }
 
+// Read APP_FLAVOR from environment to set a unique applicationId per flavor.
+// This allows all flavor APKs to be installed side-by-side on the same device.
+// Defaults to 'agixt' for local development when the env var is not set.
+def appFlavor = System.getenv('APP_FLAVOR') ?: 'agixt'
+
 android {
     namespace = "dev.agixt.agixt"
     compileSdk = flutter.compileSdkVersion
-    ndkVersion = "27.0.11902837"
+    ndkVersion = "28.2.13676358"
 
     // Add signing configs for release builds
     signingConfigs {
@@ -56,8 +61,7 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "dev.agixt.agixt"
+        applicationId = "dev.agixt.${appFlavor}"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = 24 // minimum SDK version for speech_to_text
@@ -71,7 +75,7 @@ android {
 
         // Add the required manifest placeholders
         manifestPlaceholders = [
-            'appAuthRedirectScheme': 'agixt',
+            'appAuthRedirectScheme': appFlavor,
             'applicationName': 'io.flutter.app.FlutterApplication'
         ]
     }
@@ -108,7 +112,7 @@ subprojects {
         if (project.plugins.hasPlugin("com.android.application") ||
                 project.plugins.hasPlugin("com.android.library")) {
             project.android {
-                compileSdkVersion 34                
+                compileSdkVersion 35                
             }
         }
     }

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip

android/settings.gradle

@@ -22,7 +22,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.6.0" apply false
+    id "com.android.application" version "8.9.1" apply false
     id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }