Merge branch 'main' into autocomplete-search

stadiamaps · Oct 17, 2024 · 57e21d2 · 57e21d2
2 parents ff295fc + 9d7c0c5
commit 57e21d2
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 125 deletions.
diff --git a/Package.swift b/Package.swift
@@ -16,7 +16,7 @@ if useLocalFramework {
         path: "./common/target/ios/libferrostar-rs.xcframework"
     )
 } else {
-    let releaseTag = "0.17.0"
+    let releaseTag = "0.18.0"
     let releaseChecksum = "89c37244d3a4a56237d403647092d2e54e46213f5e1958eaaa14557846d6999a"
     binaryTarget = .binaryTarget(
         name: "FerrostarCoreRS",

diff --git a/android/build.gradle b/android/build.gradle
@@ -13,5 +13,5 @@ plugins {
 
 allprojects {
     group = "com.stadiamaps.ferrostar"
-    version = "0.17.0"
+    version = "0.18.0"
 }
diff --git a/android/composeui/build.gradle b/android/composeui/build.gradle
@@ -21,12 +21,6 @@ android {
         consumerProguardFiles "consumer-rules.pro"
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
     compileOptions {
         coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/android/composeui/proguard-rules.pro b/android/composeui/proguard-rules.pro
diff --git a/android/core/build.gradle b/android/core/build.gradle
@@ -23,12 +23,6 @@ android {
         consumerProguardFiles "consumer-rules.pro"
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
     compileOptions {
         coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/android/core/consumer-rules.pro b/android/core/consumer-rules.pro
@@ -0,0 +1,8 @@
+# Ferrostar & JNA
+# TODO: This needs validation from a publishing app. Ticket https://github.com/stadiamaps/ferrostar/issues/185
+-keep class com.sun.jna.** { *; }
+-keep class uniffi.ferrostar.** { *; }
+-dontwarn java.awt.Component
+-dontwarn java.awt.GraphicsEnvironment
+-dontwarn java.awt.HeadlessException
+-dontwarn java.awt.Window
diff --git a/android/core/proguard-rules.pro b/android/core/proguard-rules.pro
diff --git a/android/google-play-services/build.gradle b/android/google-play-services/build.gradle
@@ -19,12 +19,6 @@ android {
         consumerProguardFiles "consumer-rules.pro"
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
     compileOptions {
         coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/android/google-play-services/proguard-rules.pro b/android/google-play-services/proguard-rules.pro
diff --git a/android/maplibreui/build.gradle b/android/maplibreui/build.gradle
@@ -21,12 +21,6 @@ android {
         consumerProguardFiles "consumer-rules.pro"
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
     compileOptions {
         coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/android/maplibreui/proguard-rules.pro b/android/maplibreui/proguard-rules.pro
diff --git a/common/Cargo.lock b/common/Cargo.lock
diff --git a/common/ferrostar/Cargo.toml b/common/ferrostar/Cargo.toml
@@ -2,7 +2,7 @@ lints.workspace = true
 
 [package]
 name = "ferrostar"
-version = "0.17.0"
+version = "0.18.0"
 readme = "README.md"
 description = "The core of modern turn-by-turn navigation."
 keywords = ["navigation", "routing", "valhalla", "osrm"]

diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -6,7 +6,7 @@
     "CatMe0w <[email protected]> (https://github.com/CatMe0w)",
     "Luke Seelenbinder <[email protected]>"
   ],
-  "version": "0.17.0",
+  "version": "0.18.0",
   "license": "BSD-3-Clause",
   "type": "module",
   "main": "./dist/ferrostar-webcomponents.js",