Merge 4af3503 into 30e2d76

Author: lucas-zimerman

CHANGELOG.md

@@ -9,6 +9,7 @@
 ### Fixes
 
 - `sentry-expo-upload-sourcemaps` no longer requires Sentry url when uploading sourcemaps to `sentry.io` ([#3915](https://github.com/getsentry/sentry-react-native/pull/3915))
+- Flavor aware Android builds use `SENTRY_AUTH_TOKEN` env as fallback when token not found in `sentry-flavor-type.properties`. ([#3917](https://github.com/getsentry/sentry-react-native/pull/3917))
 
 ### Dependencies
 

sentry.gradle

@@ -183,7 +183,7 @@ gradle.projectsEvaluated {
                       ])
                       args.addAll(!config.flavorAware ? [] : [
                           "--url", sentryProps.get("defaults.url"),
-                          "--auth-token", sentryProps.get("auth.token")
+                          "--auth-token", sentryProps.get("auth.token") ?: System.getenv("SENTRY_AUTH_TOKEN")
                       ])
                       args.addAll(["react-native", "gradle",
                           "--bundle", bundleOutput,           // The path to a bundle that should be uploaded.