From 655314525035548bc2d97b1f4f818146d48b9d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Mon, 11 Nov 2024 09:34:57 +0100
Subject: [PATCH] Fix Bugsnag upload conflict

---
 app/build.gradle                                            | 4 ++++
 .../src/main/kotlin/AndroidAppConventionPlugin.kt           | 6 +-----
 build-logic/convention/src/main/kotlin/Constants.kt         | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5551ff75..8fa53b12 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -116,6 +116,10 @@ licensee {
     allowUrl("https://opensource.org/licenses/MIT")
 }
 
+bugsnag {
+    overwrite = true
+}
+
 dependencies {
     implementation project(':core-common')
     implementation project(':core-database')
diff --git a/build-logic/convention/src/main/kotlin/AndroidAppConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidAppConventionPlugin.kt
index ec1c2db2..03084004 100644
--- a/build-logic/convention/src/main/kotlin/AndroidAppConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidAppConventionPlugin.kt
@@ -47,15 +47,11 @@ class AndroidAppConventionPlugin : Plugin<Project> {
                 }
 
                 buildTypes {
-                    val buildUuidKey = "build_uuid"
-                    getByName("debug") {
-                        addManifestPlaceholders(mapOf(buildUuidKey to "debug"))
-                    }
                     getByName("release") {
                         val uuid = UUID.nameUUIDFromBytes(
                             ("github" + Constants.VERSION_CODE + Constants.VERSION_NAME).encodeToByteArray()
                         ).toString()
-                        addManifestPlaceholders(mapOf(buildUuidKey to uuid))
+                        addManifestPlaceholders(mapOf("build_uuid" to uuid))
                     }
                 }
 
diff --git a/build-logic/convention/src/main/kotlin/Constants.kt b/build-logic/convention/src/main/kotlin/Constants.kt
index 4eb7b768..04ce83ae 100644
--- a/build-logic/convention/src/main/kotlin/Constants.kt
+++ b/build-logic/convention/src/main/kotlin/Constants.kt
@@ -22,6 +22,6 @@ object Constants {
     const val TARGET_SDK = 35
     val javaToolchainVersion: JavaLanguageVersion = JavaLanguageVersion.of(17)
 
-    const val VERSION_CODE = 6
-    const val VERSION_NAME = "1.1.3"
+    const val VERSION_CODE = 7
+    const val VERSION_NAME = "1.1.4"
 }