Skip to content

Commit ee94db5

Browse files
committed
Add null safety and consistent lazy evaluation for task matching
1 parent b072259 commit ee94db5

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

packages/core/sentry.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ plugins.withId('com.android.application') {
119119
// .join('\n')
120120

121121
def currentVariants = extractCurrentVariants(bundleTask, v)
122-
if (currentVariants == null) return
122+
if (currentVariants == null || currentVariants.isEmpty()) return
123123

124124
def previousCliTask = null
125125
def applicationVariant = null
@@ -328,9 +328,10 @@ plugins.withId('com.android.application') {
328328
previousCliTask.configure { finalizedBy cliCleanUpTask }
329329

330330
def packageTasks = tasks.matching {
331-
task -> ("package${applicationVariant}".equalsIgnoreCase(task.name) || "package${applicationVariant}Bundle".equalsIgnoreCase(task.name)) && task.enabled
331+
task -> ("package${applicationVariant}".equalsIgnoreCase(task.name) || "package${applicationVariant}Bundle".equalsIgnoreCase(task.name))
332332
}
333333
packageTasks.configureEach { packageTask ->
334+
if (!packageTask.enabled) return
334335
packageTask.dependsOn modulesTask
335336
packageTask.finalizedBy modulesCleanUpTask
336337
}

0 commit comments

Comments
 (0)