Merge pull request #21452 from wordpress-mobile/dont_send_sentry_mapp…

…ing_files_from_local_machines Don't send sentry mapping files from local machines
wordpress-mobile · Nov 13, 2024 · a81d9ef · a81d9ef
2 parents bf81edf + 79fe4cb
commit a81d9ef
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -72,9 +72,10 @@ sentry {
         logcat.enabled = false
     }
     autoInstallation.enabled = false
-    includeSourceContext = true
-    autoUploadSourceContext = true
     includeDependenciesReport = false
+
+    includeSourceContext = gradle.ext.isCi
+    includeProguardMapping = gradle.ext.isCi
     /* Sentry won't send source context or add performance instrumentations for debug builds
     so we can save build times. Sending events will still work in debug builds
     (if enabled in WPCrashLoggingDataProvider).
@@ -196,7 +197,7 @@ android {
         targetCompatibility JvmTarget.fromTarget(libs.versions.java.get()).target
     }
 
-    flavorDimensions "app", "buildType"
+    flavorDimensions = ['app', 'buildType']
 
     productFlavors {
         wordpress {
@@ -300,7 +301,7 @@ android {
         checkGeneratedSources = true
         lintConfig file("${project.rootDir}/config/lint/lint.xml")
         baseline file("${project.rootDir}/config/lint/baseline.xml")
-        sarifReport = System.getenv('CI') ? true : false
+        sarifReport = gradle.ext.isCi
     }
 
     packagingOptions {

diff --git a/build.gradle b/build.gradle
@@ -39,7 +39,7 @@ measureBuilds {
                 findProperty('appsMetricsToken')
         )
     }
-    attachGradleScanId = System.getenv('CI')?.toBoolean() ?: false
+    attachGradleScanId = gradle.ext.isCi
 }
 
 allprojects {

diff --git a/config/gradle/gradle_build_cache.gradle b/config/gradle/gradle_build_cache.gradle
@@ -1,6 +1,6 @@
 
 // Only run build cache on CI builds.
-if (System.getenv('CI')) {
+if (gradle.ext.isCi) {
     buildCache {
         remote(HttpBuildCache) {
             url = "http://10.0.2.215:5071/cache/"

diff --git a/config/gradle/gradle_build_scan.gradle b/config/gradle/gradle_build_scan.gradle
@@ -1,6 +1,6 @@
 
 // Only run build scan on CI builds.
-if (System.getenv('CI')) {
+if (gradle.ext.isCi) {
     develocity {
         buildScan {
             termsOfUseUrl = 'https://gradle.com/terms-of-service'

diff --git a/settings.gradle b/settings.gradle
@@ -16,6 +16,8 @@ plugins {
     id "com.gradle.develocity" version "3.18.1"
 }
 
+gradle.ext.isCi = System.getenv('CI')?.toBoolean() ?: false
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {