From cda7bcb247d01f83ccb8fe52d9997fc2a4b1f643 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Tue, 27 Aug 2024 10:56:08 +0200
Subject: [PATCH] use same app id for FOSS flavor

---
 .github/workflows/preview-apk.yml | 2 +-
 .github/workflows/release.yml     | 4 ++--
 build.gradle                      | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/preview-apk.yml b/.github/workflows/preview-apk.yml
index ee9707bf3..714745015 100644
--- a/.github/workflows/preview-apk.yml
+++ b/.github/workflows/preview-apk.yml
@@ -48,7 +48,7 @@ jobs:
         uses: gradle/wrapper-validation-action@v1
 
       - name: Build APK
-        run: ./gradlew --no-daemon assembleFossDebug
+        run: ./gradlew --no-daemon -PABI_FILTER=armeabi-v7a assembleFossDebug
 
       - name: Upload APK
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1208c8aed..0e9371622 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -54,7 +54,7 @@ jobs:
           echo "DC_RELEASE_STORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }}" >> ~/.gradle/gradle.properties
           echo "DC_RELEASE_KEY_ALIAS=${{ secrets.ALIAS }}" >> ~/.gradle/gradle.properties
           echo "DC_RELEASE_KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> ~/.gradle/gradle.properties
-          ./gradlew --no-daemon assembleGplayRelease
+          ./gradlew --no-daemon assembleFossRelease
 
       - name: Release
         uses: softprops/action-gh-release@v1
@@ -63,4 +63,4 @@ jobs:
           body: "If you don't know what APK file to download for your phone, download the one that has 'universal' in its name, it should work for all phones"
           prerelease: ${{ contains(github.event.ref, '-beta') }}
           fail_on_unmatched_files: true
-          files: build/outputs/apk/gplay/release/*.apk
+          files: build/outputs/apk/foss/release/*.apk
diff --git a/build.gradle b/build.gradle
index 6bb076504..a199ebc21 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 688
+        versionCode 30000688
         versionName "1.46.16"
 
         applicationId "chat.delta.lite"
@@ -122,13 +122,11 @@ android {
         foss {
             dimension "none"
             buildConfigField "boolean", "USE_PLAY_SERVICES", "false"
-            applicationId "com.github.arcanechat"
         }
         gplay {
             dimension "none"
             apply plugin: "com.google.gms.google-services"
             buildConfigField "boolean", "USE_PLAY_SERVICES", "true"
-            versionCode 30000000 + android.defaultConfig.versionCode
         }
     }