UUID type fix

Package.swift

@@ -16,7 +16,7 @@ if useLocalFramework {
         path: "./common/target/ios/libferrostar-rs.xcframework"
     )
 } else {
-    let releaseTag = "0.10.1"
+    let releaseTag = "0.11.0"
     let releaseChecksum = "cc959191f3d066f628264c103e5ea0c3544664ffd0e61907e082d7f1a4d8c5d2"
     binaryTarget = .binaryTarget(
         name: "FerrostarCoreRS",

android/build.gradle

@@ -12,5 +12,5 @@ plugins {
 
 allprojects {
     group = "com.stadiamaps.ferrostar"
-    version = "0.10.1"
+    version = "0.11.0"
 }

android/core/src/main/java/com/stadiamaps/ferrostar/core/FerrostarCore.kt

@@ -27,6 +27,7 @@ import uniffi.ferrostar.RouteDeviation
 import uniffi.ferrostar.RouteRequest
 import uniffi.ferrostar.TripState
 import uniffi.ferrostar.UserLocation
+import uniffi.ferrostar.Uuid
 import uniffi.ferrostar.Waypoint
 
 /** Represents the complete state of the navigation session provided by FerrostarCore-RS. */
@@ -109,7 +110,7 @@ class FerrostarCore(
 
   // Maintains a set of utterance IDs which have been seen previously.
   // This helps us maintain the guarantee that the observer won't see the same one twice.
-  private val _queuedUtteranceIds: MutableSet<String> = mutableSetOf()
+  private val _queuedUtteranceIds: MutableSet<Uuid> = mutableSetOf()
 
   var isCalculatingNewRoute: Boolean = false
     private set

android/core/src/main/java/com/stadiamaps/ferrostar/core/Speech.kt

@@ -107,10 +107,13 @@ class AndroidTtsObserver(
       // Amazon Polly is generally the intended target for SSML on Android though.
       val status =
           tts.speak(
-              spokenInstruction.text, TextToSpeech.QUEUE_ADD, null, spokenInstruction.utteranceId)
+              spokenInstruction.text,
+              TextToSpeech.QUEUE_ADD,
+              null,
+              spokenInstruction.utteranceId.toString())
       if (status != TextToSpeech.SUCCESS) {
         android.util.Log.e(TAG, "Unable to speak instruction: code $status")
-        statusObserver?.onTtsSpeakError(spokenInstruction.utteranceId, status)
+        statusObserver?.onTtsSpeakError(spokenInstruction.utteranceId.toString(), status)
       }
     }
   }

apple/Sources/FerrostarCore/FerrostarCore.swift

@@ -89,7 +89,7 @@ public protocol FerrostarCoreDelegate: AnyObject {
     private var lastAutomaticRecalculation: Date? = nil
     private var lastLocation: UserLocation? = nil
     private var recalculationTask: Task<Void, Never>?
-    private var queuedUtteranceIDs: Set<String> = Set()
+    private var queuedUtteranceIDs: Set<UUID> = Set()
 
     private var config: SwiftNavigationControllerConfig
 

apple/Sources/UniFFI/ferrostar.swift

@@ -3880,25 +3880,30 @@ private struct FfiConverterDictionaryStringString: FfiConverterRustBuffer {
 }
 
 /**
- * Typealias from the type name used in the UDL file to the builtin type.  This
+ * Typealias from the type name used in the UDL file to the custom type.  This
  * is needed because the UDL type name is used in function/method signatures.
  */
-public typealias Uuid = String
+public typealias Uuid = UUID
+
 public struct FfiConverterTypeUuid: FfiConverter {
     public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> Uuid {
-        try FfiConverterString.read(from: &buf)
+        let builtinValue = try FfiConverterString.read(from: &buf)
+        return UUID(uuidString: builtinValue)!
     }
 
     public static func write(_ value: Uuid, into buf: inout [UInt8]) {
-        FfiConverterString.write(value, into: &buf)
+        let builtinValue = value.uuidString
+        return FfiConverterString.write(builtinValue, into: &buf)
     }
 
     public static func lift(_ value: RustBuffer) throws -> Uuid {
-        try FfiConverterString.lift(value)
+        let builtinValue = try FfiConverterString.lift(value)
+        return UUID(uuidString: builtinValue)!
     }
 
     public static func lower(_ value: Uuid) -> RustBuffer {
-        FfiConverterString.lower(value)
+        let builtinValue = value.uuidString
+        return FfiConverterString.lower(builtinValue)
     }
 }
 

common/ferrostar/Cargo.toml

@@ -2,7 +2,7 @@ lints.workspace = true
 
 [package]
 name = "ferrostar"
-version = "0.10.1"
+version = "0.11.0"
 readme = "README.md"
 description = "The core of modern turn-by-turn navigation."
 keywords = ["navigation", "routing", "valhalla", "osrm"]

common/ferrostar/uniffi.toml

@@ -0,0 +1,12 @@
+[bindings.swift.custom_types.Uuid]
+type_name = "UUID"
+into_custom = "UUID(uuidString: {})!"
+from_custom = "{}.uuidString"
+
+[bindings.kotlin.custom_types.Uuid]
+# Eventually we can transition to the Kotlin stdlib type,
+# but this was only just added in Kotlin 2.0.20 (Aug 2024) and is marked experimental.
+# See https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.uuid/-uuid/.
+type_name = "java.util.UUID"
+into_custom = "java.util.UUID.fromString({})"
+from_custom = "{}.toString()"

web/package.json

@@ -6,7 +6,7 @@
     "CatMe0w <[email protected]> (https://github.com/CatMe0w)",
     "Luke Seelenbinder <[email protected]>"
   ],
-  "version": "0.10.1",
+  "version": "0.11.0",
   "license": "BSD-3-Clause",
   "type": "module",
   "main": "./dist/ferrostar-webcomponents.js",