3.4.5 push

google · Apr 29, 2021 · 7a16f5a · 7a16f5a
1 parent 379ae07
commit 7a16f5a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/google-services-plugin/build.gradle b/google-services-plugin/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 }
 
 group = 'com.google.gms'
-version = '4.3.4'
+version = '4.3.5'
 project.ext.archivesBaseName = 'google-services'
 project.ext.pomDesc = 'Gradle plug-in to build Firebase applications.'
 

diff --git a/google-services-plugin/src/main/groovy/com/google/gms/googleservices/GoogleServicesTask.java b/google-services-plugin/src/main/groovy/com/google/gms/googleservices/GoogleServicesTask.java
@@ -487,7 +487,7 @@ private static List<String> splitVariantNames(String variant) {
     Matcher flavorMatcher = FLAVOR_PATTERN.matcher(variant);
     while (flavorMatcher.find()) {
       String match = flavorMatcher.group(1);
-      if (match != null) {
+      if (match != null && !match.equals("null")) {
         flavors.add(match.toLowerCase());
       }
     }
@@ -509,7 +509,7 @@ static List<String> getJsonLocations(String variantDirname) {
           .collect(toList());
     }
     List<String> flavorNames = new ArrayList<>();
-    if (variantMatcher.group(1) != null) {
+    if (variantMatcher.group(1) != null && !variantMatcher.group(1).equals("null")) {
       flavorNames.add(variantMatcher.group(1).toLowerCase());
     }
     flavorNames.addAll(splitVariantNames(variantMatcher.group(2)));
@@ -531,7 +531,7 @@ static List<String> getJsonLocations(String variantDirname) {
     fileLocations = fileLocations
         .stream()
         .distinct()
-        .sorted(Comparator.comparing(GoogleServicesTask::countSlashes))
+        .sorted(Comparator.comparing(GoogleServicesTask::countSlashes).reversed())
         .map(location -> location.isEmpty() ? location + JSON_FILE_NAME : location + '/' + JSON_FILE_NAME)
         .collect(toList());
     return fileLocations;