From a581358d3335c478ab6c21359dd4dce74859e35e Mon Sep 17 00:00:00 2001
From: Julius Kamiri <kabangijulius@gmail.com>
Date: Sat, 4 Aug 2018 10:30:47 +0300
Subject: [PATCH] Fix envConfigFiles in build.gradle not working

Caused by picking the default environment file before checking for multiple configurations
---
 android/dotenv.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/dotenv.gradle b/android/dotenv.gradle
index 5046f87..7a2df3b 100644
--- a/android/dotenv.gradle
+++ b/android/dotenv.gradle
@@ -28,8 +28,6 @@ def loadDotEnv(flavor = getCurrentFlavor()) {
         envFile = System.env['ENVFILE']
     } else if (System.getProperty('ENVFILE')) {
         envFile = System.getProperty('ENVFILE')
-    } else if (project.hasProperty("defaultEnvFile")) {
-        envFile = project.defaultEnvFile
     } else if (project.hasProperty("envConfigFiles")) {
         // use startsWith because sometimes the task is "generateDebugSources", so we want to match "debug"
         project.ext.envConfigFiles.any { pair ->
@@ -38,6 +36,8 @@ def loadDotEnv(flavor = getCurrentFlavor()) {
                 return true
             }
         }
+    } else if (project.hasProperty("defaultEnvFile")) {
+        envFile = project.defaultEnvFile
     }
 
     def env = [:]