From bf1467a068b90f1f0db94a2f57c5afa498187345 Mon Sep 17 00:00:00 2001
From: Jim Wu <mlgmxyysd@meowcat.org>
Date: Mon, 6 Jan 2020 20:12:55 +0800
Subject: [PATCH] Remove useless file

---
 edxp-core/.gitignore   |  1 -
 edxp-core/build.gradle | 22 +++++-----------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/edxp-core/.gitignore b/edxp-core/.gitignore
index 64538351..b077bf8d 100644
--- a/edxp-core/.gitignore
+++ b/edxp-core/.gitignore
@@ -4,7 +4,6 @@
 /obj
 /release
 /template_override/module.prop
-/template_override/riru_module.prop
 /template_override/system
 /template_override/system_x86
 *.iml
\ No newline at end of file
diff --git a/edxp-core/build.gradle b/edxp-core/build.gradle
index 224a46c7..f07980b2 100644
--- a/edxp-core/build.gradle
+++ b/edxp-core/build.gradle
@@ -28,9 +28,9 @@ ext {
     yahfa_module_id = "riru_edxposed"
     sandhook_module_id = yahfa_module_id + "_sandhook"
     whale_module_id = yahfa_module_id + "_whale"
-    yahfa_authors = "solohsu, rk700 & MlgmXyysd"
-    sandhook_authors = "solohsu, ganyao114 & MlgmXyysd"
-    whale_authors = "solohsu, asLody & MlgmXyysd"
+    yahfa_authors = "solohsu, MlgmXyysd & rk700"
+    sandhook_authors = "solohsu, MlgmXyysd & ganyao114"
+    whale_authors = "solohsu, MlgmXyysd & asLody"
 
     riruModuleId = "edxp"
     zipPathMagiskRelease = "$buildDir/tmp/release/magisk"
@@ -148,11 +148,6 @@ afterEvaluate {
                                 versionCode: "$versionCode", authorList: "$authorList")
                         filter(FixCrLfFilter.class, eol: FixCrLfFilter.CrLf.newInstance("lf"))
                     }
-                    copy {
-                        from "${templateRootPath}/module.prop"
-                        into templateRootPath
-                        rename "module.prop", "riru_module.prop"
-                    }
                 }
                 def libPathRelease = "${buildDir}/intermediates/cmake/${variantLowered}/obj"
                 doLast {
@@ -169,10 +164,6 @@ afterEvaluate {
                                 .replaceAll('%BACKEND%', "$backendCapped") }
                         filter(FixCrLfFilter.class, eol: FixCrLfFilter.CrLf.newInstance("lf"))
                     }
-                    copy {
-                        from 'template_override/riru_module.prop'
-                        into "$zipPathMagiskRelease/data/misc/riru/modules/${riruModuleId}"
-                    }
                     copy {
                         from "$libPathRelease/armeabi-v7a"
                         into "$zipPathMagiskRelease/system/lib"
@@ -189,15 +180,12 @@ afterEvaluate {
                         from "$libPathRelease/x86_64"
                         into "$zipPathMagiskRelease/system_x86/lib64"
                     }
-
-                    file("$zipPathMagiskRelease/riru_module.prop").delete()
-                    file("$zipPathMagiskRelease/data/misc/riru/modules/${riruModuleId}/riru_module.prop").renameTo("$zipPathMagiskRelease/data/misc/riru/modules/${riruModuleId}/module.prop")
                 }
             }
 
             def zipTask = task("zip${backendCapped}${variantCapped}", type: Zip) {
                 dependsOn prepareMagiskFilesTask
-                archiveName "magisk-${module_name}-${backend}-${project.version}-${variantLowered}.zip"
+                archiveName "${module_name}-${backend}-${project.version}-${variantLowered}.zip"
                 destinationDir file("$projectDir/release")
                 from "$zipPathMagiskRelease"
             }
@@ -206,7 +194,7 @@ afterEvaluate {
                 dependsOn zipTask
                 workingDir "${projectDir}/release"
                 def commands = ["adb", "push",
-                                "magisk-${module_name}-${backend}-${project.version}-${variantLowered}.zip",
+                                "${module_name}-${backend}-${project.version}-${variantLowered}.zip",
                                 "/sdcard/"]
                 if (is_windows) {
                     commandLine 'cmd', '/c', commands.join(" ")