diff --git a/.configure-files/sentry.properties.enc b/.configure-files/sentry.properties.enc deleted file mode 100644 index 82b98bce1b1..00000000000 --- a/.configure-files/sentry.properties.enc +++ /dev/null @@ -1 +0,0 @@ -UgUt>|tϝmHLGX#kA@r{xjjKKhVh8P8^c4EcC~LX wýPIBZK>ʿi^1Q2{{DM \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 599d9e2e6c0..0c59e490b5e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } sentry { - projectName = project.findProperty("sentryAndroidProject")?.toString() + projectName = "pocket-casts-android" } android { @@ -48,10 +48,6 @@ android { named("release") { manifestPlaceholders["appIcon"] = "@mipmap/ic_launcher" - - if (project.findProperty("sentryAndroidProject")?.toString().isNullOrBlank()) { - println("WARNING: Sentry configuration not found. The ProGuard mapping files won't be uploaded.") - } } } diff --git a/automotive/build.gradle.kts b/automotive/build.gradle.kts index 273572e5fcb..2793c2500cc 100644 --- a/automotive/build.gradle.kts +++ b/automotive/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } sentry { - projectName = project.findProperty("sentryAutomotiveProject")?.toString() + projectName = "pocket-casts-automotive" } android { @@ -38,10 +38,6 @@ 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.") - } } } diff --git a/build.gradle.kts b/build.gradle.kts index 608aa995262..6ca14232a22 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,6 +13,7 @@ import com.google.devtools.ksp.gradle.KspExtension import com.google.devtools.ksp.gradle.KspGradleSubplugin import io.sentry.android.gradle.extensions.InstrumentationFeature import io.sentry.android.gradle.extensions.SentryPluginExtension +import io.sentry.android.gradle.tasks.SentryCliExecTask import java.util.EnumSet import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions @@ -474,9 +475,11 @@ subprojects { } fun Project.applyCommonSentryConfiguration() { + val sentryAuthToken = providers.environmentVariable("SENTRY_AUTH_TOKEN").orNull?.trim()?.ifEmpty { null } + extensions.getByType(SentryPluginExtension::class.java).apply { - authToken = project.findProperty("sentryAuthToken")?.toString() - org = project.findProperty("sentryOrg")?.toString() + authToken = sentryAuthToken + org = "a8c" val shouldUploadDebugFiles = System.getenv()["CI"].toBoolean() && !project.properties["skipSentryProguardMappingUpload"]?.toString().toBoolean() @@ -490,6 +493,17 @@ fun Project.applyCommonSentryConfiguration() { includeDependenciesReport = false ignoredBuildTypes = setOf("debug", "debugProd", "prototype") } + + tasks.withType().configureEach { + doFirst { + if (sentryAuthToken == null) { + throw GradleException( + "SENTRY_AUTH_TOKEN is not set (or is blank). Export it to upload debug files to Sentry, " + + "or pass -PskipSentryProguardMappingUpload=true to skip the upload.", + ) + } + } + } } tasks.register("aggregatedLintRelease") { diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts index 8229c2d2c37..b1b56164a72 100644 --- a/dependencies.gradle.kts +++ b/dependencies.gradle.kts @@ -120,11 +120,5 @@ 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", "")) - set("sentryTvProject", secretProperties.getProperty("sentryTvProject", "")) } } diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts index b00d75695b7..1af31aa6739 100644 --- a/wear/build.gradle.kts +++ b/wear/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } sentry { - projectName = project.findProperty("sentryWearProject")?.toString() + projectName = "pocket-casts-wear" } android { @@ -34,10 +34,6 @@ android { named("release") { manifestPlaceholders["appIcon"] = "@mipmap/ic_launcher" - - if (project.findProperty("sentryWearProject")?.toString().isNullOrBlank()) { - println("WARNING: Sentry configuration not found. The ProGuard mapping files won't be uploaded.") - } } }