Skip to content

Commit 6e7063c

Browse files
DzmitryFomchyngithub-actions[bot]
DzmitryFomchyn
authored and
github-actions[bot]
committed
NDK 27 artifact (#9556)
* Configure NDK 27 artifact * Bump SDK registry plugin, add config for NDK27 publishing * Bump SDK registry plugin * Revert Search SDK version to 2.14.0-32f22cd-SNAPSHOT GitOrigin-RevId: ff273695294ec1989f95641db17effd6d19672ac
1 parent 9656c4c commit 6e7063c

File tree

4 files changed

+66
-50
lines changed

4 files changed

+66
-50
lines changed

‎Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,17 @@ prepare-ui-coverage-reports: ui-unit-tests-release-jacoco
197197
.PHONY: publish-local
198198
publish-local:
199199
./gradlew publishToMavenLocal
200+
./gradlew publishToMavenLocal -PndkMajor=27
200201

201202
.PHONY: upload-to-sdk-registry-snapshot
202203
upload-to-sdk-registry-snapshot:
203-
./gradlew mapboxSDKRegistryUpload -Psnapshot=true -PVERSION_NAME=$(VERSION_NAME);
204+
./gradlew mapboxSDKRegistryUpload -Psnapshot=true -PVERSION_NAME=$(VERSION_NAME)
205+
./gradlew mapboxSDKRegistryUpload -Psnapshot=true -PVERSION_NAME=$(VERSION_NAME) -PndkMajor=27
204206

205207
.PHONY: upload-to-sdk-registry
206208
upload-to-sdk-registry:
207-
./gradlew mapboxSDKRegistryUpload;
209+
./gradlew mapboxSDKRegistryUpload
210+
./gradlew mapboxSDKRegistryUpload -PndkMajor=27
208211

209212
.PHONY: publish-to-sdk-registry
210213
publish-to-sdk-registry:

‎gradle/artifact-settings.gradle‎

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ ext {
1212
snapshot = project.hasProperty("snapshot") ? project.property("snapshot").toBoolean() : false
1313
releaseTagPrefix = project.hasProperty('RELEASE_TAG_PREFIX') ? project.property('RELEASE_TAG_PREFIX') : 'mapbox-navigation-android_dash-core_'
1414
versionName = getVersionName()
15-
15+
16+
def ndkVersionSuffix = ""
17+
if (project.hasProperty("ndkMajor")) {
18+
ndkVersionSuffix = "-ndk${project.property("ndkMajor")}"
19+
println("Building with NDK version suffix: " + ndkVersionSuffix)
20+
}
21+
1622
/**
1723
* Properties used for artifact publishing.
1824
*
@@ -23,43 +29,43 @@ ext {
2329
* 2. The SDK name used in the SDK registry.
2430
*/
2531
navSdkArtifactSettings = [
26-
'libnavigation-android' : new Tuple2('android', 'navigation-core-android'),
27-
'base' : new Tuple2('base', 'navigation-core-base'),
28-
'navigation' : new Tuple2('navigation', 'navigation-core-navigation'),
29-
'copilot' : new Tuple2('copilot', 'navigation-core-copilot'),
30-
'metrics' : new Tuple2('metrics', 'navigation-core-metrics'),
31-
'tripdata' : new Tuple2('tripdata', 'navigation-core-tripdata'),
32-
'utils' : new Tuple2('utils', 'navigation-core-utils'),
33-
'voice' : new Tuple2('voice', 'navigation-core-voice'),
34-
'navigator' : new Tuple2('navigator', 'navigation-core-navigator'),
35-
'ui-base' : new Tuple2('ui-base', 'navigation-core-ui-base'),
36-
'ui-maps' : new Tuple2('ui-maps', 'navigation-core-ui-maps'),
37-
'ui-utils' : new Tuple2('ui-utils', 'navigation-core-ui-utils'),
38-
'notification' : new Tuple2('notification', 'navigation-core-notification'),
39-
'search' : new Tuple2('search', 'navigation-core-search'),
40-
'ui-components' : new Tuple2('ui-components', 'navigation-core-ui-components'),
41-
'androidauto' : new Tuple2('android-auto-components', 'navigation-core-androidauto'),
42-
'libtesting-router' : new Tuple2('test-router', 'navigation-core-testing-router'),
43-
'libnavigation-custom-route' : new Tuple2('customroute', 'navigation-core-custom-route'),
44-
'datainputs' : new Tuple2('datainputs', 'navigation-core-datainputs'),
45-
'adasis' : new Tuple2('adasis', 'navigation-core-adasis'),
46-
'ev' : new Tuple2('ev', 'navigation-core-ev'),
47-
'ev-rangemap' : new Tuple2('ev-rangemap', 'navigation-core-ev-rangemap'),
48-
'ev-ui' : new Tuple2('ev-ui', 'navigation-core-ev-ui'),
49-
'weather' : new Tuple2('weather', 'navigation-core-weather'),
50-
'roadcam' : new Tuple2('roadcam', 'navigation-core-roadcam'),
51-
'roadcam-ui' : new Tuple2('roadcam-ui', 'navigation-core-roadcam-ui'),
52-
'libnavigation-compose' : new Tuple2('compose', 'navigation-core-compose'),
53-
'libnavigation-compose-core' : new Tuple2('compose-core', 'navigation-core-compose-core'),
54-
'libnavigation-compose-foundation' : new Tuple2('compose-foundation', 'navigation-core-compose-foundation'),
55-
'coordination' : new Tuple2('coordination', 'navigation-core-coordination'),
56-
'coordination-full-hd' : new Tuple2('coordination-full-hd', 'navigation-core-coordination-full-hd'),
57-
'core-mapgpt' : new Tuple2('core-mapgpt', 'navigation-core-mapgpt-core'),
58-
'ui-mapgpt' : new Tuple2('ui-mapgpt', 'navigation-core-mapgpt-ui'),
59-
'applemusic-mapgpt' : new Tuple2('applemusic-mapgpt', 'navigation-core-mapgpt-applemusic'),
60-
'driver-notification' : new Tuple2('driver-notification', 'navigation-core-driver-notification'),
61-
'ev-driver-notification' : new Tuple2('ev-driver-notification', 'navigation-core-ev-driver-notification'),
62-
'audio' : new Tuple2('audio', 'navigation-core-audio'),
32+
'libnavigation-android' : new Tuple2("android$ndkVersionSuffix", 'navigation-core-android'),
33+
'base' : new Tuple2("base$ndkVersionSuffix", 'navigation-core-base'),
34+
'navigation' : new Tuple2("navigation$ndkVersionSuffix", 'navigation-core-navigation'),
35+
'copilot' : new Tuple2("copilot$ndkVersionSuffix", 'navigation-core-copilot'),
36+
'metrics' : new Tuple2("metrics$ndkVersionSuffix", 'navigation-core-metrics'),
37+
'tripdata' : new Tuple2("tripdata$ndkVersionSuffix", 'navigation-core-tripdata'),
38+
'utils' : new Tuple2("utils$ndkVersionSuffix", 'navigation-core-utils'),
39+
'voice' : new Tuple2("voice$ndkVersionSuffix", 'navigation-core-voice'),
40+
'navigator' : new Tuple2("navigator$ndkVersionSuffix", 'navigation-core-navigator'),
41+
'ui-base' : new Tuple2("ui-base$ndkVersionSuffix", 'navigation-core-ui-base'),
42+
'ui-maps' : new Tuple2("ui-maps$ndkVersionSuffix", 'navigation-core-ui-maps'),
43+
'ui-utils' : new Tuple2("ui-utils$ndkVersionSuffix", 'navigation-core-ui-utils'),
44+
'notification' : new Tuple2("notification$ndkVersionSuffix", 'navigation-core-notification'),
45+
'search' : new Tuple2("search$ndkVersionSuffix", 'navigation-core-search'),
46+
'ui-components' : new Tuple2("ui-components$ndkVersionSuffix", 'navigation-core-ui-components'),
47+
'androidauto' : new Tuple2("android-auto-components$ndkVersionSuffix", 'navigation-core-androidauto'),
48+
'libtesting-router' : new Tuple2("test-router$ndkVersionSuffix", 'navigation-core-testing-router'),
49+
'libnavigation-custom-route' : new Tuple2("customroute$ndkVersionSuffix", 'navigation-core-custom-route'),
50+
'datainputs' : new Tuple2("datainputs$ndkVersionSuffix", 'navigation-core-datainputs'),
51+
'adasis' : new Tuple2("adasis$ndkVersionSuffix", 'navigation-core-adasis'),
52+
'ev' : new Tuple2("ev$ndkVersionSuffix", 'navigation-core-ev'),
53+
'ev-rangemap' : new Tuple2("ev-rangemap$ndkVersionSuffix", 'navigation-core-ev-rangemap'),
54+
'ev-ui' : new Tuple2("ev-ui$ndkVersionSuffix", 'navigation-core-ev-ui'),
55+
'weather' : new Tuple2("weather$ndkVersionSuffix", 'navigation-core-weather'),
56+
'roadcam' : new Tuple2("roadcam$ndkVersionSuffix", 'navigation-core-roadcam'),
57+
'roadcam-ui' : new Tuple2("roadcam-ui$ndkVersionSuffix", 'navigation-core-roadcam-ui'),
58+
'libnavigation-compose' : new Tuple2("compose$ndkVersionSuffix", 'navigation-core-compose'),
59+
'libnavigation-compose-core' : new Tuple2("compose-core$ndkVersionSuffix", 'navigation-core-compose-core'),
60+
'libnavigation-compose-foundation' : new Tuple2("compose-foundation$ndkVersionSuffix", 'navigation-core-compose-foundation'),
61+
'coordination' : new Tuple2("coordination$ndkVersionSuffix", 'navigation-core-coordination'),
62+
'coordination-full-hd' : new Tuple2("coordination-full-hd$ndkVersionSuffix", 'navigation-core-coordination-full-hd'),
63+
'core-mapgpt' : new Tuple2("core-mapgpt$ndkVersionSuffix", 'navigation-core-mapgpt-core'),
64+
'ui-mapgpt' : new Tuple2("ui-mapgpt$ndkVersionSuffix", 'navigation-core-mapgpt-ui'),
65+
'applemusic-mapgpt' : new Tuple2("applemusic-mapgpt$ndkVersionSuffix", 'navigation-core-mapgpt-applemusic'),
66+
'driver-notification' : new Tuple2("driver-notification$ndkVersionSuffix", 'navigation-core-driver-notification'),
67+
'ev-driver-notification' : new Tuple2("ev-driver-notification$ndkVersionSuffix", 'navigation-core-ev-driver-notification'),
68+
'audio' : new Tuple2("audio$ndkVersionSuffix", 'navigation-core-audio'),
6369
]
6470
}
6571

‎gradle/dependencies.gradle‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ ext {
1010

1111
def mapboxSdkVersionSuffix = '14.0-SNAPSHOT-06-26--10-31.git-32f22cd'
1212

13+
def ndkVersionSuffix = ""
14+
if (project.hasProperty("ndkMajor")) {
15+
ndkVersionSuffix = "-ndk${project.property("ndkMajor")}"
16+
println("Building with NDK version suffix: " + ndkVersionSuffix)
17+
}
18+
1319
// Navigation Native CI can run SDK CI downstream with forced Navigation Native version
1420
// in this case `FORCE_MAPBOX_NAVIGATION_NATIVE_VERSION` environment variable will contain
1521
// version which we should use in this build
@@ -88,21 +94,21 @@ ext {
8894
]
8995
dependenciesList = [
9096
// mapbox
91-
mapboxMapSdk : "com.mapbox.maps:android:${version.mapboxMapSdk}",
92-
mapboxMapsAndroidAuto : "com.mapbox.extension:maps-androidauto:${version.mapboxMapSdk}",
97+
mapboxMapSdk : "com.mapbox.maps:android$ndkVersionSuffix:${version.mapboxMapSdk}",
98+
mapboxMapsAndroidAuto : "com.mapbox.extension:maps-androidauto$ndkVersionSuffix:${version.mapboxMapSdk}",
9399
mapboxSdkServices : "com.mapbox.mapboxsdk:mapbox-sdk-services:${version.mapboxSdkServices}",
94100
mapboxSdkServicesCore : "com.mapbox.mapboxsdk:mapbox-sdk-core:${version.mapboxSdkServices}",
95101
mapboxSdkGeoJSON : "com.mapbox.mapboxsdk:mapbox-sdk-geojson:${version.mapboxSdkServices}",
96102
mapboxSdkTurf : "com.mapbox.mapboxsdk:mapbox-sdk-turf:${version.mapboxSdkServices}",
97103
mapboxSdkDirectionsModels : "com.mapbox.mapboxsdk:mapbox-sdk-directions-models:${version.mapboxSdkServices}",
98104
mapboxSdkRefreshModels : "com.mapbox.mapboxsdk:mapbox-sdk-directions-refresh-models:${version.mapboxSdkServices}",
99-
mapboxNavigator : "com.mapbox.navigator:dash-native:${version.mapboxNavigator}",
100-
mapboxCommonNative : "com.mapbox.common:common:${version.mapboxCommonNative}",
101-
mapboxSearch : "com.mapbox.search:mapbox-search-android:${version.mapboxSearch}",
102-
mapboxOfflineSearch : "com.mapbox.search:offline:${version.mapboxSearch}",
103-
mapboxNavSdkCpp : "com.mapbox.navsdk:sdk:${version.mapboxNavSdkCpp}",
104-
mapboxNavSdkFullHdCpp : "com.mapbox.navsdk:navsdk-hd:${version.mapboxNavSdkCpp}",
105-
mapboxMapGptExpAndroid : "com.mapbox.mapgpt.experimental:mapgpt:${version.mapboxCommonNative}",
105+
mapboxNavigator : "com.mapbox.navigator:dash-native$ndkVersionSuffix:${version.mapboxNavigator}",
106+
mapboxCommonNative : "com.mapbox.common:common$ndkVersionSuffix:${version.mapboxCommonNative}",
107+
mapboxSearch : "com.mapbox.search:mapbox-search-android$ndkVersionSuffix:${version.mapboxSearch}",
108+
mapboxOfflineSearch : "com.mapbox.search:offline$ndkVersionSuffix:${version.mapboxSearch}",
109+
mapboxNavSdkCpp : "com.mapbox.navsdk:sdk$ndkVersionSuffix:${version.mapboxNavSdkCpp}",
110+
mapboxNavSdkFullHdCpp : "com.mapbox.navsdk:navsdk-hd$ndkVersionSuffix:${version.mapboxNavSdkCpp}",
111+
mapboxMapGptExpAndroid : "com.mapbox.mapgpt.experimental:mapgpt$ndkVersionSuffix:${version.mapboxCommonNative}",
106112

107113
mapboxAnnotations : "com.mapbox.base:annotations:${version.mapboxBaseAndroid}",
108114
mapboxAnnotationsProcessor: "com.mapbox.base:annotations-processor:${version.mapboxBaseAndroid}",
@@ -240,7 +246,7 @@ ext {
240246
googleServices : '4.4.2',
241247
mapboxSdkVersions : '1.1.5',
242248
dokka : '1.9.20',
243-
mapboxSdkRegistry : '0.7.0',
249+
mapboxSdkRegistry : '1.4.1',
244250
mapboxAccessToken : '0.2.1',
245251
mapboxNativeDownload : '0.2.2',
246252
firebaseCrashlytics : '3.0.3'

‎gradle/publish.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ registry {
6868
publish = true
6969
publishMessage = "cc @mapbox/navigation-android"
7070
publications = ["release"]
71+
additionalPackageSuffixes = ["-ndk27"]
7172
}
7273

7374
task androidSourcesJar(type: Jar) {

0 commit comments

Comments
 (0)