Skip to content

Commit 0e23a31

Browse files
authored
Use binary Mapbox NDK Plugin and remove dummy one from public (#2823)
1 parent eea9dff commit 0e23a31

File tree

8 files changed

+19
-59
lines changed

8 files changed

+19
-59
lines changed

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id("com.mapbox.gradle.application")
3-
id("com.mapbox.gradle.plugins.common.ndk")
3+
id("com.mapbox.gradle.plugins.ndk")
44
}
55

66
apply {

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ buildscript {
2525
classpath(libs.plugin.mapbox.accessToken)
2626
classpath(libs.plugin.mapbox.sdkRegistry)
2727
classpath(libs.plugin.mapbox.sdkVersions)
28+
classpath(libs.plugin.mapbox.ndk)
2829
classpath(libs.plugin.pitest)
2930
classpath(libs.plugin.playPublisher)
3031
classpath(libs.plugin.gradleVersions)

gradle/commonlibs.versions.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[versions]
2+
3+
# Mapbox NDK Gradle Plugin will read these versions to figure out what NDK versions are supported in
4+
# this codebase.
5+
defaultNdkMajor = "23"
6+
ndkMajor23 = "23.2.8568313"
7+
ndkMajor27 = "27.0.12077973"

gradle/libs.versions.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ pluginLicense = "0.9.0"
2020
pluginMapboxAccessToken = "0.4.0"
2121
pluginMapboxSdkRegistry = "1.2.5"
2222
pluginMapboxSdkVersions = "1.1.3"
23+
pluginMapboxNdk = "0.1.0"
2324
pluginPitest = "0.2.8"
2425
pluginTaskTree = "2.1.0"
2526
pluginPlayPublisher = "3.7.0"
@@ -103,6 +104,7 @@ plugin-japicmp = { module = "me.champeau.gradle:japicmp-gradle-plugin", version.
103104
plugin-mapbox-accessToken = { module = "com.mapbox.gradle.plugins:access-token", version.ref = "pluginMapboxAccessToken" }
104105
plugin-mapbox-sdkRegistry = { module = "com.mapbox.gradle.plugins:sdk-registry", version.ref = "pluginMapboxSdkRegistry" }
105106
plugin-mapbox-sdkVersions = { module = "com.mapbox.mapboxsdk:mapbox-android-sdk-versions", version.ref = "pluginMapboxSdkVersions" }
107+
plugin-mapbox-ndk = { module = "com.mapbox.gradle.plugins:ndk", version.ref = "pluginMapboxNdk" }
106108

107109
plugin-pitest = { module = "pl.droidsonroids.gradle:gradle-pitest-plugin", version.ref = "pluginPitest" }
108110
plugin-playPublisher = { module = "com.github.triplet.gradle:play-publisher", version.ref = "pluginPlayPublisher" }

mapbox-dummy-plugins/build.gradle.kts

Lines changed: 0 additions & 33 deletions
This file was deleted.

mapbox-dummy-plugins/settings.gradle.kts

Lines changed: 0 additions & 9 deletions
This file was deleted.

mapbox-dummy-plugins/src/main/kotlin/com/mapbox/gradle/plugins/DummyCommonNdkPlugin.kt

Lines changed: 0 additions & 15 deletions
This file was deleted.

settings.gradle.kts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,14 @@ pluginManagement {
55
mavenCentral()
66
}
77
includeBuild("mapbox-convention-plugin")
8-
includeBuild("mapbox-dummy-plugins")
8+
}
9+
10+
dependencyResolutionManagement {
11+
versionCatalogs {
12+
create("commonLibs") {
13+
from(files("gradle/commonlibs.versions.toml"))
14+
}
15+
}
916
}
1017

1118
include(

0 commit comments

Comments
 (0)