From 480641743aa3e14937ce46dfdf0bc5f0c0edff6e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 2 Dec 2023 16:50:29 +0100
Subject: [PATCH] Updated gradle DSL

---
 app/build.gradle  | 19 +++++++++----------
 gradle.properties |  1 -
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 00f8604290..a437046533 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,7 +28,6 @@ android {
         targetSdkVersion 34
         versionCode getVersionCode()
         versionName "1." + getVersionCode()
-        archivesBaseName = "FairEmail-v$versionName" + getRevision()
 
         manifestPlaceholders = [namespace: applicationId.replace('.debug', '')]
 
@@ -60,6 +59,10 @@ android {
         }
     }
 
+    base {
+        archivesName = "FairEmail-v1." + getVersionCode() + getRevision()
+    }
+
     sourceSets {
         github {
             java.srcDirs = ['src/main/java', 'src/play/java', 'src/extra/java']
@@ -193,7 +196,7 @@ android {
         github {
             dimension "all"
             manifestPlaceholders.largeHeap = false
-            manifestPlaceholders.build_uuid = UUID.nameUUIDFromBytes((archivesBaseName + "github").getBytes()).toString();
+            manifestPlaceholders.build_uuid = UUID.nameUUIDFromBytes(("github" + getVersionCode() + getRevision()).getBytes()).toString();
             buildConfigField "boolean", "TEST_RELEASE", "false"
             buildConfigField "boolean", "BETA_RELEASE", "true"
             buildConfigField "boolean", "PLAY_STORE_RELEASE", "false"
@@ -215,7 +218,7 @@ android {
         large {
             dimension "all"
             manifestPlaceholders.largeHeap = true
-            manifestPlaceholders.build_uuid = UUID.nameUUIDFromBytes((archivesBaseName + "large").getBytes()).toString();
+            manifestPlaceholders.build_uuid = UUID.nameUUIDFromBytes(("large" + getVersionCode() + getRevision()).getBytes()).toString();
             buildConfigField "boolean", "TEST_RELEASE", "false"
             buildConfigField "boolean", "BETA_RELEASE", "true"
             buildConfigField "boolean", "PLAY_STORE_RELEASE", "false"
@@ -237,7 +240,7 @@ android {
         fdroid {
             dimension "all"
             manifestPlaceholders.largeHeap = false
-            manifestPlaceholders.build_uuid = UUID.nameUUIDFromBytes((archivesBaseName + "fdroid").getBytes()).toString();
+            manifestPlaceholders.build_uuid = UUID.nameUUIDFromBytes(("fdroid" + getVersionCode() + getRevision()).getBytes()).toString();
             externalNativeBuild {
                 cmake {
                     arguments "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--build-id=none"
@@ -269,7 +272,7 @@ android {
             dimension "all"
             //minSdkVersion 23
             manifestPlaceholders.largeHeap = false
-            manifestPlaceholders.build_uuid = UUID.nameUUIDFromBytes((archivesBaseName + "play").getBytes()).toString();
+            manifestPlaceholders.build_uuid = UUID.nameUUIDFromBytes(("play" + getVersionCode() + getRevision()).getBytes()).toString();
             buildConfigField "boolean", "TEST_RELEASE", "false"
             buildConfigField "boolean", "BETA_RELEASE", "true"
             buildConfigField "boolean", "PLAY_STORE_RELEASE", "true"
@@ -292,7 +295,7 @@ android {
             dimension "all"
             minSdkVersion 23
             manifestPlaceholders.largeHeap = false
-            manifestPlaceholders.build_uuid = UUID.nameUUIDFromBytes((archivesBaseName + "amazon").getBytes()).toString();
+            manifestPlaceholders.build_uuid = UUID.nameUUIDFromBytes(("amazon" + getVersionCode() + getRevision()).getBytes()).toString();
             buildConfigField "boolean", "TEST_RELEASE", "false"
             buildConfigField "boolean", "BETA_RELEASE", "true"
             buildConfigField "boolean", "PLAY_STORE_RELEASE", "false"
@@ -354,10 +357,6 @@ android {
         reportBuilds = false // disables upload of build metadata
         overwrite = true
         builderName = "M66B"
-        sourceControl {
-            provider = "github-enterprise"
-            repository = "https://github.com/M66B/FairEmail"
-        }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 77aaeb29ee..37b7027abe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,5 @@ org.gradle.warning.mode=all
 
 android.useAndroidX=true
 android.enableJetifier=false
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true