v3.4.0-beta.1 (#7867)

ca1c91719a88fe0b9bf74f5cba46fc5687e855b1

.aiexclude

@@ -0,0 +1,6 @@
+*
+*token.xml
+*tokens.xml
+.json
+.keystore
+.jks

.editorconfig

@@ -1,11 +1,13 @@
 root = true
 
 [*.{kt,kts}]
+ktlint_code_style=ktlint_official
 indent_style = space
 indent_size = 4
 continuation_indent_size=4
-ktlint_disabled_rules=trailing-comma-on-call-site,trailing-comma-on-declaration-site
 
+ij_kotlin_allow_trailing_comma=true
+ij_kotlin_allow_trailing_comma_on_call_site=true
 ij_kotlin_imports_layout=*,java.**,javax.**,kotlin.**,^
 
 insert_final_newline=true
@@ -14,10 +16,13 @@ insert_final_newline=true
 max_line_length=100
 
 [**/qa_test_app/**.kt]
-ktlint_disabled_rules=package-name,trailing-comma-on-call-site,trailing-comma-on-declaration-site
+ktlint_disabled_rules=package-name
 
 [**/test/**.kt]
 ktlint_ignore_back_ticked_identifier=true
 
 [**/instrumentation_tests/**.kt]
-ktlint_disabled_rules=package-name,filename,trailing-comma-on-call-site,trailing-comma-on-declaration-site
+ktlint_disabled_rules=package-name,filename
+
+[**/screenshot_tests/**.kt]
+ktlint_disabled_rules=package-name,filename

.gitattributes

@@ -1 +1 @@
-CHANGELOG.md merge=union
+CHANGELOG.md merge=union

.gitignore

@@ -18,3 +18,7 @@ build/
 
 jacoco.exec
 qa-test-app/src/main/res/values/mapbox_access_token.xml
+
+
+# SDK configuration
+/**/src/main/assets/sdk_versions/*

Makefile

@@ -1,40 +1,33 @@
+PUBLIC_API_PREFIX = public-api
+
 RELEASED_CORE_MODULES = \
-libnavigation-router \
 libnavigation-base \
 libnavigation-metrics \
 libnavigation-util \
 libnavigator \
 libtrip-notification \
 libnavigation-core \
 libnavigation-copilot \
+libnavigation-tripdata \
+libnavigation-voice \
+libtesting-router
 
 CORE_MODULES = $(RELEASED_CORE_MODULES)
 
 RELEASED_UI_MODULES = \
 libnavui-maps \
+ui-components \
+androidauto \
 libnavui-base \
 libnavui-util \
-libnavui-tripprogress \
-libnavui-maneuver \
-libnavui-resources \
-libnavui-voice \
-libnavigation-android \
-libnavui-speedlimit \
-libnavui-shield \
-libnavui-status \
-libnavui-dropin \
-libnavui-app \
+libnavigation-android
 
 UI_MODULES = $(RELEASED_UI_MODULES)
 
-ANDROIDAUTO_MODULES = \
-libnavui-androidauto
+PUBLIC_API_MODULES = $(CORE_MODULES) $(UI_MODULES)
 
 APPLICATION_MODULES = \
-qa-test-app \
-examples \
-instrumentation-tests \
-android-auto-app \
+instrumentation-tests
 
 define run-gradle-tasks
     COMMAND="./gradlew"; \
@@ -49,21 +42,18 @@ endef
 check-kotlin-lint:
 	$(call run-gradle-tasks,$(CORE_MODULES),ktlint) \
 	&& $(call run-gradle-tasks,$(UI_MODULES),ktlint) \
-	&& $(call run-gradle-tasks,$(ANDROIDAUTO_MODULES),ktlint) \
 	&& $(call run-gradle-tasks,$(APPLICATION_MODULES),ktlint)
 
 .PHONY: format-kotlin-lint
 format-kotlin-lint:
 	$(call run-gradle-tasks,$(CORE_MODULES),ktlintFormat) \
 	&& $(call run-gradle-tasks,$(UI_MODULES),ktlintFormat) \
-	&& $(call run-gradle-tasks,$(ANDROIDAUTO_MODULES),ktlintFormat) \
 	&& $(call run-gradle-tasks,$(APPLICATION_MODULES),ktlintFormat)
 
 .PHONY: check-android-lint
 check-android-lint:
 	$(call run-gradle-tasks,$(CORE_MODULES),lint) \
 	&& $(call run-gradle-tasks,$(UI_MODULES),lint) \
-	&& $(call run-gradle-tasks,$(ANDROIDAUTO_MODULES),lint) \
 	&& $(call run-gradle-tasks,$(APPLICATION_MODULES),lint)
 
 .PHONY: license-verification
@@ -80,10 +70,6 @@ javadoc-dokka:
 	./gradlew dokkaHtmlMultiModule
 	./docs/replace-styles.sh
 
-.PHONY: javadoc-dokka-androidauto
-javadoc-dokka-androidauto:
-	./gradlew libnavui-androidauto:dokkaHtml
-
 .PHONY: dependency-graphs
 dependency-graphs:
 	$(call run-gradle-tasks,$(CORE_MODULES),generateDependencyGraphMapboxLibraries) \
@@ -94,9 +80,9 @@ dependency-updates:
 	$(call run-gradle-tasks,$(CORE_MODULES),dependencyUpdates) \
 	&& $(call run-gradle-tasks,$(UI_MODULES),dependencyUpdates) \
 
-.PHONY: verify-common-sdk-version
-verify-common-sdk-version:
-	./gradlew verifyCommonSdkVersion
+.PHONY: find-all-common-sdk-versions
+find-all-common-sdk-versions:
+	./gradlew findAllCommonSdkVersions
 
 .PHONY: dex-count
 dex-count:
@@ -129,25 +115,29 @@ core-dependency-graph:
 
 .PHONY: core-check-api
 core-check-api: assemble-core-release
-	./gradlew :libnavigation-router:checkApi -PhidePackage=com.mapbox.navigation.route.internal
 	./gradlew :libnavigation-base:checkApi -PhidePackage=com.mapbox.navigation.base.internal
 	./gradlew :libnavigation-metrics:checkApi -PhidePackage=com.mapbox.navigation.metrics.internal
 	./gradlew :libnavigation-util:checkApi -PhidePackage=com.mapbox.navigation.utils.internal
 	./gradlew :libnavigator:checkApi -PhidePackage=com.mapbox.navigation.navigator.internal
 	./gradlew :libtrip-notification:checkApi -PhidePackage=com.mapbox.navigation.trip.notification.internal
 	./gradlew :libnavigation-core:checkApi -PhidePackage=com.mapbox.navigation.core.internal
 	./gradlew :libnavigation-copilot:checkApi -PhidePackage=com.mapbox.navigation.copilot.internal
+	./gradlew :libnavigation-tripdata:checkApi -PhidePackage=com.mapbox.navigation.tripdata.internal,com.mapbox.navigation.tripdata.maneuver.internal,com.mapbox.navigation.tripdata.progress.internal,com.mapbox.navigation.tripdata.shield.internal,com.mapbox.navigation.tripdata.speedlimit.internal
+	./gradlew :libnavigation-voice:checkApi -PhidePackage=com.mapbox.navigation.voice.internal -PhideId=ReferencesHidden
+	./gradlew :libtesting-router:checkApi -PhidePackage=com.mapbox.navigation.testing.router.internal
 
 .PHONY: core-update-api
 core-update-api: assemble-core-release
-	./gradlew :libnavigation-router:updateApi -PhidePackage=com.mapbox.navigation.route.internal
 	./gradlew :libnavigation-base:updateApi -PhidePackage=com.mapbox.navigation.base.internal
 	./gradlew :libnavigation-metrics:updateApi -PhidePackage=com.mapbox.navigation.metrics.internal
 	./gradlew :libnavigation-util:updateApi -PhidePackage=com.mapbox.navigation.utils.internal
 	./gradlew :libnavigator:updateApi -PhidePackage=com.mapbox.navigation.navigator.internal
 	./gradlew :libtrip-notification:updateApi -PhidePackage=com.mapbox.navigation.trip.notification.internal
 	./gradlew :libnavigation-core:updateApi -PhidePackage=com.mapbox.navigation.core.internal
 	./gradlew :libnavigation-copilot:updateApi -PhidePackage=com.mapbox.navigation.copilot.internal
+	./gradlew :libnavigation-tripdata:updateApi -PhidePackage=com.mapbox.navigation.tripdata.internal,com.mapbox.navigation.tripdata.maneuver.internal,com.mapbox.navigation.tripdata.progress.internal,com.mapbox.navigation.tripdata.shield.internal,com.mapbox.navigation.tripdata.speedlimit.internal
+	./gradlew :libnavigation-voice:updateApi -PhidePackage=com.mapbox.navigation.voice.internal
+	./gradlew :libtesting-router:updateApi -PhidePackage=com.mapbox.navigation.testing.router.internal
 
 .PHONY: assemble-ui-debug
 assemble-ui-debug:
@@ -157,10 +147,6 @@ assemble-ui-debug:
 assemble-ui-release:
 	$(call run-gradle-tasks,$(UI_MODULES),assembleRelease $(additional_gradle_parameters))
 
-.PHONY: assemble-androidauto-release
-assemble-androidauto-release:
-	$(call run-gradle-tasks,$(ANDROIDAUTO_MODULES),assembleRelease)
-
 .PHONY: ui-unit-tests
 ui-unit-tests:
 	$(call run-gradle-tasks,$(UI_MODULES),test)
@@ -179,11 +165,11 @@ publish-local:
 
 .PHONY: upload-to-sdk-registry-snapshot
 upload-to-sdk-registry-snapshot:
-	./gradlew mapboxSDKRegistryUpload -Psnapshot=true;
+	./gradlew mapboxSDKRegistryUpload -Psnapshot=true -PVERSION_NAME=$(VERSION_NAME);
 
 .PHONY: upload-to-sdk-registry
 upload-to-sdk-registry:
-	./gradlew mapboxSDKRegistryUpload -x libnavui-androidauto:mapboxSDKRegistryUpload;
+	./gradlew mapboxSDKRegistryUpload;
 
 .PHONY: publish-to-sdk-registry
 publish-to-sdk-registry:
@@ -194,62 +180,29 @@ publish-to-sdk-registry:
 		./gradlew mapboxSDKRegistryPublishAll; \
 	fi
 
-.PHONY: upload-to-sdk-registry-androidauto
-upload-to-sdk-registry-androidauto:
-	./gradlew libnavui-androidauto:mapboxSDKRegistryUpload;
-
-.PHONY: publish-to-sdk-registry-androidauto
-publish-to-sdk-registry-androidauto:
-	@if [ -z "$(GITHUB_TOKEN)" ]; then \
-		echo "GITHUB_TOKEN env variable has to be set"; \
-	else \
-		python3 -m pip install git-pull-request; \
-		./gradlew libnavui-androidauto:mapboxSDKRegistryPublish; \
-	fi
-
 .PHONY: ui-check-api
 ui-check-api: assemble-ui-release
 	# TODO Remove -PhideId=ReferencesHidden after fixing errors
 	./gradlew :libnavui-maps:checkApi -PhidePackage=com.mapbox.navigation.ui.maps.internal -PhideId=ReferencesHidden
+	./gradlew :ui-components:updateApi -PhidePackage=com.mapbox.navigation.ui.components.internal,com.mapbox.navigation.ui.components.maneuver.internal,com.mapbox.navigation.ui.components.maps.internal,com.mapbox.navigation.ui.components.speedlimit.internal,com.mapbox.navigation.ui.components.status.internal,com.mapbox.navigation.ui.components.tripprogress.internal,com.mapbox.navigation.ui.components.voice.internal
+	./gradlew :androidauto:updateApi -PhidePackage=com.mapbox.navigation.ui.androidauto.internal
 	./gradlew :libnavui-base:checkApi -PhidePackage=com.mapbox.navigation.ui.base.internal -PhideId=ReferencesHidden
 	./gradlew :libnavui-util:checkApi -PhidePackage=com.mapbox.navigation.ui.utils.internal -PhideId=ReferencesHidden
-	./gradlew :libnavui-maneuver:checkApi -PhidePackage=com.mapbox.navigation.ui.maneuver.internal -PhideId=ReferencesHidden
-	./gradlew :libnavui-tripprogress:checkApi -PhidePackage=com.mapbox.navigation.ui.tripprogress.internal -PhideId=ReferencesHidden
-	./gradlew :libnavui-voice:checkApi -PhidePackage=com.mapbox.navigation.ui.voice.internal -PhideId=ReferencesHidden
-	./gradlew :libnavui-shield:checkApi -PhidePackage=com.mapbox.navigation.ui.shield.internal
-	./gradlew :libnavui-speedlimit:checkApi -PhidePackage=com.mapbox.navigation.ui.speedlimit.internal -PhideId=ReferencesHidden
-	./gradlew :libnavui-status:checkApi -PhidePackage=com.mapbox.navigation.ui.status.internal
-	./gradlew :libnavui-dropin:checkApi -PhidePackage=com.mapbox.navigation.dropin.internal
-	./gradlew :libnavui-app:checkApi -PhidePackage=com.mapbox.navigation.ui.app.internal
 
 .PHONY: ui-update-api
 ui-update-api: assemble-ui-release
 	./gradlew :libnavui-maps:updateApi -PhidePackage=com.mapbox.navigation.ui.maps.internal
+	./gradlew :ui-components:updateApi -PhidePackage=com.mapbox.navigation.ui.components.internal,com.mapbox.navigation.ui.components.maneuver.internal,com.mapbox.navigation.ui.components.maps.internal,com.mapbox.navigation.ui.components.speedlimit.internal,com.mapbox.navigation.ui.components.status.internal,com.mapbox.navigation.ui.components.tripprogress.internal,com.mapbox.navigation.ui.components.voice.internal
+	./gradlew :androidauto:updateApi -PhidePackage=com.mapbox.navigation.ui.androidauto.internal
 	./gradlew :libnavui-base:updateApi -PhidePackage=com.mapbox.navigation.ui.base.internal
 	./gradlew :libnavui-util:updateApi -PhidePackage=com.mapbox.navigation.ui.utils.internal
-	./gradlew :libnavui-maneuver:updateApi -PhidePackage=com.mapbox.navigation.ui.maneuver.internal
-	./gradlew :libnavui-tripprogress:updateApi -PhidePackage=com.mapbox.navigation.ui.tripprogress.internal
-	./gradlew :libnavui-voice:updateApi -PhidePackage=com.mapbox.navigation.ui.voice.internal
-	./gradlew :libnavui-shield:updateApi -PhidePackage=com.mapbox.navigation.ui.shield.internal
-	./gradlew :libnavui-speedlimit:updateApi -PhidePackage=com.mapbox.navigation.ui.speedlimit.internal
-	./gradlew :libnavui-status:updateApi -PhidePackage=com.mapbox.navigation.ui.status.internal
-	./gradlew :libnavui-dropin:updateApi -PhidePackage=com.mapbox.navigation.dropin.internal
-	./gradlew :libnavui-app:updateApi -PhidePackage=com.mapbox.navigation.ui.app.internal
-
-.PHONY: androidauto-check-api
-androidauto-check-api: assemble-androidauto-release
-	./gradlew :libnavui-androidauto:checkApi -PhidePackage=com.mapbox.androidauto.internal
-
-.PHONY: androidauto-update-api
-androidauto-update-api: assemble-androidauto-release
-	./gradlew :libnavui-androidauto:updateApi -PhidePackage=com.mapbox.androidauto.internal
 
 .PHONY: update-metalava
 update-metalava:
 	sh ./scripts/update_metalava.sh
 
 # Android Auto helper command. Set up your environment to run the desktop car emulator.
-# Guidance available in the android-auto README: /libnavui-androidauto/README.md
+# Guidance available in the android-auto README: /libnavigation-extensions/androidauto/README.md
 .PHONY: car
 car:
 	adb forward tcp:5277 tcp:5277