From de1dd6cdcf8e5987f3035f3040a03198a2e8c03f Mon Sep 17 00:00:00 2001
From: kotori0 <admin@0x.mk>
Date: Fri, 11 Dec 2020 14:27:47 +0800
Subject: [PATCH] Fix gradle errors

---
 edxp-common/build.gradle      | 4 ++--
 edxp-core/build.gradle        | 4 ++--
 edxp-sandhook/build.gradle    | 4 ++--
 edxp-service/build.gradle     | 4 ++--
 edxp-yahfa/build.gradle       | 4 ++--
 gradle.properties             | 6 +++---
 sandhook-hooklib/build.gradle | 8 +++-----
 7 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/edxp-common/build.gradle b/edxp-common/build.gradle
index 01a708ed..9a804dda 100644
--- a/edxp-common/build.gradle
+++ b/edxp-common/build.gradle
@@ -4,8 +4,8 @@ android {
     compileSdkVersion androidCompileSdkVersion.toInteger()
 
     defaultConfig {
-        minSdkVersion minSdkVersion
-        targetSdkVersion targetSdkVersion
+        minSdkVersion androidMinSdkVersion.toInteger()
+        targetSdkVersion androidTargetSdkVersion.toInteger()
         versionCode 1
         versionName "1.0"
     }
diff --git a/edxp-core/build.gradle b/edxp-core/build.gradle
index 20aa1baf..e5a9205c 100644
--- a/edxp-core/build.gradle
+++ b/edxp-core/build.gradle
@@ -60,8 +60,8 @@ dependencies {
 android {
     compileSdkVersion androidCompileSdkVersion.toInteger()
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        minSdkVersion androidMinSdkVersion.toInteger()
+        targetSdkVersion androidTargetSdkVersion.toInteger()
 
         buildFeatures {
             prefab true
diff --git a/edxp-sandhook/build.gradle b/edxp-sandhook/build.gradle
index 65a339e8..93f34878 100644
--- a/edxp-sandhook/build.gradle
+++ b/edxp-sandhook/build.gradle
@@ -8,8 +8,8 @@ android {
 
     defaultConfig {
         applicationId "com.elderdrivers.riru.edxp.sandhook"
-        minSdkVersion minSdkVersion
-        targetSdkVersion targetSdkVersion
+        minSdkVersion androidMinSdkVersion.toInteger()
+        targetSdkVersion androidTargetSdkVersion.toInteger()
         versionCode 1
         versionName "1.0"
         multiDexEnabled false
diff --git a/edxp-service/build.gradle b/edxp-service/build.gradle
index b93169ce..4ff94376 100644
--- a/edxp-service/build.gradle
+++ b/edxp-service/build.gradle
@@ -8,8 +8,8 @@ android {
 
     defaultConfig {
         applicationId "com.elderdrivers.riru.edxp.yahfa"
-        minSdkVersion minSdkVersion
-        targetSdkVersion targetSdkVersion
+        minSdkVersion androidMinSdkVersion.toInteger()
+        targetSdkVersion androidTargetSdkVersion.toInteger()
         versionCode 1
         versionName "1.0"
         multiDexEnabled false
diff --git a/edxp-yahfa/build.gradle b/edxp-yahfa/build.gradle
index 892c9c75..d3c2aa20 100644
--- a/edxp-yahfa/build.gradle
+++ b/edxp-yahfa/build.gradle
@@ -8,8 +8,8 @@ android {
 
     defaultConfig {
         applicationId "com.elderdrivers.riru.edxp.yahfa"
-        minSdkVersion minSdkVersion
-        targetSdkVersion targetSdkVersion
+        minSdkVersion androidMinSdkVersion.toInteger()
+        targetSdkVersion androidTargetSdkVersion.toInteger()
         versionCode 1
         versionName "1.0"
         multiDexEnabled false
diff --git a/gradle.properties b/gradle.properties
index 0950a45a..f5332393 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 androidCompileSdkVersion=30
+androidMinSdkVersion=26
+androidTargetSdkVersion=30
 androidCompileNdkVersion=22.0.6917172
 android.prefabVersion=1.1.2
-apiCode=93
-minSdkVersion=26
-targetSdkVersion=30
\ No newline at end of file
+apiCode=93
\ No newline at end of file
diff --git a/sandhook-hooklib/build.gradle b/sandhook-hooklib/build.gradle
index 588010a4..c75ec3ff 100644
--- a/sandhook-hooklib/build.gradle
+++ b/sandhook-hooklib/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion targetSdkVersion
+    compileSdkVersion androidCompileSdkVersion.toInteger()
 
     defaultConfig {
-        minSdkVersion minSdkVersion
-        targetSdkVersion targetSdkVersion
+        minSdkVersion androidMinSdkVersion.toInteger()
+        targetSdkVersion androidTargetSdkVersion.toInteger()
         versionCode 1
         versionName "1.0"
 
@@ -47,14 +47,12 @@ afterEvaluate {
         task("copySandHook${variantNameCapped}LibraryToMagiskTemplate") {
             def libPathRelease = "${buildDir}/intermediates/cmake/${variantNameLowered}/obj"
             doLast {
-                project.logger.lifecycle(libPathRelease)
                 copy {
                     include "libsandhook.edxp.so"
                     from "${libPathRelease}/armeabi-v7a"
                     into "${zipPathMagiskReleasePath}/system/lib"
                 }
                 copy {
-                    project.logger.lifecycle(zipPathMagiskReleasePath)
                     include "libsandhook.edxp.so"
                     from "${libPathRelease}/arm64-v8a"
                     into "${zipPathMagiskReleasePath}/system/lib64"