fix: Look for sentry.properties on flavor folder (#737)

* fix: Look for sentry.properties on flavor folder
* ref: Check build types before flavor name

Author: bruno-garcia

sentry-android-gradle-plugin/src/main/groovy/io/sentry/android/gradle/SentryPlugin.groovy

@@ -202,25 +202,38 @@ class SentryPlugin implements Plugin<Project> {
                         description "Write references to proguard UUIDs to the android assets."
                         workingDir project.rootDir
 
-                        def variantName = variant.buildType.name
+                        def buildTypeName = variant.buildType.name
                         def flavorName = variant.flavorName
+                        // When flavor is used in combination with dimensions, variant.flavorName will be a concatenation
+                        // of flavors of different dimensions
                         def propName = "sentry.properties"
-                        def possibleProps = [
-                                "${project.projectDir}/src/${variantName}/${propName}",
+                        // current flavor name takes priority
+                        def possibleProps = []
+                        variant.productFlavors.each {
+                            // flavors used with dimension come in second
+                            possibleProps.push("${project.projectDir}/src/${it.name}/${propName}")
+                        }
+
+                        possibleProps = [
+                                "${project.projectDir}/src/${buildTypeName}/${propName}",
+                                "${project.projectDir}/src/${buildTypeName}/${flavorName}/${propName}",
+                                "${project.projectDir}/src/${flavorName}/${buildTypeName}/${propName}",
                                 "${project.projectDir}/src/${flavorName}/${propName}",
-                                "${project.projectDir}/src/${variantName}/${flavorName}/${propName}",
-                                "${project.projectDir}/src/${flavorName}/${variantName}/${propName}",
-                                "${project.rootDir.toPath()}/src/${variantName}/${propName}",
                                 "${project.rootDir.toPath()}/src/${flavorName}/${propName}",
-                                "${project.rootDir.toPath()}/src/${variantName}/${flavorName}/${propName}",
-                                "${project.rootDir.toPath()}/src/${flavorName}/${variantName}/${propName}",
+                        ] + possibleProps + [
+                                "${project.rootDir.toPath()}/src/${buildTypeName}/${propName}",
+                                "${project.rootDir.toPath()}/src/${buildTypeName}/${flavorName}/${propName}",
+                                "${project.rootDir.toPath()}/src/${flavorName}/${buildTypeName}/${propName}",
+                                // Root sentry.properties is the last to be looked up
                                 "${project.rootDir.toPath()}/${propName}"
                         ]
 
                         def propsFile = null
                         possibleProps.each {
+                            project.logger.info("Looking for Sentry properties at: $it")
                             if (propsFile == null && new File(it).isFile()) {
                                 propsFile = it
+                                project.logger.info("Found Sentry properties in: $it")
                             }
                         }