Update paths according to changes in Android plugin 3.6.0

kezong · Mar 3, 2020 · 1682799 · 1682799
1 parent 1674674
commit 1682799
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/source/src/main/groovy/com/kezong/fataar/VariantProcessor.groovy b/source/src/main/groovy/com/kezong/fataar/VariantProcessor.groovy
@@ -236,7 +236,7 @@ class VariantProcessor {
             }
         }
 
-        String taskPath = 'transformClassesAndResourcesWithSyncLibJarsFor' + mVariant.name.capitalize()
+        String taskPath = mVersionAdapter.getSyncLibJarsTaskPath()
         Task syncLibTask = mProject.tasks.findByPath(taskPath)
         if (syncLibTask == null) {
             throw new RuntimeException("Can not find task ${taskPath}!")

diff --git a/source/src/main/groovy/com/kezong/fataar/VersionAdapter.groovy b/source/src/main/groovy/com/kezong/fataar/VersionAdapter.groovy
@@ -49,7 +49,9 @@ class VersionAdapter {
     }
 
     File getLibsDirFile() {
-        if (Utils.compareVersion(mGradlePluginVersion, "3.1.0") >= 0) {
+        if (Utils.compareVersion(mGradlePluginVersion, '3.6.0') >= 0) {
+            return mProject.file("${mProject.buildDir.path}/intermediates/aar_libs_directory/${mVariant.dirName}/libs")
+        } else if (Utils.compareVersion(mGradlePluginVersion, '3.1.0') >= 0) {
             return mProject.file(mProject.buildDir.path + '/intermediates/packaged-classes/' + mVariant.dirName + "/libs")
         } else {
             return mProject.file(mProject.buildDir.path + '/intermediates/bundles/' + mVariant.dirName + "/libs")
@@ -87,4 +89,12 @@ class VersionAdapter {
             return mProject.file(mProject.buildDir.path + '/intermediates/bundles/' + mVariant.name + "/R.txt")
         }
     }
-}
+
+    String getSyncLibJarsTaskPath() {
+        if (Utils.compareVersion(mGradlePluginVersion, '3.6.0') >= 0) {
+            return "sync${mVariant.name.capitalize()}LibJars"
+        } else {
+            return "transformClassesAndResourcesWithSyncLibJarsFor${mVariant.name.capitalize()}"
+        }
+    }
+}