Refine gradle files

JackyAnn · May 4, 2020 · cf37e75 · cf37e75
1 parent 9e9eee5
commit cf37e75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,8 +35,6 @@ tasks.register<Delete>("clean") {
 // skip uploading the mapping to Crashlytics
 subprojects {
     tasks.whenTaskAdded {
-        if(name.contains("uploadCrashlyticsMappingFileRelease")) {
-            enabled = false
-        }
+        if (name.contains("uploadCrashlyticsMappingFile")) enabled = false
     }
 }
diff --git a/buildSrc/src/main/kotlin/Helpers.kt b/buildSrc/src/main/kotlin/Helpers.kt
@@ -15,9 +15,9 @@ const val lifecycleVersion = "2.2.0"
 
 private val Project.android get() = extensions.getByName<BaseExtension>("android")
 
-private val flavorRegex = ".*(assemble|generate)\\w*(Release|Debug).*".toRegex()
+private val flavorRegex = "(assemble|generate)\\w*(Release|Debug)".toRegex()
 val Project.currentFlavor get() = gradle.startParameter.taskRequests.toString().let { task ->
-    flavorRegex.matchEntire(task)?.groupValues?.get(2)?.toLowerCase(Locale.ROOT) ?: "debug".also {
+    flavorRegex.find(task)?.groupValues?.get(2)?.toLowerCase(Locale.ROOT) ?: "debug".also {
         println("Warning: No match found for $task")
     }
 }