From 29d4adca9e77c5e598bb767fdc7e99ca7564c87a Mon Sep 17 00:00:00 2001
From: snake-4 <18491360+snake-4@users.noreply.github.com>
Date: Mon, 22 Apr 2024 01:57:38 +0200
Subject: [PATCH] Changes to build system

---
 build.gradle.kts                         | 3 +--
 gradle/libs.versions.toml                | 5 -----
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 module/build.gradle.kts                  | 7 ++-----
 settings.gradle.kts                      | 4 +---
 5 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 gradle/libs.versions.toml

diff --git a/build.gradle.kts b/build.gradle.kts
index 4d348cb..087d584 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 import java.io.ByteArrayOutputStream
 
 plugins {
-    alias(libs.plugins.agp.lib) apply false
+    id("com.android.library") version "8.3.2" apply false
 }
 
 val commitHash: String by extra {
@@ -17,4 +17,3 @@ val moduleId by extra("zygisk-assistant")
 val moduleName by extra("Zygisk Assistant")
 val verName by extra("v2.0.4")
 val verCode by extra(204)
-val abiList by extra(listOf("armeabi-v7a","arm64-v8a","x86","x86_64"))
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
deleted file mode 100644
index 1d1cab1..0000000
--- a/gradle/libs.versions.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[versions]
-agp = "8.3.2"
-
-[plugins]
-agp-lib = { id = "com.android.library", version.ref = "agp" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e7646de..b82aa23 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/module/build.gradle.kts b/module/build.gradle.kts
index 874cb69..ff69599 100644
--- a/module/build.gradle.kts
+++ b/module/build.gradle.kts
@@ -1,7 +1,7 @@
 import android.databinding.tool.ext.capitalizeUS
 
 plugins {
-    alias(libs.plugins.agp.lib)
+    id("com.android.library")
 }
 
 val moduleId: String by rootProject.extra
@@ -13,12 +13,9 @@ val abiList: List<String> by rootProject.extra
 
 android {
     namespace = "com.example.library"
-    compileSdkVersion = "android-34"
+    compileSdkVersion = "android-31"
     defaultConfig {
         minSdk = 21
-        ndk {
-            abiFilters.addAll(abiList)
-        }
         externalNativeBuild {
             ndkBuild {
                 arguments("-j${Runtime.getRuntime().availableProcessors()}")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9bf84ad..0dc78ce 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,6 +14,4 @@ dependencyResolutionManagement {
     }
 }
 
-include(
-    ":module"
-)
+include(":module")