Skip to content

Fix: Aligns Android autoupload logic with iOS #4262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 12, 2024
Merged

Fix: Aligns Android autoupload logic with iOS #4262

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26bbcf2
Aligns Android autoupload logic with iOS
antonis Nov 12, 2024
18b71e5
fix(gradle): DISABLE_NATIVE_UPLOAD should not affect JS source maps u…
krystofwoldrich Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions packages/core/sentry.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,16 @@ import org.apache.tools.ant.taskdefs.condition.Os
import java.util.regex.Matcher
import java.util.regex.Pattern

project.ext.shouldSentryAutoUploadNative = { ->
return System.getenv('SENTRY_DISABLE_NATIVE_DEBUG_UPLOAD') != 'true'
}

project.ext.shouldSentryAutoUploadGeneral = { ->
return System.getenv('SENTRY_DISABLE_AUTO_UPLOAD') != 'true'
}

project.ext.shouldSentryAutoUpload = { ->
return System.getenv('SENTRY_DISABLE_AUTO_UPLOAD') != 'true' ||
System.getenv('SENTRY_DISABLE_NATIVE_DEBUG_UPLOAD') != 'true'
return shouldSentryAutoUploadGeneral() && shouldSentryAutoUploadNative()
}

def config = project.hasProperty("sentryCli") ? project.sentryCli : [];
Expand Down Expand Up @@ -99,7 +106,7 @@ gradle.projectsEvaluated {

/** Upload source map file to the sentry server via CLI call. */
def cliTask = tasks.create(nameCliTask) {
onlyIf { shouldSentryAutoUpload() }
onlyIf { shouldSentryAutoUploadGeneral() }
description = "upload debug symbols to sentry"
group = 'sentry.io'

Expand Down
Loading