From 38ad6b2b3de02c42e180994777c08ac88a27f249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Mon, 11 Nov 2024 09:34:57 +0100 Subject: [PATCH] Fix Bugsnag upload conflict --- app/build.gradle | 4 ++++ .../convention/src/main/kotlin/AndroidAppConventionPlugin.kt | 2 ++ build-logic/convention/src/main/kotlin/Constants.kt | 4 ++-- 3 files changed, 8 insertions(+), 2 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..4356927a 100644 --- a/build-logic/convention/src/main/kotlin/AndroidAppConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidAppConventionPlugin.kt @@ -49,6 +49,8 @@ class AndroidAppConventionPlugin : Plugin { buildTypes { val buildUuidKey = "build_uuid" getByName("debug") { + // Bugsnag won't upload mappings for debug builds, but the manifest placeholder + // needs to resolve to something addManifestPlaceholders(mapOf(buildUuidKey to "debug")) } getByName("release") { 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" }