Skip to content

Commit 3b75fc2

Browse files
dzinadgithub-actions[bot]
authored andcommitted
bump mapbox-sdk to bd49341
GitOrigin-RevId: 55cba80736fbf5d3b35069a186cde355ec9200e1
1 parent be01a9e commit 3b75fc2

5 files changed

Lines changed: 16 additions & 26 deletions

File tree

gradle/dependencies.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ ext {
1313
// version which we should use in this build
1414
def mapboxNavigatorVersion = System.getenv("FORCE_MAPBOX_NAVIGATION_NATIVE_VERSION")
1515
if (mapboxNavigatorVersion == null || mapboxNavigatorVersion == '') {
16-
mapboxNavigatorVersion = '324.13.0-SNAPSHOT-05-05--04-29.git-a7c22c9'
16+
mapboxNavigatorVersion = '324.13.0-SNAPSHOT-05-07--04-29.git-bd49341'
1717
}
1818
if (!project.hasProperty("hasPrintedNavigatorVersion")) {
1919
println("Navigation Native version: " + mapboxNavigatorVersion)
2020
project.ext.hasPrintedNavigatorVersion = true
2121
}
2222

2323
version = [
24-
mapboxMapSdk : '11.13.0-SNAPSHOT-05-05--04-29.git-a7c22c9',
24+
mapboxMapSdk : '11.13.0-SNAPSHOT-05-07--04-29.git-bd49341',
2525
mapboxSdkServices : '7.4.0',
2626
mapboxNavigator : "${mapboxNavigatorVersion}",
27-
mapboxCommonNative : '24.13.0-SNAPSHOT-05-05--04-29.git-a7c22c9',
28-
mapboxNavSdkCpp : '0.13.0-SNAPSHOT-05-05--04-29.git-a7c22c9',
29-
mapboxSearch : '2.13.0-a7c22c9-SNAPSHOT',
27+
mapboxCommonNative : '24.13.0-SNAPSHOT-05-07--04-29.git-bd49341',
28+
mapboxNavSdkCpp : '0.13.0-SNAPSHOT-05-07--04-29.git-bd49341',
29+
mapboxSearch : '2.13.0-bd49341-SNAPSHOT',
3030
mapboxBaseAndroid : '0.11.0',
3131
androidXActivity : '1.7.1',
3232
androidXActivityCompose : '1.9.2',

libtesting-thirdparty/src/main/java/com/mapbox/navigation/testing/factories/NativeFactories.kt

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ import com.mapbox.navigator.OffRoadStateProvider
1616
import com.mapbox.navigator.RerouteError
1717
import com.mapbox.navigator.RerouteErrorType
1818
import com.mapbox.navigator.RoadName
19-
import com.mapbox.navigator.RouteAnnotation
20-
import com.mapbox.navigator.RouteData
2119
import com.mapbox.navigator.RouteIndices
2220
import com.mapbox.navigator.RouteInfo
2321
import com.mapbox.navigator.RouteInterface
@@ -31,7 +29,7 @@ import com.mapbox.navigator.SpeedLimitUnit
3129
import com.mapbox.navigator.TimeZone
3230
import com.mapbox.navigator.TurnLane
3331
import com.mapbox.navigator.UpcomingRouteAlertUpdate
34-
import com.mapbox.navigator.VoiceInstructionInfo
32+
import com.mapbox.navigator.VoiceInstruction
3533
import com.mapbox.navigator.Waypoint
3634
import com.mapbox.navigator.WaypointType
3735
import java.nio.ByteBuffer
@@ -57,7 +55,7 @@ fun createNavigationStatus(
5755
intersectionIndex: Int = 0,
5856
turnLanes: List<TurnLane> = emptyList(),
5957
roads: List<RoadName> = emptyList(),
60-
voiceInstruction: VoiceInstructionInfo? = null,
58+
voiceInstruction: VoiceInstruction? = null,
6159
// default banner instruction workarounds the direct usage of the MapboxNativeNavigatorImpl
6260
bannerInstruction: BannerInstruction? = createBannerInstruction(),
6361
speedLimit: SpeedLimit = SpeedLimit(null, SpeedLimitUnit.KILOMETRES_PER_HOUR, SpeedLimitSign.VIENNA),
@@ -117,8 +115,8 @@ fun createNavigationStatus(
117115

118116
fun createVoiceInstruction(
119117
announcement: String = "test"
120-
): VoiceInstructionInfo {
121-
return VoiceInstructionInfo("test", announcement, 0f, 0)
118+
): VoiceInstruction {
119+
return VoiceInstruction("test", announcement, 0f, 0)
122120
}
123121

124122
fun createBannerInstruction(
@@ -214,14 +212,6 @@ fun createRouteInterface(
214212

215213
override fun getResponseUuid() = responseUUID
216214

217-
override fun getRouteData(): RouteData {
218-
TODO("Not yet implemented")
219-
}
220-
221-
override fun getRouteAnnotation(): RouteAnnotation {
222-
TODO("Not yet implemented")
223-
}
224-
225215
override fun getRouteIndex() = routeIndex
226216

227217
override fun getResponseJsonRef(): DataRef {

navigation/src/main/java/com/mapbox/navigation/core/navigator/NavigatorMapper.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import com.mapbox.navigator.Navigator
3232
import com.mapbox.navigator.RouteState
3333
import com.mapbox.navigator.SpeedLimitSign
3434
import com.mapbox.navigator.SpeedLimitUnit
35-
import com.mapbox.navigator.VoiceInstructionInfo
35+
import com.mapbox.navigator.VoiceInstruction
3636
import kotlin.math.roundToInt
3737

3838
private const val ONE_INDEX = 1
@@ -250,7 +250,7 @@ internal fun NavigationStatus.getCurrentBannerInstructions(
250250
}
251251
}
252252

253-
internal fun VoiceInstructionInfo.mapToDirectionsApi(): VoiceInstructions? {
253+
internal fun VoiceInstruction.mapToDirectionsApi(): VoiceInstructions? {
254254
return VoiceInstructions.builder()
255255
.announcement(this.announcement)
256256
.distanceAlongGeometry(this.remainingStepDistance.toDouble())

navigation/src/test/java/com/mapbox/navigation/core/navigator/NavigatorMapperTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import com.mapbox.navigator.RouteState
3434
import com.mapbox.navigator.SpeedLimitSign
3535
import com.mapbox.navigator.SpeedLimitUnit
3636
import com.mapbox.navigator.UpcomingRouteAlert
37-
import com.mapbox.navigator.VoiceInstructionInfo
37+
import com.mapbox.navigator.VoiceInstruction
3838
import io.mockk.every
3939
import io.mockk.mockk
4040
import org.junit.Assert.assertEquals
@@ -810,7 +810,7 @@ class NavigatorMapperTest {
810810
every { view } returns null
811811
every { index } returns 0
812812
}
813-
private val nativeVoiceInstructions = mockk<VoiceInstructionInfo> {
813+
private val nativeVoiceInstructions = mockk<VoiceInstruction> {
814814
every { announcement } returns "announcement"
815815
every { remainingStepDistance } returns 111f
816816
every { ssmlAnnouncement } returns "ssmlAnnouncement"

navigation/src/test/java/com/mapbox/navigation/core/telemetry/events/FeedbackMetadataTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.mapbox.geojson.Point
77
import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
88
import com.mapbox.navigation.testing.withPrefabTestPoint
99
import com.mapbox.navigator.FixLocation
10-
import com.mapbox.navigator.StepData
10+
import com.mapbox.navigator.Step
1111
import com.mapbox.navigator.UserFeedbackMetadata
1212
import nl.jqno.equalsverifier.EqualsVerifier
1313
import org.json.JSONObject
@@ -235,8 +235,8 @@ class FeedbackMetadataTest {
235235
previousType: String,
236236
previousModifier: String,
237237
previousInstruction: String,
238-
): StepData {
239-
return StepData(
238+
): Step {
239+
return Step(
240240
distance,
241241
distanceRemaining,
242242
duration,

0 commit comments

Comments
 (0)