expo-location 16.0.0 → 16.1.0

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 16.1.0 — 2023-07-13
+
+### 🐛 Bug fixes
+
+- Downgrade play-services-location to 20.0.0 to support react-native-maps. ([#23501](https://github.com/expo/expo/pull/23501) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
 ## 16.0.0 — 2023-06-21
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '16.0.0'
+version = '16.1.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -67,7 +67,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 29
-    versionName "16.0.0"
+    versionName "16.1.0"
   }
   lintOptions {
     abortOnError false
@@ -82,7 +82,7 @@ android {
 dependencies {
   implementation project(':expo-modules-core')
 
-  api 'com.google.android.gms:play-services-location:21.0.1'
+  api 'com.google.android.gms:play-services-location:20.0.0'
 
   api('io.nlopez.smartlocation:library:3.3.3') {
     transitive = false

package/android/src/main/java/expo/modules/location/LocationHelpers.java

@@ -119,15 +119,16 @@ public class LocationHelpers {
     return heading;
   }
 
-  public static LocationRequest.Builder prepareLocationRequest(Map<String, Object> options) {
+  public static LocationRequest prepareLocationRequest(Map<String, Object> options) {
     LocationParams locationParams = LocationHelpers.mapOptionsToLocationParams(options);
     int accuracy = LocationHelpers.getAccuracyFromOptions(options);
 
-    return new LocationRequest.Builder(locationParams.getInterval())
-      .setMinUpdateIntervalMillis(locationParams.getInterval())
-      .setMaxUpdateDelayMillis(locationParams.getInterval())
-      .setMinUpdateDistanceMeters(locationParams.getDistance())
-      .setPriority(mapAccuracyToPriority(accuracy));
+    return new LocationRequest()
+        .setFastestInterval(locationParams.getInterval())
+        .setInterval(locationParams.getInterval())
+        .setMaxWaitTime(locationParams.getInterval())
+        .setSmallestDisplacement(locationParams.getDistance())
+        .setPriority(mapAccuracyToPriority(accuracy));
   }
 
   public static LocationParams mapOptionsToLocationParams(Map<String, Object> options) {
@@ -146,14 +147,14 @@ public class LocationHelpers {
     return locationParamsBuilder.build();
   }
 
-  static void requestSingleLocation(final LocationModule locationModule, final LocationRequest.Builder locationRequest, final Promise promise) {
+  static void requestSingleLocation(final LocationModule locationModule, final LocationRequest locationRequest, final Promise promise) {
     // we want just one update
-    locationRequest.setMaxUpdates(1);
+    locationRequest.setNumUpdates(1);
 
-    locationModule.requestLocationUpdates(locationRequest.build(), null, new LocationRequestCallbacks() {
+    locationModule.requestLocationUpdates(locationRequest, null, new LocationRequestCallbacks() {
       @Override
       public void onLocationChanged(Location location) {
-          promise.resolve(LocationHelpers.locationToBundle(location, Bundle.class));
+        promise.resolve(LocationHelpers.locationToBundle(location, Bundle.class));
       }
 
       @Override

package/android/src/main/java/expo/modules/location/LocationModule.java

@@ -275,7 +275,7 @@ public class LocationModule extends ExportedModule implements LifecycleEventList
   @ExpoMethod
   public void getCurrentPositionAsync(final Map<String, Object> options, final Promise promise) {
     // Read options
-    final LocationRequest.Builder builder = LocationHelpers.prepareLocationRequest(options);
+    final LocationRequest locationRequest = LocationHelpers.prepareLocationRequest(options);
     boolean showUserSettingsDialog = !options.containsKey(SHOW_USER_SETTINGS_DIALOG_KEY) || (boolean) options.get(SHOW_USER_SETTINGS_DIALOG_KEY);
 
     // Check for permissions
@@ -285,12 +285,12 @@ public class LocationModule extends ExportedModule implements LifecycleEventList
     }
 
     if (LocationHelpers.hasNetworkProviderEnabled(mContext) || !showUserSettingsDialog) {
-      LocationHelpers.requestSingleLocation(this, builder, promise);
+      LocationHelpers.requestSingleLocation(this, locationRequest, promise);
     } else {
       // Pending requests can ask the user to turn on improved accuracy mode in user's settings.
-      addPendingLocationRequest(builder.build(), resultCode -> {
+      addPendingLocationRequest(locationRequest, resultCode -> {
         if (resultCode == Activity.RESULT_OK) {
-          LocationHelpers.requestSingleLocation(LocationModule.this, builder, promise);
+          LocationHelpers.requestSingleLocation(LocationModule.this, locationRequest, promise);
         } else {
           promise.reject(new LocationSettingsUnsatisfiedException());
         }
@@ -336,16 +336,16 @@ public class LocationModule extends ExportedModule implements LifecycleEventList
       return;
     }
 
-    final LocationRequest.Builder locationRequest = LocationHelpers.prepareLocationRequest(options);
+    final LocationRequest locationRequest = LocationHelpers.prepareLocationRequest(options);
     boolean showUserSettingsDialog = !options.containsKey(SHOW_USER_SETTINGS_DIALOG_KEY) || (boolean) options.get(SHOW_USER_SETTINGS_DIALOG_KEY);
 
     if (LocationHelpers.hasNetworkProviderEnabled(mContext) || !showUserSettingsDialog) {
-      LocationHelpers.requestContinuousUpdates(this, locationRequest.build(), watchId, promise);
+      LocationHelpers.requestContinuousUpdates(this, locationRequest, watchId, promise);
     } else {
       // Pending requests can ask the user to turn on improved accuracy mode in user's settings.
-      addPendingLocationRequest(locationRequest.build(), resultCode -> {
+      addPendingLocationRequest(locationRequest, resultCode -> {
         if (resultCode == Activity.RESULT_OK) {
-          LocationHelpers.requestContinuousUpdates(LocationModule.this, locationRequest.build(), watchId, promise);
+          LocationHelpers.requestContinuousUpdates(LocationModule.this, locationRequest, watchId, promise);
         } else {
           promise.reject(new LocationSettingsUnsatisfiedException());
         }
@@ -443,9 +443,9 @@ public class LocationModule extends ExportedModule implements LifecycleEventList
       return;
     }
 
-    LocationRequest.Builder locationRequest = LocationHelpers.prepareLocationRequest(new HashMap<>());
+    LocationRequest locationRequest = LocationHelpers.prepareLocationRequest(new HashMap<>());
 
-    addPendingLocationRequest(locationRequest.build(), resultCode -> {
+    addPendingLocationRequest(locationRequest, resultCode -> {
       if (resultCode == Activity.RESULT_OK) {
         promise.resolve(null);
       } else {

package/android/src/main/java/expo/modules/location/taskConsumers/LocationTaskConsumer.java

@@ -181,7 +181,7 @@ public class LocationTaskConsumer extends TaskConsumer implements TaskConsumerIn
       return;
     }
 
-    mLocationRequest = LocationHelpers.prepareLocationRequest(mTask.getOptions()).build();
+    mLocationRequest = LocationHelpers.prepareLocationRequest(mTask.getOptions());
     mPendingIntent = preparePendingIntent();
 
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-location",
-  "version": "16.0.0",
+  "version": "16.1.0",
   "description": "Allows reading geolocation information from the device. Your app can poll for the current location or subscribe to location update events.",
   "main": "build/Location.js",
   "types": "build/Location.d.ts",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "fa5ecca8251986b9f197cc14074eec0ab6dfb6db"
+  "gitHead": "091c7777c1cc1298826b0a5c2c35e0e201d083ed"
 }