diff --git a/app/apk/build.gradle.kts b/app/apk/build.gradle.kts index f3301097c..56241df8f 100644 --- a/app/apk/build.gradle.kts +++ b/app/apk/build.gradle.kts @@ -1,8 +1,8 @@ plugins { id("com.android.application") kotlin("plugin.parcelize") - id("com.android.legacy-kapt") - id("androidx.navigation.safeargs.kotlin") + alias(libs.plugins.legacy.kapt) + alias(libs.plugins.navigation.safeargs) } setupMainApk() diff --git a/app/buildSrc/build.gradle.kts b/app/buildSrc/build.gradle.kts index 80cae8093..ee770f35e 100644 --- a/app/buildSrc/build.gradle.kts +++ b/app/buildSrc/build.gradle.kts @@ -19,10 +19,5 @@ gradlePlugin { dependencies { implementation(kotlin("gradle-plugin", libs.versions.kotlin.get())) implementation(libs.android.gradle.plugin) - implementation(libs.android.kapt.plugin) - implementation(libs.ksp.plugin) - implementation(libs.navigation.safe.args.plugin) - implementation(libs.lsparanoid.plugin) - implementation(libs.moshi.plugin) implementation(libs.jgit) } diff --git a/app/core/build.gradle.kts b/app/core/build.gradle.kts index 3e47b9208..c907a1216 100644 --- a/app/core/build.gradle.kts +++ b/app/core/build.gradle.kts @@ -1,8 +1,8 @@ plugins { id("com.android.library") kotlin("plugin.parcelize") - id("dev.zacsweers.moshix") - id("com.google.devtools.ksp") + alias(libs.plugins.moshix) + alias(libs.plugins.ksp) } setupCoreLib() diff --git a/app/gradle/libs.versions.toml b/app/gradle/libs.versions.toml index 476f97ebc..5f8c4a23e 100644 --- a/app/gradle/libs.versions.toml +++ b/app/gradle/libs.versions.toml @@ -59,10 +59,10 @@ rikka-insets = { module = "dev.rikka.rikkax.insets:insets", version.ref = "rikka # Build plugins android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "android" } -android-kapt-plugin = { module = "com.android.legacy-kapt:com.android.legacy-kapt.gradle.plugin", version.ref = "android" } -ksp-plugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" } -navigation-safe-args-plugin = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "navigation" } -lsparanoid-plugin = { module = "org.lsposed.lsparanoid:gradle-plugin", version = "0.6.0" } -moshi-plugin = { module = "dev.zacsweers.moshix:dev.zacsweers.moshix.gradle.plugin", version = "0.34.4" } [plugins] +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +lsparanoid = { id = "org.lsposed.lsparanoid", version = "0.6.0" } +moshix = { id = "dev.zacsweers.moshix", version = "0.34.4" } +legacy-kapt = { id = "com.android.legacy-kapt", version.ref = "android" } +navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } diff --git a/app/settings.gradle.kts b/app/settings.gradle.kts index 6c8856455..836ef936d 100644 --- a/app/settings.gradle.kts +++ b/app/settings.gradle.kts @@ -7,5 +7,13 @@ dependencyResolutionManagement { maven("https://jitpack.io") } } + +pluginManagement { + repositories { + gradlePluginPortal() + google() + } +} + rootProject.name = "Magisk" include(":apk", ":core", ":shared", ":stub", ":test") diff --git a/app/stub/build.gradle.kts b/app/stub/build.gradle.kts index 154ec61cb..a4e665bd9 100644 --- a/app/stub/build.gradle.kts +++ b/app/stub/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("com.android.application") - id("org.lsposed.lsparanoid") + alias(libs.plugins.lsparanoid) } lsparanoid {