From 255d7ed399e011c3f928c64a63ce432f97fa49d2 Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Tue, 16 Apr 2024 20:40:41 +0200 Subject: [PATCH] Use Gradle version catalog for plugins (#2268) --- .github/dependabot.yml | 2 +- platform/android/MapLibreAndroid/build.gradle | 4 ++-- platform/android/MapLibreAndroidLint/build.gradle | 2 +- platform/android/MapLibreAndroidTestApp/build.gradle | 4 ++-- platform/android/build.gradle | 11 +++++------ platform/android/gradle/libs.versions.toml | 11 ++++++++++- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 02e2c58a3..7d1e1d662 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,6 +10,6 @@ updates: schedule: interval: 'daily' - package-ecosystem: 'gradle' - directory: '/' + directory: '/platform/android' schedule: interval: 'daily' \ No newline at end of file diff --git a/platform/android/MapLibreAndroid/build.gradle b/platform/android/MapLibreAndroid/build.gradle index 2e234c769..8ca2875d6 100644 --- a/platform/android/MapLibreAndroid/build.gradle +++ b/platform/android/MapLibreAndroid/build.gradle @@ -1,8 +1,8 @@ import org.jetbrains.dokka.gradle.DokkaTask plugins { - id 'org.jmailen.kotlinter' - id 'org.jetbrains.dokka' version '1.7.20' + alias libs.plugins.kotlinter + alias libs.plugins.dokka } apply plugin: 'com.android.library' diff --git a/platform/android/MapLibreAndroidLint/build.gradle b/platform/android/MapLibreAndroidLint/build.gradle index 8be192bd9..023b3f8d4 100644 --- a/platform/android/MapLibreAndroidLint/build.gradle +++ b/platform/android/MapLibreAndroidLint/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.jmailen.kotlinter' + alias libs.plugins.kotlinter } apply plugin: 'java-library' diff --git a/platform/android/MapLibreAndroidTestApp/build.gradle b/platform/android/MapLibreAndroidTestApp/build.gradle index b230d055d..60b721420 100644 --- a/platform/android/MapLibreAndroidTestApp/build.gradle +++ b/platform/android/MapLibreAndroidTestApp/build.gradle @@ -1,8 +1,8 @@ plugins { - id 'org.jmailen.kotlinter' + alias libs.plugins.kotlinter id 'com.android.application' id 'org.jetbrains.kotlin.android' - id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.21' + alias libs.plugins.kotlinPluginSerialization } apply from: "${rootDir}/gradle/native-build.gradle" diff --git a/platform/android/build.gradle b/platform/android/build.gradle index 196353c9c..697ae39c9 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -7,18 +7,17 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.4' + classpath libs.androidGradlePlugin classpath libs.licensesPlugin - // classpath dependenciesList.jacocoPlugin classpath libs.gradleNexus - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" + classpath libs.kotlinPlugin } } plugins { - id("io.github.gradle-nexus.publish-plugin") version "1.1.0" - id("org.jmailen.kotlinter") version "3.13.0" apply false - id 'org.jetbrains.kotlin.android' version '1.9.21' apply false + alias libs.plugins.nexusPublishPlugin + alias libs.plugins.kotlinter apply false + alias libs.plugins.kotlinAndroid apply false } allprojects { diff --git a/platform/android/gradle/libs.versions.toml b/platform/android/gradle/libs.versions.toml index 1912ebd88..e70d1667e 100644 --- a/platform/android/gradle/libs.versions.toml +++ b/platform/android/gradle/libs.versions.toml @@ -32,6 +32,7 @@ androidxTestExtJUnit = "1.1.5" androidxTestCoreKtx = "1.5.0" kotlinxSerializationJson = "1.6.0" +androidGradlePlugin = "8.1.4" [libraries] maplibreJavaGeoJSON = { group = "org.maplibre.gl", name = "android-sdk-geojson", version.ref = "mapLibreServices" } @@ -80,4 +81,12 @@ androidxTestExtJUnit = { group = "androidx.test.ext", name = "junit", version = androidxTestCoreKtx = { group = "androidx.test", name = "core-ktx", version = "1.5.0" } kotlinxSerializationJson = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.6.0" } -[plugins] \ No newline at end of file +androidGradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin"} + + +[plugins] +nexusPublishPlugin = { id = "io.github.gradle-nexus.publish-plugin", version = "1.1.0" } +kotlinter = { id = "org.jmailen.kotlinter", version = "3.13.0" } +kotlinAndroid = { id = "org.jetbrains.kotlin.android", version = "1.9.21" } +dokka = { id = "org.jetbrains.dokka", version = "1.7.20" } +kotlinPluginSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version = "1.9.21" } \ No newline at end of file