adapt gradle plugin 3.6.1

kezong · Mar 10, 2020 · 8595cbe · 8595cbe
1 parent 51702b4
commit 8595cbe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/source/src/main/groovy/com/kezong/fataar/VersionAdapter.groovy b/source/src/main/groovy/com/kezong/fataar/VersionAdapter.groovy
@@ -83,7 +83,9 @@ class VersionAdapter {
     }
 
     File getSymbolFile() {
-        if (Utils.compareVersion(mGradlePluginVersion, "3.1.0") >= 0) {
+        if (Utils.compareVersion(mGradlePluginVersion, "3.6.0") >= 0) {
+            return mProject.file(mProject.buildDir.path + '/intermediates/compile_symbol_list/' + mVariant.dirName + "/R.txt")
+        } else if (Utils.compareVersion(mGradlePluginVersion, "3.1.0") >= 0) {
             return mProject.file(mProject.buildDir.path + '/intermediates/symbols/' + mVariant.dirName + "/R.txt")
         } else {
             return mProject.file(mProject.buildDir.path + '/intermediates/bundles/' + mVariant.name + "/R.txt")

diff --git a/source/src/main/java/com/kezong/fataar/LibraryManifestMerger.java b/source/src/main/java/com/kezong/fataar/LibraryManifestMerger.java
@@ -9,6 +9,7 @@
 
 import org.apache.tools.ant.BuildException;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.workers.WorkerExecutor;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -87,4 +88,8 @@ public String getName() {
         writer.flush();
         writer.close();
     }
+
+    public WorkerExecutor getWorkerExecutor() {
+        return null;
+    }
 }