From 3f769e51e875100932433a60478ff58ebfa94a29 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Sun, 13 Dec 2020 14:02:21 +0800
Subject: [PATCH] Revert Gradle changes

---
 edxp-sandhook/build.gradle | 15 ++++++---------
 edxp-yahfa/build.gradle    | 16 +++++-----------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/edxp-sandhook/build.gradle b/edxp-sandhook/build.gradle
index 974a748c..2dffc4d5 100644
--- a/edxp-sandhook/build.gradle
+++ b/edxp-sandhook/build.gradle
@@ -59,21 +59,18 @@ afterEvaluate {
         def variantNameLowered = variant.name.toLowerCase()
         def myTemplatePath = "${projectDir}/template_override/"
 
-        task "copyDex${variantNameCapped}" {
+        task("copyDex${variantNameCapped}", type: Copy) {
             dependsOn "assemble${variantNameCapped}"
             dependsOn tasks.getByPath(":edxp-common:copyCommonProperties")
             dependsOn tasks.getByPath(":sandhook-hooklib:copySandHook${variantNameCapped}LibraryToMagiskTemplate")
             def dexOutPath = variant.name.contains("release") ?
                     "${buildDir}/intermediates/dex/${variantNameLowered}/minify${variantNameCapped}WithR8" :
                     "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}"
-            doLast  {
-                project.logger.lifecycle("copyDex${variantNameCapped}")
-                copy {
-                    from(dexOutPath) {
-                        rename "classes.dex", "edxp.dex"
-                    }
-                    into myTemplatePath + "system/framework/"
-                }
+            from(dexOutPath) {
+                rename "classes.dex", "edxp.dex"
+            }
+            destinationDir file(zipPathMagiskReleasePath + "system/framework/")
+            doLast {
                 copy {
                     from file(myTemplatePath)
                     into file(zipPathMagiskReleasePath)
diff --git a/edxp-yahfa/build.gradle b/edxp-yahfa/build.gradle
index 7a7e1d8a..f5996d63 100644
--- a/edxp-yahfa/build.gradle
+++ b/edxp-yahfa/build.gradle
@@ -57,23 +57,17 @@ afterEvaluate {
         def variantNameCapped = variant.name.capitalize()
         def variantNameLowered = variant.name.toLowerCase()
 
-        task "copyDex${variantNameCapped}" {
+        task("copyDex${variantNameCapped}", type: Copy) {
             dependsOn "assemble${variantNameCapped}"
             dependsOn tasks.getByPath(":edxp-common:copyCommonProperties")
             def dexOutPath = variant.name.contains("release") ?
                     "${buildDir}/intermediates/dex/${variantNameLowered}/minify${variantNameCapped}WithR8" :
                     "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}"
-
-            outputs.upToDateWhen { false }
-            doLast {
-                project.logger.lifecycle("copyDex${variantNameCapped}")
-                copy {
-                    from (dexOutPath){
-                        rename("classes.dex", "edxp.dex")
-                    }
-                    into file(zipPathMagiskReleasePath + "/system/framework/")
-                }
+            from (dexOutPath){
+                rename("classes.dex", "edxp.dex")
             }
+            destinationDir file(zipPathMagiskReleasePath + "system/framework/")
+            outputs.upToDateWhen { false }
         }
 
     }