Modernize Android Gradle plugin application

evilcorpltd · Apr 13, 2022 · 568b102 · 568b102
1 parent 33dba20
commit 568b102
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,17 +3,8 @@ plugins {
     alias(libs.plugins.versions)
     id(BuildPlugin.kotlinAndroid) version kotlinVersion apply false
     id(BuildPlugin.kotlinKapt) version kotlinVersion apply false
-}
-
-buildscript {
-    repositories {
-        mavenLocal()
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath(BuildPlugin.gradle)
-    }
+    id(BuildPlugin.androidLibrary) version androidPluginVersion apply false
+    id(BuildPlugin.androidApplication) version androidPluginVersion apply false
 }
 
 tasks.register("clean").configure {

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,16 +1,11 @@
 const val kotlinVersion = "1.6.20"
+const val androidPluginVersion = "7.1.3"
 
 object BuildPlugin {
-    private object Version {
-        const val gradle = "7.1.3"
-    }
-
     const val androidApplication = "com.android.application"
     const val androidLibrary = "com.android.library"
     const val kotlinAndroid = "org.jetbrains.kotlin.android"
     const val kotlinKapt = "org.jetbrains.kotlin.kapt"
-
-    const val gradle = "com.android.tools.build:gradle:${Version.gradle}"
 }
 
 object AndroidSdk {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,6 +8,15 @@ dependencyResolutionManagement {
     }
 }
 
+pluginManagement {
+    repositories {
+        mavenLocal()
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+
 include(":atox")
 include(":core")
 include(":domain")