Maps SDK Android integration to build flow (#3160)

GitOrigin-RevId: d11a5a916cf734bbd7ad45236b1611bd5c5e355c

Author: natiginfo

LICENSE.md

@@ -1,6 +1,6 @@
 ### License
 
-Mapbox Maps for Android version 11.0
+Mapbox Maps for Android version 11.13.0-SNAPSHOT-04-17--04-29.git-884495a
 Mapbox Maps Android SDK
 
 Copyright © 2021 - 2025 Mapbox, Inc. All rights reserved.
@@ -482,7 +482,7 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 
 ===========================================================================
 
-### MapboxCoreMaps,11.12.0-beta.1,Mapbox ToS,Mapbox,https://www.mapbox.com/
+### MapboxCoreMaps,11.13.0-SNAPSHOT-04-17--04-29.git-884495a,Mapbox ToS,Mapbox,https://www.mapbox.com/
 
 ```
 Mapbox Core Maps version 11.0

Makefile

@@ -1,7 +1,6 @@
 .PHONY: check
 check:
 	./gradlew ktlint lint;
-	python scripts/license-validate.py;
 	./gradlew clean dokkaHtml -Pmapbox.dokkaHtmlFlavor=release
 
 .PHONY: test

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=11.12.0-SNAPSHOT
+VERSION_NAME=11.13.0-SNAPSHOT-04-17--04-29.git-884495a
 
 # Project-wide Gradle settings.
 # IDE (e.g. Android Studio) users:

gradle/libs.versions.toml

@@ -18,7 +18,7 @@ pluginJacoco = "0.8.12"
 pluginGradle = "7.4.2"
 pluginLicense = "0.9.0"
 pluginMapboxAccessToken = "0.4.0"
-pluginMapboxSdkRegistry = "1.2.5"
+pluginMapboxSdkRegistry = "1.3.3"
 pluginMapboxSdkVersions = "1.1.3"
 pluginMapboxNdk = "0.1.0"
 pluginPitest = "0.2.8"
@@ -35,8 +35,8 @@ japicmp = "0.4.1"
 # Dependencies
 
 # GlNative and Common are used by the convention plugin
-mapboxGlNative = "11.12.0-beta.1"
-mapboxCommon = "24.12.0-beta.1"
+mapboxGlNative = "11.13.0-SNAPSHOT-04-17--04-29.git-884495a"
+mapboxCommon = "24.13.0-SNAPSHOT-04-17--04-29.git-884495a"
 
 mapboxBase = "0.11.0"
 mapboxGestures = "0.8.0"

mapbox-convention-plugin/src/main/kotlin/com/mapbox/maps/gradle/plugins/internal/GradleExt.kt

@@ -36,9 +36,18 @@ internal fun <T> ListProperty<T>.setDisallowChanges(value: List<T>?) {
  */
 internal fun Project.appendNdkIfNeeded(value: String): String {
   val ndkMajor: String? = project.findProperty("ndkMajor")?.toString()
-  return if (ndkMajor != null) {
+  return if (ndkMajor != null && ndkMajor != findDefaultNdkMajor()) {
     "$value-ndk$ndkMajor"
   } else {
     value
   }
-}
+}
+
+/**
+ * @return the `defaultNdkMajor` version defined `projects/common/platform/android/gradle/libs.versions.toml`.
+ */
+private fun Project.findDefaultNdkMajor(): String =
+  getVersionCatalog().findVersion("defaultNdkMajor").get().toString()
+
+private fun Project.getVersionCatalog() =
+  extensions.getByType(VersionCatalogsExtension::class.java).named("commonLibs")