Skip to content

fix(android): Accept RegularFile in Gradle bundle task path guards #6320

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
antonis merged 2 commits into from
Jun 19, 2026
Merged

fix(android): Accept RegularFile in Gradle bundle task path guards #6320

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
308504e
fix(android): Accept RegularFile in Gradle bundle task path guards
antonis Jun 18, 2026
6ebdc24
Update changelog
antonis Jun 19, 2026
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
> make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
<!-- prettier-ignore-end -->

## Unreleased

### Fixes

- Fix Android Gradle source map upload being silently skipped on some occasions ([#6319](https://github.com/getsentry/sentry-react-native/issues/6319))
Comment thread
antonis marked this conversation as resolved.
Outdated

## 8.15.0

### Features
Expand Down
6 changes: 6 additions & 0 deletions packages/core/sentry.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,19 +253,25 @@ fun extractBundleTaskArguments(
val jsSourceMapsDir = (props["jsSourceMapsDir"] as? org.gradle.api.provider.Provider<*>)?.orNull
val jsIntermediateSourceMapsDir = (props["jsIntermediateSourceMapsDir"] as? org.gradle.api.provider.Provider<*>)?.orNull

// React Native's BundleHermesCTask declares `jsIntermediateSourceMapsDir` as a `RegularFileProperty`
// (and other versions may do the same for the bundle/sourcemap dirs) even though they hold a
// directory path, so accept both `Directory` and `RegularFile` here.
val bundleDirFile =
when (jsBundleDir) {
is org.gradle.api.file.Directory -> jsBundleDir.asFile
is org.gradle.api.file.RegularFile -> jsBundleDir.asFile
else -> return BundleTaskArgs(null, null, null, null)
}
val sourcemapsDirFile =
when (jsSourceMapsDir) {
is org.gradle.api.file.Directory -> jsSourceMapsDir.asFile
is org.gradle.api.file.RegularFile -> jsSourceMapsDir.asFile
else -> return BundleTaskArgs(null, null, null, null)
}
val intermediateSourcemapsDirFile =
when (jsIntermediateSourceMapsDir) {
is org.gradle.api.file.Directory -> jsIntermediateSourceMapsDir.asFile
is org.gradle.api.file.RegularFile -> jsIntermediateSourceMapsDir.asFile
else -> return BundleTaskArgs(null, null, null, null)
}

Expand Down
Loading