diff --git a/build.gradle.kts b/build.gradle.kts index 0a55a4f..5fc65d4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,18 +2,7 @@ import com.android.build.gradle.LibraryExtension import java.io.ByteArrayOutputStream plugins { - id("com.android.application") apply false - id("com.android.library") apply false -} - -buildscript { - repositories { - maven("https://plugins.gradle.org/m2/") - } - dependencies { - classpath("org.eclipse.jgit:org.eclipse.jgit:6.4.0.202211300538-r") - classpath("org.mozilla.rust-android-gradle:plugin:0.9.3") - } + alias(libs.plugins.agp.lib) apply false } fun String.execute(currentWorkingDir: File = file("./")): String { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..e143fe5 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,9 @@ +[versions] +agp = "8.1.2" +kotlin = "1.9.10" + +[plugins] +agp-lib = { id = "com.android.library", version.ref = "agp" } +kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +lsplugin-jgit = { id = "org.lsposed.lsplugin.jgit", version = "1.1" } +rust-android = { id = "org.mozilla.rust-android-gradle.rust-android", version = "0.9.3" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..7f93135 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b560697..3fa8f86 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/loader/build.gradle.kts b/loader/build.gradle.kts index 3f3d973..7e0b365 100644 --- a/loader/build.gradle.kts +++ b/loader/build.gradle.kts @@ -2,7 +2,7 @@ import java.nio.file.Paths import org.gradle.internal.os.OperatingSystem plugins { - id("com.android.library") + alias(libs.plugins.agp.lib) } fun Project.findInPath(executable: String, property: String): String? { diff --git a/module/build.gradle.kts b/module/build.gradle.kts index 39255fd..52b9c19 100644 --- a/module/build.gradle.kts +++ b/module/build.gradle.kts @@ -4,7 +4,7 @@ import org.apache.tools.ant.filters.ReplaceTokens import org.apache.tools.ant.filters.FixCrLfFilter plugins { - id("com.android.library") + alias(libs.plugins.agp.lib) } val moduleId: String by rootProject.extra diff --git a/settings.gradle.kts b/settings.gradle.kts index 80dc4f1..e0bb43f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,10 +6,6 @@ pluginManagement { mavenCentral() gradlePluginPortal() } - plugins { - id("com.android.library") version "8.1.0" - id("com.android.application") version "8.1.0" - } } dependencyResolutionManagement { diff --git a/zygiskd/build.gradle.kts b/zygiskd/build.gradle.kts index 7d07fdb..60b18a6 100644 --- a/zygiskd/build.gradle.kts +++ b/zygiskd/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.library") - id("org.mozilla.rust-android-gradle.rust-android") + alias(libs.plugins.agp.lib) + alias(libs.plugins.rust.android) } val verName: String by rootProject.extra