Merge branch 'main' into feat/common/snapped-course

stadiamaps · Sep 11, 2024 · 90d6402 · 90d6402
2 parents b78ace5 + 622a787
commit 90d6402
Show file tree

Hide file tree

Showing 26 changed files with 309 additions and 194 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,18 @@
+version: 2
+updates:
+  - package-ecosystem: cargo
+    directory: /common
+    schedule:
+      interval: monthly
+  - package-ecosystem: swift
+    directory: /
+    schedule:
+      interval: monthly
+  - package-ecosystem: gradle
+    directory: /android
+    schedule:
+      interval: monthly
+  - package-ecosystem: npm
+    directory: /web
+    schedule:
+      interval: monthly
diff --git a/Package.swift b/Package.swift
@@ -16,8 +16,8 @@ if useLocalFramework {
         path: "./common/target/ios/libferrostar-rs.xcframework"
     )
 } else {
-    let releaseTag = "0.10.0"
-    let releaseChecksum = "e4eafc2331e5a6307cdd6257fe73ae8a977fca119938788d976d0218cfbfc5a8"
+    let releaseTag = "0.10.1"
+    let releaseChecksum = "cc959191f3d066f628264c103e5ea0c3544664ffd0e61907e082d7f1a4d8c5d2"
     binaryTarget = .binaryTarget(
         name: "FerrostarCoreRS",
         url: "https://github.com/stadiamaps/ferrostar/releases/download/\(releaseTag)/libferrostar-rs.xcframework.zip",

diff --git a/android/build.gradle b/android/build.gradle
@@ -12,5 +12,5 @@ plugins {
 
 allprojects {
     group = "com.stadiamaps.ferrostar"
-    version = "0.10.0"
+    version = "0.10.1"
 }
diff --git a/...omposeui/src/main/java/com/stadiamaps/ferrostar/composeui/formatting/DistanceFormatter.kt b/...omposeui/src/main/java/com/stadiamaps/ferrostar/composeui/formatting/DistanceFormatter.kt
@@ -150,7 +150,7 @@ class LocalizedDistanceFormatter(
                 DecimalPrecision.NEAREST_TENTH
               }
         } else {
-          // Longer distances: use m
+          // Shorter distances: use m
           unit = MeasureUnit.METER
           distance =
               if (distanceInMeters > 100) {

diff --git a/...shots/images/com.stadiamaps.ferrostar.views_ArrivalViewTest_testArrivalView.png b/...shots/images/com.stadiamaps.ferrostar.views_ArrivalViewTest_testArrivalView.png
diff --git a/...images/com.stadiamaps.ferrostar.views_ArrivalViewTest_testArrivalView24Hour.png b/...images/com.stadiamaps.ferrostar.views_ArrivalViewTest_testArrivalView24Hour.png
diff --git a/...tadiamaps.ferrostar.views_ArrivalViewTest_testArrivalViewInformationalStyle.png b/...tadiamaps.ferrostar.views_ArrivalViewTest_testArrivalViewInformationalStyle.png
diff --git a/...ages/com.stadiamaps.ferrostar.views_ArrivalViewTest_testArrivalViewWithExit.png b/...ages/com.stadiamaps.ferrostar.views_ArrivalViewTest_testArrivalViewWithExit.png
diff --git a/...ages/com.stadiamaps.ferrostar.views_InstructionViewTest_testInstructionView.png b/...ages/com.stadiamaps.ferrostar.views_InstructionViewTest_testInstructionView.png
diff --git a/...aps.ferrostar.views_NavigatingInnerGridViewTest_testNavigatingInnerGridView.png b/...aps.ferrostar.views_NavigatingInnerGridViewTest_testNavigatingInnerGridView.png
diff --git a/...star.views_NavigatingInnerGridViewTest_testNavigatingInnerGridViewLandscape.png b/...star.views_NavigatingInnerGridViewTest_testNavigatingInnerGridViewLandscape.png
diff --git a/...om.stadiamaps.ferrostar.views_NavigationUIButtonTest_testNavigationUIButton.png b/...om.stadiamaps.ferrostar.views_NavigationUIButtonTest_testNavigationUIButton.png
diff --git a/...aps.ferrostar.views_NavigationUIButtonTest_testNavigationUIButtonCustomized.png b/...aps.ferrostar.views_NavigationUIButtonTest_testNavigationUIButtonCustomized.png
diff --git a/...m.stadiamaps.ferrostar.views_RTLInstructionViewTests_testRTLInstructionView.png b/...m.stadiamaps.ferrostar.views_RTLInstructionViewTests_testRTLInstructionView.png
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
@@ -1,23 +1,23 @@
 [versions]
-agp = "8.5.2"
-kotlin = "2.0.0"
+agp = "8.6.0"
+kotlin = "2.0.20"
 cargo-ndk = "0.3.4"
-ktfmt = "0.19.0"
-androidx-lifecycle = "2.8.4"
+ktfmt = "0.20.1"
+androidx-lifecycle = "2.8.5"
 paparazzi = "1.3.4"
 desugar_jdk_libs = "2.0.4"
 ktx = "1.13.1"
 kotlinx-coroutines = "1.8.1"
-kotlinx-datetime = "0.6.0"
+kotlinx-datetime = "0.6.1"
 androidx-appcompat = "1.7.0"
-androidx-activity-compose = "1.9.1"
-compose = "2024.06.00"
+androidx-activity-compose = "1.9.2"
+compose = "2024.09.00"
 okhttp = "4.12.0"
 moshi = "1.15.1"
 maplibre-compose = "0.0.16"
 junit = "4.13.2"
 junitVersion = "1.2.1"
-junitCompose = "1.6.8"
+junitCompose = "1.7.0"
 espressoCore = "3.6.1"
 okhttp-mock = "2.0.0"
 mavenPublish = "0.29.0"

diff --git a/apple/Sources/UniFFI/ferrostar.swift b/apple/Sources/UniFFI/ferrostar.swift
@@ -47,9 +47,11 @@ private extension ForeignBytes {
 
 private extension Data {
     init(rustBuffer: RustBuffer) {
-        // TODO: This copies the buffer. Can we read directly from a
-        // Rust buffer?
-        self.init(bytes: rustBuffer.data!, count: Int(rustBuffer.len))
+        self.init(
+            bytesNoCopy: rustBuffer.data!,
+            count: Int(rustBuffer.len),
+            deallocator: .none
+        )
     }
 }