feat: adjusted dependencies

.github/workflows/docs.yml

@@ -32,7 +32,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up JDK
-      uses: actions/setup-java@v4.2.1
+      uses: actions/setup-java@v4.5.0
       with:
         java-version: '21'
         distribution: 'temurin'

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Set up JDK
-      uses: actions/setup-java@v4.2.1
+      uses: actions/setup-java@v4.5.0
       with:
         java-version: '21'
         distribution: 'temurin'

.github/workflows/test.yml

@@ -38,7 +38,7 @@ jobs:
       uses: gradle/actions/wrapper-validation@v4
 
     - name: Set up JDK
-      uses: actions/setup-java@v4.2.1
+      uses: actions/setup-java@v4.5.0
       with:
         java-version: '21'
         distribution: 'temurin'

.releaserc

@@ -6,7 +6,7 @@ plugins:
   - - "@google/semantic-release-replace-plugin"
     - replacements:
         - files:
-            - "build.gradle"
+            - "build.gradle.kts"
           from: "\\bversion = '.*'"
           to: "version = '${nextRelease.version}'"
         - files:
@@ -18,7 +18,7 @@ plugins:
       publishCmd: "./gradlew publish --warn --stacktrace"
   - - "@semantic-release/git"
     - assets:
-        - "build.gradle"
+        - "build.gradle.kts"
         - "*.md"
   - "@semantic-release/github"
 options:

build-logic/convention/build.gradle.kts

@@ -10,16 +10,16 @@ repositories {
 
 
 dependencies {
-    implementation(libs.kotlin.gradle.plugin)
-    implementation(libs.android.gradle.plugin)
-    implementation(libs.dokka.plugin)
+    implementation(libs.kotlinGradlePlugin)
+    implementation(libs.gradle)
+    implementation(libs.dokkaGradlePlugin)
     implementation(libs.org.jacoco.core)
 }
 
 gradlePlugin {
     plugins {
         register("publishingConventionPlugin") {
-            id = "android.maps.compose.PublishingConventionPlugin"
+            id = "android.maps.ktx.PublishingConventionPlugin"
             implementationClass = "PublishingConventionPlugin"
         }
     }

build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt

@@ -61,11 +61,11 @@ class PublishingConventionPlugin : Plugin<Project> {
                     pom {
                         name.set(project.name)
                         description.set("Jetpack Compose components for the Maps SDK for Android")
-                        url.set("https://github.com/googlemaps/android-maps-compose")
+                        url.set("https://github.com/googlemaps/android-maps-ktx")
                         scm {
-                            connection.set("scm:[email protected]:googlemaps/android-maps-compose.git")
-                            developerConnection.set("scm:[email protected]:googlemaps/android-maps-compose.git")
-                            url.set("https://github.com/googlemaps/android-maps-compose")
+                            connection.set("scm:[email protected]:googlemaps/android-maps-ktx.git")
+                            developerConnection.set("scm:[email protected]:googlemaps/android-maps-ktx.git")
+                            url.set("https://github.com/googlemaps/android-maps-ktx")
                         }
                         licenses {
                             license {

build.gradle.kts

@@ -54,13 +54,6 @@ allprojects {
     group = "com.google.maps.android"
     version = "5.1.1"
     val projectArtifactId by extra { project.name }
-    repositories {
-        google()
-        mavenCentral()
-        flatDir {
-            dirs("libs")
-        }
-    }
 }
 
 tasks.register<Delete>("clean") {

gradle/libs.versions.toml

@@ -20,6 +20,8 @@ kotlinGradlePlugin = "1.9.20"
 mockitoInline = "5.2.0"
 mockitoKotlin = "2.2.0"
 secretsGradlePlugin = "2.0.1"
+org-jacoco-core = "0.8.11"
+agp = "8.7.2"
 
 [libraries]
 androidMapsUtils = { group = "com.google.maps.android", name = "android-maps-utils", version.ref = "androidMapsUtils" }
@@ -40,6 +42,7 @@ mockitoInline = { group = "org.mockito", name = "mockito-inline", version.ref =
 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" }
+org-jacoco-core = { module = "org.jacoco:org.jacoco.core", version.ref = "org-jacoco-core" }
 
 [plugins]
 androidGradlePlugin = { id = "com.android.tools.build:gradle", version = "8.2.2" }

maps-ktx/build.gradle.kts

@@ -18,6 +18,7 @@
 plugins {
     id("com.android.library")
     id("kotlin-android")
+    id("android.maps.ktx.PublishingConventionPlugin")
 }
 
 android {
@@ -29,7 +30,6 @@ android {
 
     defaultConfig {
         minSdk = libs.versions.androidMinSdk.get().toInt()
-        targetSdk = libs.versions.androidTargetSdk.get().toInt()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }

maps-utils-ktx/build.gradle.kts

@@ -17,6 +17,7 @@
 plugins {
     id("com.android.library")
     id("kotlin-android")
+    id("android.maps.ktx.PublishingConventionPlugin")
 }
 
 android {

settings.gradle.kts

@@ -1,4 +1,21 @@
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+pluginManagement {
+    includeBuild("build-logic")
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+rootProject.name = "android-maps-ktx"
+
 include(":app")
 include(":maps-ktx")
-include(":maps-utils-ktx")
-rootProject.name = "android-maps-ktx"
+include(":maps-utils-ktx")