chore: migration to Catalogue

googlemaps · May 27, 2024 · e1edf8a · e1edf8a
1 parent f44f7b2
commit e1edf8a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,7 +21,7 @@ plugins {
 }
 
 android {
-    compileSdk versions.android.compileSdk
+    compileSdk libs.versions.androidCompileSdk.get().toInteger()
 
     defaultConfig {
         applicationId "com.google.maps.android.ktx.demo"

diff --git a/build.gradle b/build.gradle
@@ -15,25 +15,17 @@
  */
 
 buildscript {
-    ext.versions = [
-            'android'          : [
-                    "buildTools": "30.0.3",
-                    "compileSdk": 34,
-                    "minSdk"    : 19,
-                    "targetSdk" : 34
-            ]]
-
     repositories {
         gradlePluginPortal()
         google()
         mavenCentral()
     }
     dependencies {
         classpath libs.gradle
-        classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.9.20'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
+        classpath libs.dokkaGradlePlugin
+        classpath libs.kotlinGradlePlugin
         classpath libs.jacocoAndroid
-        classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
+        classpath libs.secretsGradlePlugin
     }
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,21 +6,24 @@ androidTargetSdk = "34"
 
 androidMapsUtils = "3.8.2"
 
-androidxAppcompat = "1.1.0"
-androidxCoreKtx = "1.2.0"
-androidxTest = "1.2.0"
-androidxJunit = "1.1.1"
+androidxAppcompat = "1.6.1"
+androidxCoreKtx = "1.13.1"
+androidxTest = "1.5.0"
+androidxJunit = "1.1.5"
 
+dokkaGradlePlugin = "1.9.20"
 gradle = "8.2.2"
 jacocoAndroid = "0.2.1"
-junit = "4.12"
+junit = "4.13.2"
 kotlin = "2.0.0"
+kotlinGradlePlugin = "1.9.20"
 kotlinxCoroutines = "1.6.0"
 lifecycleRuntimeKtx = "2.8.0"
 mockito = "3.8.0"
 mockitoInline = "5.2.0"
 mockitoKotlin = "2.2.0"
 androidMapsSdk = "18.2.0"
+secretsGradlePlugin = "2.0.1"
 
 [plugins]
 androidGradlePlugin = { id = "com.android.tools.build:gradle", version = "8.2.2" }
@@ -37,13 +40,16 @@ androidxCoreKtx = { group = "androidx.core", name = "core-ktx", version.ref = "a
 androidxTest = { group = "androidx.test", name = "core", version.ref = "androidxTest" }
 androidxJunit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxJunit" }
 
+dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokkaGradlePlugin" }
 gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
 jacocoAndroid = { module = "com.mxalbert.gradle:jacoco-android", version.ref = "jacocoAndroid" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
+kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" }
 kotlinStdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk7", version.ref = "kotlin" }
 kotlinxCoroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
 lifecycleRuntimeKtx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
 mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
 mockitoInline = { group = "org.mockito", name = "mockito-inline", version.ref = "mockitoInline" }
 mockitoKotlin = { group = "com.nhaarman.mockitokotlin2", name = "mockito-kotlin", version.ref = "mockitoKotlin" }
 playServicesMaps = { group = "com.google.android.gms", name = "play-services-maps", version.ref = "androidMapsSdk" }
+secretsGradlePlugin = { module = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin", version.ref = "secretsGradlePlugin" }
diff --git a/maps-ktx/build.gradle b/maps-ktx/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk versions.android.compileSdk
+    compileSdk libs.versions.androidCompileSdk.get().toInteger()
 
     defaultConfig {
         minSdkVersion libs.versions.androidMinSdk.get().toInteger()

diff --git a/maps-utils-ktx/build.gradle b/maps-utils-ktx/build.gradle
@@ -18,7 +18,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk versions.android.compileSdk
+    compileSdk libs.versions.androidCompileSdk.get().toInteger()
 
     defaultConfig {
         minSdkVersion libs.versions.androidMinSdk.get().toInteger()