bump compile and target sdks (#9692)

Zayankovsky · github-actions[bot] · commit fde2cc33e984 · 2025-07-14T10:52:40.000Z
GitOrigin-RevId: ec7346dfbe4ff2c75422035e22c15210bdbc1499
diff --git a/base/src/main/java/com/mapbox/navigation/base/utils/DecodeUtils.kt b/base/src/main/java/com/mapbox/navigation/base/utils/DecodeUtils.kt
@@ -10,7 +10,6 @@ import com.mapbox.geojson.Point
 import com.mapbox.geojson.utils.PolylineUtils
 import com.mapbox.navigation.base.internal.utils.isSameRoute
 import com.mapbox.navigation.utils.internal.logD
-import com.mapbox.navigation.utils.internal.precision
 
 private const val LOG_TAG = "DecodeUtils"
 
@@ -172,7 +171,7 @@ object DecodeUtils {
         synchronized(stepsGeometryDecodeCache) {
             cachedRoutes.removeAll { it.route.isSameRoute(route) && it.precision == precision }
             if (cachedRoutes.size > 2) {
-                cachedRoutes.removeFirst()
+                cachedRoutes.removeAt(0)
             }
             cachedRoutes.add(CachedRouteInfo(route, precision, stepCount))
             stepsGeometryDecodeCache.resize(cachedRoutes.sumOf { it.stepCount }.coerceAtLeast(1))
diff --git a/copilot/src/main/java/com/mapbox/navigation/copilot/internal/CopilotSession.kt b/copilot/src/main/java/com/mapbox/navigation/copilot/internal/CopilotSession.kt
@@ -68,7 +68,7 @@ data class CopilotSession(
                 endedAt = "",
                 navSdkVersion = retrieveNavSdkVersion(),
                 navNativeSdkVersion = retrieveNavNativeSdkVersion(),
-                appVersion = applicationContext.getVersionName(),
+                appVersion = applicationContext.getVersionName().orEmpty(),
                 appUserId = copilotOptions.userId ?: eventsAppMetadata?.userId ?: "_",
                 appSessionId = eventsAppMetadata?.sessionId ?: "_",
                 recording = recording,
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -3,8 +3,8 @@ ext {
 
   androidVersions = [
       minSdkVersion           : 21,
-      targetSdkVersion        : 34,
-      compileSdkVersion       : 34,
+      targetSdkVersion        : 36,
+      compileSdkVersion       : 36,
       carMinSdkVersion        : 23
   ]
 
diff --git a/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/ClosuresTest.kt b/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/ClosuresTest.kt
@@ -33,7 +33,6 @@ import com.mapbox.navigation.testing.utils.http.MockDirectionsRefreshHandler
 import com.mapbox.navigation.testing.utils.http.MockDirectionsRequestHandler
 import com.mapbox.navigation.testing.utils.location.MockLocationReplayerRule
 import com.mapbox.navigation.testing.utils.location.moveAlongTheRouteUntilTracking
-import com.mapbox.navigation.testing.utils.location.stayOnPosition
 import com.mapbox.navigation.testing.utils.readRawFileText
 import com.mapbox.navigation.testing.utils.routes.RoutesProvider
 import com.mapbox.navigation.testing.utils.routes.requestMockRoutes
@@ -177,15 +176,13 @@ class ClosuresTest : BaseCoreNoCleanUpTest() {
 
         assertFalse(routeProgressAfterRefresh.hasUnexpectedUpcomingClosures())
 
-        mockWebServerRule.requestHandlers.removeLast()
-        mockWebServerRule.requestHandlers.add(
+        mockWebServerRule.requestHandlers[mockWebServerRule.requestHandlers.lastIndex] =
             MockDirectionsRefreshHandler(
                 "route_response_route_refresh",
                 // [1, 3] closure on leg#0 - closure moved
                 readRawFileText(context, R.raw.route_response_route_refresh_annotations),
                 acceptedGeometryIndex = 0,
-            ),
-        )
+            )
         mapboxNavigation.routeRefreshController.requestImmediateRouteRefresh()
         mapboxNavigation.routesUpdates()
             .filter { it.reason == RoutesExtra.ROUTES_UPDATE_REASON_REFRESH && it !== firstRefresh }
diff --git a/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/RefreshTtlTest.kt b/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/RefreshTtlTest.kt
@@ -285,15 +285,13 @@ class RefreshTtlTest : BaseCoreNoCleanUpTest() {
             }.first()
             assertEquals(0, invalidatedResults.size)
 
-            mockWebServerRule.requestHandlers.removeLast()
             // refresh_ttl = 2
-            mockWebServerRule.requestHandlers.add(
+            mockWebServerRule.requestHandlers[mockWebServerRule.requestHandlers.lastIndex] =
                 MockDirectionsRefreshHandler(
                     "route_response_route_refresh_with_large_ttls",
                     readRawFileText(context, R.raw.route_response_route_refreshed_ttl_2),
                     routeIndex = 1,
-                ),
-            )
+                )
 
             val actualRoutesInvalidatedResults = mapboxNavigation
                 .routesInvalidatedResults().take(2).toList()
@@ -304,7 +302,9 @@ class RefreshTtlTest : BaseCoreNoCleanUpTest() {
                     // after third refresh
                     listOf("route_response_route_refresh_with_large_ttls#1"),
                 ),
-                actualRoutesInvalidatedResults.map { it.invalidatedRoutes.map { it.id } },
+                actualRoutesInvalidatedResults.map { params ->
+                    params.invalidatedRoutes.map { it.id }
+                },
             )
         }
     }
diff --git a/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/RouteRefreshTest.kt b/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/RouteRefreshTest.kt
@@ -147,7 +147,7 @@ class RouteRefreshTest : BaseTest<EmptyTestActivity>(EmptyTestActivity::class.ja
             val requestedRoutes = mapboxNavigation.requestRoutes(routeOptions)
                 .getSuccessfulResultOrThrowException()
                 .routes
-                .reversed()
+                .asReversed()
 
             mapboxNavigation.setNavigationRoutes(requestedRoutes)
             mapboxNavigation.startTripSession()
@@ -888,8 +888,8 @@ class RouteRefreshTest : BaseTest<EmptyTestActivity>(EmptyTestActivity::class.ja
             .first()
 
         mapboxNavigation.routesUpdates()
-            .filter {
-                (it.reason == ROUTES_UPDATE_REASON_REFRESH).also {
+            .filter { result ->
+                (result.reason == ROUTES_UPDATE_REASON_REFRESH).also {
                     if (it) {
                         assertEquals(0, mapboxNavigation.currentLegIndex())
                     }
@@ -947,8 +947,8 @@ class RouteRefreshTest : BaseTest<EmptyTestActivity>(EmptyTestActivity::class.ja
         )
 
         mapboxNavigation.routesUpdates()
-            .filter {
-                (it.reason == ROUTES_UPDATE_REASON_REFRESH).also {
+            .filter { result ->
+                (result.reason == ROUTES_UPDATE_REASON_REFRESH).also {
                     if (it) {
                         assertEquals(1, mapboxNavigation.currentLegIndex())
                     }
diff --git a/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/UpcomingRouteObjectsTest.kt b/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/UpcomingRouteObjectsTest.kt
@@ -45,7 +45,6 @@ import com.mapbox.navigation.testing.utils.http.MockDirectionsRefreshHandler
 import com.mapbox.navigation.testing.utils.http.MockDirectionsRequestHandler
 import com.mapbox.navigation.testing.utils.location.MockLocationReplayerRule
 import com.mapbox.navigation.testing.utils.location.moveAlongTheRouteUntilTracking
-import com.mapbox.navigation.testing.utils.location.stayOnPosition
 import com.mapbox.navigation.testing.utils.readRawFileText
 import com.mapbox.navigation.testing.utils.routes.RoutesProvider
 import com.mapbox.navigation.testing.utils.routes.requestMockRoutes
@@ -404,16 +403,14 @@ class UpcomingRouteObjectsTest : BaseCoreNoCleanUpTest() {
 
         checkRoadObjects(expectedObjectsAfterFirstRefresh, updateAfterRefresh.upcomingRoadObjects)
 
-        mockWebServerRule.requestHandlers.removeLast()
-        mockWebServerRule.requestHandlers.add(
+        mockWebServerRule.requestHandlers[mockWebServerRule.requestHandlers.lastIndex] =
             FailByRequestMockRequestHandler(
                 MockDirectionsRefreshHandler(
                     "route_with_road_objects_europe",
                     readRawFileText(context, R.raw.route_with_road_objects_europe_refresh2),
                     acceptedGeometryIndex = 249,
                 ),
-            ),
-        )
+            )
 
         mapboxNavigation.routeRefreshController.requestImmediateRouteRefresh()
         mapboxNavigation.routesUpdates()
@@ -657,8 +654,7 @@ class UpcomingRouteObjectsTest : BaseCoreNoCleanUpTest() {
         )
 
         val incident = mapboxNavigation.getNavigationRoutes().first().upcomingRoadObjects
-            .filter { it.roadObject.objectType == RoadObjectType.INCIDENT }
-            .first()
+            .first { it.roadObject.objectType == RoadObjectType.INCIDENT }
 
         assertEquals(
             listOf("Higashikanto Expwy(Koya To Itako)"),
diff --git a/navigation/src/main/java/com/mapbox/navigation/core/replay/route/ReplayRouteDriver.kt b/navigation/src/main/java/com/mapbox/navigation/core/replay/route/ReplayRouteDriver.kt
@@ -145,7 +145,7 @@ internal class ReplayRouteDriver {
             segmentDistance,
         )
 
-        if (isNotEmpty()) removeLast()
+        removeLastOrNull()
         for (stepIndex in 0..segment.steps.lastIndex) {
             val step = segment.steps[stepIndex]
             val point =
diff --git a/navigation/src/main/java/com/mapbox/navigation/core/replay/route/ReplayRouteInterpolator.kt b/navigation/src/main/java/com/mapbox/navigation/core/replay/route/ReplayRouteInterpolator.kt
@@ -130,7 +130,7 @@ internal class ReplayRouteInterpolator {
         if (distance == 0.0) return this
         val startDistance = lastOrNull()?.positionMeters ?: 0.0
         val startTime = lastOrNull()?.timeSeconds ?: 0.0
-        if (startDistance > 0.0) { removeLast() }
+        if (startDistance > 0.0) { removeAt(lastIndex) }
         val t1 = distance / speed
         val steps = ceil(t1) * frequency
         val increment = t1 / steps
@@ -155,7 +155,7 @@ internal class ReplayRouteInterpolator {
         if (distance == 0.0) return this
         val startDistance = lastOrNull()?.positionMeters ?: 0.0
         val startTime = lastOrNull()?.timeSeconds ?: 0.0
-        if (startDistance > 0.0) { removeLast() }
+        if (startDistance > 0.0) { removeAt(lastIndex) }
         val acceleration = (endSpeed.pow(2.0) - startSpeed.pow(2.0)) / (2 * distance)
         val t1 = (endSpeed - startSpeed) / acceleration
         val steps = ceil(t1) * frequency
diff --git a/navigation/src/test/java/com/mapbox/navigation/core/routerefresh/PlannedRouteRefreshIntegrationTest.kt b/navigation/src/test/java/com/mapbox/navigation/core/routerefresh/PlannedRouteRefreshIntegrationTest.kt
@@ -3,12 +3,11 @@ package com.mapbox.navigation.core.routerefresh
 import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
 import com.mapbox.navigation.core.directions.session.RoutesExtra
 import com.mapbox.navigation.core.directions.session.RoutesUpdatedResult
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
-@OptIn(ExperimentalPreviewMapboxNavigationAPI::class, ExperimentalCoroutinesApi::class)
+@OptIn(ExperimentalPreviewMapboxNavigationAPI::class)
 internal class PlannedRouteRefreshIntegrationTest : RouteRefreshIntegrationTest() {
 
     @Test
@@ -67,7 +66,7 @@ internal class PlannedRouteRefreshIntegrationTest : RouteRefreshIntegrationTest(
 
         testDispatcher.advanceTimeBy(20_000)
 
-        val routesAfterReroute = routes.reversed()
+        val routesAfterReroute = routes.asReversed()
         routeRefreshController.onRoutesChanged(
             RoutesUpdatedResult(
                 routesAfterReroute,
diff --git a/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/ViewportDataSourceProcessor.kt b/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/ViewportDataSourceProcessor.kt
@@ -97,14 +97,14 @@ internal object ViewportDataSourceProcessor {
         return route.legs()?.mapIndexed { legIndex, leg ->
             leg.steps()?.mapIndexed { stepIndex, step ->
                 val stepPoints = completeRoutePoints[legIndex][stepIndex]
-                val intersectionLocations =
-                    step.intersections()?.map { it.location() } ?: emptyList()
-                val list: MutableList<Point> = ArrayList()
-                list.add(stepPoints.first())
-                list.addAll(intersectionLocations)
-                list.add(stepPoints.last())
-                val comparisonList = list.toMutableList()
-                list.removeFirst()
+                val list = buildList {
+                    step.intersections()?.mapTo(destination = this) { it.location() }
+                    add(stepPoints.last())
+                }
+                val comparisonList = buildList {
+                    add(stepPoints.first())
+                    addAll(list)
+                }
                 val intersectionDistances = list.mapIndexed { index, point ->
                     TurfMeasurement.distance(point, comparisonList[index]).kilometersToMeters()
                 }
diff --git a/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/internal/ui/RouteLineComponent.kt b/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/internal/ui/RouteLineComponent.kt
@@ -19,14 +19,12 @@ import com.mapbox.navigation.core.internal.extensions.flowRouteProgress
 import com.mapbox.navigation.core.internal.extensions.flowRoutesUpdated
 import com.mapbox.navigation.ui.base.lifecycle.UIComponent
 import com.mapbox.navigation.ui.maps.route.line.MapboxRouteLineApiExtensions.findClosestRoute
-import com.mapbox.navigation.ui.maps.route.line.MapboxRouteLineApiExtensions.getRouteDrawData
 import com.mapbox.navigation.ui.maps.route.line.api.MapboxRouteLineApi
 import com.mapbox.navigation.ui.maps.route.line.api.MapboxRouteLineView
 import com.mapbox.navigation.ui.maps.route.line.model.MapboxRouteLineApiOptions
 import com.mapbox.navigation.ui.maps.route.line.model.MapboxRouteLineViewDynamicOptionsBuilderBlock
 import com.mapbox.navigation.ui.maps.route.line.model.MapboxRouteLineViewOptions
 import com.mapbox.navigation.ui.utils.internal.Provider
-import com.mapbox.navigation.utils.internal.ifNonNull
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
@@ -83,12 +81,8 @@ class RouteLineComponent(
 ) : UIComponent() {
 
     private var currentRoutesProgressData: RoutesProgressData? = null
-    private val contractProvider: Provider<RouteLineComponentContract>
-
-    init {
-        this.contractProvider = contractProvider ?: Provider {
-            MapboxRouteLineComponentContract()
-        }
+    private val contractProvider = contractProvider ?: Provider {
+        MapboxRouteLineComponentContract()
     }
 
     private val routeClickPadding = Utils.dpToPx(30f)
@@ -100,7 +94,7 @@ class RouteLineComponent(
 
     private val onPositionChangedListener = OnIndicatorPositionChangedListener { point ->
         val result = routeLineApi.updateTraveledRouteLine(point)
-        mapboxMap.getStyle()?.apply {
+        mapboxMap.style?.apply {
             routeLineView.renderRouteLineUpdate(this, result)
         }
     }
@@ -149,7 +143,7 @@ class RouteLineComponent(
                         )
                     }
                 }
-                ifNonNull(mapboxMap.getStyle()) { style ->
+                mapboxMap.style?.let { style ->
                     routeLineApi.updateWithRouteProgress(routeProgress) { result ->
                         routeLineView.renderRouteLineUpdate(style, result).also {
                             result.error?.let {
@@ -186,7 +180,7 @@ class RouteLineComponent(
                     routesToLegIndex.second,
                     mapboxNavigation.getAlternativeMetadataFor(routes),
                 ) { value ->
-                    mapboxMap.getStyle()?.apply {
+                    mapboxMap.style?.apply {
                         routeLineView.renderRouteDrawData(this, value)
                     }
                 }
diff --git a/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/arrow/RouteArrowUtils.kt b/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/arrow/RouteArrowUtils.kt
@@ -31,9 +31,9 @@ internal object RouteArrowUtils {
     private const val TAG = "RouteArrowUtils"
 
     fun obtainArrowPointsFrom(routeProgress: RouteProgress): List<Point> {
-        val reversedCurrent: List<Point> = routeProgress.currentLegProgress
-            ?.currentStepProgress?.stepPoints?.reversed()
-            ?: listOf()
+        val reversedCurrent = routeProgress.currentLegProgress
+            ?.currentStepProgress?.stepPoints?.asReversed()
+            .orEmpty()
         val arrowLineCurrent = LineString.fromLngLats(reversedCurrent)
         if (reversedCurrent.size < 2) {
             return listOf()
@@ -58,7 +58,7 @@ internal object RouteArrowUtils {
             TurfConstants.UNIT_METERS,
         )
 
-        return arrowCurrentSliced.coordinates().reversed().plus(arrowUpcomingSliced.coordinates())
+        return arrowCurrentSliced.coordinates().asReversed() + arrowUpcomingSliced.coordinates()
     }
 
     @OptIn(MapboxExperimental::class, ExperimentalPreviewMapboxNavigationAPI::class)
diff --git a/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/api/MapboxRouteLineView.kt b/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/api/MapboxRouteLineView.kt
@@ -193,10 +193,10 @@ class MapboxRouteLineView @VisibleForTesting internal constructor(
         LAYER_GROUP_2_BLUR,
         LAYER_GROUP_3_BLUR,
     )
-    private val sourceToFeatureMap = mutableMapOf<RouteLineSourceKey, RouteLineFeatureId>(
-        Pair(MapboxRouteLineUtils.layerGroup1SourceKey, RouteLineFeatureId(null)),
-        Pair(MapboxRouteLineUtils.layerGroup2SourceKey, RouteLineFeatureId(null)),
-        Pair(MapboxRouteLineUtils.layerGroup3SourceKey, RouteLineFeatureId(null)),
+    private val sourceToFeatureMap = mutableMapOf(
+        MapboxRouteLineUtils.layerGroup1SourceKey to RouteLineFeatureId(featureId = null),
+        MapboxRouteLineUtils.layerGroup2SourceKey to RouteLineFeatureId(featureId = null),
+        MapboxRouteLineUtils.layerGroup3SourceKey to RouteLineFeatureId(featureId = null),
     )
 
     private val scope = MutexBasedScope(
@@ -405,25 +405,25 @@ class MapboxRouteLineView @VisibleForTesting internal constructor(
                     ).also { sourceFeaturePairings.remove(it) }
                     ifNonNull(relatedSourceKey) { sourceKeyFeaturePair ->
                         val gradientCommandsDeferreds =
-                            ifNonNull(routeLineData.dynamicData) { dynamicData ->
+                            routeLineData.dynamicData?.let { dynamicData ->
                                 getGradientUpdateCommands(
                                     style,
                                     sourceKeyFeaturePair.first,
                                     dynamicData,
                                     sourceLayerMap,
                                     holder.data,
-                                ).reversed()
-                            } ?: listOf()
+                                ).asReversed()
+                            }.orEmpty()
 
                         val maskingGradientCommandsDeferreds = when (index) {
-                            0 -> ifNonNull(routeSetValue.routeLineMaskingLayerDynamicData) {
+                            0 -> routeSetValue.routeLineMaskingLayerDynamicData?.let {
                                 getGradientUpdateCommands(
                                     style,
                                     maskingLayerIds,
                                     it,
                                     holder.data,
                                 )
-                            } ?: listOf()
+                            }.orEmpty()
 
                             else -> listOf()
                         }
@@ -1073,9 +1073,9 @@ class MapboxRouteLineView @VisibleForTesting internal constructor(
         featureCollection: FeatureCollection,
         dataId: Int? = null,
     ) {
-        style.getSource(sourceId)?.let {
+        style.getSource(sourceId)?.let { source ->
             val stringDataId = dataId?.let { "$it" }.orEmpty()
-            (it as GeoJsonSource).featureCollection(featureCollection, stringDataId)
+            (source as GeoJsonSource).featureCollection(featureCollection, stringDataId)
         }
     }
 
diff --git a/ui-maps/src/test/java/com/mapbox/navigation/ui/maps/internal/route/line/MapboxRouteLineUtilsTest.kt b/ui-maps/src/test/java/com/mapbox/navigation/ui/maps/internal/route/line/MapboxRouteLineUtilsTest.kt
diff --git a/ui-maps/src/test/java/com/mapbox/navigation/ui/maps/internal/ui/RouteLineComponentTest.kt b/ui-maps/src/test/java/com/mapbox/navigation/ui/maps/internal/ui/RouteLineComponentTest.kt

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ ext {`
`3`	`3`
`4`	`4`	`androidVersions = [`
`5`	`5`	`minSdkVersion : 21,`
`6`		`- targetSdkVersion : 34,`
`7`		`- compileSdkVersion : 34,`
	`6`	`+ targetSdkVersion : 36,`
	`7`	`+ compileSdkVersion : 36,`
`8`	`8`	`carMinSdkVersion : 23`
`9`	`9`	`]`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ internal class ReplayRouteDriver {`
`145`	`145`	`segmentDistance,`
`146`	`146`	`)`
`147`	`147`
`148`		`- if (isNotEmpty()) removeLast()`
	`148`	`+ removeLastOrNull()`
`149`	`149`	`for (stepIndex in 0..segment.steps.lastIndex) {`
`150`	`150`	`val step = segment.steps[stepIndex]`
`151`	`151`	`val point =`