fix: replace plugin ids with aliases and remove redundant kotlin-android plugin

Author: dkhawk

app/build.gradle.kts

@@ -16,7 +16,6 @@
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.secrets.gradle.plugin)
 }
 

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

@@ -43,9 +43,7 @@ class PublishingConventionPlugin : Plugin<Project> {
         extensions.configure<MavenPublishBaseExtension> {
             configure(
                 AndroidSingleVariantLibrary(
-                    variant = "release",
-                    sourcesJar = true,
-                    publishJavadocJar = true
+                    variant = "release"
                 )
             )
 

build.gradle.kts

@@ -16,8 +16,7 @@
 
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
-    id("org.jetbrains.dokka") version "2.1.0"
+    alias(libs.plugins.dokka) apply false
     alias(libs.plugins.gradle.maven.publish) apply false
     alias(libs.plugins.secrets.gradle.plugin) apply false
 }

docs/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     kotlin("jvm") apply false
-    id("org.jetbrains.dokka")
+    alias(libs.plugins.dokka)
 }
 
 dependencies {

gradle.properties

@@ -16,7 +16,7 @@ org.gradle.jvmargs=-Xmx1536m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+# android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
@@ -25,18 +25,20 @@ kotlin.code.style=official
 signing.keyId=
 signing.password=
 signing.secretKeyRingFile=
-android.defaults.buildfeatures.buildconfig=true
 
 mavenCentralUsername=
 mavenCentralPassword=
 
 # Migration to AGP 8.2.1
 android.nonTransitiveRClass=false
-android.nonFinalResIds=false
 
 # Despite being deprecated, targeting lowest java version is needed to support old Android runtime
 android.javaCompile.suppressSourceTargetDeprecationWarning=true
 
 # Add a property to enable automatic release to Maven Central (optional, but good for CI)
 # If true, publishToMavenCentral will also close and release the staging repository
-mavenCentralAutomaticRelease=false
+mavenCentralAutomaticRelease=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false

gradle/libs.versions.toml

@@ -32,7 +32,7 @@ truth = "1.4.5"
 
 # --- Gradle Plugins ---
 # Versions for Gradle plugins used in the build process.
-agp = "8.13.2"
+agp = "9.0.1"
 dokkaGradlePlugin = "2.1.0"
 gradleMavenPublishPlugin = "0.36.0"
 jacocoAndroidGradlePlugin = "0.2.1"

maps-ktx/build.gradle.kts

@@ -16,9 +16,8 @@
  */
 
 plugins {
-    alias(libs.plugins.kotlin.android)
     id("android.maps.ktx.PublishingConventionPlugin")
-    id("org.jetbrains.dokka")
+    alias(libs.plugins.dokka)
 }
 
 android {
@@ -82,22 +81,23 @@ val generateArtifactIdFile = tasks.register("generateArtifactIdFile") {
     val outputDir = layout.buildDirectory.dir("generated/source/artifactId")
     val packageName = "com.google.maps.android.ktx.utils.meta"
     val packagePath = packageName.replace('.', '/')
-    val outputFile = outputDir.get().file("$packagePath/ArtifactId.kt").asFile
+    val outputFile = outputDir.get().file("$packagePath/AttributionId.java").asFile
 
     outputs.file(outputFile)
 
     doLast {
         outputFile.parentFile.mkdirs()
         outputFile.writeText(
             """
-            package $packageName
+            package $packageName;
 
             /**
              * Automatically generated object containing the library's attribution ID.
              * This is used to track library usage for analytics.
              */
-            public object AttributionId {
-                public const val VALUE: String = "$attributionId"
+            public final class AttributionId {
+                public static final String VALUE = "$attributionId";
+                private AttributionId() {}
             }
             """.trimIndent()
         )

maps-utils-ktx/build.gradle.kts

@@ -15,9 +15,8 @@
  */
 
 plugins {
-    alias(libs.plugins.kotlin.android)
     id("android.maps.ktx.PublishingConventionPlugin")
-    id("org.jetbrains.dokka")
+    alias(libs.plugins.dokka)
 }
 
 android {