Merge branch 'v2' into mrichardson/http_method

Author: velocitysystems

.changes/geolocation-android-timeout.md

@@ -0,0 +1,6 @@
+---
+geolocation: patch
+geolocation-js: patch
+---
+
+On Android, use the `timeout` value for `setMinUpdateIntervalMillis`, `setMaxUpdateDelayMillis` and `setIntervalMillis` instead of just `minUpdateInterval`.

examples/api/package.json

@@ -40,6 +40,6 @@
     "@unocss/extractor-svelte": "^66.3.3",
     "svelte": "^5.20.4",
     "unocss": "^66.3.3",
-    "vite": "^7.0.4"
+    "vite": "^7.0.7"
   }
 }

package.json

@@ -11,20 +11,21 @@
     "example:api:dev": "pnpm run --filter \"api\" tauri dev"
   },
   "devDependencies": {
-    "@eslint/js": "9.35.0",
+    "@eslint/js": "9.36.0",
     "@rollup/plugin-node-resolve": "16.0.1",
     "@rollup/plugin-terser": "0.4.4",
     "@rollup/plugin-typescript": "12.1.4",
     "covector": "^0.12.4",
-    "eslint": "9.35.0",
+    "eslint": "9.36.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-security": "3.0.1",
     "prettier": "3.6.2",
-    "rollup": "4.50.1",
+    "rollup": "4.52.2",
     "tslib": "2.8.1",
     "typescript": "5.9.2",
-    "typescript-eslint": "8.42.0"
+    "typescript-eslint": "8.44.1"
   },
+  "minimumReleaseAge": 4320,
   "pnpm": {
     "overrides": {
       "esbuild@<0.25.0": ">=0.25.0"
@@ -34,6 +35,6 @@
     ]
   },
   "engines": {
-    "pnpm": "^10.0.0"
+    "pnpm": "^10.16.0"
   }
 }

plugins/deep-link/examples/app/package.json

@@ -16,6 +16,6 @@
   "devDependencies": {
     "@tauri-apps/cli": "2.8.4",
     "typescript": "^5.7.3",
-    "vite": "^7.0.4"
+    "vite": "^7.0.7"
   }
 }

plugins/geolocation/android/src/main/java/Geolocation.kt

@@ -91,11 +91,9 @@ public class Geolocation(private val context: Context) {
                 val lowPrio = if (networkEnabled) Priority.PRIORITY_BALANCED_POWER_ACCURACY else Priority.PRIORITY_LOW_POWER
                 val prio = if (enableHighAccuracy) Priority.PRIORITY_HIGH_ACCURACY else lowPrio
 
-                Logger.error(prio.toString())
-
-                val locationRequest = LocationRequest.Builder(10000)
+                val locationRequest = LocationRequest.Builder(timeout)
                     .setMaxUpdateDelayMillis(timeout)
-                    .setMinUpdateIntervalMillis(5000)
+                    .setMinUpdateIntervalMillis(timeout)
                     .setPriority(prio)
                     .build()
 
@@ -145,4 +143,4 @@ public class Geolocation(private val context: Context) {
 
         return lastLoc
     }
-}
+}

plugins/store/examples/AppSettingsManager/package.json

@@ -10,6 +10,6 @@
   "devDependencies": {
     "@tauri-apps/cli": "2.8.4",
     "typescript": "^5.7.3",
-    "vite": "^7.0.4"
+    "vite": "^7.0.7"
   }
 }

plugins/websocket/examples/tauri-app/package.json

@@ -11,7 +11,7 @@
   "devDependencies": {
     "@tauri-apps/cli": "2.8.4",
     "typescript": "^5.7.3",
-    "vite": "^7.0.4"
+    "vite": "^7.0.7"
   },
   "dependencies": {
     "tauri-plugin-websocket-api": "link:..\\.."