Use binary Mapbox NDK Plugin and remove dummy one from public (#2823)

mapbox · Oct 28, 2024 · 0e23a31 · 0e23a31
1 parent eea9dff
commit 0e23a31
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 59 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
   id("com.mapbox.gradle.application")
-  id("com.mapbox.gradle.plugins.common.ndk")
+  id("com.mapbox.gradle.plugins.ndk")
 }
 
 apply {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,6 +25,7 @@ buildscript {
     classpath(libs.plugin.mapbox.accessToken)
     classpath(libs.plugin.mapbox.sdkRegistry)
     classpath(libs.plugin.mapbox.sdkVersions)
+    classpath(libs.plugin.mapbox.ndk)
     classpath(libs.plugin.pitest)
     classpath(libs.plugin.playPublisher)
     classpath(libs.plugin.gradleVersions)

diff --git a/gradle/commonlibs.versions.toml b/gradle/commonlibs.versions.toml
@@ -0,0 +1,7 @@
+[versions]
+
+# Mapbox NDK Gradle Plugin will read these versions to figure out what NDK versions are supported in
+# this codebase.
+defaultNdkMajor = "23"
+ndkMajor23 = "23.2.8568313"
+ndkMajor27 = "27.0.12077973"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,6 +20,7 @@ pluginLicense = "0.9.0"
 pluginMapboxAccessToken = "0.4.0"
 pluginMapboxSdkRegistry = "1.2.5"
 pluginMapboxSdkVersions = "1.1.3"
+pluginMapboxNdk = "0.1.0"
 pluginPitest = "0.2.8"
 pluginTaskTree = "2.1.0"
 pluginPlayPublisher = "3.7.0"
@@ -103,6 +104,7 @@ plugin-japicmp = { module = "me.champeau.gradle:japicmp-gradle-plugin", version.
 plugin-mapbox-accessToken = { module = "com.mapbox.gradle.plugins:access-token", version.ref = "pluginMapboxAccessToken" }
 plugin-mapbox-sdkRegistry = { module = "com.mapbox.gradle.plugins:sdk-registry", version.ref = "pluginMapboxSdkRegistry" }
 plugin-mapbox-sdkVersions = { module = "com.mapbox.mapboxsdk:mapbox-android-sdk-versions", version.ref = "pluginMapboxSdkVersions" }
+plugin-mapbox-ndk = { module = "com.mapbox.gradle.plugins:ndk", version.ref = "pluginMapboxNdk" }
 
 plugin-pitest = { module = "pl.droidsonroids.gradle:gradle-pitest-plugin", version.ref = "pluginPitest" }
 plugin-playPublisher = { module = "com.github.triplet.gradle:play-publisher", version.ref = "pluginPlayPublisher" }

diff --git a/mapbox-dummy-plugins/build.gradle.kts b/mapbox-dummy-plugins/build.gradle.kts
diff --git a/mapbox-dummy-plugins/settings.gradle.kts b/mapbox-dummy-plugins/settings.gradle.kts
diff --git a/mapbox-dummy-plugins/src/main/kotlin/com/mapbox/gradle/plugins/DummyCommonNdkPlugin.kt b/mapbox-dummy-plugins/src/main/kotlin/com/mapbox/gradle/plugins/DummyCommonNdkPlugin.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -5,7 +5,14 @@ pluginManagement {
     mavenCentral()
   }
   includeBuild("mapbox-convention-plugin")
-  includeBuild("mapbox-dummy-plugins")
+}
+
+dependencyResolutionManagement {
+  versionCatalogs {
+    create("commonLibs") {
+      from(files("gradle/commonlibs.versions.toml"))
+    }
+  }
 }
 
 include(