adapt gradle plugin 4.2.0

kezong · May 6, 2021 · 416d821 · 416d821
1 parent 989e676
commit 416d821
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 10 deletions.
diff --git a/example/build.gradle b/example/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.github.kezong:fat-aar:1.3.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
     }

diff --git a/example/gradle/wrapper/gradle-wrapper.properties b/example/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/source/build.gradle b/source/build.gradle
@@ -18,5 +18,5 @@ dependencies {
     implementation gradleApi()
     implementation localGroovy()
     implementation "org.javassist:javassist:3.27.0-GA"
-    implementation 'com.android.tools.build:gradle:4.1.0'
+    implementation 'com.android.tools.build:gradle:4.2.0'
 }
diff --git a/source/gradle/wrapper/gradle-wrapper.properties b/source/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/source/src/main/groovy/com/kezong/fataar/VariantProcessor.groovy b/source/src/main/groovy/com/kezong/fataar/VariantProcessor.groovy
@@ -336,7 +336,6 @@ class VariantProcessor {
         TaskProvider<LibraryManifestMerger> manifestsMergeTask = mProject.tasks.register("merge${mVariant.name.capitalize()}Manifest", LibraryManifestMerger) {
             setGradleVersion(mProject.getGradle().getGradleVersion())
             setGradlePluginVersion(VersionAdapter.AGPVersion)
-            setVariantName(mVariant.name)
             setMainManifestFile(manifestOutput)
             setSecondaryManifestFiles(inputManifests)
             setOutputFile(manifestOutput)

diff --git a/source/src/main/java/com/kezong/fataar/LibraryManifestMerger.java b/source/src/main/java/com/kezong/fataar/LibraryManifestMerger.java
@@ -1,15 +1,14 @@
 package com.kezong.fataar;
 
 import com.android.build.gradle.internal.LoggerWrapper;
-import com.android.build.gradle.tasks.InvokeManifestMerger;
 import com.android.manifmerger.ManifestMerger2;
 import com.android.manifmerger.ManifestProvider;
 import com.android.manifmerger.MergingReport;
 import com.android.utils.ILogger;
 
 import org.apache.tools.ant.BuildException;
+import org.gradle.api.DefaultTask;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.workers.WorkerExecutor;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -22,12 +21,18 @@
 /**
  * ManifestMerger for Library
  */
-public class LibraryManifestMerger extends InvokeManifestMerger {
+public class LibraryManifestMerger extends DefaultTask {
 
     private String mGradlePluginVersion;
 
     private String mGradleVersion;
 
+    private File mMainManifestFile;
+
+    private List<File> mSecondaryManifestFiles;
+
+    private File mOutputFile;
+
     public void setGradlePluginVersion(String gradlePluginVersion) {
         mGradlePluginVersion = gradlePluginVersion;
     }
@@ -89,7 +94,27 @@ public String getName() {
         writer.close();
     }
 
-    public WorkerExecutor getWorkerExecutor() {
-        return null;
+    public File getMainManifestFile() {
+        return mMainManifestFile;
+    }
+
+    public void setMainManifestFile(File mainManifestFile) {
+        this.mMainManifestFile = mainManifestFile;
+    }
+
+    public List<File> getSecondaryManifestFiles() {
+        return mSecondaryManifestFiles;
+    }
+
+    public void setSecondaryManifestFiles(List<File> secondaryManifestFiles) {
+        this.mSecondaryManifestFiles = secondaryManifestFiles;
+    }
+
+    public File getOutputFile() {
+        return mOutputFile;
+    }
+
+    public void setOutputFile(File outputFile) {
+        this.mOutputFile = outputFile;
     }
 }