Skip to content

Commit 8d973b7

Browse files
korshaknngithub-actions[bot]
authored andcommitted
bump for 3.9-rc.1 (#8976)
GitOrigin-RevId: 4594613fdc60ee9046115c7e4d7277ac0ee43192
1 parent ce4392f commit 8d973b7

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

gradle/dependencies.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ 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.12.0-SNAPSHOT-04-17--15-12.git-07e5868'
16+
mapboxNavigatorVersion = '324.12.0-rc.1'
1717
}
1818
println("Navigation Native version: " + mapboxNavigatorVersion)
1919

2020
version = [
21-
mapboxMapSdk : '11.12.0-beta.1',
21+
mapboxMapSdk : '11.12.0-rc.1',
2222
mapboxSdkServices : '7.4.0',
2323
mapboxNavigator : "${mapboxNavigatorVersion}",
24-
mapboxCommonNative : '24.12.0-SNAPSHOT-04-16--13-18.git-d194c03',
25-
mapboxNavSdkCpp : '0.12.0-SNAPSHOT-04-16--13-18.git-d194c03',
26-
mapboxSearch : '2.12.0-beta.1',
24+
mapboxCommonNative : '24.12.0-rc.1',
25+
mapboxNavSdkCpp : '0.12.0-rc.1',
26+
mapboxSearch : '2.12.0-rc.1',
2727
mapboxBaseAndroid : '0.11.0',
2828
androidXActivity : '1.7.1',
2929
androidXActivityCompose : '1.9.2',

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.mapbox.navigation.testing.factories
22

3-
import com.mapbox.api.directions.v5.models.RouteOptions
43
import com.mapbox.api.directions.v5.models.StepManeuver
54
import com.mapbox.bindgen.DataRef
65
import com.mapbox.geojson.Point
@@ -17,6 +16,8 @@ import com.mapbox.navigator.OffRoadStateProvider
1716
import com.mapbox.navigator.RerouteError
1817
import com.mapbox.navigator.RerouteErrorType
1918
import com.mapbox.navigator.RoadName
19+
import com.mapbox.navigator.RouteAnnotation
20+
import com.mapbox.navigator.RouteData
2021
import com.mapbox.navigator.RouteIndices
2122
import com.mapbox.navigator.RouteInfo
2223
import com.mapbox.navigator.RouteInterface
@@ -31,10 +32,9 @@ import com.mapbox.navigator.TimeZone
3132
import com.mapbox.navigator.TurnLane
3233
import com.mapbox.navigator.UpcomingRouteAlertUpdate
3334
import com.mapbox.navigator.VoiceInstruction
35+
import com.mapbox.navigator.VoiceInstructionInfo
3436
import com.mapbox.navigator.Waypoint
3537
import com.mapbox.navigator.WaypointType
36-
import com.mapbox.navigator.route_data.RouteAnnotation
37-
import com.mapbox.navigator.route_data.RouteData
3838
import java.nio.ByteBuffer
3939
import java.time.Instant
4040
import java.util.Date
@@ -58,7 +58,7 @@ fun createNavigationStatus(
5858
intersectionIndex: Int = 0,
5959
turnLanes: List<TurnLane> = emptyList(),
6060
roads: List<RoadName> = emptyList(),
61-
voiceInstruction: VoiceInstruction? = null,
61+
voiceInstruction: VoiceInstructionInfo? = null,
6262
// default banner instruction workarounds the direct usage of the MapboxNativeNavigatorImpl
6363
bannerInstruction: BannerInstruction? = createBannerInstruction(),
6464
speedLimit: SpeedLimit = SpeedLimit(null, SpeedLimitUnit.KILOMETRES_PER_HOUR, SpeedLimitSign.VIENNA),
@@ -118,8 +118,8 @@ fun createNavigationStatus(
118118

119119
fun createVoiceInstruction(
120120
announcement: String = "test"
121-
): VoiceInstruction {
122-
return VoiceInstruction("test", announcement, 0f, 0)
121+
): VoiceInstructionInfo {
122+
return VoiceInstructionInfo("test", announcement, 0f, 0)
123123
}
124124

125125
fun createBannerInstruction(

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.VoiceInstruction
35+
import com.mapbox.navigator.VoiceInstructionInfo
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 VoiceInstruction.mapToDirectionsApi(): VoiceInstructions? {
253+
internal fun VoiceInstructionInfo.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.VoiceInstruction
37+
import com.mapbox.navigator.VoiceInstructionInfo
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<VoiceInstruction> {
813+
private val nativeVoiceInstructions = mockk<VoiceInstructionInfo> {
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.Step
10+
import com.mapbox.navigator.StepData
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-
): Step {
239-
return Step(
238+
): StepData {
239+
return StepData(
240240
distance,
241241
distanceRemaining,
242242
duration,

0 commit comments

Comments
 (0)