Use per-project Sentry configuration (#4818)

.configure

@@ -1,18 +1,13 @@
 {
   "project_name": "pocketcasts-android",
   "branch": "trunk",
-  "pinned_hash": "29f04c18842c391363c5129b59b8a32973319611",
+  "pinned_hash": "f8db88d1a1d1149ce3a144b7c629e36717c885ea",
   "files_to_copy": [
     {
       "file": "android/pocket-casts/secret.properties",
       "destination": "secret.properties",
       "encrypt": true
     },
-    {
-      "file": "android/pocket-casts/sentry.properties",
-      "destination": "sentry.properties",
-      "encrypt": true
-    },
     {
       "file": "android/pocket-casts/google-services.json",
       "destination": "app/google-services.json",

app/build.gradle.kts

@@ -9,6 +9,10 @@ plugins {
     alias(libs.plugins.compose.compiler)
 }
 
+sentry {
+    projectName = project.findProperty("sentryAndroidProject")?.toString()
+}
+
 android {
     namespace = "au.com.shiftyjelly.pocketcasts"
 
@@ -46,8 +50,8 @@ android {
         named("release") {
             manifestPlaceholders["appIcon"] = "@mipmap/ic_launcher"
 
-            if (!file("${project.rootDir}/sentry.properties").exists()) {
-                println("WARNING: Sentry configuration file 'sentry.properties' not found. The ProGuard mapping files won't be uploaded.")
+            if (project.findProperty("sentryAndroidProject")?.toString().isNullOrBlank()) {
+                println("WARNING: Sentry configuration not found. The ProGuard mapping files won't be uploaded.")
             }
         }
     }

automotive/build.gradle.kts

@@ -9,6 +9,10 @@ plugins {
     alias(libs.plugins.compose.compiler)
 }
 
+sentry {
+    projectName = project.findProperty("sentryAutomotiveProject")?.toString()
+}
+
 android {
     namespace = "au.com.shiftyjelly.pocketcasts"
 
@@ -35,6 +39,10 @@ android {
 
         named("release") {
             manifestPlaceholders["appIcon"] = "@mipmap/ic_launcher"
+
+            if (project.findProperty("sentryAutomotiveProject")?.toString().isNullOrBlank()) {
+                println("WARNING: Sentry configuration not found. The ProGuard mapping files won't be uploaded.")
+            }
         }
     }
 

build.gradle.kts

@@ -14,7 +14,6 @@ import com.google.devtools.ksp.gradle.KspGradleSubplugin
 import io.sentry.android.gradle.extensions.InstrumentationFeature
 import io.sentry.android.gradle.extensions.SentryPluginExtension
 import java.util.EnumSet
-import kotlin.collections.addAll
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
 import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
@@ -174,7 +173,7 @@ subprojects {
     }
 
     plugins.withId(rootProject.libs.plugins.sentry.get().pluginId) {
-        configureSentry()
+        applyCommonSentryConfiguration()
     }
 
     configurations.configureEach {
@@ -419,8 +418,11 @@ subprojects {
     }
 }
 
-fun Project.configureSentry() {
+fun Project.applyCommonSentryConfiguration() {
     extensions.getByType(SentryPluginExtension::class.java).apply {
+        authToken = project.findProperty("sentryAuthToken")?.toString()
+        org = project.findProperty("sentryOrg")?.toString()
+
         val shouldUploadDebugFiles = System.getenv()["CI"].toBoolean() &&
             !project.properties["skipSentryProguardMappingUpload"]?.toString().toBoolean()
         includeProguardMapping = shouldUploadDebugFiles

dependencies.gradle.kts

@@ -106,5 +106,10 @@ project.apply {
         set("encryptionKey", secretProperties.getProperty("encryption_key", ""))
         set("appSecret", secretProperties.getProperty("app_secret", ""))
         set("metaAppId", secretProperties.getProperty("metaAppId", ""))
+        set("sentryAuthToken", secretProperties.getProperty("sentryAuthToken", ""))
+        set("sentryOrg", secretProperties.getProperty("sentryOrg", ""))
+        set("sentryAndroidProject", secretProperties.getProperty("sentryAndroidProject", ""))
+        set("sentryAutomotiveProject", secretProperties.getProperty("sentryAutomotiveProject", ""))
+        set("sentryWearProject", secretProperties.getProperty("sentryWearProject", ""))
     }
 }

wear/build.gradle.kts

@@ -11,6 +11,10 @@ plugins {
     alias(libs.plugins.compose.compiler)
 }
 
+sentry {
+    projectName = project.findProperty("sentryWearProject")?.toString()
+}
+
 android {
     namespace = "au.com.shiftyjelly.pocketcasts"
 
@@ -32,8 +36,8 @@ android {
         named("release") {
             manifestPlaceholders["appIcon"] = "@mipmap/ic_launcher"
 
-            if (!file("${project.rootDir}/sentry.properties").exists()) {
-                println("WARNING: Sentry configuration file 'sentry.properties' not found. The ProGuard mapping files won't be uploaded.")
+            if (project.findProperty("sentryWearProject")?.toString().isNullOrBlank()) {
+                println("WARNING: Sentry configuration not found. The ProGuard mapping files won't be uploaded.")
             }
         }
     }