fix(gradle): Use application variant instead of varian output to hook…

… to correct package task for modules cleanup (#3161)

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 5.8.1
 
+### Fixed
+
+- Use application variant instead of variant output to hook to correct package task for modules cleanup ([#3161](https://github.com/getsentry/sentry-react-native/pull/3161))
+
 ### Dependencies
 
 - Bump JavaScript SDK from v7.60.1 to v7.61.0 ([#3222](https://github.com/getsentry/sentry-react-native/pull/3222))

sentry.gradle

@@ -63,6 +63,7 @@ gradle.projectsEvaluated {
         def releaseName = null
         def versionCode = null
         def previousCliTask = null
+        def applicationVariant = null
 
         def nameCleanup = "${bundleTask.name}_SentryUploadCleanUp"
         def nameModulesCleanup = "${bundleTask.name}_SentryCollectModulesCleanUp"
@@ -71,6 +72,7 @@ gradle.projectsEvaluated {
           variant = currentVariant[0]
           releaseName = currentVariant[1]
           versionCode = currentVariant[2]
+          applicationVariant = currentVariant[3]
 
           try {
             if (versionCode instanceof String) {
@@ -217,13 +219,10 @@ gradle.projectsEvaluated {
             delete modulesOutput
         }
 
-        def variantTaskName = variant.replaceAll("[\\s\\-()]", "") // variant is dev-release beta-release etc.
-        // task.name could be packageDev-debugRelease but in that case currentVariants == null
-        // because of the regex in `extractCurrentVariants` and this code doesn't run
         def packageTasks = tasks.findAll {
           task -> (
-            "package${variantTaskName}".equalsIgnoreCase(task.name)
-              || "package${variantTaskName}Bundle".equalsIgnoreCase(task.name)
+            "package${applicationVariant}".equalsIgnoreCase(task.name)
+              || "package${applicationVariant}Bundle".equalsIgnoreCase(task.name)
             ) && task.enabled
         }
         packageTasks.each { packageTask ->
@@ -265,7 +264,7 @@ def extractReleasesInfo() {
             if (releases[variantName] == null) {
                 releases[variantName] = [:]
             }
-            releases[variantName][outputName] = [outputName, releaseName, versionCode]
+            releases[variantName][outputName] = [outputName, releaseName, versionCode, variantName]
         }
     }