Merge pull request #292 from powerserg17-bunch/master

Supporting 4.2.0-alpha07 changes
kezong · Apr 12, 2021 · c136da6 · c136da6
2 parents 52ec215 + 2743498
commit c136da6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/source/src/main/groovy/com/kezong/fataar/FatUtils.groovy b/source/src/main/groovy/com/kezong/fataar/FatUtils.groovy
@@ -58,6 +58,15 @@ class FatUtils {
         String[] version1Array = version1[0].split("[._]")
         String[] version2Array = version2[0].split("[._]")
 
+        String preRelease1 = new String()
+        String preRelease2 = new String()
+        if (version1.length > 1) {
+            preRelease1 = version1[1]
+        }
+        if (version2.length > 1) {
+            preRelease2 = version2[1]
+        }
+
         int index = 0
         int minLen = Math.min(version1Array.length, version2Array.length)
         long diff = 0
@@ -79,6 +88,19 @@ class FatUtils {
                     return -1
                 }
             }
+            //compare pre-release
+            if (!preRelease1.isEmpty() && preRelease2.isEmpty()) {
+                return -1
+            } else if (preRelease1.isEmpty() && !preRelease2.isEmpty()) {
+                return 1
+            } else if (!preRelease1.isEmpty() && !preRelease2.isEmpty()) {
+                int preReleaseDiff = preRelease1.compareTo(preRelease2);
+                if (preReleaseDiff > 0) {
+                    return 1
+                } else if (preReleaseDiff < 0) {
+                    return -1
+                }
+            }
             return 0
         } else {
             return diff > 0 ? 1 : -1

diff --git a/source/src/main/groovy/com/kezong/fataar/VariantProcessor.groovy b/source/src/main/groovy/com/kezong/fataar/VariantProcessor.groovy
@@ -320,7 +320,9 @@ class VariantProcessor {
         ManifestProcessorTask processManifestTask = mVersionAdapter.getProcessManifest()
 
         File manifestOutput
-        if (FatUtils.compareVersion(VersionAdapter.AGPVersion, "3.3.0") >= 0) {
+        if (FatUtils.compareVersion(VersionAdapter.AGPVersion, "4.2.0-alpha07") >= 0) {
+            manifestOutput = mProject.file("${mProject.buildDir.path}/intermediates/merged_manifest/${mVariant.name}/AndroidManifest.xml")
+        } else if (FatUtils.compareVersion(VersionAdapter.AGPVersion, "3.3.0") >= 0) {
             manifestOutput = mProject.file("${mProject.buildDir.path}/intermediates/library_manifest/${mVariant.name}/AndroidManifest.xml")
         } else {
             manifestOutput = mProject.file(processManifestTask.getManifestOutputDirectory().absolutePath + "/AndroidManifest.xml")