Skip to content

Commit 8fbf600

Browse files
fix(modules): Modules create only one cleanup task (#2657)
1 parent bb4d70c commit 8fbf600

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- [diff](https://github.com/getsentry/sentry-wizard/compare/v1.2.17...v1.4.0)
1010
- Android builds without ext config, auto create assets dir for modules ([#2652](https://github.com/getsentry/sentry-react-native/pull/2652))
1111
- Exit gracefully if source map file for collecting modules doesn't exist ([#2655](https://github.com/getsentry/sentry-react-native/pull/2655))
12+
- Create only one clean-up tasks for modules collection ([#2657](https://github.com/getsentry/sentry-react-native/pull/2657))
1213

1314
### Dependencies
1415

sentry.gradle

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -194,19 +194,24 @@ gradle.projectsEvaluated {
194194
}
195195
previousCliTask = cliTask
196196
cliTask.finalizedBy modulesTask
197+
}
197198

198-
def modulesCleanUpTask = tasks.create(name: nameModulesCleanup, type: Delete) {
199-
description = "clean up collected modules generated file"
200-
group = 'sentry.io'
199+
def modulesCleanUpTask = tasks.create(name: nameModulesCleanup, type: Delete) {
200+
description = "clean up collected modules generated file"
201+
group = 'sentry.io'
201202

202-
delete modulesOutput
203-
}
203+
delete modulesOutput
204+
}
204205

205-
def packageTasks = tasks.findAll { task -> "package${variant}".equalsIgnoreCase(task.name) && task.enabled }
206-
packageTasks.each { packageTask ->
207-
packageTask.dependsOn modulesTask
208-
packageTask.finalizedBy modulesCleanUpTask
209-
}
206+
def variantTaskName = variant.replaceAll("[\\s\\-()]", "") // variant is dev-release beta-release etc.
207+
// task.name could be packageDev-debugRelease but in that case currentVariants == null
208+
// because of the regex in `extractCurrentVariants` and this code doesn't run
209+
def packageTasks = tasks.findAll {
210+
task -> "package${variantTaskName}".equalsIgnoreCase(task.name) && task.enabled
211+
}
212+
packageTasks.each { packageTask ->
213+
packageTask.dependsOn modulesTask
214+
packageTask.finalizedBy modulesCleanUpTask
210215
}
211216

212217
/** Delete sourcemap files */

0 commit comments

Comments
 (0)