From e3882fc5a011de73f215dcebd6ccb00fefb429c1 Mon Sep 17 00:00:00 2001
From: hyongbai <hyongbai@gmail.com>
Date: Mon, 10 Dec 2018 16:57:04 +0800
Subject: [PATCH] #Compat# fix method not found tools.build.gradle.3.2.0

---
 .../qihoo360/replugin/gradle/host/RePlugin.groovy    | 12 ++++--------
 .../impl/json/PluginBuiltinJsonCreator.groovy        |  9 +++------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/replugin-host-gradle/src/main/groovy/com/qihoo360/replugin/gradle/host/RePlugin.groovy b/replugin-host-gradle/src/main/groovy/com/qihoo360/replugin/gradle/host/RePlugin.groovy
index efa60a61..9c056d07 100644
--- a/replugin-host-gradle/src/main/groovy/com/qihoo360/replugin/gradle/host/RePlugin.groovy
+++ b/replugin-host-gradle/src/main/groovy/com/qihoo360/replugin/gradle/host/RePlugin.groovy
@@ -72,8 +72,7 @@ public class Replugin implements Plugin<Project> {
                 generateHostConfigTask.group = AppConstant.TASKS_GROUP
 
                 //depends on build config task
-                String generateBuildConfigTaskName = variant.getVariantData().getScope().getGenerateBuildConfigTask().name
-                def generateBuildConfigTask = project.tasks.getByName(generateBuildConfigTaskName)
+                def generateBuildConfigTask = variant.getGenerateBuildConfig()
                 if (generateBuildConfigTask) {
                     generateHostConfigTask.dependsOn generateBuildConfigTask
                     generateBuildConfigTask.finalizedBy generateHostConfigTask
@@ -89,8 +88,7 @@ public class Replugin implements Plugin<Project> {
                 generateBuiltinJsonTask.group = AppConstant.TASKS_GROUP
 
                 //depends on mergeAssets Task
-                String mergeAssetsTaskName = variant.getVariantData().getScope().getMergeAssetsTask().name
-                def mergeAssetsTask = project.tasks.getByName(mergeAssetsTaskName)
+                def mergeAssetsTask = variant.getMergeAssets()
                 if (mergeAssetsTask) {
                     generateBuiltinJsonTask.dependsOn mergeAssetsTask
                     mergeAssetsTask.finalizedBy generateBuiltinJsonTask
@@ -151,10 +149,8 @@ public class Replugin implements Plugin<Project> {
         }
         showPluginsTask.group = AppConstant.TASKS_GROUP
 
-        //get mergeAssetsTask name
-        String mergeAssetsTaskName = variant.getVariantData().getScope().getMergeAssetsTask().name
-        //get real gradle task
-        def mergeAssetsTask = project.tasks.getByName(mergeAssetsTaskName)
+        //get mergeAssetsTask name, get real gradle task
+        def mergeAssetsTask = variant.getMergeAssets()
 
         //depend on mergeAssetsTask so that assets have been merged
         if (mergeAssetsTask) {
diff --git a/replugin-host-gradle/src/main/groovy/com/qihoo360/replugin/gradle/host/creator/impl/json/PluginBuiltinJsonCreator.groovy b/replugin-host-gradle/src/main/groovy/com/qihoo360/replugin/gradle/host/creator/impl/json/PluginBuiltinJsonCreator.groovy
index 6eb82b4c..a6cc6ffd 100644
--- a/replugin-host-gradle/src/main/groovy/com/qihoo360/replugin/gradle/host/creator/impl/json/PluginBuiltinJsonCreator.groovy
+++ b/replugin-host-gradle/src/main/groovy/com/qihoo360/replugin/gradle/host/creator/impl/json/PluginBuiltinJsonCreator.groovy
@@ -35,11 +35,8 @@ public class PluginBuiltinJsonCreator implements IFileCreator {
     def PluginBuiltinJsonCreator(def project, def variant, def cfg) {
         this.config = cfg
         this.variant = variant
-        //make sure processResources Task execute after mergeAssets Task
-        String mergeAssetsTaskName = variant.getVariantData().getScope().getMergeAssetsTask().name
-        //get real gradle task
-        def mergeAssetsTask = project.tasks.getByName(mergeAssetsTaskName)
-        fileDir = mergeAssetsTask.outputDir
+        //make sure processResources Task execute after mergeAssets Task, get real gradle task
+        fileDir = variant.getMergeAssets()?.outputDir
         fileName = config.builtInJsonFileName
     }
 
@@ -56,7 +53,7 @@ public class PluginBuiltinJsonCreator implements IFileCreator {
     @Override
     String getFileContent() {
         //查找插件文件并抽取信息,如果没有就直接返回null
-        File pluginDirFile = new File(fileDir.getAbsolutePath() + File.separator + config.pluginDir)
+        File pluginDirFile = new File(fileDir?.getAbsolutePath() + File.separator + config.pluginDir)
         if (!pluginDirFile.exists()) {
             println "${AppConstant.TAG} The ${pluginDirFile.absolutePath} does not exist "
             println "${AppConstant.TAG} pluginsInfo=null"