From a84e05d0872c818cab6fe9ba8f0826e11bf99ce5 Mon Sep 17 00:00:00 2001
From: Marco Saia <marco.saia@datadoghq.com>
Date: Wed, 14 May 2025 16:48:08 +0200
Subject: [PATCH] [FIX] Custom Datadog upload options not set correctly

---
 packages/core/datadog-configuration.gradle | 6 ++----
 packages/core/datadog-sourcemaps.gradle    | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/core/datadog-configuration.gradle b/packages/core/datadog-configuration.gradle
index 535624790..224950b56 100644
--- a/packages/core/datadog-configuration.gradle
+++ b/packages/core/datadog-configuration.gradle
@@ -5,10 +5,8 @@
  */
 
 def getConfigurationFilePath() {
-    if (project.hasProperty("datadog")) {
-        if (project.datadog.configurationFilePath) {
-            return project.datadog.configurationFilePath
-        }
+    if (project.ext.has("datadog") && project.ext.datadog.configurationFilePath) {
+        return project.ext.datadog.configurationFilePath
     }
     return '../../datadog-configuration.json'
 }
diff --git a/packages/core/datadog-sourcemaps.gradle b/packages/core/datadog-sourcemaps.gradle
index f7fb288e2..7a3f19532 100644
--- a/packages/core/datadog-sourcemaps.gradle
+++ b/packages/core/datadog-sourcemaps.gradle
@@ -268,8 +268,8 @@ private def runShellCommand(
 }
 
 private def getServiceName(variant) {
-    if (project.hasProperty("datadog") && project.datadog.serviceName) {
-        return project.datadog.serviceName
+    if (project.ext.has("datadog") && project.ext.datadog.serviceName) {
+        return project.ext.datadog.serviceName
     }
     return variant.applicationId
 }