diff --git a/tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/Compatibilities.groovy b/tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/Compatibilities.groovy index 2086efa5..678ef86e 100644 --- a/tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/Compatibilities.groovy +++ b/tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/Compatibilities.groovy @@ -70,6 +70,10 @@ class Compatibilities { return project.tasks.findByName("process${variant.name.capitalize()}Manifest") } + static def getProcessManifestForPackageTask(project, variant) { + return project.tasks.findByName("process${variant.name.capitalize()}ManifestForPackage") + } + static def getMergeResourcesTask(project, variant) { return project.tasks.findByName("merge${variant.name.capitalize()}Resources") } diff --git a/tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/TinkerPatchPlugin.groovy b/tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/TinkerPatchPlugin.groovy index 56099160..7107aa09 100644 --- a/tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/TinkerPatchPlugin.groovy +++ b/tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/TinkerPatchPlugin.groovy @@ -150,6 +150,9 @@ class TinkerPatchPlugin implements Plugin { def tinkerManifestTask = mProject.tasks.create("tinkerProcess${capitalizedVariantName}Manifest", TinkerManifestTask) tinkerManifestTask.mustRunAfter agpProcessManifestTask + def agpProcessManifestForPackageTask = Compatibilities.getProcessManifestForPackageTask(project, variant) + agpProcessManifestForPackageTask.mustRunAfter tinkerManifestTask + variant.outputs.each { variantOutput -> setPatchNewApkPath(configuration, variantOutput, variant, tinkerPatchBuildTask) setPatchOutputFolder(configuration, variantOutput, variant, tinkerPatchBuildTask)